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,10 +28,11 @@
         };
 
         "$mod" = "SUPER";
-        bind = [
+        bind =
+          [
             "$mod, Return, exec, alacritty"
             "$mod, D, exec, fuzzel"
-          "$mod, F, exec, qutebrowser"
+            "$mod, B, exec, qutebrowser"
 
             "$mod SHIFT, Q, killactive,"
             "$mod SHIFT, X, exit,"
@@ -34,6 +41,11 @@
             "$mod, J, movefocus, d"
             "$mod, K, movefocus, u"
             "$mod, L, movefocus, r"
+
+            "$mod SHIFT, H, movewindow, l"
+            "$mod SHIFT, J, movewindow, d"
+            "$mod SHIFT, K, movewindow, u"
+            "$mod SHIFT, L, movewindow, r"
           ]
           ++ (builtins.concatLists (builtins.genList (
               # workspaces
@@ -47,7 +59,13 @@
                 "$mod, ${ws}, workspace, ${toString (x + 1)}"
                 "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
               ]
-        ) 10) );
+            )
+            10));
+
+        monitor =
+          lib.mapAttrsToList
+          (_: v: "${v.name},${v.config.mode}@${v.config.rate},${v.config.position},1")
+          osConfig.mods.monitors;
       };
     };
   };