Merge branch 'main' of codeberg.org:muon/home

hosts/murk/configuration.nix

@@ -35,6 +35,7 @@ in {
     pkgs.piper
     pkgs.libpq
     pkgs.qmk
+    pkgs.jq
   ];
 
   # System
@@ -54,15 +55,12 @@ in {
   mods.theme.wallpaper = ./wallpaper.png;
 
   services.xserver.windowManager.i3.enable = true;
+  # mods.desktop.wayland.enable = true;
 
   mods.impermanence.enable = true;
 
-  services.hardware.openrgb.enable = true;
   virtualisation.docker.enable = true;
 
-  services.picom.enable = true;
-  services.picom.opacityRules = ["50:name *= 'Cheat'"];
-
   users.users.muon.openssh.authorizedKeys.keys = keys;
   users.users.root.openssh.authorizedKeys.keys = keys;
 

hosts/murk/home.nix

@@ -13,6 +13,7 @@ in {
   # Modules
   mods.xdg.enable = true;
   mods.i3.enable = true;
+  # mods.hyprland.enable = true;
   mods.battery.enable = true;
   mods.terminal.zsh.enable = true;
   mods.terminal.emulator.enable = true;

modules/home/desktop/hyprland.nix

@@ -1,4 +1,10 @@
-{ pkgs, lib, config, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  osConfig,
+  ...
+}: {
   options.mods.hyprland.enable = lib.mkEnableOption {
     description = "enables hyprland";
     default = false;
@@ -22,32 +28,44 @@
         };
 
         "$mod" = "SUPER";
-        bind = [
+        bind =
-          "$mod, Return, exec, alacritty"
+          [
-          "$mod, D, exec, fuzzel"
+            "$mod, Return, exec, alacritty"
-          "$mod, F, exec, qutebrowser"
+            "$mod, D, exec, fuzzel"
+            "$mod, B, exec, qutebrowser"
 
-          "$mod SHIFT, Q, killactive,"
+            "$mod SHIFT, Q, killactive,"
-          "$mod SHIFT, X, exit,"
+            "$mod SHIFT, X, exit,"
 
-          "$mod, H, movefocus, l"
+            "$mod, H, movefocus, l"
-          "$mod, J, movefocus, d"
+            "$mod, J, movefocus, d"
-          "$mod, K, movefocus, u"
+            "$mod, K, movefocus, u"
-          "$mod, L, movefocus, r"
+            "$mod, L, movefocus, r"
-        ]
+
-        ++ (builtins.concatLists (builtins.genList (
+            "$mod SHIFT, H, movewindow, l"
-          # workspaces
+            "$mod SHIFT, J, movewindow, d"
-          # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
+            "$mod SHIFT, K, movewindow, u"
-          x: let
+            "$mod SHIFT, L, movewindow, r"
-            ws = let
-              c = (x + 1) / 10;
-            in
-              builtins.toString (x + 1 - (c * 10));
-          in [
-            "$mod, ${ws}, workspace, ${toString (x + 1)}"
-            "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
           ]
-        ) 10) );
+          ++ (builtins.concatLists (builtins.genList (
+              # workspaces
+              # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
+              x: let
+                ws = let
+                  c = (x + 1) / 10;
+                in
+                  builtins.toString (x + 1 - (c * 10));
+              in [
+                "$mod, ${ws}, workspace, ${toString (x + 1)}"
+                "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
+              ]
+            )
+            10));
+
+        monitor =
+          lib.mapAttrsToList
+          (_: v: "${v.name},${v.config.mode}@${v.config.rate},${v.config.position},1")
+          osConfig.mods.monitors;
       };
     };
   };