diff --git a/desktop/cinnamon.nix b/desktop/cinnamon.nix index 96b2186..b7d1819 100644 --- a/desktop/cinnamon.nix +++ b/desktop/cinnamon.nix @@ -1,5 +1,4 @@ { ... }: { - services.desktopManager.cinnamon.enable; - + services.xserver.desktopManager.xfce.enable = true; } diff --git a/flake.lock b/flake.lock index 20f332b..a20f03a 100644 --- a/flake.lock +++ b/flake.lock @@ -17,6 +17,27 @@ "type": "indirect" } }, + "hm-stable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.05", + "repo": "home-manager", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -119,6 +140,7 @@ }, "root": { "inputs": { + "hm-stable": "hm-stable", "home-manager": "home-manager", "impermanence": "impermanence", "nixpkgs-stable": "nixpkgs-stable", diff --git a/flake.nix b/flake.nix index 1509f31..a55ad9d 100644 --- a/flake.nix +++ b/flake.nix @@ -14,14 +14,14 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; -# hm-stable = { -# url = "github:nix-community/home-manager/release-25.05"; -# inputs.nixpkgs-stable.follows = "nixpkgs"; -# }; + hm-stable = { + url = "github:nix-community/home-manager/release-25.05"; + inputs.nixpkgs.follows = "nixpkgs-stable"; + }; zapret.url = "github:n0vvvonder/zapret-flake.nix"; }; - outputs = { self, nixpkgs-unstable, impermanence, home-manager, zapret, nixpkgs-stable, ...}@inputs: { + outputs = { self, nixpkgs-unstable, impermanence, home-manager, zapret, nixpkgs-stable, hm-stable, ...}@inputs: { nixosConfigurations = { Ratchet = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; @@ -83,7 +83,7 @@ } ]; }; - Quark = nixpkgs-stable.lib.nixosSystem { + Qwark = nixpkgs-stable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ @@ -95,14 +95,14 @@ ./hosts/Quark/sound.nix ./hosts/generic/virtualization.nix ./desktop/cinnamon.nix - # hm-stable.nixosModules.home-manager { - # home-manager.useUserPackages = true; - # home-manager.users.yaroslav = { - # imports = [ - # ./home/yaroslav/home.nix - # ]; - # }; - # } + hm-stable.nixosModules.home-manager { + home-manager.useUserPackages = true; + home-manager.users.yaroslav = { + imports = [ + ./home/yaroslav/home.nix + ]; + }; + } ]; }; }; diff --git a/hosts/Quark/Quark-hardware.nix b/hosts/Quark/Quark-hardware.nix index 2159b19..24a089b 100644 --- a/hosts/Quark/Quark-hardware.nix +++ b/hosts/Quark/Quark-hardware.nix @@ -55,7 +55,9 @@ #boot.initrd.network.flushBeforeStage2 = false; # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; - + networking.firewall.allowedTCPPorts = [ 4713 ]; + networking.hostName = "Qwark"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + system.stateVersion = "25.05"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }