From 5b4a4c262388fcc2bd99174a4ce0a84bf987faed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Gro=C3=9Fmann?= <patrickdgro@gmail.com>
Date: Sun, 12 Mar 2023 20:30:30 +0900
Subject: [PATCH] feat: Update hyprland conf WIP: switch to spotifyd +
 spotify-tui

---
 data/hyprland/config.nix          | 90 ++++++++++++++++---------------
 flake.lock                        |  4 +-
 users/common/programs/spotify.nix | 14 +++++
 users/patrick.nix                 |  6 +--
 4 files changed, 66 insertions(+), 48 deletions(-)
 create mode 100644 users/common/programs/spotify.nix

diff --git a/data/hyprland/config.nix b/data/hyprland/config.nix
index 218e9c3..f7222f6 100644
--- a/data/hyprland/config.nix
+++ b/data/hyprland/config.nix
@@ -1,61 +1,65 @@
 MOD: TAGS: pkgs:
 ''
-    general {
-    	gaps_in = 1
-    	gaps_out = 0
-    }
+     general {
+     	gaps_in = 1
+     	gaps_out = 0
+     }
 
-    input {
-    	sensitivity = 0
-    	kb_model = pc105
-    	kb_layout = de
-    	kb_variant = bone
-    	repeat_rate = 60
-    	repeat_delay = 235
-    	# Only change focus on mouse click
-    	follow_mouse = 2
+     input {
+     	sensitivity = 0
+     	kb_layout = de
+     	kb_variant = bone
+     	repeat_rate = 60
+     	repeat_delay = 235
+     	# Only change focus on mouse click
+     	follow_mouse = 2
+  	accel_profile = flat
   touchpad {
-  	natural_scroll = true
+   	natural_scroll = true
+   }
+     }
+
+  gestures {
+  	workspace_swipe = true
   }
-    }
 
-    # keybinds
-    bind=${MOD},q,killactive,
-    bind=${MOD},return,fullscreen,
-    bind=${MOD},f,togglefloating
-    bind=${MOD},tab,cyclenext,
-    bind=ALT,tab,cyclenext,
-    bind=,Menu,exec,rofi -show drun
+     # keybinds
+     bind=${MOD},q,killactive,
+     bind=${MOD},return,fullscreen,
+     bind=${MOD},f,togglefloating
+     bind=${MOD},tab,cyclenext,
+     bind=ALT,tab,cyclenext,
+     bind=,Menu,exec,rofi -show drun
 
-    bind=${MOD},left,movefocus,l
-    bind=${MOD},right,movefocus,r
-    bind=${MOD},up,movefocus,u
-    bind=${MOD},down,movefocus,d
+     bind=${MOD},left,movefocus,l
+     bind=${MOD},right,movefocus,r
+     bind=${MOD},up,movefocus,u
+     bind=${MOD},down,movefocus,d
 
-    bind=${MOD},n,movefocus,l
-    bind=${MOD},s,movefocus,r
-    bind=${MOD},l,movefocus,u
-    bind=${MOD},r,movefocus,d
+     bind=${MOD},n,movefocus,l
+     bind=${MOD},s,movefocus,r
+     bind=${MOD},l,movefocus,u
+     bind=${MOD},r,movefocus,d
 
-    bind=${MOD} + SHIFT,left,movewindow,l
-    bind=${MOD} + SHIFT,right,movewindow,r
-    bind=${MOD} + SHIFT,up,movewindow,u
-    bind=${MOD} + SHIFT,down,movewindow,d
+     bind=${MOD} + SHIFT,left,movewindow,l
+     bind=${MOD} + SHIFT,right,movewindow,r
+     bind=${MOD} + SHIFT,up,movewindow,u
+     bind=${MOD} + SHIFT,down,movewindow,d
 
-    bind=${MOD} + SHIFT,n,movewindow,l
-    bind=${MOD} + SHIFT,s,movewindow,r
-    bind=${MOD} + SHIFT,l,movewindow,u
-    bind=${MOD} + SHIFT,r,movewindow,d
+     bind=${MOD} + SHIFT,n,movewindow,l
+     bind=${MOD} + SHIFT,s,movewindow,r
+     bind=${MOD} + SHIFT,l,movewindow,u
+     bind=${MOD} + SHIFT,r,movewindow,d
 
-    bind=${MOD},comma,workspace,-1
-    bind=${MOD},period,workspace,+1
+     bind=${MOD},comma,workspace,-1
+     bind=${MOD},period,workspace,+1
 
 
 
 
-    bind=${MOD},b,exec,firefox
-    bind=${MOD},t,exec,kitty
-    bind=${MOD} + SHIFT,Escape,exit
+     bind=${MOD},b,exec,firefox
+     bind=${MOD},t,exec,kitty
+     bind=${MOD} + SHIFT,Escape,exit
 ''
 + builtins.concatStringsSep "\n" (map (
     x: ''
diff --git a/flake.lock b/flake.lock
index e8808db..af5aca0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -247,11 +247,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-b3t2blYgmHf/HXc152Fa7+YKJSS05vRnrs8i+H6SWA8=",
-        "path": "/nix/store/cp64wcr7y55dlaamgq4axbhzhw2pqwhd-source/templates",
+        "path": "/nix/store/m12grpvqvq7vs62knlp1s288mb2n775k-source/templates",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/cp64wcr7y55dlaamgq4axbhzhw2pqwhd-source/templates",
+        "path": "/nix/store/m12grpvqvq7vs62knlp1s288mb2n775k-source/templates",
         "type": "path"
       }
     },
diff --git a/users/common/programs/spotify.nix b/users/common/programs/spotify.nix
new file mode 100644
index 0000000..655eb00
--- /dev/null
+++ b/users/common/programs/spotify.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  home = {
+    packages = with pkgs; [
+      spotify-tui
+    ];
+  };
+  services.spotifyd = {
+    enable = true;
+  };
+}
diff --git a/users/patrick.nix b/users/patrick.nix
index 9174670..f6f5128 100644
--- a/users/patrick.nix
+++ b/users/patrick.nix
@@ -5,11 +5,12 @@
 }: {
   imports = [
     common/programs/kitty.nix
-    #common/graphical/herbstluftwm.nix
     common/graphical/hyprland.nix
-    #common/graphical/autorandr.nix
     common/programs/polybar.nix
     common/programs/rofi.nix
+    common/programs/spotify.nix
+    #common/graphical/herbstluftwm.nix
+    #common/graphical/autorandr.nix
     #common/touchegg-module.nix
     #common/touchegg-settings.nix
   ];
@@ -21,7 +22,6 @@
       bitwarden
       nextcloud-client
       signal-desktop
-      spotify-tui
       xdragon
       xournalpp
       zathura