Added

programs/wm/niri/config.kdl

@@ -1,18 +1,30 @@
 input {
 		keyboard {
-			xkb {
-				layout "de"
-			}
+				xkb {
+						layout "de"
+						variant "mac"
+				}
 		}
 
+		focus-follows-mouse
+
 		touchpad {
 				tap 
 				natural-scroll
 		}
+		
+		tablet {
+				map-to-output "DP-1"
+		}
+		
+		touch {
+				map-to-output "DP-1"
+		}
 }
 
 output "DP-1" {
 		position x=1920 y=0
+		variable-refresh-rate on-demand=true
 }
 
 output "HDMI-A-2" {
@@ -21,21 +33,28 @@ output "HDMI-A-2" {
 
 layout {
 		gaps 16
-		center-focused-column "always"
+		center-focused-column "never"
+
+		preset-column-widths {
+				proportion 0.125
+				proportion 0.75
+				proportion 0.125
+		}
 
 		focus-ring {
-				//off
-				width 2
-				active-color "#1e1e2e55"
-				inactive-color "#11111b55"
+				off
+				width 4
+				active-gradient from="#fab387" to="#f9e2af" angle=45
+				//inactive-color "#11111b55"
 
 		}
 
 		border {
 				off
-				width 2
-				active-color "#a6e3a1"
-				inactive-color "#f38ba8"
+				width 4
+				//active-color "#a6e3a1"
+				inactive-color "#cba6f7"
+				//urgent-color "#f38ba8"
 
 		}
 
@@ -49,8 +68,8 @@ layout {
 }
 
 spawn-at-startup "waybar"
-spawn-at-startup "swaync"
-spawn-at-startup "while true; do sleep 300; $HOME/.config/hypr/rotate-wallpaper.sh"
+spawn-at-startup "mako"
+spawn-at-startup "swww-daemon"
 screenshot-path "~/Pictures/Screenshots/%Y-%m-%d_%H-%M-%S.png"
 
 binds {
@@ -79,6 +98,7 @@ binds {
 		Super+A { spawn "rofi" "-show" "window" "-theme" ".config/rofi/custom.rasi"; }
 		Super+R { spawn "rofi" "-show" "drun" "-theme" ".config/rofi/custom.rasi"; }
 		Super+S { spawn "rofi" "-show" "p" "-modi" "p:rofi-power-menu" "-theme" ".config/rofi/power.rasi"; }
+		Super+L { spawn "swaylock"; }
 
 		// Screenshot 
 		Super+Z { screenshot-screen; }
@@ -103,8 +123,21 @@ binds {
 		Super+7 { focus-workspace 7; }
 		Super+8 { focus-workspace 8; }
 		Super+9 { focus-workspace 9; }
+		
+		// Switch window to Workspaces
+		Super+Shift+1 { move-window-to-workspace 1; }
+		Super+Shift+2 { move-window-to-workspace 2; }
+		Super+Shift+3 { move-window-to-workspace 3; }
+		Super+Shift+4 { move-window-to-workspace 4; }
+		Super+Shift+5 { move-window-to-workspace 5; }
+		Super+Shift+6 { move-window-to-workspace 6; }
+		Super+Shift+7 { move-window-to-workspace 7; }
+		Super+Shift+8 { move-window-to-workspace 8; }
+		Super+Shift+9 { move-window-to-workspace 9; }
 
 		// Focus Window
-		Super+Shift+Left { focus-column-left; }
-		Super+Shift+Right { focus-column-right; }
+		Super+Left { focus-column-left; }
+		Super+Right { focus-column-right; }
+		Super+Down { focus-workspace-down; }
+		Super+Up { focus-workspace-up; }
 }

programs/wm/niri/default.nix

@@ -3,7 +3,7 @@
   ...
 }:
 {
-  #  imports = [ ./niri-switcher.nix ];
+  imports = [ ./swaylock.nix ];
 
   home.packages = with pkgs; [
     niri

programs/wm/niri/swaylock.nix

@@ -0,0 +1,35 @@
+{ lib, ... }:
+{
+  programs.swaylock = {
+    enable = true;
+    settings = lib.mkForce {
+      image = "$HOME/Pictures/Wallpapers/rain.gif";
+      #show-keyboard-layout = true;
+      font = "JetbrainsMono Nerd Font";
+      font-size = 24;
+      text-color = "cdd6f4";
+
+      # indicator
+      indicator-idle-visible = true;
+      indicator-radius = 150;
+      indicator-thickness = 20;
+      inside-color = "11111b00";
+
+      key-hl-color = "fab387";
+
+      line-uses-ring = true;
+      line-color = "cdd6f400";
+      line-clear-color = "cdd6f400";
+      line-wrong-color = "cdd6f400";
+      line-caps-lock-color = "cdd6f400";
+      line-ver-color = "cdd6f400";
+
+      ring-color = "cba6f7";
+      ring-clear-color = "89dceb";
+      ring-caps-color = "74c7ec";
+      ring-ver-color = "a6e3a1";
+      ring-wrong-color = "f38ba8";
+    };
+  };
+
+}