From d6bbb4f1f33fb12b922bd7febf0b82fdf12616cd Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 4 Apr 2023 17:36:30 +0100
Subject: [PATCH] Fix and enable blur with picom, needed new backend

Temp disable polybar until configured
Set fancy theme for rofi
Add missing screenshot manager for xfce
Fix up shortcuts
---
 nixos/home-manager/env/picom.nix   |  7 ++++---
 nixos/home-manager/env/polybar.nix | 13 +++++++++++-
 nixos/home-manager/env/rofi.nix    |  1 +
 nixos/home-manager/env/sxhkd.nix   | 32 ++++--------------------------
 nixos/home-manager/env/xfce.nix    |  3 ++-
 5 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/nixos/home-manager/env/picom.nix b/nixos/home-manager/env/picom.nix
index 12ce906a..3cdd49b9 100644
--- a/nixos/home-manager/env/picom.nix
+++ b/nixos/home-manager/env/picom.nix
@@ -2,6 +2,7 @@
 {
   services.picom = {
     enable = true;
+    backend = "glx";
     shadow = true;
     fade = true;
     activeOpacity = 1.0;
@@ -10,10 +11,10 @@
       blur = {
         # requires: https://github.com/ibhagwan/picom
         # method = "dual_kawase";
-        method = "kernel";
+        method = "gaussian";
+        size = 20;
+        deviation = 15;
         strength = 7;
-        deviation = 1.0;
-        kernel = "11x11gaussian";
         background = false;
         background-frame = false;
         background-fixed = false;
diff --git a/nixos/home-manager/env/polybar.nix b/nixos/home-manager/env/polybar.nix
index 45a36640..b12fd75b 100644
--- a/nixos/home-manager/env/polybar.nix
+++ b/nixos/home-manager/env/polybar.nix
@@ -1,4 +1,15 @@
 { ... }:
 {
-  services.polybar.enable = true;
+  services.polybar = {
+    enable = true;
+    script = ''
+      POLYBAR_CONFIG_DIR="$HOME/.dotfiles/polybar"
+      polybar -c "$POLYBAR_CONFIG_DIR/config" pam1 &
+      polybar -c "$POLYBAR_CONFIG_DIR/config" pam2 &
+      polybar -c "$POLYBAR_CONFIG_DIR/config" pam3 &
+      polybar -c "$POLYBAR_CONFIG_DIR/config" pam4 &
+      polybar -c "$POLYBAR_CONFIG_DIR/config" pam5 &
+      polybar -c "$POLYBAR_CONFIG_DIR/config" pam6 &
+    '';
+  };
 }
diff --git a/nixos/home-manager/env/rofi.nix b/nixos/home-manager/env/rofi.nix
index 2681c8d4..b635e33e 100644
--- a/nixos/home-manager/env/rofi.nix
+++ b/nixos/home-manager/env/rofi.nix
@@ -4,5 +4,6 @@
     enable = true;
     location = "right";
     pass.enable = true;
+    theme = "fancy";
   };
 }
diff --git a/nixos/home-manager/env/sxhkd.nix b/nixos/home-manager/env/sxhkd.nix
index c52902f2..f87cc343 100644
--- a/nixos/home-manager/env/sxhkd.nix
+++ b/nixos/home-manager/env/sxhkd.nix
@@ -4,29 +4,16 @@
     enable = true;
     keybindings = {
       "super + w" = "firefox";
-      # terminal emulator
       "super + Return" = "kitty";
-      "super + t" = "al-terminal";
-      "alt + shift + Return" = "al-terminal";
-      # file manager
+      "alt + shift + Return" = "xfce4-terminal --drop-down";
       "super + f" = "kitty -e ranger";
-      "super + shift + f" = "al-filemanager";
-      # program launcher
-      "super + @space" = "rofi_run -r";
-      "alt + p" = "rofi_run -r";
-      #to change tabs ig
-      # Switch to recent window
+      "super + shift + f" = "thunar";
+      "super + @space" = "rofi -show drun";
+      "alt + p" = "rofi -show drun";
       "alt + Tab" = "bspc node -f last.local";
-      # make sxhkd reload its configuration files:
       "super + shift + r" = "pkill -USR1 -x sxhkd";
-      # quit bspwm normally
-      "super + x" = "rofi_run -l";
-      # Send the window to another edge of the screen
       "super + {_,shift + }{Left,Down,Up,Right}" = "bspc node -{f,s} {west,south,north,east}";
-      # close and kill
       "super + {_,shift + }q" = "bspc node -{c,k}";
-      # alternate between the tiled and monocle layout
-      #super + shift + m
       "alt + Return" = "bspc desktop -l next";
       # if the current node is automatic, send it to the last manual, otherwise pull the last leaf
       "super + y" = "bspc query -N -n focused.automatic && bspc node -n last.!automatic || bspc node last.leaf -n focused";
@@ -59,17 +46,6 @@
       # focus or send to the given desktop
       "super + {_,shift + }{1-9,0}" = "bspc {desktop -f,node -d} '^{1-9,10}'";
       #
-      # preselect
-      #
-      # preselect the direction
-      "super + ctrl + {h,j,k,l}" = "bspc node -p {west,south,north,east}";
-      # preselect the ratio
-      "super + ctrl + {1-9}" = "bspc node -o 0.{1-9}";
-      # cancel the preselection for the focused node
-      "super + ctrl + space" = "bspc node -p cancel";
-      # cancel the preselection for the focused desktop
-      "super + ctrl + shift + space" = "bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel";
-      #
       # move/resize
       #
       # expand a window by moving one of its side outward
diff --git a/nixos/home-manager/env/xfce.nix b/nixos/home-manager/env/xfce.nix
index 56717ac3..58a00eb4 100644
--- a/nixos/home-manager/env/xfce.nix
+++ b/nixos/home-manager/env/xfce.nix
@@ -5,10 +5,11 @@
     ./sxhkd.nix
     ./picom.nix
     ./rofi.nix
-    ./polybar.nix
+    #./polybar.nix
   ];
   home.packages = with pkgs; [
     xfce.thunar
     ranger
+    flameshot
   ];
 }