Update config to use updated variable names

flake.lock

@@ -287,7 +287,9 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems",
         "xdph": "xdph"
       },
@@ -555,13 +557,13 @@
       "locked": {
         "lastModified": 1728018373,
         "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -646,22 +648,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1728018373,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -700,7 +686,7 @@
         "nix-ld": "nix-ld",
         "nix-matlab": "nix-matlab",
         "nix-topology": "nix-topology",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "snowfall-lib": "snowfall-lib",

flake.nix

@@ -34,7 +34,7 @@
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    # hyprland.inputs.nixpkgs.follows = "nixpkgs";
+    hyprland.inputs.nixpkgs.follows = "nixpkgs";
 
     hyprland-plugins = {
       url = "github:hyprwm/hyprland-plugins";

modules/home/hyprland/default.nix

@@ -87,7 +87,7 @@ in
     wayland.windowManager.hyprland = {
       # Whether to enable Hyprland wayland compositor
       enable = true;
-      # package = inputs.hyprland.packages."${pkgs.system}".hyprland; # does only work with nixos-unstable
+      package = inputs.hyprland.packages."${pkgs.system}".hyprland; # does only work with nixos-unstable
 
       # The hyprland package to use (simplifies use of plugins)
       # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
@@ -100,9 +100,9 @@ in
       # Make PATH available to systemd services
       systemd.variables = [ "--all" ];
 
-      plugins = with pkgs; [
-        # inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars # does only work with nixos-unstable
-        hyprlandPlugins.hyprbars
+      plugins = [
+        inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars # does only work with nixos-unstable
+        # hyprlandPlugins.hyprbars
       ];
 
       settings = {

modules/home/kitty/default.nix

@@ -31,7 +31,7 @@ in
     programs.kitty = {
       enable = true;
       shellIntegration.enableFishIntegration = true;
-      theme = "Catppuccin-Mocha";
+      themeFile = "Catppuccin-Mocha";
       settings = {
         enable_audio_bell = false;
         confirm_os_window_close = 0; # no ask on quit

modules/nixos/hyprland/default.nix

@@ -30,7 +30,7 @@ in
 
   config = lib.mkIf cfg.enable {
     programs.hyprland.enable = true;
-    # programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; # does only work with nixos-unstable
+    programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; # does only work with nixos-unstable
     programs.hyprland.xwayland.enable = true;
     security.pam.services.hyprlock = { };
     services.displayManager.defaultSession = "hyprland";

systems/x86_64-linux/aspi/default.nix

@@ -101,7 +101,7 @@
     ];
   };
 
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   services.xserver.wacom.enable = true;
 

systems/x86_64-linux/kardorf/default.nix

@@ -95,7 +95,7 @@
   services.xserver.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
   # hardware.nvidia.modesetting.enable = true; # for wayland
 
   nix.gc = {

systems/x86_64-linux/pianonix/default.nix

@@ -51,7 +51,7 @@
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   nix.gc = {
     automatic = true;