From 98668e05f90ccb901578961857408e1763eb9972 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Tue, 17 Dec 2024 22:30:15 +0100 Subject: [PATCH] Changed directory of config --- README.md | 2 +- nixos/configuration.nix | 4 ++-- nixos/modules/impermanence/default.nix | 2 +- nixos/modules/impermanence/home.nix | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4c1cb54..cfcd323 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ sudo mkdir /mnt/tmp && TMPDIR=/mnt/tmp sudo nixos-install --flake github:KyleKre or together ~~~ -sudo nix --extra-experimental-features "flakes nix-command" run github:nix-community/disko -- --mode zap_create_mount --flake github:KyleKrein/nixos-config#kylekrein-homepc && sudo git clone https://github.com/KyleKrein/nixos-config.git /mnt/persist/nixos-config && sudo mkdir /mnt/tmp && TMPDIR=/mnt/tmp sudo nixos-install --flake /mnt/persist/nixos-config#kylekrein-homepc && sudo rm -rf /mnt/tmp +sudo nix --extra-experimental-features "flakes nix-command" run github:nix-community/disko -- --mode zap_create_mount --flake github:KyleKrein/nixos-config#kylekrein-homepc && sudo mkdir /mnt/tmp && TMPDIR=/mnt/tmp sudo nixos-install --flake github:KyleKrein/nixos-config#kylekrein-homepc && sudo rm -rf /mnt/tmp ~~~ diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b2bbc86..1411a0b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -14,7 +14,7 @@ kylekrein.services.autoUpgrade = { enable = true; pushUpdates = if hwconfig.hostname == "${username}-homepc" then true else false; - configDir = "${if hwconfig.useImpermanence then "/persist/nixos-config" else "/home/${username}/nixos-config"}"; + configDir = "/home/${username}/nixos-config"; user = username; }; @@ -248,7 +248,7 @@ enable = true; clean.enable = true; clean.extraArgs = "--keep-since 4d --keep 3"; - flake = "${if hwconfig.useImpermanence then "/persist/nixos-config" else "/home/${username}/nixos-config"}"; + flake = "/home/${username}/nixos-config"; }; #https://discourse.nixos.org/t/dolphin-does-not-have-mime-associations/48985/3 # This fixes the unpopulated MIME menus diff --git a/nixos/modules/impermanence/default.nix b/nixos/modules/impermanence/default.nix index 7caa2f7..3353259 100644 --- a/nixos/modules/impermanence/default.nix +++ b/nixos/modules/impermanence/default.nix @@ -21,7 +21,7 @@ systemd.tmpfiles.rules = [ "d /persist/home/ 0777 root root -" # /persist/home created, owned by root "d /persist/home/${username} 0700 ${username} users -" # /persist/home/ created, owned by that user - "d /persist/nixos-config/ 0700 ${username} users -" + #"d /persist/nixos-config 0700 ${username} users -" ]; programs.fuse.userAllowOther = true; diff --git a/nixos/modules/impermanence/home.nix b/nixos/modules/impermanence/home.nix index 56edd6e..8e2406f 100644 --- a/nixos/modules/impermanence/home.nix +++ b/nixos/modules/impermanence/home.nix @@ -10,8 +10,9 @@ "Pictures" "Documents" "Videos" - "VirtualBox VMs" + "VMs" "Git" + "nixos-config" "blender" ".gnupg" ".ssh"