diff --git a/13-inch-thin-cannon/configuration.nix b/13-inch-thin-cannon/configuration.nix index bb5bf6d..c50b2f0 100644 --- a/13-inch-thin-cannon/configuration.nix +++ b/13-inch-thin-cannon/configuration.nix @@ -8,39 +8,6 @@ imports = [ ./hardware-configuration.nix ] ++ lib.optional (builtins.pathExists ./wireguard.nix) ./wireguard.nix; - - systemd.tmpfiles.rules = [ - "d /nix/persist 0755 root root -" - ]; - - fileSystems = lib.mkForce { - "/" = { - device = "none"; - fsType = "tmpfs"; - options = [ "defaults" "size=2G" "mode=755" ]; - }; - "/nix" = { - device = "/dev/disk/by-uuid/76cffb2a-7482-4116-a423-c7ede185ca7d"; - fsType = "ext4"; - neededForBoot = true; - }; - "/persist" = { - device = "/nix/persist"; - fsType = "none"; - options = [ "bind" ]; - neededForBoot = true; - }; - "/boot" = { - device = "/dev/disk/by-uuid/209F-2960"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/5bece5cb-4baf-4d7b-87bd-400f997c401e"; } - ]; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Bootloader. @@ -140,21 +107,6 @@ powerManagement.powertop.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - environment.persistence."/persist" = { - hideMounts = true; - directories = [ - "/etc/NetworkManager/system-connections" - "/etc/ssh" - "/var/lib/bluetooth" - "/var/lib/nixos" - "/var/lib/systemd" - "/var/lib/wireplumber" - "/var/log/journal" - ]; - files = [ - "/etc/machine-id" - ]; - }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/13-inch-thin-cannon/home.nix b/13-inch-thin-cannon/home.nix index 9e5fb73..7f73313 100644 --- a/13-inch-thin-cannon/home.nix +++ b/13-inch-thin-cannon/home.nix @@ -83,24 +83,4 @@ in }; }; }; - - home.persistence."/persist" = { - directories = [ - "Desktop" - "Documents" - "Downloads" - "Pictures" - "Videos" - "Projects" - ".local/state" - ".ssh" - ".gnupg" - ".config/gtk-4.0" - ".config/gtk-3.0" - ".mozilla" - ]; - files = [ - ".bash_history" - ]; - }; } diff --git a/flake.lock b/flake.lock index 5225e43..a7a0f2e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,48 +20,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "impermanence", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768598210, - "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "impermanence": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769548169, - "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1781577229, @@ -81,7 +39,6 @@ "root": { "inputs": { "home-manager": "home-manager", - "impermanence": "impermanence", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index eb7ead2..ba2df16 100644 --- a/flake.nix +++ b/flake.nix @@ -7,13 +7,9 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - impermanence = { - url = "github:nix-community/impermanence"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, nixpkgs, home-manager, impermanence, ... }: let + outputs = { self, nixpkgs, home-manager, ... }: let lib = nixpkgs.lib; system = "x86_64-linux"; in { @@ -48,7 +44,6 @@ inherit system; modules = [ ./13-inch-thin-cannon/configuration.nix - impermanence.nixosModules.impermanence home-manager.nixosModules.default { home-manager = {