feat: thor dots merge

.config/ah/currentPackages

@@ -17,7 +17,6 @@ adobe-source-code-pro-fonts
 adwaita-cursors
 adwaita-icon-theme
 adwaita-icon-theme-legacy
-ah-pkg-bin
 akonadi
 akonadi-calendar
 akonadi-contacts
@@ -30,7 +29,6 @@ alsa-plugins
 alsa-topology-conf
 alsa-ucm-conf
 alsa-utils
-amd-ucode
 aml
 android-studio
 aom
@@ -140,8 +138,6 @@ croc
 cross
 crypto++
 cryptsetup
-cuda
-cuda-tools
 cups
 cups-filters
 curl
@@ -831,9 +827,7 @@ lib32-mpg123
 lib32-ncurses
 lib32-nspr
 lib32-nss
-lib32-nvidia-utils
 lib32-openal
-lib32-opencl-nvidia
 lib32-openssl
 lib32-openssl-1.1
 lib32-orc
@@ -1143,7 +1137,6 @@ libutempter
 libutf8proc
 libuv
 libva
-libva-nvidia-driver
 libvdpau
 libverto
 libvips
@@ -1322,9 +1315,6 @@ nspr
 nss
 ntfs-3g
 numactl
-nvidia-open-dkms
-nvidia-settings
-nvidia-utils
 nvm
 nvtop
 nwg-look
@@ -1333,13 +1323,10 @@ obs-studio
 obsidian
 ocl-icd
 okular
-ollama-cuda
 onetbb
 oniguruma
 openal
 openbsd-netcat
-opencl-headers
-opencl-nvidia
 opencolorio
 opencore-amr
 opencv
@@ -1388,8 +1375,6 @@ papirus-folders-catppuccin-git
 papirus-icon-theme
 parsec-bin
 parted
-paru-git
-paru-git-debug
 pass
 pass-otp
 passt

.config/btop/btop.conf

@@ -1,8 +1,8 @@
-#? Config file for btop v. 1.3.2
+#? Config file for btop v. 1.4.0
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
-color_theme = "/usr/share/btop/themes/whiteout.theme"
+color_theme = "/usr/share/btop/themes/gruvbox_material_dark.theme"
 
 #* If the theme set background should be shown, set to False if you want terminal background transparency.
 theme_background = True

.config/flameshot/flameshot.ini

@@ -1,3 +1,4 @@
 [General]
 contrastOpacity=188
+savePath=/home/mike/pictures/tmp
 showStartupLaunchMessage=false

.config/gtk-2.0/gtkrc-2.0

@@ -2,11 +2,11 @@
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
 include "/home/mike/.gtkrc-2.0.mine"
-gtk-theme-name="catppuccin-latte-sapphire-standard+default"
+gtk-theme-name="Gruvbox-Yellow-Dark"
-gtk-icon-theme-name="Papirus-Light"
+gtk-icon-theme-name="Papirus-Dark"
 gtk-font-name="Roboto 11"
-gtk-cursor-theme-name="catppuccin-latte-light-cursors"
+gtk-cursor-theme-name="Simp1e-Gruvbox-Dark"
-gtk-cursor-theme-size=24
+gtk-cursor-theme-size=16
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1

.config/gtk-3.0/settings.ini

@@ -1,9 +1,9 @@
 [Settings]
-gtk-theme-name=catppuccin-latte-sapphire-standard+default
+gtk-theme-name=Gruvbox-Yellow-Dark
-gtk-icon-theme-name=Papirus-Light
+gtk-icon-theme-name=Papirus-Dark
 gtk-font-name=Roboto 11
-gtk-cursor-theme-name=catppuccin-latte-light-cursors
+gtk-cursor-theme-name=Simp1e-Gruvbox-Dark
-gtk-cursor-theme-size=24
+gtk-cursor-theme-size=16
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1
@@ -14,4 +14,4 @@ gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintslight
 gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=0
+gtk-application-prefer-dark-theme=1

.config/htop/htoprc

@@ -42,14 +42,14 @@ column_meters_2=AllCPUs4 DiskIO
 column_meter_modes_2=3 3
 tree_view=1
 sort_key=46
-tree_sort_key=39
+tree_sort_key=46
 sort_direction=1
 tree_sort_direction=-1
 tree_view_always_by_pid=0
 all_branches_collapsed=1
 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
 .sort_key=PERCENT_CPU
-.tree_sort_key=M_RESIDENT
+.tree_sort_key=PERCENT_CPU
 .tree_view_always_by_pid=0
 .tree_view=1
 .sort_direction=1

.config/hypr/autostart.sh

@@ -7,7 +7,6 @@ swww-daemon &
 fcitx5 -d &
 kanata -c ~/.config/kanata/config.kbd &
 waybar &
-flameshot &
 awatcher-bundle & 
 
 /usr/lib/mate-polkit/polkit-mate-authentication-agent-1 & disown
@@ -19,3 +18,4 @@ ff2mpv-rust &
 #     A=/usr/lib$L/seahorse/seahorse-ssh-askpass
 #     [[ -x $A ]] && export SSH_ASKPASS=$A && break
 # done
+

.config/hypr/hypridle.conf

@@ -25,8 +25,9 @@ listener {
 
 listener {
     timeout = 900                                 # 15min
-    on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
+    on-timeout = systemctl hibernate
-    on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
+    # on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
+    # on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
 }
 
 # listener {

.config/hypr/lock.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-grim -o HDMI-A-1 /tmp/screenshot-0.png && grim -o DP-1 /tmp/screenshot-1.png && grim -o DP-2 /tmp/screenshot-2.png && (pidof hyprlock || hyprlock)
+grim /tmp/screenshot-0.png && (pidof hyprlock || hyprlock)

.config/kanata/config.kbd

@@ -1,5 +1,9 @@
 ;; Kanata configuration for caps to esc+ctrl
 
+(defcfg
+  linux-dev /dev/input/by-path/platform-i8042-serio-0-event-kbd
+)
+
 (defsrc
   caps
 )

.config/mimeapps.list

@@ -6,8 +6,9 @@ image/png=feh.desktop;
 text/html=vim.desktop;
 application/pdf=okularApplication_pdf.desktop;
 video/x-matroska=mpv.desktop;
-x-scheme-handler/mailto=userapp-Evolution-ZIODU2.desktop;
+x-scheme-handler/mailto=userapp-Evolution-ZIODU2.desktop;userapp-Evolution-RB4MU2.desktop;
 x-scheme-handler/tonsite=org.telegram.desktop.desktop;
+text/markdown=dev.zed.Zed.desktop;
 
 [Default Applications]
 application/pdf=xreader.desktop;
@@ -35,5 +36,8 @@ x-scheme-handler/spice=org.remmina.Remmina.desktop;
 x-scheme-handler/terminal=kitty.desktop;
 x-scheme-handler/vnc=org.remmina.Remmina.desktop;
 video/x-matroska=mpv.desktop
-x-scheme-handler/mailto=userapp-Evolution-ZIODU2.desktop
+x-scheme-handler/mailto=userapp-Evolution-RB4MU2.desktop
 x-scheme-handler/tonsite=org.telegram.desktop.desktop
+x-scheme-handler/mailspring=Mailspring.desktop
+text/markdown=dev.zed.Zed.desktop
+hoppscotch=hoppscotch-handler.desktop

.config/waybar/config.jsonc

@@ -15,7 +15,7 @@
     "cpu",
     "memory",
     // "temperature",
-    // "backlight",
+    "backlight",
     // "keyboard-state",
     "battery",
     "clock",
@@ -183,6 +183,7 @@
     "format-icons": ["", "", "", "", "", "", "", "", ""],
   },
   "battery": {
+    "bat": "BAT0",
     "states": {
       // "good": 95,
       "warning": 30,

.config/zed/settings.json

@@ -29,11 +29,11 @@
   "vim_mode": false,
   "assistant": {
     "default_model": {
-      "provider": "ollama",
+      "provider": "copilot_chat",
-      "model": "mistral:7b-instruct-v0.3-q4_K_S"
+      "model": "gpt-4o"
     },
     "version": "2",
-    "provider": null
+    "provider": "copilot_chat"
   },
   "lsp": {
     "rust-analyzer": {

.config/zsh/.aliases

@@ -2,6 +2,7 @@
 
 # TEMP ZED FIX
 alias zed='env WEBKIT_DISABLE_DMABUF_RENDERER=1 zed '
+alias code='env ELECTRON_OZONE_PLATFORM_HINT=auto code '
 
 alias ..="cd .."
 alias cd..="cd .."

.config/zsh/.zshrc

@@ -183,4 +183,5 @@ eval "$(zoxide init zsh)"
 
 # . "$HOME/.cargo/env"
 
-. "/home/mike/.local/share/cargo/env"
+. "$HOME/.local/share/cargo/env"
+

.zshenv

@@ -80,3 +80,5 @@ fi
 export FZF_DEFAULT_OPTS="--color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 --color=fg:#cad3f5,header:#ed8796,info:#c6a0f6,pointer:#f4dbd6 --color=marker:#f4dbd6,fg+:#cad3f5,prompt:#c6a0f6,hl+:#ed8796";
 
 export PATH=$PATH:$HOME/.local/bin
+export PATH=$PATH:$HOME/.nix-profile/bin
+export PATH=$PATH:$HOME/.local/share/cargo/bin