From 6903724321b6928965ecf24b1361d86126cd892d Mon Sep 17 00:00:00 2001
From: Nichkara <nichkara@nickr.eu>
Date: Thu, 26 Feb 2026 21:04:54 +0100
Subject: [PATCH] Configure git

---
 configuration.nix                      |  9 ------
 desktop-environment/window-manager.nix | 16 +++++++++-
 home-manager.nix                       | 43 ++++++++++++++++++++++----
 terminal-environment/config.nix        |  3 +-
 4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 8beee23..c7f1c2a 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -49,15 +49,6 @@
   # Configure console keymap
   console.keyMap = "de-latin1";
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.nichkara = {
-    isNormalUser = true;
-    description = "Nina Chloé Kassandra";
-    extraGroups = [ "networkmanager" "wheel" "docker" "scanner" "lp"];
-    packages = with pkgs; [];
-    shell = pkgs.zsh;
-  };
-
   environment.systemPackages = with pkgs; [
         wget
         networkmanager
diff --git a/desktop-environment/window-manager.nix b/desktop-environment/window-manager.nix
index a504393..a088f6b 100644
--- a/desktop-environment/window-manager.nix
+++ b/desktop-environment/window-manager.nix
@@ -1,4 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
+let
+    dotfiles_hypr = pkgs.fetchgit {
+        url = "https://git.nichkara.eu/dotfiles/hypr";
+        rev = "96f9ca03450049baffbc8a2b71c3a40367edd2a5";
+        sha256 = lib.fakeSha256;
+    };
+in
 {
     environment.systemPackages = with pkgs; [
         wofi
@@ -18,4 +25,11 @@
         xwayland.enable = true;
     };
 
+    home-manager.users.nichkara = { ... }: {
+        home.file.".config/hypr" = {
+        source = dotfiles_hypr;
+        recursive = true;
+        };
+    };
+
 }
diff --git a/home-manager.nix b/home-manager.nix
index 76d4637..285c8af 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -3,11 +3,42 @@
 let
 in
 {
-  imports =
-    [
-      <home-manager/nixos>
-      ./desktop-environment/config.nix
-      ./terminal-environment/config.nix
-      ./system-environment/config.nix
+    users.users.nichkara = {
+        isNormalUser = true;
+        description = "Nina Chloé Kassandra";
+        extraGroups = [ "networkmanager" "wheel" "docker" "scanner" "lp"];
+        packages = with pkgs; [];
+        shell = pkgs.zsh;
+    };
+
+    home-manager.users.nichkara = { pkgs, ... }: {
+        home.stateVersion = "25.11";
+        programs.git = {
+            enable = true;
+            settings = {
+                user = {
+                    name = "Nina Chloé Kassandra Reiß";
+                    email = "nina.reiss@nickr.eu";
+                };
+                push = {
+                    autoSetupRemote = true;
+                };
+                gpg = {
+                    format = "ssh";
+                };
+            };
+            signing = {
+                signByDefault = true;
+                key = "";
+            };
+        };
+    };
+
+    imports = [
+        <home-manager/nixos>
+        ./desktop-environment/config.nix
+        ./terminal-environment/config.nix
+        ./system-environment/config.nix
     ];
+
 }
diff --git a/terminal-environment/config.nix b/terminal-environment/config.nix
index 407aea3..74dbdcd 100644
--- a/terminal-environment/config.nix
+++ b/terminal-environment/config.nix
@@ -1,14 +1,15 @@
 { pkgs, ... }:
 {
+
     environment.systemPackages = with pkgs; [
         vim
         neovim
         astyle
         python313Packages.pynvim
-        git
         hyfetch
         fzf
         fzf-zsh
+        ripgrep
         ripgrep-all
     ];