Merge branch 'main' of github.com:bloxx12/nichts

hosts/lars/default.nix

@@ -5,7 +5,7 @@
   security.sudo.package = pkgs.sudo.override { withInsults = true; };
   security.polkit.enable = true;
   programs.kdeconnect.enable = true;
-  myOptions = {
+  modules = {
       other = {
           system = {
               gitPath = "/home/lars/nichts";

hosts/lars/dyonisos/configuration.nix

@@ -1,11 +1,15 @@
 { config, inputs, pkgs, ... }:
 {
-  myOptions = {
+  modules = {
       other = {
           system = {
               hostname = "dyonisos";
               username = "lars";
           };
       };
+      hyprland = {
+          enable = true;
+	  monitor = ",preferred,auto,1";
+      };
   };
 }

hosts/lars/dyonisos/programs.nix

@@ -1,6 +1,6 @@
 { config, inputs, pkgs, ... }:
 let
-  username = config.myOptions.other.system.username;
+  username = config.modules.other.system.username;
 in {
     home-manager.users.${username} = {
         home.packages = let

hosts/lars/hyprland.nix

@@ -1,10 +1,17 @@
 { config, lib, inputs, pkgs, ... }:
 with lib; let
-  username = config.myOptions.other.system.username;
-  cfg = config.myOptions.hyprland;
+  username = config.modules.other.system.username;
+  cfg = config.modules.hyprland;
 in {
-    options.myOptions.hyprland.nvidia.enable = mkEnableOption "nvidia";
-    options.myOptions.hyprland.enable = mkEnableOption "hyprland";
+    options.modules.hyprland.nvidia.enable = mkEnableOption "nvidia";
+    options.modules.hyprland = {
+        enable = mkEnableOption "hyprland";
+	monitor = mkOption {
+	    description = "hyprland monitor config";
+	    default = ",preferred,auto,1";
+	    type = types.listof(types.str);
+	};
+    };
 
   config = mkIf cfg.enable {
 	  environment.sessionVariables = mkIf cfg.nvidia.enable {
@@ -36,11 +43,6 @@ in {
 		settings = {
 			"$mod" = "SUPER";
 
-			monitor = [
-			    "DP-2,2560x1440@144,0x0,1"
-			    "DP-1,1920x1080@60,2560x0,1"
-			];
-
 			input = {
 			    kb_layout = "ch";
 			};
@@ -56,6 +58,16 @@ in {
 			    # Monitor management
 			    "$mod SHIFT, k, movecurrentworkspacetomonitor, DP-2"
 			    "$mod SHIFT, j, movecurrentworkspacetomonitor, DP-1"
+
+			    # Window Management
+			    "$mod, left, movefocus, l"
+			    "$mod, right, movefocus, r"
+			    "$mod, up, movefocus, u"
+			    "$mod, down, movefocus, d"
+			    "$mod, F, fullscreen"
+
+			    # Screenshot
+			    "$mod SHIFT, s, exec, grim -g 'slurp -d' - | wl-copy"
 			]
 			++ (
 			  builtins.concatLists (builtins.genList (

hosts/lars/kronos/configuration.nix

@@ -1,6 +1,6 @@
 { config, inputs, pkgs, ... }:
 {
-  myOptions = {
+  modules = {
       other = {
           system = {
               hostname = "kronos";
@@ -10,6 +10,10 @@
       hyprland = {
           enable = true;
       	  nvidia.enable = true;
+			monitor = [
+			    "DP-2,2560x1440@144,0x0,1"
+			    "DP-1,1920x1080@60,2560x0,1"
+			];
       };
   };
 

hosts/lars/kronos/programs.nix

@@ -1,6 +1,6 @@
 { config, inputs, pkgs, ... }:
 let
-  username = config.myOptions.other.system.username;
+  username = config.modules.other.system.username;
 in {
     home-manager.users.${username} = {
         home.packages = let

hosts/lars/programs.nix

@@ -1,6 +1,6 @@
 { config, inputs, pkgs, ... }:
 let
-  username = config.myOptions.other.system.username;
+  username = config.modules.other.system.username;
 in {
     home-manager.users.${username} = {
         home.packages = let
@@ -50,6 +50,9 @@ in {
 	    kitty
 	    nextcloud-client
 	    vscode
+	    grim
+	    slurp
+	    wl-clipboard
         ];
     };
 }