diff --git a/flake.nix b/flake.nix index ae26d9b..0a22adf 100644 --- a/flake.nix +++ b/flake.nix @@ -14,14 +14,14 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - 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-stable.follows = "nixpkgs"; +# }; zapret.url = "github:n0vvvonder/zapret-flake.nix"; }; - outputs = { self, nixpkgs, impermanence, home-manager, zapret, nixpkgs-stable, hm-stable, ...}@inputs: { + outputs = { self, nixpkgs, impermanence, home-manager, zapret, nixpkgs-stable, ...}@inputs: { nixosConfigurations = { Ratchet = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -90,14 +90,15 @@ impermanence.nixosModules.impermanence ./hosts/generic/configuration_generic.nix ./hosts/generic/users.nix - hm-stable.nixosModules.home-manager { - home-manager.useUserPackages = true; - home-manager.users.yaroslav = { - imports = [ - ./home/yaroslav/home.nix - ]; - }; - } + ./hosts/Quark/Quark_hardware.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 c24c2c9..740a72d 100644 --- a/hosts/Quark/Quark-hardware.nix +++ b/hosts/Quark/Quark-hardware.nix @@ -12,21 +12,25 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - boot.initrd.network.enable = true; swapDevices = [ ]; fileSystems."/" = { - device = "192.168.1.222:/share/nixos-1"; - fsType = "nfs4"; - options = [ "defaults" ]; + device = "/dev/sda4"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + fileSystems."/nix" = { + device = "/dev/sda4"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - boot.initrd.network.flushBeforeStage2 = false; + #networking.useDHCP = lib.mkDefault true; + #boot.initrd.network.flushBeforeStage2 = false; # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;