diff --git a/.gitignore b/.gitignore index 5c7970b..57df00a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -fcitx5/conf/cached_layouts \ No newline at end of file +cached_layouts \ No newline at end of file diff --git a/linux-macbook/Xresources b/linux-hidpi/Xresources similarity index 100% rename from linux-macbook/Xresources rename to linux-hidpi/Xresources diff --git a/linux-hidpi/bspwm/bspwmrc b/linux-hidpi/bspwm/bspwmrc new file mode 100755 index 0000000..213a19a --- /dev/null +++ b/linux-hidpi/bspwm/bspwmrc @@ -0,0 +1,52 @@ +#! /bin/sh + +bspc monitor -d I II III IV V VI VII VIII IX X + +bspc config top_padding 27 +bspc config border_width 0 +bspc config window_gap 24 + +bspc config split_ratio 0.52 +bspc config borderless_monocle true +bspc config gapless_monocle true +bspc config focus_follows_pointer true + +bspc rule -a Org.gnome.Nautilus desktop='^1' state=pseudo_tiled follow=on +bspc rule -a TelegramDesktop desktop='^1' state=floating follow=on +bspc rule -a Nextcloud desktop='^1' state=pseudo_tiled follow=on +bspc rule -a "*:transgui" desktop='^1' state=floating follow=on +bspc rule -a Google-chrome desktop='^2' follow=on +bspc rule -a baka-mplayer state=floating sticky=on + +function kill_program { + if ps -A | grep $1; then + killall -q $1 + fi +} + +kill_program gnome-keyring-daemon +kill_program picom +kill_program pasystray +kill_program polybar +kill_program dunst +kill_program polkit-gnome-authentication-agent-1 +kill_program gsd-xsettings + +gnome-keyring-daemon --start --components=pkcs11 & +/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & +/usr/lib/gsd-xsettings & +feh --bg-fill ${HOME}/.config/wallpaper.png +xsetroot -cursor_name left_ptr +picom --experimental-backends & +polybar mybar & +fcitx5 & +dunst & +sxhkd & +dex -a +libinput-gestures-setup restart +[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap + +xinput set-prop "bcm5974" "libinput Natural Scrolling Enabled" 1 +xinput set-prop "bcm5974" "libinput Accel Speed" 0.5 +xinput set-prop 'Logitech G102 LIGHTSYNC Gaming Mouse' 'libinput Natural Scrolling Enabled' 1 +xinput set-prop 'Logitech G102 LIGHTSYNC Gaming Mouse' 'libinput Accel Speed' -0.5 diff --git a/linux-hidpi/dconf/user b/linux-hidpi/dconf/user new file mode 100644 index 0000000..5d90562 Binary files /dev/null and b/linux-hidpi/dconf/user differ diff --git a/linux-hidpi/dunst b/linux-hidpi/dunst new file mode 120000 index 0000000..8e4a05e --- /dev/null +++ b/linux-hidpi/dunst @@ -0,0 +1 @@ +/home/vbalien/newdotfiles/linux/dunst \ No newline at end of file diff --git a/linux-macbook/pam_environment b/linux-hidpi/pam_environment similarity index 100% rename from linux-macbook/pam_environment rename to linux-hidpi/pam_environment diff --git a/linux-macbook/polybar/config b/linux-hidpi/polybar/config similarity index 99% rename from linux-macbook/polybar/config rename to linux-hidpi/polybar/config index 894da5d..7c04649 100644 --- a/linux-macbook/polybar/config +++ b/linux-hidpi/polybar/config @@ -62,6 +62,9 @@ modules-right = pulseaudio wlan eth date tray-position = right tray-padding = 2 +tray-scale = 1.0 +tray-maxsize = 32 + ;tray-detached = true ;tray-offset-x = -10 ;tray-background = #0063ff diff --git a/linux-macbook/rofi/config.rasi b/linux-hidpi/rofi/config.rasi similarity index 100% rename from linux-macbook/rofi/config.rasi rename to linux-hidpi/rofi/config.rasi diff --git a/linux-macbook/rofi/numix.rasi b/linux-hidpi/rofi/numix.rasi similarity index 100% rename from linux-macbook/rofi/numix.rasi rename to linux-hidpi/rofi/numix.rasi diff --git a/linux-macbook/sxhkd/sxhkdrc b/linux-hidpi/sxhkd/sxhkdrc similarity index 100% rename from linux-macbook/sxhkd/sxhkdrc rename to linux-hidpi/sxhkd/sxhkdrc diff --git a/linux-macbook/dconf/user b/linux-macbook/dconf/user deleted file mode 100644 index 6fafe1c..0000000 Binary files a/linux-macbook/dconf/user and /dev/null differ diff --git a/linux/bakamplayer.ini b/linux/bakamplayer.ini deleted file mode 100644 index f94d39f..0000000 --- a/linux/bakamplayer.ini +++ /dev/null @@ -1,55 +0,0 @@ -{ - "autoFit": 100, - "debug": false, - "gestures": false, - "hideAllControls": true, - "hidePopup": false, - "input": { - "Ctrl+S": [ - "screenshot", - "Take screenshot without subtitles" - ], - "Ctrl+Shift+T": [ - "", - "" - ] - }, - "lang": "ko", - "maxRecent": 5, - "mpv": { - "hwdec": "auto-copy", - "input-ipc-server": "/tmp/mpvsocket", - "msg-level": "status", - "screenshot-directory": "/home/vbalien/Pictures", - "screenshot-format": "", - "screenshot-template": "screenshot%#04n", - "speed": 1, - "vo": "", - "volume": 100 - }, - "onTop": "never", - "recent": [ - { - "path": "/run/user/1000/gvfs/afp-volume:host=home.alien.moe,user=vbalien,volume=Animations/[Ohys-Raws] Maou Gakuin no Futekigousha - 03 (AT-X 1280x720 x264 AAC).mp4" - }, - { - "path": "/run/user/1000/gvfs/afp-volume:host=home.alien.moe,user=vbalien,volume=Animations/[Ohys-Raws] Re Zero kara Hajimeru Isekai Seikatsu 2nd Season - 02 (AT-X 1920x1080 x264 AAC).mp4" - }, - { - "path": "/run/user/1000/gvfs/afp-volume:host=home.alien.moe,user=vbalien,volume=Animations/[Ohys-Raws] Yahari Ore no Seishun LoveCome wa Machigatte Iru. Kan - 02 (TBS 1920x1080 x264 AAC).mp4" - }, - { - "path": "/run/user/1000/gvfs/afp-volume:host=home.alien.moe,user=vbalien,volume=Animations/[Moozzi2] Machikado Mazoku - TV + SP/[Moozzi2] Machikado Mazoku - 01 (BD 1920x1080 x.264 Flac).mkv" - }, - { - "path": "/run/user/1000/gvfs/afp-volume:host=home.alien.moe,user=vbalien,volume=Animations/[Ohys-Raws] Bang Dream! Garupa Pico Oomori - 02 (AT-X 1280x720 x264 AAC).mp4" - } - ], - "remaining": true, - "resume": true, - "screenshotDialog": false, - "showAll": true, - "splitter": 313, - "trayIcon": false, - "version": "2.0.3" -} diff --git a/linux/bspwm/bspwmrc b/linux/bspwm/bspwmrc index 16f22ee..768bb90 100755 --- a/linux/bspwm/bspwmrc +++ b/linux/bspwm/bspwmrc @@ -4,7 +4,7 @@ bspc monitor -d I II III IV V VI VII VIII IX X bspc config top_padding 27 bspc config border_width 0 -bspc config window_gap `expr 12 * $GDK_SCALE` +bspc config window_gap 24 bspc config split_ratio 0.52 bspc config borderless_monocle true @@ -44,6 +44,7 @@ dunst & sxhkd & dex -a libinput-gestures-setup restart +[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap xinput set-prop "bcm5974" "libinput Natural Scrolling Enabled" 1 xinput set-prop 'Logitech G102 LIGHTSYNC Gaming Mouse' 'libinput Natural Scrolling Enabled' 1 diff --git a/mapping.ts b/mapping.ts index bb95693..194e273 100755 --- a/mapping.ts +++ b/mapping.ts @@ -15,7 +15,7 @@ const linux: DotOption = { `yay -S --needed sxhkd bspwm rofi dunst-git visual-studio-code-bin ttf-nanum polybar-git baka-mplayer-git - picom-ibhagwan-git alacritty zsh maim + picom-ibhagwan-git alacritty zsh maim gtk-engine-murrine xclip xdotool google-chrome pulseaudio gnome-keyring pasystray polkit-gnome nerd-fonts-terminus gnome-settings-daemon nitrogen dex sassc @@ -36,7 +36,6 @@ const linux: DotOption = { ".config/sxhkd": "linux/sxhkd", ".config/fcitx5": "linux/fcitx5", ".config/dconf": "linux/dconf", - ".config/bakamplayer.ini": "linux/bakamplayer.ini", ".xinitrc": "linux/xinitrc", ".pam_environment": "linux/pam_environment", ".zshrc": "linux/zshrc", @@ -44,22 +43,24 @@ const linux: DotOption = { }, }; -const linuxMacbook: DotOption = { +const linuxHiDPI: DotOption = { ...linux, hostname: "MBP", link: { ...linux.link, - ".config/dconf": "linux-macbook/dconf", - ".config/polybar": "linux-macbook/polybar", - ".config/rofi": "linux-macbook/rofi", - ".config/sxhkd": "linux-macbook/sxhkd", - ".pam_environment": "linux-macbook/pam_environment", - ".Xresources": "linux-macbook/Xresources", + ".config/bspwm": "linux-hidpi/bspwm", + ".config/dconf": "linux-hidpi/dconf", + ".config/polybar": "linux-hidpi/polybar", + ".config/rofi": "linux-hidpi/rofi", + ".config/sxhkd": "linux-hidpi/sxhkd", + ".config/dunst": "linux-hidpi/dunst", + ".pam_environment": "linux-hidpi/pam_environment", + ".Xresources": "linux-hidpi/Xresources", }, }; try { - await dot(Deno.args, [linux, linuxMacbook]); + await dot(Deno.args, [linux, linuxHiDPI]); } catch (err) { console.log(err.message); }