diff --git a/flake.lock b/flake.lock index ce7b9f1..c17f14b 100644 --- a/flake.lock +++ b/flake.lock @@ -162,22 +162,6 @@ "type": "github" } }, - "nixos-hardware": { - "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1741379970, @@ -215,7 +199,6 @@ "agenix": "agenix", "flake-utils": "flake-utils_2", "home-manager": "home-manager_2", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2" } }, diff --git a/flake.nix b/flake.nix index e56d8dd..01a0d20 100644 --- a/flake.nix +++ b/flake.nix @@ -12,22 +12,17 @@ flake-utils.url = "github:numtide/flake-utils"; agenix.url = "github:yaxitech/ragenix"; - - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - outputs = { self, nixpkgs, home-manager, flake-utils, agenix, nixos-hardware - , ... }@inputs: - let - coreModules = - [ home-manager.nixosModules.default agenix.nixosModules.default ]; - inherit (self) outputs; + outputs = { self, nixpkgs, home-manager, flake-utils, agenix, ... }@inputs: + let inherit (self) outputs; in { nixosConfigurations.minji = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inputs = inputs; }; - modules = coreModules ++ [ - nixos-hardware.nixosModules.framework-16-7040-amd + modules = [ + home-manager.nixosModules.default + agenix.nixosModules.default ./nix/hosts/common/sys.nix ./nix/hosts/minji/sys.nix ]; @@ -36,7 +31,7 @@ nixosConfigurations.chaewon = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inputs = inputs; }; - modules = coreModules ++ [ + modules = [ home-manager.nixosModules.default agenix.nixosModules.default ./nix/hosts/common/sys.nix diff --git a/nix/hosts/minji/sys.nix b/nix/hosts/minji/sys.nix index ddde405..19d7e69 100644 --- a/nix/hosts/minji/sys.nix +++ b/nix/hosts/minji/sys.nix @@ -151,10 +151,11 @@ }; }; - services.swaynotificationcenter.enable = true; + # Window Manager + programs.niri.enable = true; + programs.xwayland.enable = true; - ## Battery - services.power-profiles-daemon.enable = true; + services.swaynotificationcenter.enable = true; services.tailscale = { enable = true; @@ -172,10 +173,6 @@ }; # Programs - ## Window Manager - programs.niri.enable = true; - programs.xwayland.enable = true; - programs.kdeconnect = { enable = true; package = pkgs.kdePackages.kdeconnect-kde;