From 6c72d0b4bf5784b84acd6cdf65b28cb90a676aaa Mon Sep 17 00:00:00 2001 From: Armel van Ravels Date: Tue, 17 Mar 2026 21:14:47 +0100 Subject: [PATCH] Use another git config for work machine --- systems/modules/home-manager-work.nix | 10 ++++++ systems/modules/home-manager.nix | 2 +- .../modules/home}/backgrounds/bird.jpg | Bin .../modules/home}/backgrounds/monkey.jpg | Bin systems/modules/home/home-work.nix | 32 ++++++++++++++++++ {home => systems/modules/home}/home.nix | 0 .../modules/home}/other/fonts.nix | 0 .../modules/home}/programs/bitwarden.nix | 0 .../modules/home}/programs/direnv.nix | 0 .../modules/home}/programs/direnv/direnvrc | 0 .../home}/programs/fastfetch/config.jsonc | 0 .../modules/home}/programs/firefox.nix | 0 systems/modules/home/programs/git-work.nix | 11 ++++++ .../modules/home}/programs/git.nix | 0 .../modules/home}/programs/kitty.nix | 0 .../modules/home}/programs/libreoffice.nix | 0 .../modules/home}/programs/nvim.nix | 0 .../modules/home}/programs/ripgrep.nix | 0 .../modules/home}/programs/tmux.nix | 0 .../modules/home}/programs/vscode.nix | 0 .../modules/home}/programs/zsh.nix | 0 {home => systems/modules/home}/wm/cursor.nix | 0 {home => systems/modules/home}/wm/dconf.nix | 0 {home => systems/modules/home}/wm/gtk.nix | 0 .../modules/home}/wm/hyprland.nix | 0 .../modules/home}/wm/hyprpaper.nix | 0 {home => systems/modules/home}/wm/rofi.nix | 0 {home => systems/modules/home}/wm/waybar.nix | 0 .../modules/home}/wm/waybar/waybar-style.css | 0 systems/work/default.nix | 2 +- 30 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 systems/modules/home-manager-work.nix rename {home => systems/modules/home}/backgrounds/bird.jpg (100%) rename {home => systems/modules/home}/backgrounds/monkey.jpg (100%) create mode 100644 systems/modules/home/home-work.nix rename {home => systems/modules/home}/home.nix (100%) rename {home => systems/modules/home}/other/fonts.nix (100%) rename {home => systems/modules/home}/programs/bitwarden.nix (100%) rename {home => systems/modules/home}/programs/direnv.nix (100%) rename {home => systems/modules/home}/programs/direnv/direnvrc (100%) rename {home => systems/modules/home}/programs/fastfetch/config.jsonc (100%) rename {home => systems/modules/home}/programs/firefox.nix (100%) create mode 100644 systems/modules/home/programs/git-work.nix rename {home => systems/modules/home}/programs/git.nix (100%) rename {home => systems/modules/home}/programs/kitty.nix (100%) rename {home => systems/modules/home}/programs/libreoffice.nix (100%) rename {home => systems/modules/home}/programs/nvim.nix (100%) rename {home => systems/modules/home}/programs/ripgrep.nix (100%) rename {home => systems/modules/home}/programs/tmux.nix (100%) rename {home => systems/modules/home}/programs/vscode.nix (100%) rename {home => systems/modules/home}/programs/zsh.nix (100%) rename {home => systems/modules/home}/wm/cursor.nix (100%) rename {home => systems/modules/home}/wm/dconf.nix (100%) rename {home => systems/modules/home}/wm/gtk.nix (100%) rename {home => systems/modules/home}/wm/hyprland.nix (100%) rename {home => systems/modules/home}/wm/hyprpaper.nix (100%) rename {home => systems/modules/home}/wm/rofi.nix (100%) rename {home => systems/modules/home}/wm/waybar.nix (100%) rename {home => systems/modules/home}/wm/waybar/waybar-style.css (100%) diff --git a/systems/modules/home-manager-work.nix b/systems/modules/home-manager-work.nix new file mode 100644 index 0000000..1d04601 --- /dev/null +++ b/systems/modules/home-manager-work.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + + users.avravels = import home/home-work.nix; + }; +} diff --git a/systems/modules/home-manager.nix b/systems/modules/home-manager.nix index 4024107..dc46d73 100644 --- a/systems/modules/home-manager.nix +++ b/systems/modules/home-manager.nix @@ -5,6 +5,6 @@ useGlobalPkgs = true; useUserPackages = true; - users.avravels = import ../../home/home.nix; + users.avravels = import home/home.nix; }; } diff --git a/home/backgrounds/bird.jpg b/systems/modules/home/backgrounds/bird.jpg similarity index 100% rename from home/backgrounds/bird.jpg rename to systems/modules/home/backgrounds/bird.jpg diff --git a/home/backgrounds/monkey.jpg b/systems/modules/home/backgrounds/monkey.jpg similarity index 100% rename from home/backgrounds/monkey.jpg rename to systems/modules/home/backgrounds/monkey.jpg diff --git a/systems/modules/home/home-work.nix b/systems/modules/home/home-work.nix new file mode 100644 index 0000000..f3af46d --- /dev/null +++ b/systems/modules/home/home-work.nix @@ -0,0 +1,32 @@ +{ pkgs, lib, ... }: + +{ + # Home Manager state version + home.stateVersion = "25.11"; + + home.username = "avravels"; + home.homeDirectory = "/home/avravels"; + + imports = [ + ./other/fonts.nix + ./programs/bitwarden.nix + ./programs/kitty.nix + ./programs/zsh.nix + ./programs/direnv.nix + ./programs/firefox.nix + ./programs/tmux.nix + ./programs/git-work.nix + ./programs/libreoffice.nix + ./programs/nvim.nix + ./programs/ripgrep.nix + ./programs/vscode.nix + ./wm/rofi.nix + ./wm/cursor.nix + ./wm/dconf.nix + ./wm/gtk.nix + ./wm/waybar.nix + ./wm/hyprland.nix + ./wm/hyprpaper.nix + ]; + +} diff --git a/home/home.nix b/systems/modules/home/home.nix similarity index 100% rename from home/home.nix rename to systems/modules/home/home.nix diff --git a/home/other/fonts.nix b/systems/modules/home/other/fonts.nix similarity index 100% rename from home/other/fonts.nix rename to systems/modules/home/other/fonts.nix diff --git a/home/programs/bitwarden.nix b/systems/modules/home/programs/bitwarden.nix similarity index 100% rename from home/programs/bitwarden.nix rename to systems/modules/home/programs/bitwarden.nix diff --git a/home/programs/direnv.nix b/systems/modules/home/programs/direnv.nix similarity index 100% rename from home/programs/direnv.nix rename to systems/modules/home/programs/direnv.nix diff --git a/home/programs/direnv/direnvrc b/systems/modules/home/programs/direnv/direnvrc similarity index 100% rename from home/programs/direnv/direnvrc rename to systems/modules/home/programs/direnv/direnvrc diff --git a/home/programs/fastfetch/config.jsonc b/systems/modules/home/programs/fastfetch/config.jsonc similarity index 100% rename from home/programs/fastfetch/config.jsonc rename to systems/modules/home/programs/fastfetch/config.jsonc diff --git a/home/programs/firefox.nix b/systems/modules/home/programs/firefox.nix similarity index 100% rename from home/programs/firefox.nix rename to systems/modules/home/programs/firefox.nix diff --git a/systems/modules/home/programs/git-work.nix b/systems/modules/home/programs/git-work.nix new file mode 100644 index 0000000..8d3aef7 --- /dev/null +++ b/systems/modules/home/programs/git-work.nix @@ -0,0 +1,11 @@ +{ pkgs, ... } : + +{ + programs.git = { + enable = true; + settings.user = { + name = "Armel van Ravels"; + email = "armel@webavance.nl"; + }; + }; +} diff --git a/home/programs/git.nix b/systems/modules/home/programs/git.nix similarity index 100% rename from home/programs/git.nix rename to systems/modules/home/programs/git.nix diff --git a/home/programs/kitty.nix b/systems/modules/home/programs/kitty.nix similarity index 100% rename from home/programs/kitty.nix rename to systems/modules/home/programs/kitty.nix diff --git a/home/programs/libreoffice.nix b/systems/modules/home/programs/libreoffice.nix similarity index 100% rename from home/programs/libreoffice.nix rename to systems/modules/home/programs/libreoffice.nix diff --git a/home/programs/nvim.nix b/systems/modules/home/programs/nvim.nix similarity index 100% rename from home/programs/nvim.nix rename to systems/modules/home/programs/nvim.nix diff --git a/home/programs/ripgrep.nix b/systems/modules/home/programs/ripgrep.nix similarity index 100% rename from home/programs/ripgrep.nix rename to systems/modules/home/programs/ripgrep.nix diff --git a/home/programs/tmux.nix b/systems/modules/home/programs/tmux.nix similarity index 100% rename from home/programs/tmux.nix rename to systems/modules/home/programs/tmux.nix diff --git a/home/programs/vscode.nix b/systems/modules/home/programs/vscode.nix similarity index 100% rename from home/programs/vscode.nix rename to systems/modules/home/programs/vscode.nix diff --git a/home/programs/zsh.nix b/systems/modules/home/programs/zsh.nix similarity index 100% rename from home/programs/zsh.nix rename to systems/modules/home/programs/zsh.nix diff --git a/home/wm/cursor.nix b/systems/modules/home/wm/cursor.nix similarity index 100% rename from home/wm/cursor.nix rename to systems/modules/home/wm/cursor.nix diff --git a/home/wm/dconf.nix b/systems/modules/home/wm/dconf.nix similarity index 100% rename from home/wm/dconf.nix rename to systems/modules/home/wm/dconf.nix diff --git a/home/wm/gtk.nix b/systems/modules/home/wm/gtk.nix similarity index 100% rename from home/wm/gtk.nix rename to systems/modules/home/wm/gtk.nix diff --git a/home/wm/hyprland.nix b/systems/modules/home/wm/hyprland.nix similarity index 100% rename from home/wm/hyprland.nix rename to systems/modules/home/wm/hyprland.nix diff --git a/home/wm/hyprpaper.nix b/systems/modules/home/wm/hyprpaper.nix similarity index 100% rename from home/wm/hyprpaper.nix rename to systems/modules/home/wm/hyprpaper.nix diff --git a/home/wm/rofi.nix b/systems/modules/home/wm/rofi.nix similarity index 100% rename from home/wm/rofi.nix rename to systems/modules/home/wm/rofi.nix diff --git a/home/wm/waybar.nix b/systems/modules/home/wm/waybar.nix similarity index 100% rename from home/wm/waybar.nix rename to systems/modules/home/wm/waybar.nix diff --git a/home/wm/waybar/waybar-style.css b/systems/modules/home/wm/waybar/waybar-style.css similarity index 100% rename from home/wm/waybar/waybar-style.css rename to systems/modules/home/wm/waybar/waybar-style.css diff --git a/systems/work/default.nix b/systems/work/default.nix index a1539ea..0f8d971 100644 --- a/systems/work/default.nix +++ b/systems/work/default.nix @@ -4,7 +4,7 @@ imports = [ ./hardware-configuration.nix - ../modules/home-manager.nix + ../modules/home-manager-work.nix ../modules/common.nix ../modules/users.nix ../modules/locales.nix