diff --git a/flake.lock b/flake.lock index 09d1f10..f77a0f6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1689802112, - "narHash": "sha256-Se7oHV/L0dHTQ4xp8MvYafaVdkSzF04Hx5NeloUYHtM=", + "lastModified": 1690303752, + "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=", "owner": "nix-community", "repo": "home-manager", - "rev": "0cb3ac57fca6b52c42e4c0f560185540ae1dfb6c", + "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1689849745, - "narHash": "sha256-6Lyu2doe9GktaA4QJHh3xlvaYeS58qpK6lDOSKTB2oA=", + "lastModified": 1690284788, + "narHash": "sha256-6QKfaqw6tU+VF6tLEduxyx+67+FGpsEtl3Rd7riU3uw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b65adf8d4a0c239f5aa44425d14d1fe14f675643", + "rev": "a9b8e2159c2813a6951d0b0186fbb7f2f8554d3e", "type": "github" }, "original": { @@ -84,11 +84,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688500189, - "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", + "lastModified": 1690179384, + "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", + "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1689679375, - "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=", + "lastModified": 1690179384, + "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "684c17c429c42515bafb3ad775d2a710947f3d67", + "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", "type": "github" }, "original": { @@ -143,18 +143,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1689611045, - "narHash": "sha256-3RTOlQabkNetQ4O4UzSf57JPco9VGVHhSU1ls5uKBeE=", + "lastModified": 1690165843, + "narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=", "owner": "wlroots", "repo": "wlroots", - "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", + "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", + "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3", "type": "gitlab" } }, diff --git a/hosts/default.nix b/hosts/default.nix index 3f7aa7a..27842a7 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -9,7 +9,7 @@ in desktop = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { - inherit pkgs old-nixpkgs home-manager hyprland hyprland-contrib user system; + inherit pkgs old-nixpkgs home-manager hyprland-contrib user system; host = { name = "desktop"; fristMonitor = "DP-1"; @@ -17,7 +17,6 @@ in }; }; modules = [ - hyprland.nixosModules.default ./configuration.nix ./desktop @@ -35,7 +34,6 @@ in }; home-manager.users.${user} = { imports = [ - hyprland.homeManagerModules.default ./home.nix desktop/home.nix ]; @@ -47,7 +45,7 @@ in work = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { - inherit pkgs old-nixpkgs home-manager hyprland hyprland-contrib user system; + inherit pkgs old-nixpkgs home-manager hyprland-contrib user system; host = { name = "work"; fristMonitor = "DVI-I-1"; @@ -56,7 +54,6 @@ in }; }; modules = [ - hyprland.nixosModules.default ./configuration.nix ./work @@ -75,7 +72,6 @@ in }; home-manager.users.${user} = { imports = [ - hyprland.homeManagerModules.default ./home.nix work/home.nix ]; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index d97de2b..b0cb521 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, home-manager, hyprland, user, host, ... }: +{ lib, pkgs, home-manager, user, host, ... }: { imports = diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 74609d7..98d5e10 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -1,4 +1,4 @@ -{ pkgs, hyprland, ... }: +{ pkgs, ... }: { imports = diff --git a/hosts/work/default.nix b/hosts/work/default.nix index 3c14a67..cbe26dc 100644 --- a/hosts/work/default.nix +++ b/hosts/work/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, home-manager, hyprland, user, host, ... }: +{ lib, pkgs, home-manager, user, host, ... }: { imports = diff --git a/hosts/work/home.nix b/hosts/work/home.nix index 74609d7..98d5e10 100644 --- a/hosts/work/home.nix +++ b/hosts/work/home.nix @@ -1,4 +1,4 @@ -{ pkgs, hyprland, ... }: +{ pkgs, ... }: { imports = diff --git a/modules/hyprland.nix b/modules/hyprland.nix index dc95f10..4be869f 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -1,4 +1,4 @@ -{ pkgs, home-manager, hyprland, hyprland-contrib, user, host, ... }: +{ pkgs, home-manager, hyprland-contrib, user, host, ... }: let catppuccinHyprland = pkgs.fetchFromGitHub { @@ -43,9 +43,8 @@ in home.file.".config/hypr/catppuccin.conf".source = "${catppuccinHyprland}/themes/mocha.conf"; wayland.windowManager.hyprland = { enable = true; - nvidiaPatches = true; + enableNvidiaPatches = true; systemdIntegration = true; - recommendedEnvironment = true; extraConfig = '' ${monitors}