update bspwm settings

3 files changed, 17 insertions, 19 deletions

diff --git a/home-manager/homeModules/bspwm.nix b/home-manager/homeModules/bspwm.nix
index f700f13..712a95c 100644
--- a/home-manager/homeModules/bspwm.nix
+++ b/home-manager/homeModules/bspwm.nix
@@ -35,13 +35,13 @@
           ];
         in {
           "^1" = workspaces;
-          "^2" = workspaces;
+          # "^2" = workspaces;
         };
       
       settings = {
-        focused_border_color = "#908caa";
-        normal_border_color = "#363a4f";
-        presel_feedback_color = "#752f20";
+        # focused_border_color = "#908caa";
+        # normal_border_color = "#363a4f";
+        # presel_feedback_color = "#752f20";
         border_width = 3;
         window_gap = 12;
         focus_follows_pointer = true;
@@ -49,10 +49,16 @@
       };
       
       startupPrograms = [
+        "sxhkd"
         "picom -b"
         "emacs --daemon"
-        "feh --bg-fill ~/dotfiles/cat.png"
+        "feh --bg-fill ${config.wallpaper}"
       ];
     };
+    home.packages = with pkgs; [
+      feh
+      betterlockscreen
+      xfce.xfce4-screenshooter
+    ];
   };
 }
diff --git a/home-manager/homeModules/picom.nix b/home-manager/homeModules/picom.nix
index 4ee50de..af57002 100644
--- a/home-manager/homeModules/picom.nix
+++ b/home-manager/homeModules/picom.nix
@@ -10,8 +10,7 @@
       enable = true;
       settings = {
         fading = true;
-        fade-in-step = 0.05;
-        fade-out-step = 0.05;
+        fade-delta=3;
         blur-background = false;
         corner-radius = 8;
         # blur = {
diff --git a/home-manager/homeModules/sxhkd.nix b/home-manager/homeModules/sxhkd.nix
index 43774ab..8dec06e 100644
--- a/home-manager/homeModules/sxhkd.nix
+++ b/home-manager/homeModules/sxhkd.nix
@@ -6,20 +6,17 @@
   };
   
   config = lib.mkIf config.sxhkd.enable {
-    services.sxhkd =
-      let
-        apps = {
+    services.sxhkd = {
+      enable = true;
+      keybindings = {
           "{_,shift} + {_,control} + Print" = "xfce4-screenshooter -{r,f} {_,-c}"; # Screenshooter
           "super + apostrophe" = "betterlockscreen -l"; # Lockscreen
           "super + grave" = "polybar -r"; # Restart polybar
-          "super + q" = "kitty"; # Open terminal
+          "super + q" = "alacritty"; # Open terminal
           "super + d" = "rofi -show-icons -show drun"; # Open app chooser
           "super + shift + d" = "CM_LAUNCHER=rofi clipmenu";
           "super + b" = "firefox"; # Open browser
           "super + e" = "emacsclient -c -a 'emacs'"; # Open emacs
-          "super + shift + o" = "obsidian"; # Open obsidian
-        };
-        bspwm = {
           "super + Escape" = "pkill -USR1 -x sxhkd"; # Restart sxhkd
           "super + shift + {e,r}" = "bspc {quit,wm -r}"; # Quit/restart bspwm
           "super + {control,shift} + q" = "bspc node -{k,c}"; # Close/kill window
@@ -36,11 +33,7 @@
           "super + ctrl + {1-9}" = "bspc node -o 0.{1-9}"; # Preselect the window ratio
           "super + ctrl + space" = "bspc node -p cancel"; # Cansel the preselected ratio
           "super + n" = "fish ~/.nixfiles/home-manager/home/services/polybar/hide.fish";
-        };
-        keybindings = apps ++ bspwm;
-      in {
-        enable = true;
-        inherit keybindings;
+      };
       };
   };
 }