From 521610f0441957bc8db01075e756f79a05a48b44 Mon Sep 17 00:00:00 2001
From: DerGrumpf
Date: Wed, 11 Feb 2026 22:44:15 +0100
Subject: [PATCH] Reorderd
---
home/git.nix | 17 +++++----
home/neovim/live-server.nix | 20 +++++++++++
home/packages.nix | 15 ++++----
home/shell.nix | 71 ++++++++++++++++++++-----------------
4 files changed, 75 insertions(+), 48 deletions(-)
create mode 100644 home/neovim/live-server.nix
diff --git a/home/git.nix b/home/git.nix
index abfa479..2f75258 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -1,13 +1,13 @@
-{ primaryUser, ... }:
+{ pkgs, primaryUser, ... }:
{
programs.git = {
enable = true;
settings = {
- user = {
- name = "DerGrumpf"; # TODO replace
- email = "p.keier@beyerstedt-it.de"; # TODO replace
- };
- github = {
+ user = {
+ name = "DerGrumpf"; # TODO replace
+ email = "p.keier@beyerstedt-it.de"; # TODO replace
+ };
+ github = {
user = primaryUser;
};
init = {
@@ -17,4 +17,9 @@
lfs.enable = true;
ignores = [ "**/.DS_STORE" ];
};
+
+ home.packages = with pkgs; [
+ gh
+ ];
+
}
diff --git a/home/neovim/live-server.nix b/home/neovim/live-server.nix
new file mode 100644
index 0000000..70dea7e
--- /dev/null
+++ b/home/neovim/live-server.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+{
+ # Live Server: Auto-reload browser for web development
+ # Uses browser-sync for live reload functionality
+ programs.nixvim = {
+ keymaps = [
+ {
+ mode = "n";
+ key = "ls";
+ action = "terminal browser-sync start --server --files '*.html, *.css, *.js' --no-notify";
+ options.desc = "Start live server (browser-sync)";
+ }
+ ];
+
+ extraPackages = with pkgs; [
+ nodePackages.browser-sync
+ biome
+ ];
+ };
+}
diff --git a/home/packages.nix b/home/packages.nix
index b9ceeb2..a734616 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home = {
packages = with pkgs; [
# dev tools
@@ -8,21 +9,17 @@
htop
tree
ripgrep
- gh # Move to git
- zoxide # Move to fish
unrar
# programming languages
#mise # node, deno, bun, rust, python, etc.
- # PDF Tools
- pandoc
- texlive.combined.scheme-full
- wkhtmltopdf
+ # PDF Tools
+ #pandoc
+ #texlive.combined.scheme-full
+ #wkhtmltopdf
# misc
- nil # move to nixvim
- biome # move to nixvim
yt-dlp
ffmpeg
];
diff --git a/home/shell.nix b/home/shell.nix
index 1c41485..8500d5c 100644
--- a/home/shell.nix
+++ b/home/shell.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = with pkgs; [
eza # ls replacement
fzf # FuzzyFinder
@@ -9,7 +10,7 @@
tabiew # Table viewer
glow # MD Viewer
btop
-
+ zoxide # Move to fish
llm # LLM in the Terminal
# Fun stuff
@@ -39,31 +40,32 @@
tab_bar_min_tabs = 1;
tab_bar_edge = "bottom";
tab_bar_style = "custom"; # Should be changed to custom
- tab_title_template =
- "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title}";
+ tab_title_template = "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title}";
- symbol_map = let
- mappings = [
- "U+23FB-U+23FE"
- "U+2B58"
- "U+E200-U+E2A9"
- "U+E0A0-U+E0A3"
- "U+E0B0-U+E0BF"
- "U+E0C0-U+E0C8"
- "U+E0CC-U+E0CF"
- "U+E0D0-U+E0D2"
- "U+E0D4"
- "U+E700-U+E7C5"
- "U+F000-U+F2E0"
- "U+2665"
- "U+26A1"
- "U+F400-U+F4A8"
- "U+F67C"
- "U+E000-U+E00A"
- "U+F300-U+F313"
- "U+E5FA-U+E62B"
- ];
- in (builtins.concatStringsSep "," mappings) + " Symbols Nerd Font Mono";
+ symbol_map =
+ let
+ mappings = [
+ "U+23FB-U+23FE"
+ "U+2B58"
+ "U+E200-U+E2A9"
+ "U+E0A0-U+E0A3"
+ "U+E0B0-U+E0BF"
+ "U+E0C0-U+E0C8"
+ "U+E0CC-U+E0CF"
+ "U+E0D0-U+E0D2"
+ "U+E0D4"
+ "U+E700-U+E7C5"
+ "U+F000-U+F2E0"
+ "U+2665"
+ "U+26A1"
+ "U+F400-U+F4A8"
+ "U+F67C"
+ "U+E000-U+E00A"
+ "U+F300-U+F313"
+ "U+E5FA-U+E62B"
+ ];
+ in
+ (builtins.concatStringsSep "," mappings) + " Symbols Nerd Font Mono";
};
};
@@ -73,7 +75,13 @@
enableZshIntegration = true;
enableFishIntegration = true;
- settings = { ration = [ 1 3 4 ]; };
+ settings = {
+ ration = [
+ 1
+ 3
+ 4
+ ];
+ };
};
programs.zsh = {
@@ -87,8 +95,7 @@
la = "eza -la";
f = "fzf";
i = "kitty +kitten icat";
- "nix-switch" =
- "sudo darwin-rebuild switch --flake ~/.config/nix#cyper-mac";
+ "nix-switch" = "sudo nixos-rebuild switch --flake .#rpi-4";
};
initContent = ''
@@ -107,8 +114,7 @@
la = "eza -la";
f = "fzf";
i = "kitty +kitten icat";
- "nix-switch" =
- "sudo darwin-rebuild switch --flake ~/.config/nix#cyper-mac";
+ "nix-switch" = "sudo nixos-rebuild switch --flake .#rpi-4";
};
interactiveShellInit = ''
@@ -164,8 +170,7 @@
# Git status module settings
git_status = {
- format =
- "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](red) ($ahead_behind$stashed)]($style)";
+ format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](red) ($ahead_behind$stashed)]($style)";
style = "bold #a6e3a1";
conflicted = "";
untracked = "";