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...@@ -23,82 +23,85 @@ in
23 description = "set the ghostty shader, relative to 'files/ghostty'";23 description = "set the ghostty shader, relative to 'files/ghostty'";
24 };24 };
25 };25 };
26 config.programs = {26 config = {
27 home-manager.enable = true;27 home.shell = {
28 nix-index.enable = true;28 enableShellIntegration = true;
29
30 direnv = {
31 enableZshIntegration = true;
32 nix-direnv.enable = config.programs.direnv.enable;
33 };29 };
30 programs = {
31 home-manager.enable = true;
32 nix-index.enable = true;
3433
35 git = {34 direnv = {
36 enable = true;35 nix-direnv.enable = config.programs.direnv.enable;
37 userName = lib.mkDefault user.name;36 };
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 };
4737
48 atuin = {38 git = {
49 enableBashIntegration = true;39 enable = true;
50 enableFishIntegration = true;40 userName = lib.mkDefault user.name;
51 daemon.enable = cfg.atuin.enable;41 userEmail = lib.mkDefault user.email;
52 };42 ignores = [
53 bat = {43 (lib.mkIf host.darwin ".DS_Store") # When using Finder
54 extraPackages = with pkgs.bat-extras; [44 (lib.mkIf host.darwin "._*") # When using non-APFS drives
55 batdiff45 # ViM and Neovim
56 batman46 ".*.swp"
57 batgrep47 ".nvimlog"
58 batwatch48 ];
59 batpipe49 };
60 prettybat50
61 ];51 atuin = {
62 };52 daemon.enable = cfg.atuin.enable;
63 hyfetch = {53 };
64 settings = {54
65 backend = "fastfetch";55 bat = {
66 preset = user.sexuality;56 extraPackages = with pkgs.bat-extras; [
67 mode = "rgb";57 batdiff
68 light_dark = "dark";58 batman
69 lightness = {59 batgrep
70 };60 batwatch
71 color_align = {61 batpipe
72 mode = "horizontal";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 };
73 };76 };
74 };77 };
75 };78 fastfetch.enable = cfg.hyfetch.enable;
76 fastfetch.enable = cfg.hyfetch.enable;
7779
78 fish = {80 fish = {
79 plugins = [81 plugins = [
80 {82 {
81 name = "tide";83 name = "tide";
82 inherit (pkgs.fishPlugins.tide) src;84 inherit (pkgs.fishPlugins.tide) src;
85 }
86 {
87 name = "!!";
88 inherit (pkgs.fishPlugins.bang-bang) src;
89 }
90 ];
91 shellAliases = {
83 }92 }
84 {
85 name = "!!";
86 inherit (pkgs.fishPlugins.bang-bang) src;
87 }
88 ];
89 shellAliases =
90 { }
91 // lib.optionalAttrs (!host.darwin) {93 // lib.optionalAttrs (!host.darwin) {
92 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";94 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
93 };95 };
94 shellInit = ''96 shellInit = ''
95 batman --export-env | source97 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 true98 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 '';99 '';
98 };100 };
99101
100 ghostty.settings.custom-shader = lib.mkIf (102 ghostty.settings.custom-shader = lib.mkIf (
101 cfg.ghostty.shader != null103 cfg.ghostty.shader != null
102 ) "${../../files/ghostty}/${cfg.ghostty.shader}";104 ) "${../../files/ghostty}/${cfg.ghostty.shader}";
105 };
103 };106 };
104}107}
modules/nixos/ld.nix+9-1
...@@ -63,7 +63,7 @@...@@ -63,7 +63,7 @@
63 nss63 nss
64 openssl64 openssl
65 pango65 pango
66 # pipewire66 pipewire
67 stdenv.cc.cc67 stdenv.cc.cc
68 systemd68 systemd
69 vulkan-loader69 vulkan-loader
...@@ -82,5 +82,13 @@...@@ -82,5 +82,13 @@
82 xorg.libxkbfile82 xorg.libxkbfile
83 xorg.libxshmfence83 xorg.libxshmfence
84 zlib84 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
85 ];93 ];
86}94}
users/natalie/home.nix+1
...@@ -12,6 +12,7 @@...@@ -12,6 +12,7 @@
12 direnv.enable = true;12 direnv.enable = true;
13 fish.enable = true;13 fish.enable = true;
14 man.generateCaches = false;14 man.generateCaches = false;
15 lsd.enable = true;
15 # sort-lines:end16 # sort-lines:end
16 };17 };
1718