diff --git a/flake.nix b/flake.nix index 3a76b4f..8fbee65 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,6 @@ homeManagerModules = { dev = import ./home/dev; work = import ./home/work; - home = import ./home/home; default = import ./home; }; diff --git a/home/dev/default.nix b/home/dev/default.nix index 08ae319..cd16c07 100644 --- a/home/dev/default.nix +++ b/home/dev/default.nix @@ -11,31 +11,8 @@ ]; home.packages = with pkgs; [ - neovim - - file - pciutils # lspci - usbutils # lsusb - - btop - bottom - htop - lsof - lm_sensors - powertop - procs - - libqalculate + pulumi-bin jq - - unzip - unrar-wrapper - p7zip - atool - - fastfetch - hyfetch ]; - } diff --git a/home/dev/git.nix b/home/dev/git.nix index 1416d4e..9963201 100644 --- a/home/dev/git.nix +++ b/home/dev/git.nix @@ -13,6 +13,8 @@ # 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/dev/terminal.nix b/home/dev/terminal.nix index b4cb3fd..70a68ed 100644 --- a/home/dev/terminal.nix +++ b/home/dev/terminal.nix @@ -12,9 +12,6 @@ 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/home/default.nix b/home/home/default.nix deleted file mode 100644 index a64d755..0000000 --- a/home/home/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./git.nix - ]; -} \ No newline at end of file diff --git a/home/home/git.nix b/home/home/git.nix deleted file mode 100644 index 5a7cb98..0000000 --- a/home/home/git.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - 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 e8ededc..f5d9f4c 100644 --- a/home/work/default.nix +++ b/home/work/default.nix @@ -1,13 +1,5 @@ { - pkgs, - ... -}: { imports = [ ./xfreerdp.nix - ./git.nix - ]; - - home.packages = with pkgs; [ - pulumi-bin ]; } \ No newline at end of file diff --git a/home/work/git.nix b/home/work/git.nix deleted file mode 100644 index cb1497e..0000000 --- a/home/work/git.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.git = { - userEmail = "git@evar.dev"; - userName = "Evar Smith"; - }; -} \ No newline at end of file