home

commit 7bab335e97abbf2c2407cdd407f3513a502f7304
parent d40c3bd445b693308561258a1b63b41a3bf69333
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sun,  5 Nov 2023 11:02:48 +0100

Use nixpkgs envfs

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
flake.nix
 | 
14
+++++++-------
M
systems/hosts/aomi.nix
 | 
5
+++--
M
systems/hosts/wakasu.nix
 | 
1
+

3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -74,7 +74,7 @@
         ./systems/modules/profiles/wireguard.server.nix
         ./systems/modules/profiles/zsh.nix
         inputs.sops-nix.nixosModules.sops
-        inputs.envfs.nixosModules.envfs
+        # inputs.envfs.nixosModules.envfs
         {
           # config.nix.generateRegistryFromInputs = true;
           config.home-manager.useGlobalPkgs = true;
@@ -174,12 +174,12 @@
       repo = "sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    envfs = {
-      type = "github";
-      owner = "Mic92";
-      repo = "envfs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # envfs = {
+    #   type = "github";
+    #   owner = "Mic92";
+    #   repo = "envfs";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
     # WSL
     nixos-wsl = { type = "github"; owner = "nix-community"; repo = "NixOS-WSL"; inputs.nixpkgs.follows = "nixpkgs"; };
diff --git a/systems/hosts/aomi.nix b/systems/hosts/aomi.nix
@@ -20,8 +20,8 @@ in
 {
   imports = [
     ../hardware/lenovo-p1.nix
-    import ../../users/vincent
-    import ../../users/root
+    (import ../../users/vincent)
+    (import ../../users/root)
   ];
 
   boot.initrd.luks.devices = {
@@ -150,6 +150,7 @@ in
   '';
 
   services = {
+    envfs.enable = true;
     netdata.enable = true;
     logind.extraConfig = ''
       HandleLidSwitch=ignore
diff --git a/systems/hosts/wakasu.nix b/systems/hosts/wakasu.nix
@@ -134,6 +134,7 @@ in
   ];
 
   services = {
+    envfs.enable = true;
     # automatic login is "safe" as we ask for the encryption passphrase anyway..
     getty.autologinUser = "vincent";
     wireguard = {