diff options
| -rw-r--r-- | config/foot/foot.ini | 40 | ||||
| -rw-r--r-- | config/kitty/kitty.conf | 2 | ||||
| -rw-r--r-- | config/sway/config | 8 | ||||
| -rw-r--r-- | config/waybar/config | 2 | ||||
| -rw-r--r-- | config/waybar/style.css | 61 | ||||
| -rw-r--r-- | config/zsh/.zprofile | 2 | ||||
| -rwxr-xr-x | deploy.sh | 12 |
7 files changed, 47 insertions, 80 deletions
diff --git a/config/foot/foot.ini b/config/foot/foot.ini index e7c7ae4..47ba8be 100644 --- a/config/foot/foot.ini +++ b/config/foot/foot.ini @@ -4,7 +4,7 @@ # term=foot (or xterm-256color if built with -Dterminfo=disabled) # login-shell=no -font=SauceCodePro Nerd Font:size=9 +font=JetBrainsMono Nerd Font:size=9 # font-bold=<bold variant of regular font> # font-italic=<italic variant of regular font> # font-bold-italic=<bold+italic variant of regular font> @@ -49,24 +49,26 @@ hide-when-typing=yes [colors] # alpha=1.0 -background=0xfdf6e3 -foreground=0x586e75 -regular0=0x073642 # black -regular1=0xdc322f # red -regular2=0x859900 # green -regular3=0xb58900 # yellow -regular4=0x268bd2 # blue -regular5=0xd33682 # magenta -regular6=0x2aa198 # cyan -regular7=0xeee8d5 # white -bright0=0x002b36 # bright black -bright1=0xcb4b16 # bright red -bright2=0x586e75 # bright green -bright3=0x657b83 # bright yellow -bright4=0x839496 # bright blue -bright5=0x6c71c4 # bright magenta -bright6=0x93a1a1 # bright cyan -bright7=0xfdf6e3 # bright white +background=0xeff0f2 +foreground=0x4a4b4e +regular0=0x4a4b4e +regular1=0xa32a3a +regular2=0x206620 +regular3=0x745300 +regular4=0x4b529a +regular5=0x8d377e +regular6=0x086784 +regular7=0xdee2e0 +bright0=0x676364 +bright1=0xa64822 +bright2=0x187408 +bright3=0x8b590a +bright4=0x5c59b2 +bright5=0x8e45a8 +bright6=0x3f649c +bright7=0xeff0f2 + + # selection-foreground=<inverse foreground/background> # selection-background=<inverse foreground/background> # jump-labels=<regular0> <regular3> diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 3480e56..e7ca3f0 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,6 +1,6 @@ font_family JetBrainsMono Nerd Font Mono -font_size 14.0 disable_ligatures always +font_size 11.0 copy_on_select clipboard shell_integration disabled diff --git a/config/sway/config b/config/sway/config index 13d151e..6dec471 100644 --- a/config/sway/config +++ b/config/sway/config @@ -14,7 +14,7 @@ set $down j set $up k set $right l # Your preferred terminal emulator -set $term foot +set $term kitty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. @@ -280,4 +280,10 @@ for_window [app_id="firefox"] inhibit_idle fullscreen assign [class="Tauon Music Box"] workspace number 3 assign [class="Joplin"] workspace number 4 +# +# Notifications +# + +#exec mako + include /etc/sway/config.d/* diff --git a/config/waybar/config b/config/waybar/config index 05dd2eb..4c6c17c 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -6,7 +6,7 @@ "height": 0, "modules-left": ["sway/workspaces", "sway/mode", "sway/window"], "modules-center": [], - "modules-right": ["tray", "network#wifi", "pulseaudio", "battery#bat1", "clock#local"], + "modules-right": ["tray", "network#wifi", "pulseaudio", "battery#bat1", "temperature", "clock#local"], "idle_inhibitor": { "format": "{icon}", "format-icons": { diff --git a/config/waybar/style.css b/config/waybar/style.css index 3743dc0..c88b6e7 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,33 +1,15 @@ -/* -$base03: #002b36; -$base02: #073642; -$base01: #586e75; -$base00: #657b83; -$base0: #839496; -$base1: #93a1a1; -$base2: #eee8d5; -$base3: #fdf6e3; -$yellow: #b58900; -$orange: #cb4b16; -$red: #dc322f; -$magenta: #d33682; -$violet: #6c71c4; -$blue: #268bd2; -$cyan: #2aa198; -$green: #859900; -*/ - * { - font-family: SauceCodePro Nerd Font; - font-size: 12pt; + font-family: JetBrainsMono Nerd Font; + font-size: 11pt; } window#waybar { - background: #eee8d5; - color: #657b83; + background: #eff0f2; + color: #4a4b4e; } .topbar { + border-bottom: 1px solid #e2e4e1; } @@ -36,49 +18,22 @@ window#waybar { #network, #pulseaudio, #battery, -#clock { +#clock, +#temperature { padding: 2px 10px; margin: 0; } - -#mode, -#network, -#pulseaudio, -#battery { - background: #93a1a1; - color: #eee8d5; -} - -#clock { - background: #657b83; - color: #eee8d5; -} - #workspaces button, #workspaces button:hover, #workspaces button.focused, #workspaces button.urgent { - color: #93a1a1; box-shadow: none; border-radius: 0; padding: 0 5px; -} - -#workspaces button { - background: #93a1a1; - color: #eee8d5; -} - -#workspaces button:hover { - background: #93a1a1; - color: #eee8d5; - box-shadow: none; font-weight: normal; } #workspaces button.focused { - background: #2aa198; - color: #eee8d5; - box-shadow: none; + background: #e2e4e1; } diff --git a/config/zsh/.zprofile b/config/zsh/.zprofile index 479c8aa..a9a13c9 100644 --- a/config/zsh/.zprofile +++ b/config/zsh/.zprofile @@ -2,6 +2,6 @@ if [ "$(uname)" = "Darwin" ]; then # disable Apple Terminal's annoying session restore feature SHELL_SESSIONS_DISABLE=1 fi -if [ "$DESKTOP_SESSION" = "sway" ]; then +if [ "$DESKTOP_SESSION" = "sway-session" ]; then export $(gnome-keyring-daemon --start) fi @@ -115,10 +115,14 @@ if command -v fc-cache > /dev/null; then "Sauce Code Pro Bold Italic Nerd Font Complete.ttf" get_font jetbrainsmono-nerd \ https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/JetBrainsMono.zip \ - "JetBrains Mono Regular Nerd Font Complete Mono.ttf" \ - "JetBrains Mono Italic Nerd Font Complete Mono.ttf" \ - "JetBrains Mono Bold Nerd Font Complete Mono.ttf" \ - "JetBrains Mono Bold Italic Nerd Font Complete Mono.ttf" + "JetBrains Mono Regular Nerd Font Complete Mono.ttf" \ + "JetBrains Mono Italic Nerd Font Complete Mono.ttf" \ + "JetBrains Mono Bold Nerd Font Complete Mono.ttf" \ + "JetBrains Mono Bold Italic Nerd Font Complete Mono.ttf" \ + "JetBrains Mono Regular Nerd Font Complete.ttf" \ + "JetBrains Mono Italic Nerd Font Complete.ttf" \ + "JetBrains Mono Bold Nerd Font Complete.ttf" \ + "JetBrains Mono Bold Italic Nerd Font Complete.ttf" if [ "$new_font" = "1" ]; then echo "Hint: Run 'fc-cache -v' to rebuild your font cache" fi |