From 1d6e38d45557f8b15f31224aca14cd3630aa5749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= <mike@c2yz.com>
Date: Sat, 26 Oct 2024 14:09:05 +0200
Subject: [PATCH] feat: thor dots merge

---
 .config/ah/currentPackages  | 15 ---------------
 .config/hypr/autostart.sh   |  2 +-
 .config/hypr/hypridle.conf  |  5 +++--
 .config/hypr/lock.sh        |  2 +-
 .config/kanata/config.kbd   |  4 ++++
 .config/nvim                |  2 +-
 .config/waybar/config.jsonc |  3 ++-
 .config/zed/settings.json   |  6 +++---
 .config/zsh/.zshrc          |  3 ++-
 .zshenv                     |  1 +
 10 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/.config/ah/currentPackages b/.config/ah/currentPackages
index 26aa254..3c7d67f 100644
--- a/.config/ah/currentPackages
+++ b/.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
diff --git a/.config/hypr/autostart.sh b/.config/hypr/autostart.sh
index f1d4c04..0295a71 100755
--- a/.config/hypr/autostart.sh
+++ b/.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
+
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
index 90b1ae5..8000145 100644
--- a/.config/hypr/hypridle.conf
+++ b/.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-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
+    on-timeout = systemctl hibernate
+    # 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 {
diff --git a/.config/hypr/lock.sh b/.config/hypr/lock.sh
index 6fb3aba..81da800 100755
--- a/.config/hypr/lock.sh
+++ b/.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)
diff --git a/.config/kanata/config.kbd b/.config/kanata/config.kbd
index d58b798..d76c184 100644
--- a/.config/kanata/config.kbd
+++ b/.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
 )
diff --git a/.config/nvim b/.config/nvim
index 5391f13..2207b62 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit 5391f13618ae73bb817e94ba43c5d1904c295c50
+Subproject commit 2207b62d5e1a4624ba28be5894982cc970951bff
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 105b6d3..29de453 100644
--- a/.config/waybar/config.jsonc
+++ b/.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,
diff --git a/.config/zed/settings.json b/.config/zed/settings.json
index 016a39f..ff440ae 100644
--- a/.config/zed/settings.json
+++ b/.config/zed/settings.json
@@ -29,11 +29,11 @@
   "vim_mode": false,
   "assistant": {
     "default_model": {
-      "provider": "ollama",
-      "model": "mistral:7b-instruct-v0.3-q4_K_S"
+      "provider": "copilot_chat",
+      "model": "gpt-4o"
     },
     "version": "2",
-    "provider": null
+    "provider": "copilot_chat"
   },
   "lsp": {
     "rust-analyzer": {
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index fbda544..00feb1d 100755
--- a/.config/zsh/.zshrc
+++ b/.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"
+
diff --git a/.zshenv b/.zshenv
index 7850422..31448f3 100755
--- a/.zshenv
+++ b/.zshenv
@@ -81,3 +81,4 @@ export FZF_DEFAULT_OPTS="--color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed87
 
 export PATH=$PATH:$HOME/.local/bin
 export PATH=$PATH:$HOME/.nix-profile/bin
+export PATH=$PATH:$HOME/.local/share/cargo/bin