Day/night theme, clean up, redesign

A · Jun 22, 2024 · b615ae3 · b615ae3
1 parent 5ffca6e
commit b615ae3
Show file tree

Hide file tree

Showing 56 changed files with 2,010 additions and 269 deletions.
diff --git a/all.pkgs b/all.pkgs
diff --git a/ansible.cfg b/ansible.cfg
@@ -1,7 +1,7 @@
 [defaults]
 host_key_checking     = False
 inventory             = hosts.yml
-stdout_callback       = yaml
+stdout_callback       = unixy
 display_ok_hosts      = true
 display_skipped_hosts = false
 transport             = local

diff --git a/bin/split-tracks b/bin/split-tracks
@@ -19,7 +19,7 @@ AUDIOFILE=$1
 CUEFILE=$2
 [ "$CUEFILE" ] || CUEFILE=${AUDIOFILE%.*}.cue
 [ -e "$CUEFILE" ] || { echo "CUE file not found: $CUEFILE"; exit 1; } 
-# cuefix "$CUEFILE"
+cuefix "$CUEFILE"
 cuebreakpoints "$CUEFILE" | shnsplit -O always -a $TEMPTRACK -o flac "$AUDIOFILE"
 cuetag.sh "$CUEFILE" $TEMPTRACK*.flac
 cueprint -t "$OUTPUT_FORMAT.flac\n" "$CUEFILE" | rename_from_file $TEMPTRACK*.flac
diff --git a/bin/switch-theme b/bin/switch-theme
@@ -0,0 +1,31 @@
+#! /bin/zsh
+
+sleep 0.1
+
+if [ "$1" = "light" ]; then
+  ~/.config/waybar/switch-theme light
+  ~/.config/nvim/switch-theme light
+  ~/.config/kitty/switch-theme light
+  ~/.config/wofi/switch-theme light
+
+  gsettings set org.gnome.desktop.interface gtk-theme catppuccin-latte-flamingo-standard+default
+  gsettings set org.gnome.desktop.interface color-scheme prefer-light
+
+  exit 0;
+fi
+
+if [ "$1" = "dark" ]; then
+  ~/.config/waybar/switch-theme dark
+  ~/.config/nvim/switch-theme dark
+  ~/.config/kitty/switch-theme dark
+  ~/.config/wofi/switch-theme dark
+
+  gsettings set org.gnome.desktop.interface gtk-theme catppuccin-frappe-red-standard+default
+  gsettings set org.gnome.desktop.interface color-scheme prefer-dark
+
+  exit 0;
+fi
+
+echo "There is no \"$1\" command"
+exit 1;
+
diff --git a/configs/hypr/config.d/10-display.conf b/configs/hypr/config.d/10-display.conf
@@ -1,12 +1,27 @@
-monitor=eDP-1, 2560x1600@60Hz, 200x1152, 1.6
+monitor=eDP-1, 2560x1600@60Hz, 0x0, 1.666667
 
-# Office
-monitor=desc:Samsung Electric Company LU28R55 H4ZT400899, 3840x2160@60Hz, -400x-288, 1.5
+# # Home Office
+monitor=desc:Samsung Electric Company LU28R55 HNMN700388, 3840x2160@30Hz, -180x-1080, 2
 
-# Home Office
-monitor=desc:Samsung Electric Company LU28R55 HNMN700388, 3840x2160@30Hz, -400x-288, 1.5
 
-# Gaming
-monitor=desc:Samsung Electric Company C34H89x H4ZT300037, 3440x1440@100Hz, -720x0, 1.25
+# Office
+monitor=desc:Samsung Electric Company LU28R55 H4ZT400899, 3840x2160@30Hz, -360x-1440, 1.5
+#
+# # Gaming
+# monitor=desc:Samsung Electric Company C34H89x H4ZT300037, 3440x1440@60Hz, -720x0, 1.25
 
 exec-once = hyprpaper &
+
+
+# monitor=eDP-1, 2560x1600@60Hz, 200x1152, 1.6
+#
+# # Office
+# monitor=desc:Samsung Electric Company LU28R55 H4ZT400899, 3840x2160@30Hz, -400x-288, 1.5
+#
+# # Home Office
+# monitor=desc:Samsung Electric Company LU28R55 HNMN700388, 3840x2160@30Hz, -400x-288, 2
+#
+# # Gaming
+# monitor=desc:Samsung Electric Company C34H89x H4ZT300037, 3440x1440@60Hz, -720x0, 1.25
+#
+# exec-once = hyprpaper &
diff --git a/configs/hypr/config.d/20-key-bindings.conf b/configs/hypr/config.d/20-key-bindings.conf
@@ -159,7 +159,10 @@ bindl = $mainModShift, HOME, exec, ~/.bin/playerctl-pick-current-track
 # Launcher
 # bind = $mainMod, space, exec, albert toggle
 #
-bind = $mainModShift, W, exec, ~/.config/hypr/bin/restart-waybar
+bind = $mainModShift, W, exec, ~/.config/waybar/restart
+
+bind = $mainModShift, page_up, exec, ~/.bin/switch-theme light >> ~/.tmp/switch.log
+bind = $mainModShift, page_down, exec, ~/.bin/switch-theme dark >> ~/.tmp/switch.log
 
 # 1Password
 bind = $mainMod, backslash, exec, 1password --toggle

diff --git a/configs/hypr/config.d/90-theme.conf b/configs/hypr/config.d/90-theme.conf
@@ -4,7 +4,7 @@ general {
     gaps_in = 4
     gaps_out = 10
 
-    border_size = 2
+    border_size = 3
     col.active_border = rgb(AF5F5F)
     col.inactive_border = rgb(7F848D)
 
@@ -14,17 +14,20 @@ general {
 
 group {
   groupbar {
+    # stacked = true
     gradients = false
     render_titles = false
-    font_size = 16
+    font_size = 12
     text_color = rgb(000000)
-    col.active = rgb(AF5F5F)
+    col.active = rgb(5697d8)
     col.inactive = rgb(AFB7BF)
   }
+  col.border_active = rgb(f05076)
+  col.border_inactive = rgb(7F848D)
 }
 
 decoration {
-  rounding = 0
+  rounding = 3
   drop_shadow = yes
   shadow_range = 8
   shadow_render_power = 2
@@ -46,9 +49,10 @@ decoration {
 animations {
   enabled = yes
   bezier = myBezier, 0.05, 0.1, 0.2, 1.05
+  bezier = delayedCurve,  1, -0.5, 0.99, -0.09 
   animation = windows, 0, 2, default, popin 80%
-  animation = windowsOut, 1, 2, default, popin 100%
-  animation = windowsIn, 1, 2, default, popin 100%
+  animation = windowsOut, 0, 2, default, popin 100%
+  animation = windowsIn, 0, 2, default, popin 100%
   animation = border, 0, 10, myBezier
   animation = fade, 1, 5, myBezier
   animation = workspaces, 1, 5, default, slidefadevert 0%

diff --git a/configs/hypr/config.d/90-window-rules.conf b/configs/hypr/config.d/90-window-rules.conf
@@ -60,9 +60,21 @@ windowrulev2 = size 80% 80%, class:^(org.gnome.Loupe)$
 windowrulev2 = float, class:^(vivaldi-stable)$ title:^(Vivaldi Settings.*)$
 windowrulev2 = size 60% 80%, class:^(vivaldi-stable)$ title:^(Vivaldi Settings.*)$
 
+windowrulev2 = float, class:^(vlc)$
+windowrulev2 = center, class:^(vlc)$
 
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrulev2 = float, class:^(nwg-look)$
+windowrulev2 = center, class:^(nwg-look)$
 
 
+windowrulev2 = float, class:^(thunar)$ title:^(Confirm to replace files)$
+windowrulev2 = center, class:^(thunar)$ title:^(Confirm to replace files)$
+
+windowrulev2 = bordercolor rgb(f2f20d), xwayland: 1
+
+
+windowrulev2 = noborder, class:^(wofi)$
+windowrulev2 = fullscreen, title:^(imv-overlay)$
+# windowrulev2 = animation fade title:^(imv-overlay)$
+windowrulev2 = animation windowsIn 0, title:^(imv-overlay)$
+windowrulev2 = animation windowsOut 0, title:^(imv-overlay)$
diff --git a/configs/kitty/kitty.conf b/configs/kitty/kitty.conf
@@ -1,4 +1,5 @@
 allow_remote_control yes
+listen_on unix:/tmp/kitty
 
 cursor_blink_interval 0
 background_opacity 0.8
@@ -15,7 +16,7 @@ bold_font        auto
 italic_font      auto
 bold_italic_font auto
 
-font_size 12.0
+font_size 10.0
 
 include themes/trash-polka.conf
 
@@ -38,3 +39,9 @@ map ctrl+shift+h no-op
 
 map ctrl+shift+l set_colors --configured /home/anton/.config/kitty/themes/trash-polka-light.conf
 map ctrl+shift+k set_colors --configured /home/anton/.config/kitty/themes/trash-polka.conf
+
+
+# BEGIN_KITTY_THEME
+# Trash-Polka-Light
+include current-theme.conf
+# END_KITTY_THEME
diff --git a/configs/kitty/kitty.conf.bak b/configs/kitty/kitty.conf.bak
@@ -0,0 +1,47 @@
+allow_remote_control yes
+listen_on unix:/tmp/kitty
+
+cursor_blink_interval 0
+background_opacity 0.8
+dynamic_background_opacity no
+remember_window_size no
+
+sync_to_monitor yes
+
+enable_audio_bell no
+copy_on_select yes
+
+font_family      Iosevka Nerd Font
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
+
+font_size 12.0
+
+include themes/trash-polka.conf
+
+
+map ctrl+shift+up no-op
+map ctrl+shift+k no-op
+map alt+cmd+page_up no-op
+map cmd+up no-op
+map ctrl+shift+no-op
+map ctrl+shift+j no-op
+map ctrl+shift+page_up no-op
+map cmd+page_up no-op
+map ctrl+shift+page_down no-op
+map cmd+page_down no-op
+map ctrl+shift+home no-op
+map cmd+home no-op
+map ctrl+shift+end no-op
+map cmd+end no-op
+map ctrl+shift+h no-op
+
+map ctrl+shift+l set_colors --configured /home/anton/.config/kitty/themes/trash-polka-light.conf
+map ctrl+shift+k set_colors --configured /home/anton/.config/kitty/themes/trash-polka.conf
+
+
+# BEGIN_KITTY_THEME
+# Trash-Polka
+include current-theme.conf
+# END_KITTY_THEME
diff --git a/configs/kitty/switch-theme b/configs/kitty/switch-theme
@@ -0,0 +1,24 @@
+#! /bin/zsh
+set -e
+
+if [ "$1" = "light" ]; then
+  cp ~/.config/kitty/themes/trash-polka-light.conf ~/.config/kitty/current-theme.conf
+  for socket in /tmp/kitty*; do
+    kitten @ --to unix:${socket} set-colors --configured ~/.config/kitty/themes/trash-polka-light.conf
+  done
+  exit 0;
+fi
+
+if [ "$1" = "dark" ]; then
+  cp ~/.config/kitty/themes/trash-polka.conf ~/.config/kitty/current-theme.conf
+  for socket in /tmp/kitty*; do
+    kitten @ --to unix:${socket} set-colors --configured ~/.config/kitty/themes/trash-polka.conf
+  done
+
+  exit 0;
+fi
+
+echo "There is no \"$1\" command"
+exit 1;
+
+
diff --git a/configs/kitty/themes/trash-polka-light.conf b/configs/kitty/themes/trash-polka-light.conf
@@ -8,16 +8,16 @@ selection_background #4C566A
 
 color0 #3B4252
 color1 #CB5C67
-color2 #A3BE8C
-color3 #EBCEBC
+color2 #709252
+color3 #d3946d
 color4 #5697D8
-color5 #B48EAD
-color6 #88C0D0
+color5 #84587c
+color6 #4597ae
 color7 #878A8F
 
 color8 #4C566A
 color9 #BF616A
-color10 #A3BE8C
+color10 #709252
 color11 #EBCB8B
 color12 #81A1C1
 color13 #B48EAD

diff --git a/configs/kitty/themes/trash-polka.conf b/configs/kitty/themes/trash-polka.conf
@@ -7,7 +7,8 @@ selection_foreground #161520
 selection_background #ebece6
 
 color0 #3b4251
-color1 #BF4C73
+# color1 #BF4C73
+color1  #d7346a
 color2 #a3be8b
 color3 #eacb8a
 color4 #81a1c1

diff --git a/configs/nvim/lua/colorscheme.lua b/configs/nvim/lua/colorscheme.lua
@@ -0,0 +1 @@
+vim.cmd 'colorscheme trash-polka'
diff --git a/configs/nvim/lua/opts.lua b/configs/nvim/lua/opts.lua
@@ -56,6 +56,9 @@ opt.writebackup = false
 opt.termguicolors = true
 opt.conceallevel = 2
 
+opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+opt.foldtext = "v:lua.vim.treesitter.foldtext()"
+
 -- opt.verbose = 2
 -- opt.verbosefile = "/Users/anton/.logs/nvim.log"
 

diff --git a/configs/nvim/lua/packages/theme.lua b/configs/nvim/lua/packages/theme.lua
@@ -1,4 +1,3 @@
-local cmd = vim.cmd
 
 
 local keys = {
@@ -18,7 +17,7 @@ end
 
 
 local function setup()
-  cmd 'colorscheme trash-polka'
+  require("colorscheme")
 end
 
 

diff --git a/configs/nvim/switch-theme b/configs/nvim/switch-theme
@@ -0,0 +1,32 @@
+#! /bin/sh
+# set -e
+
+PATH=${PATH}:/home/anton/.local/bin;
+CWD="${BASH_SOURCE%/*}"
+
+# pip3 install neovim-remote
+
+INSTANCES=$(ls "/run/user/1000/" | grep "nvim.")
+
+
+if [ "$1" = "light" ]; then
+  echo "vim.cmd 'colorscheme trash-polka-light'" > "${CWD}/lua/colorscheme.lua"
+  for instance in /run/user/1000/nvim*; do
+    nvr --servername=${instance} --remote-send '<esc>:colorscheme trash-polka-light<enter>'
+  done
+  exit 0;
+fi
+
+if [ "$1" = "dark" ]; then
+  echo "vim.cmd 'colorscheme trash-polka'" > "${CWD}/lua/colorscheme.lua"
+  for instance in /run/user/1000/nvim*; do
+    echo "$instance"
+    nvr --servername=${instance} --remote-send '<esc>:colorscheme trash-polka<enter>'
+    echo "$instance done"
+  done
+  exit 0;
+fi
+
+echo "There is no \"$1\" command"
+exit 1;
+
diff --git a/configs/waybar/bottom.config b/configs/waybar/bottom.config
@@ -1,5 +1,6 @@
 {
   "layer": "top", // Waybar at top layer
+  "reload_style_on_change": true ,
   "position": "bottom",
   "output": "eDP-1",
   "height": 32,
@@ -10,8 +11,8 @@
     "custom/btcusd",
     "custom/ethusdt",
     "custom/usdrub",
-    "custom/eurrub",
-    "custom/dela"
+    "custom/eurrub"
+    // "custom/dela"
   ],
   "modules-center": [],
   "modules-right": [