diff --git a/users/anon/.gitconfig b/home-manager/.gitconfig
similarity index 100%
rename from users/anon/.gitconfig
rename to home-manager/.gitconfig
diff --git a/users/anon/.gitconfig-evolit b/home-manager/.gitconfig-evolit
similarity index 100%
rename from users/anon/.gitconfig-evolit
rename to home-manager/.gitconfig-evolit
diff --git a/users/anon/.gitconfig-github b/home-manager/.gitconfig-github
similarity index 100%
rename from users/anon/.gitconfig-github
rename to home-manager/.gitconfig-github
diff --git a/users/anon/.gitconfig-gitlabfh b/home-manager/.gitconfig-gitlabfh
similarity index 100%
rename from users/anon/.gitconfig-gitlabfh
rename to home-manager/.gitconfig-gitlabfh
diff --git a/users/anon/.gitconfig-selfhosted b/home-manager/.gitconfig-selfhosted
similarity index 100%
rename from users/anon/.gitconfig-selfhosted
rename to home-manager/.gitconfig-selfhosted
diff --git a/home-manager/gitconfig.nix b/home-manager/gitconfig.nix
new file mode 100644
index 0000000..ea5eb8d
--- /dev/null
+++ b/home-manager/gitconfig.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, inputs, ...}:
+{
+  home.file.".gitconfig" = {
+    enable = true;
+    source = ./.gitconfig;
+    target = ".gitconfig";
+  };
+  home.file.".gitconfig-github" = {
+    enable = true;
+    source = ./.gitconfig-github;
+    target = ".gitconfig-github";
+  };
+  home.file.".gitconfig-selfhosted" = {
+    enable = true;
+    source = ./.gitconfig-selfhosted;
+    target = ".gitconfig-selfhosted";
+  };
+  home.file.".gitconfig-gitlabfh" = {
+    enable = true;
+    source = ./.gitconfig-gitlabfh;
+    target = ".gitconfig-gitlabfh";
+  };
+  home.file.".gitconfig-evolit" = {
+    enable = true;
+    source = ./.gitconfig-evolit;
+    target = ".gitconfig-evolit";
+  };
+}
diff --git a/modules/collections/desktop.nix b/modules/collections/desktop.nix
index 366cb61..7f6bcf1 100644
--- a/modules/collections/desktop.nix
+++ b/modules/collections/desktop.nix
@@ -7,7 +7,6 @@
     ../gpg.nix
     ../kernel.nix # use latest kernel
     ../services/syncthing.nix
-    ../static-ip.nix
     ../support/ntfs.nix
   ];
 
@@ -22,6 +21,12 @@
       ld.enable = true;
       settings.enable = true;
     };
+    static-ip = {
+      enable = true;
+      interface = "enp42s0";
+      ip = "192.168.0.11";
+      dns = "192.168.0.6";
+    };
     hardware = {
       vfio.enable = true;
       nvidia.enable = true;
diff --git a/users/anon/home.nix b/users/anon/home.nix
index 88001ad..7af933e 100644
--- a/users/anon/home.nix
+++ b/users/anon/home.nix
@@ -14,36 +14,11 @@
 
   imports = [
     ../../home-manager/nvim.nix
+    ../../home-manager/gitconfig.nix
     ../../home-manager/zsh.nix
     ../../home-manager/direnv.nix
     inputs.nix-colors.homeManagerModule
   ];
 
-  home.file.".gitconfig" = {
-    enable = true;
-    source = ./.gitconfig;
-    target = ".gitconfig";
-  };
-  home.file.".gitconfig-github" = {
-    enable = true;
-    source = ./.gitconfig-github;
-    target = ".gitconfig-github";
-  };
-  home.file.".gitconfig-selfhosted" = {
-    enable = true;
-    source = ./.gitconfig-selfhosted;
-    target = ".gitconfig-selfhosted";
-  };
-  home.file.".gitconfig-gitlabfh" = {
-    enable = true;
-    source = ./.gitconfig-gitlabfh;
-    target = ".gitconfig-gitlabfh";
-  };
-  home.file.".gitconfig-evolit" = {
-    enable = true;
-    source = ./.gitconfig-evolit;
-    target = ".gitconfig-evolit";
-  };
-
   colorScheme = inputs.nix-colors.colorSchemes.tokyo-night-dark;
 }
diff --git a/users/kopatz/.gitconfig b/users/kopatz/.gitconfig
deleted file mode 100644
index d671eb3..0000000
--- a/users/kopatz/.gitconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-[user]
-	name = Lukas
-	email = lukas.kopatz11@gmail.com
-[alias]
-	pushfwl = push --force-with-lease
-	last = log -1 --stat
-    now = commit --amend --date="now" --no-edit
-    cp = cherry-pick
-    co = checkout
-    cl = clone
-    ci = commit
-    st = status -sb
-    br = branch
-    unstage = reset HEAD --
-    dc = diff --cached
-    lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
-    lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
-    lg = !"git lg1"
-[color]
-    ui = true
-[mergetool]
-    keeptemporaries = false
-    keepbackups = false
-    prompt = false
-    trustexitcode = false
-[pull]
-    ff = true
-	
-[includeIf "gitdir/i:~/projects/github/**"]
-    path = .gitconfig-github
-[includeIf "gitdir/i:~/projects/gitea/**"]
-    path = .gitconfig-gitea
-[includeIf "gitdir/i:~/projects/fh/**"]
-    path = .gitconfig-gitlabfh
-[includeIf "gitdir/i:~/projects/evolit/**"]
-    path = .gitconfig-evolit
-[includeIf "gitdir/i:~/projects/selfhosted/**"]
-    path = .gitconfig-selfhosted
diff --git a/users/kopatz/.gitconfig-evolit b/users/kopatz/.gitconfig-evolit
deleted file mode 100644
index 2bfd72e..0000000
--- a/users/kopatz/.gitconfig-evolit
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
-        name = Lukas Kopatz
-        email = lukas.kopatz@evolit.com
diff --git a/users/kopatz/.gitconfig-github b/users/kopatz/.gitconfig-github
deleted file mode 100644
index bebae03..0000000
--- a/users/kopatz/.gitconfig-github
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[push]
-    default = upstream
-[core]
-	repositoryformatversion = 0
-	filemode = false
-	bare = false
-	logallrefupdates = true
-	symlinks = false
-	ignorecase = true
-[mergetool]
-    keeptemporaries = false
-    keepbackups = false
-    prompt = false
-    trustexitcode = false
-[user]
-	name = Kopatz
-	email = 7265381+Kropatz@users.noreply.github.com
diff --git a/users/kopatz/.gitconfig-gitlabfh b/users/kopatz/.gitconfig-gitlabfh
deleted file mode 100644
index ca25c0b..0000000
--- a/users/kopatz/.gitconfig-gitlabfh
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[push]
-    default = upstream
-[core]
-	repositoryformatversion = 0
-	filemode = false
-	bare = false
-	logallrefupdates = true
-	symlinks = false
-	ignorecase = true
-[mergetool]
-    keeptemporaries = false
-    keepbackups = false
-    prompt = false
-    trustexitcode = false
-[user]
-	name = Kopatz
-	email = is221015@fhstp.ac.at
diff --git a/users/kopatz/.gitconfig-selfhosted b/users/kopatz/.gitconfig-selfhosted
deleted file mode 100644
index 5b233ff..0000000
--- a/users/kopatz/.gitconfig-selfhosted
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[push]
-	default = upstream
-[core]
-	repositoryformatversion = 0
-	filemode = false
-	bare = false
-	logallrefupdates = true
-	symlinks = false
-	ignorecase = true
-[mergetool]
-	keeptemporaries = false
-	keepbackups = false
-	prompt = false
-	trustexitcode = false
-[user]
-	name = Kopatz
-	email = lukas.kopatz11@gmail.com
diff --git a/users/kopatz/home.nix b/users/kopatz/home.nix
index 38971ff..44a9849 100644
--- a/users/kopatz/home.nix
+++ b/users/kopatz/home.nix
@@ -13,45 +13,20 @@
   };
 
   imports = [
-    ../../home-manager/nvim.nix
     ../../home-manager/code.nix
-    ../../home-manager/zsh.nix
-    ../../home-manager/theme.nix
     ../../home-manager/direnv.nix
-    ../../home-manager/lf.nix
-    ../../home-manager/kitty.nix
-    ../../home-manager/rofi.nix
-    ../../home-manager/kde-path.nix
-    ../../home-manager/hyprland
     ../../home-manager/firefox
+    ../../home-manager/gitconfig.nix
+    ../../home-manager/hyprland
+    ../../home-manager/kde-path.nix
+    ../../home-manager/kitty.nix
+    ../../home-manager/lf.nix
+    ../../home-manager/nvim.nix
+    ../../home-manager/rofi.nix
+    ../../home-manager/theme.nix
+    ../../home-manager/zsh.nix
     inputs.nix-colors.homeManagerModule
   ];
 
-  home.file.".gitconfig" = {
-    enable = true;
-    source = ./.gitconfig;
-    target = ".gitconfig";
-  };
-  home.file.".gitconfig-github" = {
-    enable = true;
-    source = ./.gitconfig-github;
-    target = ".gitconfig-github";
-  };
-  home.file.".gitconfig-selfhosted" = {
-    enable = true;
-    source = ./.gitconfig-selfhosted;
-    target = ".gitconfig-selfhosted";
-  };
-  home.file.".gitconfig-gitlabfh" = {
-    enable = true;
-    source = ./.gitconfig-gitlabfh;
-    target = ".gitconfig-gitlabfh";
-  };
-  home.file.".gitconfig-evolit" = {
-    enable = true;
-    source = ./.gitconfig-evolit;
-    target = ".gitconfig-evolit";
-  };
-
   colorScheme = import ../../home-manager/themes/yorha/colors.nix;
 }