diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/default.nix | 9 | ||||
| -rw-r--r-- | system/fileSystemLayouts/default.nix | 13 | ||||
| -rw-r--r-- | system/impermanence/default.nix | 22 |
3 files changed, 9 insertions, 35 deletions
diff --git a/system/default.nix b/system/default.nix index f94ba34f..34bc8b4b 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,9 +1,4 @@ -{ - config, - pkgs, - shell-library, - ... -}: { +{...}: { imports = [ ./boot ./users # this needs to be before fileSystemLayouts @@ -11,7 +6,7 @@ ./font ./impermanence ./locale -#./packages + #./packages ./sound ]; } diff --git a/system/fileSystemLayouts/default.nix b/system/fileSystemLayouts/default.nix index e4062ffe..cdc59b4e 100644 --- a/system/fileSystemLayouts/default.nix +++ b/system/fileSystemLayouts/default.nix @@ -47,13 +47,12 @@ in { device = cfg.efiDisk; fsType = "vfat"; }; - - # This results in infinite recursion, don't ask my why - # "${config.users.users.soispha.home}/.config" = { - # device = "none"; - # fsType = "tmpfs"; - # options = ["defaults" "size=1G" "mode=755"]; - # }; + fileSystems."${config.users.users.soispha.home}" = { + # fileSystems."/home/sopipha" = { + device = "none"; + fsType = "tmpfs"; # Can be stored on normal drive or on tmpfs as well + options = ["defaults" "size=4G" "mode=755"]; + }; }; swapDevices = []; }; diff --git a/system/impermanence/default.nix b/system/impermanence/default.nix index 1909623b..1d330fd9 100644 --- a/system/impermanence/default.nix +++ b/system/impermanence/default.nix @@ -1,8 +1,4 @@ -{ - config, - impermanence, - ... -}: { +{impermanence, ...}: { imports = [ impermanence.nixosModules.impermanence ]; @@ -19,23 +15,7 @@ ]; files = [ "/etc/machine-id" - { - file = "/etc/nix/id_rsa"; - parentDirectory = {mode = "u=rwx,g=,o=";}; - } ]; - users.soispha = { - #home = "/srv/home/soispha"; # TODO link this to ${config.users.users.soispha.homeDirectory} - directories = [ - ".local/share" - ".cache" - - "media" - "repos" - "school" - ]; - # TODO allowOther = true; - }; }; "/srv/nixos-config" = { directories = [ |