From 8ed62ab4c856362013dd6392b4b32cdb0adeecc1 Mon Sep 17 00:00:00 2001 From: Sebastian Fischer Date: Sat, 7 Feb 2026 18:52:43 +0100 Subject: [PATCH] [TASK] Split default config from user config --- config/home.nix | 70 ++++++++++++++++++++++++++++++++++++++ config/users/sebastian.nix | 64 ---------------------------------- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/config/home.nix b/config/home.nix index c4f2f13..e53d980 100644 --- a/config/home.nix +++ b/config/home.nix @@ -18,6 +18,7 @@ hunspellDicts.de_DE darktable + # davinci-resolve-studio # Browser google-chrome @@ -94,6 +95,75 @@ fi ''; + programs.git = { + enable = true; + + settings = { + init.defaultBranch = "main"; + core.editor = "vim"; + pull.rebase = false; + }; + }; + + # Vim Konfiguration + programs.vim = { + enable = true; + defaultEditor = true; + + settings = { + number = true; + relativenumber = true; + tabstop = 2; + shiftwidth = 2; + expandtab = true; + }; + + extraConfig = '' + syntax on + set encoding=utf-8 + set autoindent + set smartindent + ''; + }; + + # Zsh mit Oh-My-Zsh und Powerlevel10k + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + + oh-my-zsh = { + enable = true; + theme = "powerlevel10k/powerlevel10k"; + plugins = [ + "git" + "git-flow" + "docker" + "docker-compose" + "systemd" + "sudo" + ]; + + custom = "$HOME/.oh-my-zsh/custom"; + }; + + shellAliases = { + ll = "ls -lah"; + la = "ls -A"; + l = "ls -CF"; + ".." = "cd .."; + "..." = "cd ../.."; + rebuild = "sudo nixos-rebuild switch"; + update = "sudo nixos-rebuild switch --upgrade"; + }; + + initContent = '' + # Powerlevel10k Konfiguration laden (falls vorhanden) + [[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh + ''; + }; + # GTK Theme (optional, für besseres Aussehen) gtk = { enable = true; diff --git a/config/users/sebastian.nix b/config/users/sebastian.nix index b9ed8bc..f10fa59 100644 --- a/config/users/sebastian.nix +++ b/config/users/sebastian.nix @@ -27,75 +27,11 @@ { programs.git = { - enable = true; - settings = { user.name = "Sebastian Fischer"; # ANPASSEN user.email = "typo3@evoweb.de"; # ANPASSEN - init.defaultBranch = "main"; - core.editor = "vim"; - pull.rebase = false; }; }; - - # Zsh mit Oh-My-Zsh und Powerlevel10k - programs.zsh = { - enable = true; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - - oh-my-zsh = { - enable = true; - theme = "powerlevel10k/powerlevel10k"; - plugins = [ - "git" - "git-flow" - "docker" - "docker-compose" - "systemd" - "sudo" - ]; - - custom = "$HOME/.oh-my-zsh/custom"; - }; - - shellAliases = { - ll = "ls -lah"; - la = "ls -A"; - l = "ls -CF"; - ".." = "cd .."; - "..." = "cd ../.."; - rebuild = "sudo nixos-rebuild switch"; - update = "sudo nixos-rebuild switch --upgrade"; - }; - - initContent = '' - # Powerlevel10k Konfiguration laden (falls vorhanden) - [[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh - ''; - }; - - # Vim Konfiguration - programs.vim = { - enable = true; - defaultEditor = true; - - settings = { - number = true; - relativenumber = true; - tabstop = 2; - shiftwidth = 2; - expandtab = true; - }; - - extraConfig = '' - syntax on - set encoding=utf-8 - set autoindent - set smartindent - ''; - }; } ]; }