From 61560dea0f26a3e5bfded8ef3c5d20010cb285e8 Mon Sep 17 00:00:00 2001
From: MoritzBoehme <mail@moritzboeh.me>
Date: Tue, 7 Sep 2021 23:11:08 +0200
Subject: [PATCH] various changes

---
 system/configuration.nix |  7 ++--
 users/moritz/home.nix    | 84 ++++++++++++++++++++--------------------
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/system/configuration.nix b/system/configuration.nix
index fd3e836..724084f 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -56,13 +56,14 @@
           enable = true;
         };
       };
-    
+      
+      libinput.enable = true;
+  
       windowManager.bspwm.enable = true;
     };
     printing.enable = true;
   };
-  # HOMEMANAGER
-
+  
   # Enable sound.
   sound.enable = true;
   hardware.pulseaudio.enable = true;
diff --git a/users/moritz/home.nix b/users/moritz/home.nix
index 36eacf2..e681631 100644
--- a/users/moritz/home.nix
+++ b/users/moritz/home.nix
@@ -64,6 +64,14 @@
           ];
   };
 
+  xdg = {
+    enable = true;
+    configFile = {
+      "sxhkd/sxhkdrc".source = ~/.dotfiles/config/sxhkd/sxhkdrc;
+      "bspwm/bspwmrc".source = ~/.dotfiles/config/bspwm/bspwmrc;
+    };
+  };
+
   # Kitty
   programs.kitty = { 
     enable = true;
@@ -86,54 +94,48 @@
     enable = true;
     enableZshIntegration = true;
   };
-  
+
   services.polybar = {
     enable = true;
-    script = ''
-             # Terminate already running bar instances
-             killall -q polybar
-    
-             # Wait until the processes have been shut down
-             while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-             while ! pgrep -x bspwm >/dev/null; do sleep 1; done
-    
-             # Launch Polybar
-             for m in $(polybar --list-monitors | cut -d":" -f1); do
-               MONITOR=$m polybar --reload bottom &
-             done
-             '';
-    config = {
-      "bar/bottom" = {
-         monitor = "\${env:MONITOR}";
-         bottom = true;
-         fixed-center = true;
-         width = "100%";
-         height = 25;
-         background = "\${color.background-alt}";
-         foreground = "\${color.foreground}";
-         line-size = 3;
-         border-size = 0;
-         padding-left = 1;
-         padding-right = 1;
-         module-margin-left = 3;
-         module-margin-right = 3;
-         font-0 = "NotoSans Nerd Font:size=11;0";
-         modules-left = "cpu memory wlan eth battery";
-         modules-center = "bspwm";
-         modules-right = "pulseaudio date powermenu";
-         tray-position = "right";
-         tray-background = "\${color.background-alt}";
-         tray-padding = 2;
-         wm-restack = "bspwm";
-         cursor-click = "pointer";
-      };
-    };
+    script = ''for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do
+  MONITOR=$m polybar --reload bottom &
+done
+'';
+    config = ~/.dotfiles/config/polybar/config.ini;
+    extraConfig = builtins.readFile ~/.dotfiles/config/polybar/modules.ini + 
+                  builtins.readFile ~/.dotfiles/config/polybar/colors.ini;
+  };
+
+  services.picom = {
+    enable = true;
+    inactiveOpacity = "0.95";
+    opacityRule = [
+      "100:fullscreen"
+      "80 :class_g   = 'Polybar'"
+    ];
+    blur = true;
+    inactiveDim = "0.1";
+  };
+
+  programs.rofi = {
+    enable = true;
+  };
+
+  programs.emacs.enable = true;
+
+  services.emacs.enable = true;
+
+  home.file.".doom.d" = {
+    source = ~/.dotfiles/config/doom;
+    recursive = true;
+    onChange = builtins.readFile ~/.dotfiles/config/doom/reload.sh;
   };
   
   home.packages = with pkgs; [
     neofetch
+    feh
   ];
-
+ 
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage
   # when a new Home Manager release introduces backwards