feat(nix): add nixpkgs-wayland flake

nixos/flake.lock

@@ -36,6 +36,21 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "locked": {
+        "lastModified": 1688025799,
+        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -97,6 +112,28 @@
         "type": "github"
       }
     },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs-wayland",
+          "nix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696343447,
+        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -115,6 +152,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "haskell-flake": {
       "locked": {
         "lastModified": 1684780604,
@@ -160,11 +215,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695684520,
+        "lastModified": 1697031886,
-        "narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=",
+        "narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7",
+        "rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3",
         "type": "github"
       },
       "original": {
@@ -262,6 +317,25 @@
         "type": "github"
       }
     },
+    "lib-aggregate": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1696766909,
+        "narHash": "sha256-lU1BmCWpQ9cx64YnJKc89lMg9cx4pCokXIbh5J//2t0=",
+        "owner": "nix-community",
+        "repo": "lib-aggregate",
+        "rev": "9f495e4feea66426589cbb59ac8b972993b5d872",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "lib-aggregate",
+        "type": "github"
+      }
+    },
     "neovim-flake": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -272,11 +346,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1696980277,
+        "lastModified": 1697067536,
-        "narHash": "sha256-JevNSElWjqzcdBwDp46Sa1L5v5fcuB3yrDMG6AwJSDI=",
+        "narHash": "sha256-dR96w6wAl5UgMO5/AOhM5S2KcelEAxDM66QVsnjv9KY=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "4eea60939f9c079d4e1652e0ed1724c4f2ab6eda",
+        "rev": "3cbb02ce77087a820decd1a724a6e8b666e0ca36",
         "type": "github"
       },
       "original": {
@@ -297,11 +371,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696982445,
+        "lastModified": 1697069012,
-        "narHash": "sha256-KZyvOOAnNRlH6UjRNxSaKQz1jMZ9j57TcSFEuTbYuzo=",
+        "narHash": "sha256-eP0XhTAy5bVCmP5ZQ1LU3Nwh9CjRcx18kHSmhHd+GBE=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "b73878077a9fea624f9d0331fefdd967a6982b17",
+        "rev": "890da9720383f47e00f8a4592cb987d6efccb3db",
         "type": "github"
       },
       "original": {
@@ -310,6 +384,26 @@
         "type": "github"
       }
     },
+    "nix-eval-jobs": {
+      "inputs": {
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": "nixpkgs_3",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1696813662,
+        "narHash": "sha256-dQTBtvjdzKa7+ViWiDdnBpdtDS4FD+gWuJJrfIrxSkc=",
+        "owner": "nix-community",
+        "repo": "nix-eval-jobs",
+        "rev": "7cdbfd5ffe59fe54fd5c44be96f58c45e25d5b62",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-eval-jobs",
+        "type": "github"
+      }
+    },
     "nix-melt": {
       "inputs": {
         "nixpkgs": [
@@ -364,6 +458,44 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1696726172,
+        "narHash": "sha256-89yxFXzTA7JRyWo6hg7SD4DlS/ejYt8Y8IvGZHbSWsg=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "59da6ac0c02c48aa92dee37057f978412797db2a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-wayland": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "lib-aggregate": "lib-aggregate",
+        "nix-eval-jobs": "nix-eval-jobs",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1697048442,
+        "narHash": "sha256-sjcml2uP9aIhDVLRoCx1Ar+ZqGPussyseoA2QSgtu9o=",
+        "owner": "nix-community",
+        "repo": "nixpkgs-wayland",
+        "rev": "941e5c403f01de6161c7d233845d309c64d021a6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs-wayland",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1696879762,
@@ -380,13 +512,29 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1696810678,
+        "narHash": "sha256-XAw8D1ZEbdqwhSvn8RsgeeNrDktx4YSikTb5V4ArsrA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "35c640b19a189ce3a86698ce2fdcd87d085a339b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
-        "lastModified": 1697057195,
+        "lastModified": 1697069045,
-        "narHash": "sha256-mcNqgz4q/JP10Vc6WcT0SiqOMymIDWq0LIvIL8sP9B8=",
+        "narHash": "sha256-80cy1s92pYIhD4FLaSAxLEgVcBo3gcX70GCm0Z7no9U=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "82a21f704a9213214463c492b5d15ab20b253a16",
+        "rev": "b5f2b4924ed6f505b95c71acd1180475d12396fd",
         "type": "github"
       },
       "original": {
@@ -404,6 +552,7 @@
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nix-melt": "nix-melt",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-wayland": "nixpkgs-wayland",
         "nur": "nur"
       }
     },
@@ -437,6 +586,43 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-wayland",
+          "nix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1695822946,
+        "narHash": "sha256-IQU3fYo0H+oGlqX5YrgZU3VRhbt2Oqe6KmslQKUO4II=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "720bd006d855b08e60664e4683ccddb7a9ff614a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "wlroots": {
       "flake": false,
       "locked": {

nixos/flake.nix

@@ -23,6 +23,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixpkgs-wayland = {
+      url = "github:nix-community/nixpkgs-wayland";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     neovim-nightly-overlay = {
       url = "github:nix-community/neovim-nightly-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -60,13 +65,13 @@
           };
         })
 
-        ./configuration.nix
-
         home-manager.nixosModules.home-manager {
           home-manager.extraSpecialArgs = attrs;
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
         }
+
+        ./configuration.nix
       ];
     };
   };

nixos/home/dotfiles.nix

@@ -1,4 +1,6 @@
-{ config, pkgs, ... }: let
+{ config, pkgs, nixpkgs-wayland, ... }: let
+  waypkgs = nixpkgs-wayland.packages.x86_64-linux;
+
   configDir = (import ../vars.nix).configDir;
   symlink = config.lib.file.mkOutOfStoreSymlink;
 in
@@ -35,6 +37,7 @@ in
 
     wofi = {
       enable = true;
+      package = waypkgs.wofi;
       settings = {
         prompt = "";
         allow_images = true;

nixos/home/hyprland.nix

@@ -1,4 +1,6 @@
-{ pkgs, config, hyprland, hyprgrass, ags, ... }: let
+{ pkgs, config, hyprland, hyprgrass, ags, nixpkgs-wayland, ... }: let
+  waypkgs = nixpkgs-wayland.packages.x86_64-linux;
+
   configDir = (import ../vars.nix).configDir;
   symlink = config.lib.file.mkOutOfStoreSymlink;
 
@@ -47,44 +49,44 @@ in
     "hypr/hyprpaper.conf".source  = symlink "${configDir}/hypr/hyprpaper.conf";
   };
 
-  home.packages = with pkgs; [
+  home.packages = [
     # ags
-    sassc
+    pkgs.sassc
-    coloryou
+    pkgs.coloryou
-    libnotify
+    pkgs.libnotify
-    playerctl
+    pkgs.playerctl
-    bluez-tools
+    pkgs.bluez-tools
-    brightnessctl
+    pkgs.brightnessctl
-    pulseaudio
+    pkgs.pulseaudio
-    libinput
+    pkgs.libinput
 
     ## gui
-    pavucontrol # TODO: replace with ags widget
+    pkgs.pavucontrol # TODO: replace with ags widget
-    networkmanagerapplet # TODO: replace with ags widget
+    pkgs.networkmanagerapplet # TODO: replace with ags widget
-    blueberry # TODO: replace with ags widget
+    pkgs.blueberry # TODO: replace with ags widget
 
 
     # Hyprland
-    hyprpaper
+    pkgs.hyprpaper
-    swayidle
+    waypkgs.swayidle
-    lisgd
+    pkgs.lisgd
-    swayosd
+    pkgs.swayosd
-    squeekboard
+    pkgs.squeekboard
-    xclip
+    pkgs.xclip
-    wl-clipboard
+    waypkgs.wl-clipboard
-    cliphist
+    pkgs.cliphist
 
     ## gui
-    gtklock
+    pkgs.gtklock
-    wl-color-picker # TODO: add bind for this in hyprland
+    pkgs.wl-color-picker # TODO: add bind for this in hyprland
-    grim
+    waypkgs.grim
-    slurp
+    waypkgs.slurp
-    swappy
+    pkgs.swappy
 
     ## libs
-    libayatana-appindicator
+    pkgs.libayatana-appindicator
-    xdg-utils
+    pkgs.xdg-utils
-    evtest
+    pkgs.evtest
-    glib
+    pkgs.glib
   ];
 }

nixos/home/packages.nix

@@ -1,12 +1,13 @@
-{ pkgs, config, nix-melt, ... }:
+{ pkgs, config, nixpkgs-wayland, nix-melt, ... }: let
-
+  waypkgs = nixpkgs-wayland.packages.x86_64-linux;
+in
 {
   programs = {
 
     obs-studio = {
       enable = true;
-      plugins = with pkgs.obs-studio-plugins; [
+      plugins = with waypkgs; [
-        wlrobs
+        obs-wlrobs
       ];
     };