diff options
Diffstat (limited to 'Common')
| -rwxr-xr-x | Common/nvim/lua/basic.lua | 4 | ||||
| -rw-r--r-- | Common/sway/config | 53 | ||||
| -rw-r--r-- | Common/waybar/style.segmented.css | 78 |
3 files changed, 60 insertions, 75 deletions
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua index 59e8f68..9d28267 100755 --- a/Common/nvim/lua/basic.lua +++ b/Common/nvim/lua/basic.lua @@ -82,8 +82,8 @@ vim.opt.mat = 2 --vim.opt.t_vb = '' --vim.opt.tm = 500 --- Add extra margin to the left (makes changing margins less annoying -vim.opt.foldcolumn = '1' +-- Left column option, used to have it at 1 to always show it. But Gitsigns is not using it anyway +vim.opt.foldcolumn = '0' -- Show leader commands vim.opt.showcmd = true diff --git a/Common/sway/config b/Common/sway/config index 763b828..4dd4340 100644 --- a/Common/sway/config +++ b/Common/sway/config @@ -2,13 +2,19 @@ include autostart include hid # border & title -for_window [title="^.*"] border none, title_format "<b> %class >> %title </b>" -for_window [floating] border 1 -default_border none +for_window [title="^.*"] title_format "<b> %class >> %title </b>" +for_window [floating] border 1, border normal +default_border pixel 2 +default_floating_border normal +smart_borders on + +client.focused #4c7899 #539ce0 #ffffff #5fe327 #539ce0 +client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a +client.unfocused #333333 #222222 #888888 #292d2e #222222 # gaps -gaps inner 5 gaps outer 0 +gaps inner 0 smart_gaps off # font @@ -20,10 +26,10 @@ font pango:monospace 11 set $Mod Mod4 # direction keys -set $up l -set $down k -set $left j -set $right semicolon +set $up k +set $down j +set $left h +set $right l ### Turn off screen on lid closed set $laptop eDP-1 @@ -147,10 +153,10 @@ bindsym $Mod+Shift+z move scratchpad bindsym $Mod+z scratchpad show # change focus -bindsym $Mod+$left focus left -bindsym $Mod+$down focus down -bindsym $Mod+$up focus up -bindsym $Mod+$right focus right +# bindsym $Mod+$left focus left +# bindsym $Mod+$down focus down +# bindsym $Mod+$up focus up +# bindsym $Mod+$right focus right # alternatively, you can use the cursor keys: bindsym $Mod+Left focus left @@ -159,10 +165,10 @@ bindsym $Mod+Up focus up bindsym $Mod+Right focus right # move focused window -bindsym $Mod+Shift+$left move left -bindsym $Mod+Shift+$down move down -bindsym $Mod+Shift+$up move up -bindsym $Mod+Shift+$right move right +# bindsym $Mod+Shift+$left move left +# bindsym $Mod+Shift+$down move down +# bindsym $Mod+Shift+$up move up +# bindsym $Mod+Shift+$right move right # alternatively, you can use the cursor keys: bindsym $Mod+Shift+Up move up @@ -196,8 +202,8 @@ bindsym $Mod+r mode "resize" # bindsym Mod1+Right resize grow width 10 px or 1 ppt # layout toggle -bindsym Mod1+Tab layout toggle tabbed stacking split -bindsym $Mod+Tab layout toggle splitv splith +bindsym Mod1+Tab layout toggle splith splitv +bindsym $Mod+Tab layout toggle all # switch to workspace with urgent window for_window [urgent="latest"] focus @@ -221,17 +227,6 @@ bindsym $Mod+Shift+f fullscreen # changing border style bindsym $Mod+b border toggle -# change gaps -bindsym $Mod+plus gaps inner current plus 5 -bindsym $Mod+minus gaps inner current minus 5 -bindsym Mod1+plus gaps outer current plus 5 -bindsym Mod1+minus gaps outer current minus 5 - -bindsym $Mod+KP_Add gaps inner current plus 5 -bindsym $Mod+KP_Subtract gaps inner current minus 5 -bindsym Mod1+KP_Add gaps outer current plus 5 -bindsym Mod1+KP_Subtract gaps outer current minus 5 - ############ bar settings ############ bar { swaybar_command "waybar" diff --git a/Common/waybar/style.segmented.css b/Common/waybar/style.segmented.css index 78ebeda..9d994ca 100644 --- a/Common/waybar/style.segmented.css +++ b/Common/waybar/style.segmented.css @@ -3,39 +3,21 @@ border-radius: 0; /* `otf-font-awesome` is required to be installed for icons */ font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 12px; min-height: 0; } window#waybar { - background-color: rgba(0, 0, 0, 0); + background-color: rgba(43, 48, 59, 1.5); /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */ + border-bottom: 0px solid rgba(100, 114, 125, 0.0); color: #ffffff; transition-property: background-color; transition-duration: .5s; } window#waybar.hidden { - opacity: 0.0; -} - -.modules-left, -.modules-center, -.modules-right { - margin: 0; - background-color: rgba(43, 48, 59, 1.5); -} - -.modules-left { - border-radius: 0 0 10px 0; -} - -.modules-center { - border-radius: 0 0 10px 10px; -} - -.modules-right { - border-radius: 0 0 0 10px; + opacity: 0.2; } /* @@ -59,30 +41,28 @@ window#waybar.chromium { #workspaces button { padding: 0 5px; padding-top: 4px; - padding-bottom: 4px; background-color: transparent; - border-top: 1px solid transparent; color: #ffffff; - border-radius: 0; -} - -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -#workspaces button:hover { - border-top: 1px solid cyan; - /* background: rgba(255, 255, 255, 0.2); */ - /* box-shadow: inherit; */ + border-bottom: 3px solid transparent; } #workspaces button.focused { - border-top: 1px solid white; - /* background: rgba(255, 255, 255, 0.1); */ + /* background-color: #64727D; */ /* border-bottom: 3px solid #ffffff; */ + border-bottom: 3px solid #64727D; } #workspaces button.urgent { background-color: #eb4d4b; } +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +#workspaces button:hover { + background: rgba(0, 0, 0, 0.2); + box-shadow: inherit; + border-bottom: 3px solid #ffffff; +} + #mode { background-color: #64727D; /* border-bottom: 3px solid #ffffff; */ @@ -103,9 +83,13 @@ window#waybar.chromium { #idle_inhibitor, #mpd { padding: 0 10px; - margin: 0; + margin: 5px 0px; color: #ffffff; - border-radius: 0; + /* border-radius: 20px; */ +} + +#battery { + margin-right: 5px; } #clock { @@ -115,7 +99,6 @@ window#waybar.chromium { #battery { /* background-color: #ffffff; */ /* color: #000000; */ - border-radius: 20px 0 0 20px; } #battery.charging { @@ -173,15 +156,11 @@ label:focus { background-color: #000000; } -#temperature, #memory, #cpu { /* color: #000000; */ - border-radius: 20px; - margin: 3px; } -#temperature.critical, #memory.critical, #cpu.critical { animation-name: blink-critical; @@ -227,19 +206,30 @@ label:focus { background-color: #ffa000; } +#temperature { + font-size: 0; + margin: 0; + padding: 0; +} + +#temperature.critical { + background-color: #eb4d4b; +} + #language { } #tray { background: rgba(0, 0, 0, 0.4); border-radius: 0; + margin: 0; } #idle_inhibitor { /* background-color: #2d3436; */ - /* border-radius: 20px; */ - /* padding: 0 5px; */ - /* margin: 4px 0px; */ + border-radius: 20px; + padding: 0 5px; + margin: 4px 0px; } #idle_inhibitor.activated { |