authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-01 20:59:12-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-01 20:59:12-07:00
log992f77e656d298463aedea1290604b9a72b2a488
treed1c39ff7132c8a15561345fd10a5f5baaec88832
parenta58f16e18b7e9161012dcfd90075e7b72e4f50cf
signature Commit is signed but in an unrecognized format.

clean up default home options, add lsd


3 files changed, 79 insertions(+), 67 deletions(-)

modules/home/default.nix+69-66
......@@ -23,82 +23,85 @@ in
2323 description = "set the ghostty shader, relative to 'files/ghostty'";
2424 };
2525 };
26 config.programs = {
27 home-manager.enable = true;
28 nix-index.enable = true;
29
30 direnv = {
31 enableZshIntegration = true;
32 nix-direnv.enable = config.programs.direnv.enable;
26 config = {
27 home.shell = {
28 enableShellIntegration = true;
3329 };
30 programs = {
31 home-manager.enable = true;
32 nix-index.enable = true;
3433
35 git = {
36 enable = true;
37 userName = lib.mkDefault user.name;
38 userEmail = lib.mkDefault user.email;
39 ignores = [
40 (lib.mkIf host.darwin ".DS_Store") # When using Finder
41 (lib.mkIf host.darwin "._*") # When using non-APFS drives
42 # ViM and Neovim
43 ".*.swp"
44 ".nvimlog"
45 ];
46 };
34 direnv = {
35 nix-direnv.enable = config.programs.direnv.enable;
36 };
4737
48 atuin = {
49 enableBashIntegration = true;
50 enableFishIntegration = true;
51 daemon.enable = cfg.atuin.enable;
52 };
53 bat = {
54 extraPackages = with pkgs.bat-extras; [
55 batdiff
56 batman
57 batgrep
58 batwatch
59 batpipe
60 prettybat
61 ];
62 };
63 hyfetch = {
64 settings = {
65 backend = "fastfetch";
66 preset = user.sexuality;
67 mode = "rgb";
68 light_dark = "dark";
69 lightness = {
70 };
71 color_align = {
72 mode = "horizontal";
38 git = {
39 enable = true;
40 userName = lib.mkDefault user.name;
41 userEmail = lib.mkDefault user.email;
42 ignores = [
43 (lib.mkIf host.darwin ".DS_Store") # When using Finder
44 (lib.mkIf host.darwin "._*") # When using non-APFS drives
45 # ViM and Neovim
46 ".*.swp"
47 ".nvimlog"
48 ];
49 };
50
51 atuin = {
52 daemon.enable = cfg.atuin.enable;
53 };
54
55 bat = {
56 extraPackages = with pkgs.bat-extras; [
57 batdiff
58 batman
59 batgrep
60 batwatch
61 batpipe
62 prettybat
63 ];
64 };
65 hyfetch = {
66 settings = {
67 backend = "fastfetch";
68 preset = user.sexuality;
69 mode = "rgb";
70 light_dark = "dark";
71 lightness = {
72 };
73 color_align = {
74 mode = "horizontal";
75 };
7376 };
7477 };
75 };
76 fastfetch.enable = cfg.hyfetch.enable;
78 fastfetch.enable = cfg.hyfetch.enable;
7779
78 fish = {
79 plugins = [
80 {
81 name = "tide";
82 inherit (pkgs.fishPlugins.tide) src;
80 fish = {
81 plugins = [
82 {
83 name = "tide";
84 inherit (pkgs.fishPlugins.tide) src;
85 }
86 {
87 name = "!!";
88 inherit (pkgs.fishPlugins.bang-bang) src;
89 }
90 ];
91 shellAliases = {
8392 }
84 {
85 name = "!!";
86 inherit (pkgs.fishPlugins.bang-bang) src;
87 }
88 ];
89 shellAliases =
90 { }
9193 // lib.optionalAttrs (!host.darwin) {
9294 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
9395 };
94 shellInit = ''
95 batman --export-env | source
96 test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
97 '';
98 };
96 shellInit = ''
97 batman --export-env | source
98 test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
99 '';
100 };
99101
100 ghostty.settings.custom-shader = lib.mkIf (
101 cfg.ghostty.shader != null
102 ) "${../../files/ghostty}/${cfg.ghostty.shader}";
102 ghostty.settings.custom-shader = lib.mkIf (
103 cfg.ghostty.shader != null
104 ) "${../../files/ghostty}/${cfg.ghostty.shader}";
105 };
103106 };
104107}
modules/nixos/ld.nix+9-1
......@@ -63,7 +63,7 @@
6363 nss
6464 openssl
6565 pango
66 # pipewire
66 pipewire
6767 stdenv.cc.cc
6868 systemd
6969 vulkan-loader
......@@ -82,5 +82,13 @@
8282 xorg.libxkbfile
8383 xorg.libxshmfence
8484 zlib
85 libxslt
86
87 # Stolen from https://github.com/Mic92/dotfiles/blob/57cf7fdf8705a5362fc19114b8395cdbf7668e94/nixos/modules/nix-ld.nix#L6-L58
88 flite
89 gtk2
90 gtk2-x11
91 libsecret
92 xorg.libXinerama
8593 ];
8694}
users/natalie/home.nix+1
......@@ -12,6 +12,7 @@
1212 direnv.enable = true;
1313 fish.enable = true;
1414 man.generateCaches = false;
15 lsd.enable = true;
1516 # sort-lines:end
1617 };
1718