revamp

common/fish.nix

@@ -2,4 +2,14 @@
   programs.fish.enable = true;
 
   users.defaultUserShell = pkgs.fish;
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      fish = prev.fish.overrideAttrs (oldAttrs: {
+        postInstall = ''
+          rm $out/share/applications/fish.desktop
+        '';
+      });
+    })
+  ];
 }

common/fs.nix

@@ -1,38 +1,14 @@
 {
+  boot.tmp.cleanOnBoot = true;
+
   fileSystems = {
     "/" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["size=4G" "mode=755"];
+      fsType = "ext4";
+      options = ["noatime"];
     };
     "/boot" = {
       device = "/dev/disk/by-label/BOOT";
       fsType = "vfat";
     };
-    "/home".neededForBoot = true;
-    "/nix" = {
-      fsType = "btrfs";
-      options = ["subvol=nix" "compress=zstd" "noatime"];
-    };
-    "/persist" = {
-      fsType = "btrfs";
-      options = ["subvol=persist" "compress=zstd" "noatime"];
-      neededForBoot = true;
-    };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["size=8G" "mode=777"];
-    };
-    "/var/log" = {
-      fsType = "btrfs";
-      options = ["subvol=log" "compress=zstd" "noatime"];
-      neededForBoot = true;
-    };
-  };
-
-  environment.persistence."/persist" = {
-    directories = ["/var/lib" "/var/cache"];
-    files = ["/etc/machine-id"];
   };
 }

common/neovim.nix

@@ -5,7 +5,11 @@
   ...
 }: {
   environment = let
-    package = inputs.myvim.packages.${pkgs.system}.default;
+    package = inputs.myvim.packages.${pkgs.system}.default.overrideAttrs (oldAttrs: {
+      postInstall = ''
+        rm $out/share/applications/nvim.desktop
+      '';
+    });
   in {
     systemPackages = [package];
     variables = lib.genAttrs ["EDITOR" "VISUAL"] (_: lib.getExe package);

common/ssh.nix

@@ -3,12 +3,7 @@
   pkgs,
   ...
 }: {
-  environment.persistence."/persist".files = [
-    "/etc/ssh/ssh_host_ed25519_key"
-    "/etc/ssh/ssh_host_ed25519_key.pub"
-  ];
-
-  age.identityPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
+  age.identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
 
   services.openssh = {
     enable = true;
@@ -27,6 +22,7 @@
 
   programs.ssh = {
     startAgent = true;
+    enableAskPassword = true;
     askPassword = lib.getExe' pkgs.ksshaskpass "ksshaskpass";
   };
 

common/users.nix

@@ -2,13 +2,12 @@
   age.secrets.user-lukas.file = ../secrets/user-lukas.age;
 
   users = {
-    mutableUsers = false;
-
-    groups.lukas = {};
+    groups.lukas.gid = 1000;
 
     users = {
       root.hashedPassword = "!";
       lukas = {
+        uid = 1000;
         isNormalUser = true;
         hashedPasswordFile = config.age.secrets.user-lukas.path;
         openssh.authorizedKeys.keys = builtins.attrValues (import ../pubkeys.nix).users;
@@ -17,6 +16,4 @@
       };
     };
   };
-
-  services.displayManager.sddm.settings.Autologin.User = "lukas";
 }