incorporate changes to work machine and use nixpkgs hyprland

flake.lock

@@ -204,55 +204,6 @@
         "type": "github"
       }
     },
-    "hyprland": {
-      "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems",
-        "wlroots": "wlroots",
-        "xdph": "xdph"
-      },
-      "locked": {
-        "lastModified": 1703245058,
-        "narHash": "sha256-TPuiNxl/KTyCoqFIMfNtX33Gtb46DOPrP9EQ13Zn6qI=",
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "rev": "7cec618fe47e457fe66ef772da00ef07665a8607",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1691753796,
-        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1703013332,
@@ -287,7 +238,6 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "hyprland": "hyprland",
         "nixpkgs": "nixpkgs",
         "stylix": "stylix"
       }
@@ -319,69 +269,6 @@
         "repo": "stylix",
         "type": "github"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "wlroots": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.freedesktop.org",
-        "lastModified": 1701368958,
-        "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.freedesktop.org",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
-        "type": "gitlab"
-      }
-    },
-    "xdph": {
-      "inputs": {
-        "hyprland-protocols": [
-          "hyprland",
-          "hyprland-protocols"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1702334919,
-        "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -7,17 +7,12 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     stylix.url = "github:danth/stylix";
   };
 
   outputs = {
     nixpkgs,
     home-manager,
-    hyprland,
     stylix,
     ...
   } @ inputs: let

hardware/work.nix

@@ -91,10 +91,39 @@
   home-manager.users.${user}.imports = [
     {
       home.stateVersion = "22.05";
-
-      programs.waybar.settings.mainBar."hyprland/workspaces".persistent_workspaces = {
-        eDP-1 = 5;
-      };
     }
   ];
+
+  displays.displays = {
+    "hp" = {
+      name = "DP-1";
+      wallpaper = ../images/demonslayer.png;
+      workspaces = {
+        start = 6;
+        end = 10;
+      };
+    };
+    "asus" = {
+      name = "HDMI-A-1";
+      wallpaper = ../images/nier2.jpg;
+      workspaces = {
+        start = 6;
+        end = 10;
+      };
+    };
+    "internal" = {
+      name = "eDP-1";
+      description = "BOE 0x07D8";
+      workspaces = {
+        start = 1;
+      };
+      position = {
+        x = 0;
+        y = 1080;
+      };
+      wallpaper = ../images/nix-soft.png;
+    };
+
+  };
+
 }

lib/mkconf.nix

@@ -15,16 +15,6 @@ nixpkgs.lib.nixosSystem {
   inherit system;
 
   modules = [
-    {
-      nix.settings = {
-        substituters = ["https://hyprland.cachix.org"];
-        trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
-      };
-      programs.hyprland = {
-        enable = true;
-        package = inputs.hyprland.packages.${system}.hyprland;
-      };
-    }
 
     inputs.stylix.nixosModules.stylix
     ({pkgs, ...}: {

lib/modules/work.nix

@@ -10,16 +10,6 @@ with lib; {
   };
 
   config = mkIf config.roles.work.enable {
-    displays.displays.internal = {
-      name = "eDP-1";
-      description = "BOE 0x07D8";
-      position = {
-        x = 0;
-        y = 1080;
-      };
-      wallpaper = ../../images/nix-soft.png;
-    };
-
     roles.email = {
       enable = true;
       email = "tristan.beedell@cryoserver.com";