diff options
| author | makefu <github@syntax-fehler.de> | 2021-06-06 19:15:44 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2021-06-06 19:15:44 +0200 |
| commit | 74058abe0b5da0753c2167d6bab29eb1eae88366 (patch) | |
| tree | 748e9e75c0498161629597f7469933e69303168b /makefu/1systems | |
| parent | 88a845f7a1a037bf6bcf23863d41f36c4cedcd7e (diff) | |
| parent | a5bc9126db72f59062ff9d6a72b2fa35437b42cb (diff) | |
Merge branch '21.05'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/omo/config.nix | 3 | ||||
| -rw-r--r-- | makefu/1systems/x/x13/default.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/x/x13/zfs.nix | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 857e7d6e7..6afe792ec 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -43,7 +43,6 @@ in { <stockholm/makefu/2configs/tools/dev.nix> <stockholm/makefu/2configs/tools/desktop.nix> <stockholm/makefu/2configs/tools/mobility.nix> - { environment.systemPackages = [ pkgs.esniper ]; } #<stockholm/makefu/2configs/graphite-standalone.nix> #<stockholm/makefu/2configs/share-user-sftp.nix> @@ -141,6 +140,7 @@ in { ]; makefu.full-populate = true; nixpkgs.config.allowUnfree = true; + users.users.share.isNormalUser = true; users.groups.share = { gid = (import <stockholm/lib>).genid "share"; members = [ "makefu" "misa" ]; @@ -152,6 +152,7 @@ in { users.users.misa = { uid = 9002; name = "misa"; + isNormalUser = true; }; zramSwap.enable = true; diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix index f0d663ee9..ea557bbef 100644 --- a/makefu/1systems/x/x13/default.nix +++ b/makefu/1systems/x/x13/default.nix @@ -8,7 +8,7 @@ <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough # <stockholm/makefu/2configs/hw/tpm.nix> <stockholm/makefu/2configs/hw/ssd.nix> - <stockholm/makefu/2configs/hw/xmm7360.nix> + # <stockholm/makefu/2configs/hw/xmm7360.nix> ]; boot.zfs.requestEncryptionCredentials = true; networking.hostId = "f8b8e0a2"; diff --git a/makefu/1systems/x/x13/zfs.nix b/makefu/1systems/x/x13/zfs.nix index adfebbf96..d6b99df41 100644 --- a/makefu/1systems/x/x13/zfs.nix +++ b/makefu/1systems/x/x13/zfs.nix @@ -13,6 +13,7 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + boot.zfs.enableUnstable = true; # required for 21.05 fileSystems."/" = { device = "zroot/root/nixos"; fsType = "zfs"; |