From 0aa28a90f252c78f2466067be8c1b48c08d57b0b Mon Sep 17 00:00:00 2001 From: Evar Date: Wed, 25 Jun 2025 03:54:37 -0400 Subject: [PATCH 1/2] home: add home flake, decentralize git username config --- flake.nix | 1 + home/dev/git.nix | 2 -- home/home/default.nix | 5 +++++ home/home/git.nix | 6 ++++++ home/work/default.nix | 1 + home/work/git.nix | 6 ++++++ 6 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 home/home/default.nix create mode 100644 home/home/git.nix create mode 100644 home/work/git.nix diff --git a/flake.nix b/flake.nix index 8fbee65..3a76b4f 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ homeManagerModules = { dev = import ./home/dev; work = import ./home/work; + home = import ./home/home; default = import ./home; }; diff --git a/home/dev/git.nix b/home/dev/git.nix index 9963201..1416d4e 100644 --- a/home/dev/git.nix +++ b/home/dev/git.nix @@ -13,8 +13,6 @@ # difftastic.enable = true; # https://difftastic.wilfred.me.uk/git.html # https://tsdh.org/posts/2022-08-01-difftastic-diffing-with-magit.html - userEmail = "esmith@true-helix.com"; - userName = "Evar Smith"; extraConfig = { init.defaultBranch = "integration"; diff --git a/home/home/default.nix b/home/home/default.nix new file mode 100644 index 0000000..a64d755 --- /dev/null +++ b/home/home/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./git.nix + ]; +} \ No newline at end of file diff --git a/home/home/git.nix b/home/home/git.nix new file mode 100644 index 0000000..5a7cb98 --- /dev/null +++ b/home/home/git.nix @@ -0,0 +1,6 @@ +{ + programs.git = { + userEmail = "git@evar.dev"; + userName = "Evar"; + }; +} \ No newline at end of file diff --git a/home/work/default.nix b/home/work/default.nix index f5d9f4c..e7e0baa 100644 --- a/home/work/default.nix +++ b/home/work/default.nix @@ -1,5 +1,6 @@ { imports = [ ./xfreerdp.nix + ./git.nix ]; } \ No newline at end of file diff --git a/home/work/git.nix b/home/work/git.nix new file mode 100644 index 0000000..cb1497e --- /dev/null +++ b/home/work/git.nix @@ -0,0 +1,6 @@ +{ + programs.git = { + userEmail = "git@evar.dev"; + userName = "Evar Smith"; + }; +} \ No newline at end of file From 2e7fe703c89d7eeacb967495c01c84db438b9f90 Mon Sep 17 00:00:00 2001 From: Evar Date: Wed, 25 Jun 2025 04:02:29 -0400 Subject: [PATCH 2/2] home: include tools from main nix config, only include pulumi-bin on work config --- home/dev/default.nix | 25 ++++++++++++++++++++++++- home/dev/terminal.nix | 3 +++ home/work/default.nix | 7 +++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/home/dev/default.nix b/home/dev/default.nix index cd16c07..08ae319 100644 --- a/home/dev/default.nix +++ b/home/dev/default.nix @@ -11,8 +11,31 @@ ]; home.packages = with pkgs; [ - pulumi-bin + neovim + + file + pciutils # lspci + usbutils # lsusb + + btop + bottom + htop + lsof + lm_sensors + powertop + procs + + libqalculate jq + + unzip + unrar-wrapper + p7zip + atool + + fastfetch + hyfetch ]; + } diff --git a/home/dev/terminal.nix b/home/dev/terminal.nix index 70a68ed..b4cb3fd 100644 --- a/home/dev/terminal.nix +++ b/home/dev/terminal.nix @@ -12,6 +12,9 @@ inputs.nix-index-database.hmModules.nix-index ]; + # TODO: consider starship for prompt + # https://starship.rs/ + # NOTE: for fish, I need the # system to have programs.fish.enable = true; # so that the shell integration can find the nix binary properly. diff --git a/home/work/default.nix b/home/work/default.nix index e7e0baa..e8ededc 100644 --- a/home/work/default.nix +++ b/home/work/default.nix @@ -1,6 +1,13 @@ { + pkgs, + ... +}: { imports = [ ./xfreerdp.nix ./git.nix ]; + + home.packages = with pkgs; [ + pulumi-bin + ]; } \ No newline at end of file