From bd00284332b8718c21c70d95d54519ac3fde118e Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Mon, 15 Sep 2025 23:30:28 +0200
Subject: [PATCH 1/3] uxe nixpkgs lib to replace importDir

---
 flake.nix        | 24 ++++++++++++------------
 hooks/pre-commit |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4d7ec50..679ff61 100644
--- a/flake.nix
+++ b/flake.nix
@@ -132,17 +132,14 @@
             pkgs = nixpkgs.legacyPackages.${system};
           }
         );
+      importModuleDir =
+        directory:
+        nixpkgs.lib.packagesFromDirectoryRecursive {
+          inherit directory;
+          callPackage = path: _args: path;
+        };
     in
     {
-      lib = {
-        importDir =
-          dir:
-          (lib.attrsets.mapAttrs' (
-            m: _:
-            lib.attrsets.nameValuePair (lib.strings.removeSuffix ".nix" m) { imports = [ "${dir}/${m}" ]; }
-          ) (builtins.readDir dir));
-      };
-
       overlays = {
         unstable-packages = final: prev: {
           unstable = import nixpkgs-unstable {
@@ -151,7 +148,7 @@
         };
       };
 
-      nixosModules = (self.lib.importDir ./nixosModules) // {
+      nixosModules = (importModuleDir ./nixosModules) // {
         niri = {
           imports = [ niri.nixosModules.niri ];
           nixpkgs.overlays = [ niri.overlays.niri ];
@@ -168,8 +165,11 @@
         };
       };
 
-      homeModules = self.lib.importDir ./homeModules;
-      homeConfigurations = self.lib.importDir ./homeConfigurations;
+      homeModules = importModuleDir ./homeModules;
+      homeConfigurations = {
+        vinzenz = ./homeConfigurations/vinzenz;
+        ronja = ./homeConfigurations/ronja;
+      };
 
       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
 
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 6b6b870..1760cfe 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -3,4 +3,4 @@ set -euxo pipefail
 
 nix fmt
 
-nix flake check --all-systems --show-trace
+nix flake check --show-trace

From edb4ffcd4a6425a9fce721568e91e332902f65a7 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Tue, 16 Sep 2025 19:29:09 +0200
Subject: [PATCH 2/3] merge default and configuration.nix

---
 homeConfigurations/vinzenz/configuration.nix | 72 -------------------
 homeConfigurations/vinzenz/default.nix       | 76 +++++++++++++++++++-
 2 files changed, 75 insertions(+), 73 deletions(-)
 delete mode 100644 homeConfigurations/vinzenz/configuration.nix

diff --git a/homeConfigurations/vinzenz/configuration.nix b/homeConfigurations/vinzenz/configuration.nix
deleted file mode 100644
index ace8086..0000000
--- a/homeConfigurations/vinzenz/configuration.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ pkgs, ... }:
-{
-  programs = {
-    home-manager.enable = true;
-    fzf.enable = true;
-    git-credential-oauth.enable = true;
-
-    direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-      enableZshIntegration = true;
-    };
-
-    eza = {
-      enable = true;
-      git = true;
-      icons = "auto";
-      extraOptions = [
-        "--group-directories-first"
-        "--header"
-      ];
-    };
-
-    thefuck = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    chromium.enable = true;
-  };
-
-  home.packages = with pkgs; [
-    keepassxc
-
-    telegram-desktop
-    element-desktop
-
-    wireguard-tools
-    wirelesstools
-
-    kdiff3
-    jetbrains-toolbox
-
-    blanket
-    vlc
-
-    ptyxis
-
-    arduino
-    arduino-ide
-    arduino-cli
-
-    servicepoint-cli
-    servicepoint-simulator
-
-    icu
-
-    nextcloud-client
-
-    lutris
-
-    foliate
-  ];
-
-  home.file = {
-    "policy.json" = {
-      target = ".config/containers/policy.json";
-      text = builtins.readFile ./.config/containers/policy.json;
-    };
-    "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
-  };
-}
diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix
index 33cfceb..a0b3e0e 100644
--- a/homeConfigurations/vinzenz/default.nix
+++ b/homeConfigurations/vinzenz/default.nix
@@ -1,6 +1,6 @@
+{ pkgs, ... }:
 {
   imports = [
-    ./configuration.nix
     ./editorconfig.nix
     ./fuzzel.nix
     ./git.nix
@@ -12,4 +12,78 @@
     ./waybar.nix
     ./zsh.nix
   ];
+
+  config = {
+    programs = {
+      home-manager.enable = true;
+      fzf.enable = true;
+      git-credential-oauth.enable = true;
+
+      direnv = {
+        enable = true;
+        nix-direnv.enable = true;
+        enableZshIntegration = true;
+      };
+
+      eza = {
+        enable = true;
+        git = true;
+        icons = "auto";
+        extraOptions = [
+          "--group-directories-first"
+          "--header"
+        ];
+      };
+
+      thefuck = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+
+      chromium.enable = true;
+    };
+
+    home.packages = with pkgs; [
+      keepassxc
+
+      telegram-desktop
+      element-desktop
+
+      wireguard-tools
+      wirelesstools
+
+      kdiff3
+      jetbrains-toolbox
+
+      blanket
+      vlc
+
+      ptyxis
+
+      arduino
+      arduino-ide
+      arduino-cli
+
+      servicepoint-cli
+      servicepoint-simulator
+
+      icu
+
+      nextcloud-client
+
+      lutris
+
+      foliate
+
+      dconf2nix
+    ];
+
+    home.file = {
+      "policy.json" = {
+        target = ".config/containers/policy.json";
+        text = builtins.readFile ./.config/containers/policy.json;
+      };
+      "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
+    };
+  };
 }

From b715206b7495f5815998aee57d24637a0ef2f086 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Tue, 16 Sep 2025 19:46:39 +0200
Subject: [PATCH 3/3] two gnome dconf settings

---
 homeConfigurations/vinzenz/gnome.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/homeConfigurations/vinzenz/gnome.nix b/homeConfigurations/vinzenz/gnome.nix
index 7424363..ce5416e 100644
--- a/homeConfigurations/vinzenz/gnome.nix
+++ b/homeConfigurations/vinzenz/gnome.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   config = {
     home.packages = with pkgs; [
@@ -26,6 +26,8 @@
         switch-applications = [ "<Super>Tab" ];
         switch-applications-backward = [ "<Shift><Super>Tab" ];
       };
+      "org/gnome/desktop/session".idle-delay = lib.hm.gvariant.mkUint32 300;
+      "org/gnome/Connections".first-run = false;
     };
   };
 }