diff --git a/flake.lock b/flake.lock index 59c9eef..cd84486 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1728638019, + "narHash": "sha256-eEga9ZYpWr4ippI8ntBdcNkXWY7qv1/9kK9jkemAyzQ=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "6af4e02b9cf2a4126af542c9e299f13228cfe2e0", "type": "github" }, "original": { @@ -215,11 +215,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-p0w6mKHEYmWJF+2GAcug7yKXzjOhKTWIV4YAoVV6NaM=", - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/disko", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/disko", "type": "path" }, "original": { - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/disko", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/disko", "type": "path" } }, @@ -726,11 +726,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1728554473, - "narHash": "sha256-wzVeYNRedx8aAi8NsUvBbPJAilozHp+mC49NUKYk73c=", + "lastModified": 1728645556, + "narHash": "sha256-Nio2vUxaya04xlvY24sPTOWz+mmDwgRgrBSU4Vx485Y=", "ref": "refs/heads/main", - "rev": "b65773bea9b912a41cfcbc789fb2e60a07e3d0c1", - "revCount": 5325, + "rev": "7564b26b7d386d248eaa47c1a481c09eefd8e3ca", + "revCount": 5328, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -770,11 +770,11 @@ "xdph": "xdph_2" }, "locked": { - "lastModified": 1728554473, - "narHash": "sha256-wzVeYNRedx8aAi8NsUvBbPJAilozHp+mC49NUKYk73c=", + "lastModified": 1728645556, + "narHash": "sha256-Nio2vUxaya04xlvY24sPTOWz+mmDwgRgrBSU4Vx485Y=", "ref": "refs/heads/main", - "rev": "b65773bea9b912a41cfcbc789fb2e60a07e3d0c1", - "revCount": 5325, + "rev": "7564b26b7d386d248eaa47c1a481c09eefd8e3ca", + "revCount": 5328, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -986,21 +986,6 @@ } }, "impermanence": { - "inputs": { - "impermanence": "impermanence_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-7aqujZhN/iKH7WYa1gCR3H60IMxfmh17AxEP7G2NAAA=", - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/impermanence", - "type": "path" - }, - "original": { - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/impermanence", - "type": "path" - } - }, - "impermanence_2": { "locked": { "lastModified": 1727649413, "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=", @@ -1015,6 +1000,21 @@ "type": "github" } }, + "impermanenceConfig": { + "inputs": { + "impermanence": "impermanence" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-7ipphehm+qDglyyFxGz2ZYf9uNbXCohPCFAGSI2QMb8=", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/impermanence", + "type": "path" + }, + "original": { + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/impermanence", + "type": "path" + } + }, "kitty": { "locked": { "lastModified": 1, @@ -1048,11 +1048,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-44GWVRPvMv2i9dkN0/eSCBkSW2xOGC32KWQYF0gOdc8=", - "path": "/nix/store/614181rkgzsqwgwg41ymc1w3j6i3qsxc-source/home", + "path": "/nix/store/49jkfcja8yv46ypbv26axn3xnkkjdlwa-source/home", "type": "path" }, "original": { - "path": "/nix/store/614181rkgzsqwgwg41ymc1w3j6i3qsxc-source/home", + "path": "/nix/store/49jkfcja8yv46ypbv26axn3xnkkjdlwa-source/home", "type": "path" } }, @@ -1434,11 +1434,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/packages", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/packages", "type": "path" }, "original": { - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/packages", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/packages", "type": "path" } }, @@ -1524,11 +1524,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-96Dpr1ejZUBA7m2x2YfNJJxwDRj7Z8r5QV4UrGGxdoU=", - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/programs", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/programs", "type": "path" }, "original": { - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/programs", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/programs", "type": "path" } }, @@ -1605,11 +1605,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-1lPCRKFKK2qmdS+akk6dkrSjXOBe0iBgQp6oTi5vCWM=", - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/sddm", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/sddm", "type": "path" }, "original": { - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/sddm", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/sddm", "type": "path" } }, @@ -1635,11 +1635,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1728533825, - "narHash": "sha256-3+Sz3NWHQZWLsIr4B/Q2CSmZmpQyk/tE7rTB6urzjZI=", + "lastModified": 1728620224, + "narHash": "sha256-YfiNICuQO/+HheUQ9P9ijFOzQpiC7YmotA0W28fbRbE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "d6e8bdf856dfba9f704fd58df4c865be8d819b30", + "rev": "b4702ed0b3d634367e28c4d042bd1fd3fb29b692", "type": "github" }, "original": { @@ -1670,18 +1670,18 @@ "locked": { "lastModified": 1, "narHash": "sha256-77xH7oSwHTKWMPseY3d8isc0oV0SgNM+CdrIxhRBOzQ=", - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/services", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/services", "type": "path" }, "original": { - "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/services", + "path": "/nix/store/aggm5rmqq87zwb9cvgh136g95wmvdag6-source/services", "type": "path" } }, "system": { "inputs": { "diskoConfig": "diskoConfig", - "impermanence": "impermanence", + "impermanenceConfig": "impermanenceConfig", "pckgs": "pckgs", "prgms": "prgms_2", "sddm": "sddm", @@ -1689,12 +1689,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yvZBqs68CVsRhNIXV0NGZpmBtOHzbCenOmIs/ov1eMo=", - "path": "/nix/store/614181rkgzsqwgwg41ymc1w3j6i3qsxc-source/system", + "narHash": "sha256-JZ8Ez+VchAtFR3VHIETEKYnpmyTy7q00KVOPmTYJG68=", + "path": "/nix/store/49jkfcja8yv46ypbv26axn3xnkkjdlwa-source/system", "type": "path" }, "original": { - "path": "/nix/store/614181rkgzsqwgwg41ymc1w3j6i3qsxc-source/system", + "path": "/nix/store/49jkfcja8yv46ypbv26axn3xnkkjdlwa-source/system", "type": "path" } }, @@ -1799,11 +1799,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1728495787, - "narHash": "sha256-D8G2OWQiYAENKDgD+V2M6PWbxxE1KN6erH/iRVNQ4Wc=", + "lastModified": 1728605273, + "narHash": "sha256-YgljLvZ0QESSd1LZvxIU+5qQ4axZVXpoF1bWhYsCiAs=", "owner": "danihek", "repo": "themecord", - "rev": "37bfb39805a545bad1f04d587f822c174e9a915a", + "rev": "0106205a57bf64eaac5d25134277bc27e0343ed8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ad32334..eb44c62 100644 --- a/flake.nix +++ b/flake.nix @@ -45,8 +45,8 @@ core_inputs.home-manager.nixosModules.home-manager ({ lib, ... }: { - sysconfig.${host}.enable = true; - disko.enable = lib.mkForce false; + #sysconfig.${host}.enable = true; + #disko.enable = lib.mkForce false; }) ]; diff --git a/system/flake.nix b/system/flake.nix index 2116a26..85d128c 100755 --- a/system/flake.nix +++ b/system/flake.nix @@ -13,7 +13,7 @@ diskoConfig.url = "./disko"; - impermanence.url = "./impermanence"; + impermanenceConfig.url = "./impermanence"; }; @@ -22,8 +22,8 @@ nixosModule = { config, lib, pkgs, core_inputs, ... }: { imports = [ ./configuration/configuration.nix - inputs.diskoConfig.module - inputs.impermanence.module +# inputs.diskoConfig.module +# inputs.impermanenceConfig.module inputs.sddm.module inputs.srvcs.module inputs.pckgs.module diff --git a/system/impermanence/default.nix b/system/impermanence/default.nix index b67df83..ad039df 100644 --- a/system/impermanence/default.nix +++ b/system/impermanence/default.nix @@ -13,20 +13,22 @@ (lib.mkIf config.disko.impermanent { fileSystems."/persist".neededForBoot = true; - environment.persistence."/persist/system" = { - hideMounts = true; - directories = [ - "/etc/nixos" - "/etc/shadow" - "/var/log" - "/var/lib/bluetooth" - "/var/lib/nixos" - "/var/lib/systemd/coredump" - "/etc/NetworkManager/system-connections" - ]; - files = [ - "/etc/machine-id" - ]; + environment.persistence = { + "/persist/system" = { + hideMounts = true; + directories = [ + "/etc/nixos" + "/etc/shadow" + "/var/log" + "/var/lib/bluetooth" + "/var/lib/nixos" + "/var/lib/systemd/coredump" + "/etc/NetworkManager/system-connections" + ]; + files = [ + "/etc/machine-id" + ]; + }; }; programs.fuse.userAllowOther = true;