Merge branch 'main' of https://codeberg.org/traverseda/nixos-config

flake.nix

@@ -84,7 +84,7 @@
           ./nixos/kde-desktop.nix
           ./nixos/cad.nix
           ./nixos/zerotier.nix
-          ./nixos/work.nix
+          ./nixos/family.nix
         ];
       };
       #Work laptop, dell g15.

nixos/configuration.nix

@@ -76,15 +76,23 @@
   #Deduplicate nix store on a timer
   nix.optimise.automatic = true;
 
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+  };
+
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
   #  wget
-     pkgs.neovim
      pkgs.mosh
      pkgs.git
      pkgs.usbutils
      pkgs.pciutils
      pkgs.atool
+     pkgs.comma
+     pkgs.home-manager
      appimage-run
   ];
 

nixos/family.nix

@@ -1,10 +1,14 @@
 
-{ inputs, outputs, lib, config, pkgs, hostname, specialArgs, ... }: {
+{ inputs, outputs, lib, config, pkgs, hostname, specialArgs, ... }:
 
-  services.displayManager = {
+let
+  autoLoginUser = specialArgs.mainUser or null;
+in
+{
+  services.displayManager = lib.mkIf (autoLoginUser != null) {
     autoLogin.enable = true;
-    autoLogin.user = "${specialArgs.mainUser}";
-  }; 
+    autoLogin.user = autoLoginUser;
+  };
   users.users = {
     gwen = {
       isNormalUser = true;
@@ -18,5 +22,9 @@
       isNormalUser = true;
       extraGroups = [ "networkManager" ];
     };
+    logic11 = {
+      isNormalUser = true;
+      extraGroups = [ "wheel" "dialout" "networkmanager" "dialout" "docker" "plugdev" "vboxusers" ];
+    };
   };
 }