reorganize users

flake.nix

@@ -64,9 +64,11 @@
         inherit system;
         specialArgs = {inherit inputs; };
         modules = [
+          ./users/kopatz.nix
           ./laptop/configuration.nix
           nixos-hardware.nixosModules.dell-xps-15-7590
           agenix.nixosModules.default
+          home-manager.nixosModules.home-manager
         ];
     };
     nixosConfigurations."wsl" = nixpkgs.lib.nixosSystem {

laptop/configuration.nix

@@ -54,5 +54,6 @@
     gnomeExtensions.backslide
     gnomeExtensions.nextcloud-folder
     gnomeExtensions.tray-icons-reloaded
+    gnomeExtensions.blur-my-shell
   ];
 }

laptop/gnome.nix

@@ -54,5 +54,6 @@
     gnomeExtensions.backslide
     gnomeExtensions.nextcloud-folder
     gnomeExtensions.tray-icons-reloaded
+    gnomeExtensions.blur-my-shell
   ];
 }

laptop/main.nix

@@ -84,32 +84,6 @@ in
   # Enable touchpad support (enabled default in most desktopManager).
   services.xserver.libinput.enable = true;
 
-  #users.mutableUsers=false;
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.kopatz = {
-    isNormalUser = true;
-    description = "kopatz";
-    extraGroups = [ "networkmanager" "wheel" "docker"];
-    #password = "test";
-    packages = with pkgs; [
-	#firefox
-    #  thunderbird
-      discord
-      librewolf
-      ungoogled-chromium
-    ];
-  };
-
-    # home manager
-  #home-manager.useGlobalPkgs = true;
-
- # home-manager.users.kopatz = { pkgs, ... }: {
-
-    # The state version is required and should stay at the version you
-    # originally installed.
-  #  system.stateVersion = "23.05";
-  #};
-
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play

users/anon.nix

@@ -1,6 +1,13 @@
 { pkgs, inputs, ... }:
+let 
+  user = "anon";
+in
 {
-  imports = [ ./home-manager/nvim.nix ];
+  imports = [
+    (
+        import ./home-manager/nvim.nix ({ user="${user}"; })
+    )
+  ];
   home-manager = {
     useGlobalPkgs = true;
     extraSpecialArgs = {
@@ -8,7 +15,7 @@
       headless = false;
     };
     useUserPackages = true;
-    users.anon = {
+    users.${user} = {
       programs.zsh = {
         enable = true;
         enableCompletion = true;
@@ -28,9 +35,9 @@
   };
   
   programs.zsh.enable = true;
-  users.users.anon = {
+  users.users.${user} = {
     isNormalUser = true;
-    description = "anon";
+    description = user;
     shell = pkgs.zsh;
     extraGroups = [ "networkmanager" "wheel" "docker" ];
     packages = with pkgs; [

users/home-manager/nvim.nix

@@ -1,5 +1,6 @@
+{ user, ... }:
 {
-  home-manager.users.anon = { pkgs, ...}: {
+  home-manager.users.${user} = { pkgs, ...}: {
     programs.neovim = {
       enable = true;
       defaultEditor = true;

users/kopatz.nix

@@ -0,0 +1,49 @@
+{ pkgs, inputs, ... }:
+let 
+  user = "kopatz";
+in
+{
+  imports = [
+    (
+        import ./home-manager/nvim.nix ({ user="${user}"; })
+    )
+  ];
+  home-manager = {
+    useGlobalPkgs = true;
+    extraSpecialArgs = {
+      inherit inputs;
+      headless = false;
+    };
+    useUserPackages = true;
+    users.${user} = {
+      programs.zsh = {
+        enable = true;
+        enableCompletion = true;
+        enableAutosuggestions = true;
+        shellAliases = {
+            ll = "ls -l";
+            update = "sudo nixos-rebuild switch";
+        };
+        oh-my-zsh = {
+          enable = true;
+          plugins = [ "git" ];
+          theme = "eastwood";
+        };
+      };
+      home.stateVersion = "23.05";
+    };
+  };
+  
+  programs.zsh.enable = true;
+  users.users.${user} = {
+    isNormalUser = true;
+    description = user;
+    shell = pkgs.zsh;
+    extraGroups = [ "networkmanager" "wheel" "docker" ];
+    packages = with pkgs; [
+      discord
+      librewolf
+      ungoogled-chromium
+    ];
+  };
+}