flake.lock

@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732742778,
+        "lastModified": 1730190761,
-        "narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
+        "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
+        "rev": "3979285062d6781525cded0f6c4ff92e71376b55",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
+        "lastModified": 1727826117,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732793095,
+        "lastModified": 1730016908,
-        "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=",
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
         "type": "github"
       },
       "original": {
@@ -124,35 +124,6 @@
         "type": "github"
       }
     },
-    "hyprgraphics": {
-      "inputs": {
-        "hyprutils": [
-          "hyprlock",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732808127,
-        "narHash": "sha256-jwqYmLVfvoLPu8UScEzZgdbbiNU3ioYcrsthjEEnGqI=",
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "rev": "4d927a52be7e15e0846456f2aa1b0ad76b5bf059",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "type": "github"
-      }
-    },
     "hyprlang": {
       "inputs": {
         "hyprutils": [
@@ -184,7 +155,6 @@
     },
     "hyprlock": {
       "inputs": {
-        "hyprgraphics": "hyprgraphics",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "nixpkgs": [
@@ -193,11 +163,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1732812191,
+        "lastModified": 1730053985,
-        "narHash": "sha256-/gYMXqhjvOcjhaYjzb1iqjpoCDqO5lkkqjG93oMMo60=",
+        "narHash": "sha256-jh7PhejwT+XqkkYnpZ6K/Gkqy4tvjN7g/ZBTvlS+Q9Y=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "4667f721be47ff6f5cf2a7ee64513f818fb764a0",
+        "rev": "edbecc87081756b45bdbea16b63e413473659dcd",
         "type": "github"
       },
       "original": {
@@ -251,11 +221,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732483221,
+        "lastModified": 1730161780,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8",
         "type": "github"
       },
       "original": {
@@ -283,11 +253,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1732521221,
+        "lastModified": 1729880355,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
         "type": "github"
       },
       "original": {

home/sway/default.nix

@@ -6,9 +6,6 @@
   osConfig,
   ...
 }:
-let
-  inherit (lib) mapAttrs;
-in
 lib.mkIf osConfig.programs.sway.enable {
 
   services.swayidle.enable = true;
@@ -202,12 +199,14 @@ lib.mkIf osConfig.programs.sway.enable {
         };
         #: }}}
         #: Output {{{
-        output = mapAttrs (name: value: {
+        output = {
-          scale = toString value.scale;
+          eDP-1 = {
-          pos = "${toString value.posX} ${toString value.posY}";
+            scale = "2";
-          res = "${toString value.resX}x${toString value.resY}";
+            pos = "0 0";
-          adaptive_sync = "on";
+            res = "3840x2400";
-        }) osConfig.modules.system.outputs;
+            adaptive_sync = "on";
+          };
+        };
         #: }}}
       };
     };

hosts/brontes/default.nix

@@ -32,23 +32,9 @@
   };
 
   modules = {
-    system = {
+    system.networking = {
-      outputs = {
+      wifi.enable = true;
-        "DP-2" = {
+      bluetooth.enable = true;
-          resX = 1920;
-          resY = 1080;
-        };
-        "HDMI-A-1" = {
-          posX = 1920;
-          resX = 1920;
-          resY = 1080;
-        };
-      };
-
-      networking = {
-        wifi.enable = true;
-        bluetooth.enable = true;
-      };
     };
 
     services = {
@@ -95,7 +81,6 @@
     firefox.enable = true;
     thunderbird.enable = true;
     sway.enable = true;
-    hyprland.enable = true;
   };
 
   security.polkit.enable = true;

hosts/marr/default.nix

@@ -17,13 +17,6 @@
     media.enableAll = true;
 
     system = {
-      outputs = {
-        eDP-1 = {
-          resX = 3840;
-          resY = 2400;
-          scale = 2.0;
-        };
-      };
       networking = {
         bluetooth.enable = true;
         wifi.enable = true;

options/system/default.nix

@@ -2,6 +2,5 @@
   imports = [
     ./networking
     ./roles
-    ./outputs.nix
   ];
 }

options/system/outputs.nix

@@ -1,43 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) mkOption;
-  inherit (lib.types)
-    attrsOf
-    submodule
-    int
-    float
-    str
-    ;
-in
-{
-  options.modules.system.outputs = mkOption {
-    type = attrsOf (
-      submodule (
-        { name, config, ... }:
-        {
-          options = {
-            name = mkOption {
-              type = str;
-              default = name;
-            };
-            scale = mkOption {
-              type = float;
-              default = 1.0;
-            };
-            posX = mkOption {
-              type = int;
-              default = 0;
-            };
-            posY = mkOption {
-              type = int;
-              default = 0;
-            };
-            resX = mkOption { type = int; };
-            resY = mkOption { type = int; };
-          };
-        }
-      )
-    );
-    default = { };
-  };
-}