From f96a22326c07e304de2ea0b82f618f7f757a89d2 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Thu, 12 May 2022 09:58:51 +0200
Subject: [PATCH] Update keybindings + fix cursor

---
 home_manager/modules/gtk_theme.nix | 2 +-
 home_manager/modules/sxhkd.nix     | 9 ++++-----
 home_manager/odin.nix              | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/home_manager/modules/gtk_theme.nix b/home_manager/modules/gtk_theme.nix
index 1146acf..9cd79c2 100644
--- a/home_manager/modules/gtk_theme.nix
+++ b/home_manager/modules/gtk_theme.nix
@@ -23,7 +23,7 @@
       package = pkgs.qogir-icon-theme;
       name = "Qogir";
       # size = 64;
-      x11.enable = true;
+      # x11.enable = true;
       gtk.enable = true;
     };
   };
diff --git a/home_manager/modules/sxhkd.nix b/home_manager/modules/sxhkd.nix
index 4a62723..a6f6019 100644
--- a/home_manager/modules/sxhkd.nix
+++ b/home_manager/modules/sxhkd.nix
@@ -4,10 +4,9 @@
     let
       primaryTerminal = "kitty";
       secondaryTerminal = "terminator";
-      primaryFileManager = "${pkgs.gnome.nautilus}/bin/nautilus";
-      secondaryFileManager = "${pkgs.pcmanfm}/bin/pcmanfm";
+      pcmanfm = "${pkgs.pcmanfm}/bin/pcmanfm";
       playerctl = "${pkgs.playerctl}/bin/playerctl";
-      pulseaudio-ctl = "${pkgs.pulseaudio-ctl}/bin/pulseaudio-ctl";
+      pamixer = "${pkgs.pamixer}/bin/pamixer";
       terminator = "${pkgs.terminator}/bin/terminator";
       update-backgroundCmd = "${pkgs.update-background}/bin/update-background";
       xbacklight = "${pkgs.xorg.xbacklight}/bin/xbacklight";
@@ -26,7 +25,7 @@
         "super + ctrl + {m,x,y,z}" = "bspc node -g {marked,locked,sticky,private}";
         "super + ctrl + shift + space" = "bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel";
         "super + ctrl + space" = "bspc node -p cancel";
-        "super + {_,shift +} e" = "{${primaryFileManager} -w, ${secondaryFileManager} -n}";
+        "super + e" = "${pcmanfm} -n";
         "super + Escape" = "pkill -USR1 -x sxhkd";
         "super + g" = "bspc node -s biggest";
         "super + {grave,Tab}" = "bspc {node,desktop} -f last";
@@ -44,7 +43,7 @@
         "alt + Tab" = "rofi -show window";
         "super + {t,shift + t,s,f}" = "bspc node -t {tiled,pseudo_tiled,floating,fullscreen}";
         "super + y" = "bspc node newest.marked.local -n newest.!automatic.local";
-        "{XF86AudioLowerVolume,XF86AudioMute,XF86AudioRaiseVolume}" = "${pulseaudio-ctl} {down,mute,up}";
+        "{XF86AudioLowerVolume,XF86AudioMute,XF86AudioRaiseVolume}" = "${pamixer} {-d 5,-t,-i 5}";
         "XF86Audio{Next,Play,Prev}" = "${playerctl} {next,play-pause,previous}";
         "XF86MonBrightness{Up,Down}" = "${xbacklight} {+,-}10%";
       };
diff --git a/home_manager/odin.nix b/home_manager/odin.nix
index 85bb93b..88ec5e2 100644
--- a/home_manager/odin.nix
+++ b/home_manager/odin.nix
@@ -18,7 +18,7 @@
       droidcam
       easyeffects
       # element-desktop # matrix client
-      evince
+      # evince
       evolution
       file
       # firefox
@@ -46,6 +46,7 @@
       httpie
       # hyperspace-cli
       inkscape
+      jabref
       jetbrains.datagrip
       # keepassxc
       krita
@@ -61,7 +62,6 @@
       nix-prefetch-scripts
       nix-tree
       obsidian
-      okular
       openvpn
       p7zip
       pavucontrol