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] 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";
+    };
+  };
 }