diff --git a/dot/file/profile b/dot/file/profile index 713b44a..e443dbb 100755 --- a/dot/file/profile +++ b/dot/file/profile @@ -6,6 +6,14 @@ reload-profile(){ . $PROFILE } +sctl(){ + systemctl $@ +} + +jctl(){ + journalctl $@ +} + export_loop(){ # Chore, because I'm lazy to type "export" so many times. # Standard "export" command takes arguments diff --git a/install.sh b/install.sh index a0af896..0ddcf7b 100755 --- a/install.sh +++ b/install.sh @@ -6,6 +6,7 @@ for i in * ; do from="$rpath/$i" to="$HOME/.config/`basename $i`" echo "'$from'" "'$to'" + rm -f "$to" ln -s -f "$from" "$to" done diff --git a/kanshi/config b/kanshi/config new file mode 100644 index 0000000..d7dc113 --- /dev/null +++ b/kanshi/config @@ -0,0 +1,5 @@ +profile { + output eDP-1 enable mode 1920x1080 position 1920,0 + output HDMI-A-1 enable mode 1920x1080 position 0,0 +} + diff --git a/nvim/lua/general.lua b/nvim/lua/general.lua index 9432bf8..37997f8 100644 --- a/nvim/lua/general.lua +++ b/nvim/lua/general.lua @@ -1,6 +1,8 @@ vim.cmd("syntax off") vim.cmd("set nowrap") +vim.g.autoformat = false + -- The standard. vim.cmd.language("en_US") diff --git a/river/init b/river/init index f59957d..d615c69 100755 --- a/river/init +++ b/river/init @@ -20,13 +20,13 @@ riverctl map normal Super Q close riverctl map normal Super+Shift E exit # Super+J and Super+K to focus the next/previous view in the layout stack -riverctl map normal Super J focus-view next -riverctl map normal Super K focus-view previous +riverctl map -repeat normal Super J focus-view next +riverctl map -repeat normal Super K focus-view previous # Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous # view in the layout stack -riverctl map normal Super+Shift J swap next -riverctl map normal Super+Shift K swap previous +riverctl map -repeat normal Super+Shift J swap next +riverctl map -repeat normal Super+Shift K swap previous # Super+Period and Super+Comma to focus the next/previous output riverctl map normal Super Period focus-output next @@ -40,18 +40,18 @@ riverctl map normal Super+Shift Comma send-to-output previous riverctl map normal Super S zoom # Super+H and Super+L to decrease/increase the main ratio of rivertile(1) -riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05" -riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05" +riverctl map -repeat normal Super H send-layout-cmd rivertile "main-ratio -0.05" +riverctl map -repeat normal Super L send-layout-cmd rivertile "main-ratio +0.05" # Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1) riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1" riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1" # Super+Alt+{H,J,K,L} to move views -riverctl map normal Super+Alt H move left 100 -riverctl map normal Super+Alt J move down 100 -riverctl map normal Super+Alt K move up 100 -riverctl map normal Super+Alt L move right 100 +riverctl map -repeat normal Super+Alt H move left 100 +riverctl map -repeat normal Super+Alt J move down 100 +riverctl map -repeat normal Super+Alt K move up 100 +riverctl map -repeat normal Super+Alt L move right 100 # Super+Alt+Control+{H,J,K,L} to snap views to screen edges riverctl map normal Super+Alt+Control H snap left @@ -60,10 +60,10 @@ riverctl map normal Super+Alt+Control K snap up riverctl map normal Super+Alt+Control L snap right # Super+Alt+Shift+{H,J,K,L} to resize views -riverctl map normal Super+Alt+Shift H resize horizontal -100 -riverctl map normal Super+Alt+Shift J resize vertical 100 -riverctl map normal Super+Alt+Shift K resize vertical -100 -riverctl map normal Super+Alt+Shift L resize horizontal 100 +riverctl map -repeat normal Super+Alt+Shift H resize horizontal -100 +riverctl map -repeat normal Super+Alt+Shift J resize vertical 100 +riverctl map -repeat normal Super+Alt+Shift K resize vertical -100 +riverctl map -repeat normal Super+Alt+Shift L resize horizontal 100 # Super + Left Mouse Button to move views riverctl map-pointer normal Super BTN_LEFT move-view @@ -97,11 +97,11 @@ all_tags=$(((1 << 32) - 1)) riverctl map normal Super 0 set-focused-tags $all_tags riverctl map normal Super+Shift 0 set-view-tags $all_tags -# Super+Space to toggle float -riverctl map normal Super Space toggle-float +# Toggle float. +riverctl map normal Super F toggle-float -# Super+F to toggle fullscreen -riverctl map normal Super F toggle-fullscreen +# Toggle fullscreen. +riverctl map normal Super+Shift F toggle-fullscreen # Super+{Up,Right,Down,Left} to change layout orientation riverctl map normal Super Up send-layout-cmd rivertile "main-location top" @@ -157,6 +157,9 @@ riverctl set-repeat 50 300 riverctl map normal Super Tab spawn "riverctl keyboard-layout 'us(dvorak)'" riverctl map normal Super A spawn "riverctl keyboard-layout 'us'" riverctl map normal Super Return spawn "riverctl keyboard-layout 'us(dvp)'" +riverctl map normal Super Backspace spawn "riverctl keyboard-layout 'ru'" + +riverctl map normal Super+Alt R spawn "RIVER_RELOAD=1 $XDG_CONFIG_HOME/river/init" # Run appications. riverctl map normal Super+Shift R spawn "$XRUNNER" @@ -170,11 +173,17 @@ riverctl rule-add -app-id "bar" csd # Set the default layout generator to be rivertile and start it. # River will send the process group of the init executable SIGTERM on exit. riverctl default-layout rivertile -rivertile -view-padding 0 -outer-padding 0 & -eval $XBAR & +riverctl focus-follows-cursor normal -eval $XTERMINAL & -eval $XTERMINAL & -eval $XTERMINAL & +# Only first time, no reloading. +if test -z "$RIVER_RELOAD" ; then + rivertile -view-padding 0 -outer-padding 0 & + + eval $XBAR & + + eval $XTERMINAL & + eval $XTERMINAL & + eval $XTERMINAL & +fi diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 9c24790..f04faee 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -2,41 +2,29 @@ "layer": "top", "position": "top", + "river/window" : { + "max-length": 80, + "min-length": 80 + }, + + "river/mode" : { + "format": "Mode: {}" + }, + "modules-left": [ "river/tags", - "custom/right-arrow-dark", - "custom/right-arrow-light", + "river/window", "river/mode", - "custom/right-arrow-dark" ], "modules-center": [ - "custom/left-arrow-dark", - "river/window", - "custom/left-arrow-light", - "custom/left-arrow-dark", - "clock#1", - "custom/right-arrow-dark", - "custom/right-arrow-light", - "", - "custom/right-arrow-dark" ], "modules-right": [ - "custom/left-arrow-dark", + "clock#1", "pulseaudio", - "custom/left-arrow-light", - "custom/left-arrow-dark", "gamemode", - "custom/left-arrow-light", - "custom/left-arrow-dark", "mpd", - "custom/left-arrow-light", - "custom/left-arrow-dark", "disk", - "custom/left-arrow-light", - "custom/left-arrow-dark", "battery", - "custom/left-arrow-light", - "custom/left-arrow-dark", "tray" ], diff --git a/waybar/style.css b/waybar/style.css index aa7a34e..788b9d1 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -4,18 +4,19 @@ } window#waybar { - background: #292b2e; - color: #fdf6e3; + background: black; + color: white; } #custom-right-arrow-dark, #custom-left-arrow-dark { - color: #1a1a1a; + color: black; + background : white ; } #custom-right-arrow-light, #custom-left-arrow-light { - color: #292b2e; - background: #1a1a1a; + color: white; + background: black; } #workspaces, @@ -28,11 +29,11 @@ window#waybar { #battery, #disk, #tray { - background: #1a1a1a; + background: black; } -#workspaces button { - padding: 0 2px; +/*#workspaces button { + padding: 0 1px; color: #fdf6e3; } #workspaces button.focused { @@ -46,7 +47,7 @@ window#waybar { background: #1a1a1a; border: #1a1a1a; padding: 0 3px; -} +}*/ #pulseaudio { color: #268bd2; @@ -87,3 +88,13 @@ window#waybar { color : black ; } +#window { + color : black ; + background: white ; +} + +#mode { + background : black ; + color : white ; +} +