less import usage

common/nixpkgs.nix

@@ -42,7 +42,7 @@
       autoUpgrade = {
         enable = true;
         dates = "daily";
-        flake = "github:kaesaecracker/nixos-configuration";
+        flake = "git+https://git.berlin.ccc.de/vinzenz/nixos-configuration.git";
       };
     };
 

home/ronja/default.nix

@@ -1,5 +1,7 @@
 inputs@{ config, pkgs, ... }:
 {
+  imports = [ ./vscode.nix ];
+  config.home-manager.users.ronja = {
     home.packages = with pkgs; [
       ## Apps
       telegram-desktop
@@ -8,7 +10,6 @@ inputs@{ config, pkgs, ... }:
 
     programs = {
       home-manager.enable = true;
-    vscode = import ./vscode.nix inputs;
 
       zsh = {
         history = {
@@ -52,4 +53,5 @@ inputs@{ config, pkgs, ... }:
         ];
       };
     };
+  };
 }

home/ronja/vscode.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  config.programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
     enableUpdateCheck = false;
@@ -53,4 +54,5 @@
         "editor.detectIndentation" = false;
       };
     };
+  };
 }

home/vinzenz/default.nix

@@ -1,15 +1,22 @@
-inputs@{ pkgs, ... }:
+{ ... }:
 {
-  imports = [ ./gnome.nix ];
+  config.home-manager.users.vinzenz =
+    { pkgs, ... }:
+    {
+      imports = [
+        ./editorconfig.nix
+        ./git.nix
+        ./gnome.nix
+        ./ssh.nix
+        ./vscode.nix
+        ./zsh.nix
+      ];
 
       config = {
+
         programs = {
           home-manager.enable = true;
           fzf.enable = true;
-      zsh = import ./zsh.nix inputs;
-      git = import ./git.nix;
-      vscode = import ./vscode.nix inputs;
-      ssh = import ./ssh.nix;
           git-credential-oauth.enable = true;
 
           direnv = {
@@ -33,8 +40,6 @@ inputs@{ pkgs, ... }:
           };
         };
 
-    editorconfig = import ./editorconfig.nix;
-
         home.packages = with pkgs; [
           keepassxc
           insync
@@ -57,4 +62,5 @@ inputs@{ pkgs, ... }:
           text = builtins.readFile ./.config/containers/policy.json;
         };
       };
+    };
 }

home/vinzenz/editorconfig.nix

@@ -1,4 +1,6 @@
+{ ... }:
 {
+  config.editorconfig = {
     enable = true;
     settings = {
       "*" = {
@@ -14,4 +16,5 @@
         indent_size = 2;
       };
     };
+  };
 }

home/vinzenz/git.nix

@@ -1,4 +1,6 @@
+{ ... }:
 {
+  config.programs.git = {
     enable = true;
     userName = "Vinzenz Schroeter";
     userEmail = "vinzenz.f.s@gmail.com";
@@ -20,4 +22,5 @@
       ".idea"
       ".envrc"
     ];
+  };
 }

home/vinzenz/gnome.nix

@@ -1,4 +1,4 @@
-inputs@{ pkgs, ... }:
+{ pkgs, ... }:
 {
   config = {
     home.packages = with pkgs.gnomeExtensions; [

home/vinzenz/ssh.nix

@@ -1,4 +1,6 @@
+{ ... }:
 {
+  config.programs.ssh = {
     enable = true;
     matchBlocks = {
       "vpn1" = {
@@ -49,4 +51,5 @@
         user = "vinzenz";
       };
     };
+  };
 }

home/vinzenz/vscode.nix

@@ -1,5 +1,6 @@
 { pkgs, lib, ... }:
 {
+  config.programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
     enableUpdateCheck = false;
@@ -55,4 +56,5 @@
         "editor.detectIndentation" = false;
       };
     };
+  };
 }

home/vinzenz/zsh.nix

@@ -1,5 +1,6 @@
 { config, ... }:
 {
+  config.programs.zsh = {
     initExtra = ''
       eval "$(direnv hook zsh)";
       export PATH=$PATH:/home/vinzenz/.cargo/bin
@@ -38,4 +39,5 @@
         "tailscale"
       ];
     };
+  };
 }

hosts/vinzenz-lpt2/configuration.nix

@@ -1,9 +1,8 @@
-{
+{ pkgs, ... }:
-  pkgs,
-  ...
-}:
 {
   imports = [ ./nginx.nix ];
+
+  config = {
     networking.networkmanager.enable = true;
     nix.settings.extra-platforms = [
       "aarch64-linux"
@@ -19,8 +18,6 @@
     # Configure console keymap
     console.keyMap = "de";
 
-  home-manager.users.vinzenz = import ../../home/vinzenz;
-
     users.users.vinzenz.openssh.authorizedKeys.keys = [
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
@@ -31,4 +28,5 @@
     #];
 
     programs.adb.enable = true;
+  };
 }

hosts/vinzenz-lpt2/imports.nix

@@ -11,5 +11,6 @@
     ../../modules/desktop-environment.nix
     ../../modules/desktop-hardware.nix
 
+    ../../home/vinzenz
   ];
 }

hosts/vinzenz-pc2/configuration.nix

@@ -1,12 +1,10 @@
-{
+{ pkgs, ... }:
-  pkgs,
-  ...
-}:
 {
   imports = [
     ./hardware.nix
     ./vscode-server.nix
   ];
+  config = {
     networking.networkmanager.enable = true;
     nix.settings.extra-platforms = [
       "aarch64-linux"
@@ -22,11 +20,6 @@
     # Configure console keymap
     console.keyMap = "de";
 
-  home-manager.users = {
-    vinzenz = import ../../home/vinzenz;
-    ronja = import ../../home/ronja;
-  };
-
     users.users.vinzenz.openssh.authorizedKeys.keys = [
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming''
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
@@ -37,4 +30,5 @@
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ssh-host-key''
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius''
     ];
+  };
 }

hosts/vinzenz-pc2/imports.nix

@@ -11,5 +11,7 @@
     ../../home
     ../../modules/desktop-environment.nix
     ../../modules/desktop-hardware.nix
+
+    ../../home/vinzenz
   ];
 }