authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-21 13:08:15-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-21 13:08:15-07:00
log23747c52ec5999362531ea8a96cf6e4e69fc23d0
treeec94a0fd8ca6896cce1e556ac3b696834d5b0bc6
parentc2d01f86b0cda4d50ba4921c086425d1dd96282b
signature Commit is signed but in an unrecognized format.

move directory structure around

7 files changed, 189 insertions(+), 197 deletions(-)

hosts/desktop/home.nix+2-2
......@@ -6,13 +6,13 @@
66 zls,
77 ...
88}: let
9 shared-programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib;};
9 shared-programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib;};
1010in {
1111 home = {
1212 stateVersion = "23.05"; # Please read the comment before changing.
1313
1414 packages = with pkgs; let
15 shared-packages = import ../shared/packages.nix {inherit pkgs;};
15 shared-packages = import ../../modules/shared/packages.nix {inherit pkgs;};
1616 in
1717 shared-packages
1818 ++ [
hosts/laptop/home.nix+2-2
......@@ -6,7 +6,7 @@
66 userSettings,
77 ...
88}: {
9 programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib userSettings;};
9 programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib userSettings;};
1010
1111 home = {
1212 inherit (userSettings) username;
......@@ -14,7 +14,7 @@
1414 # shell = pkgs.fish;
1515 stateVersion = "23.05"; # Please read the comment before changing.
1616
17 packages = pkgs.callPackage ../shared/packages.nix {};
17 packages = pkgs.callPackage ../../modules/shared/packages.nix {};
1818
1919 sessionPath = [
2020 "$HOME/.emacs.d/bin"
hosts/shared/home-programs.nix deleted-71
......@@ -1,71 +0,0 @@
1{
2 pkgs,
3 userSettings,
4 ...
5}: {
6 nix-index.enable = true;
7 atuin = {
8 enable = true;
9 enableBashIntegration = true;
10 enableFishIntegration = true;
11 daemon.enable = true;
12 };
13
14 direnv = {
15 enable = true;
16 enableZshIntegration = true;
17 nix-direnv.enable = true;
18 };
19
20 kitty = {
21 enable = true;
22 themeFile = "Catppuccin-Mocha";
23 extraConfig = "font_family Iosevka NF
24 italic_font auto
25 bold_italic_font auto
26 bold_font auto";
27 };
28
29 bat = {
30 enable = true;
31 extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat];
32 };
33
34 hyfetch = {
35 enable = true;
36 settings = {
37 backend = "fastfetch";
38 preset = userSettings.sexuality;
39 mode = "rgb";
40 light_dark = "dark";
41 lightness = {
42 };
43 color_align = {
44 mode = "horizontal";
45 };
46 };
47 };
48
49 fish = {
50 enable = true;
51
52 plugins = [
53 {
54 name = "tide";
55 inherit (pkgs.fishPlugins.tide) src;
56 }
57 {
58 name = "!!";
59 inherit (pkgs.fishPlugins.bang-bang) src;
60 }
61 ];
62 shellAliases = {
63 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
64 };
65 shellInit = ''
66 test -r '/Users/${userSettings.username}/.opam/opam-init/init.fish' && source '/Users/${userSettings.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
67 batman --export-env | source
68 '';
69 };
70 home-manager.enable = true;
71}
hosts/shared/packages.nix deleted-114
......@@ -1,114 +0,0 @@
1{pkgs, ...}:
2with pkgs; [
3 #general development
4 just
5 pkg-config
6 gnumake
7 caddy
8 pm2
9 clang-tools
10 wget
11 git
12 unzip
13 clang
14 cmake
15 gnupg
16
17 #ides
18 zed-editor
19 emacs
20
21 #virtualization
22 qemu
23 podman
24 docker
25
26 #productivity
27 glance
28 anki-bin
29 tailscale
30 openconnect
31
32 #nix tools
33 cachix
34 direnv
35 nh
36
37 #terminal stuff
38 (btop.override {cudaSupport = true;})
39 tmux
40 zellij
41 lazygit
42 fzf
43 neofetch
44 hyfetch
45 fastfetch
46 eza
47 ollama
48 uv
49 fd
50 ripgrep
51 file
52 fish
53
54 #image tools
55 imagemagick
56
57 #chatting apps
58 (discord.override {
59 withMoonlight = true;
60 })
61 vesktop
62 signal-desktop-bin
63
64 #media
65 spotify
66
67 #language servers
68 typst-live
69 lua-language-server
70 nil
71 nixd
72 texlab
73 texlivePackages.chktex
74
75 #formatters/linters
76 stylua
77 alejandra
78 statix
79
80 #neovim deps
81 lua51Packages.lua
82 lua51Packages.luarocks-nix
83 codespell
84 typst
85
86 #python
87 pyright
88 basedpyright
89 ruff
90 python312Packages.python
91 python312Packages.pynvim
92 python312Packages.pip
93
94 #programming languages
95 R
96 deno
97 ruby
98 nodePackages.npm
99 go
100 coq
101 elan
102
103 #browsers
104 tor
105 firefox
106
107 #math
108 texlive.combined.scheme-full
109
110 #fun things
111 cowsay
112 cmatrix
113 sl
114]
modules/shared/home-manager.nix deleted-8
......@@ -1,8 +0,0 @@
1{
2 config,
3 pkgs,
4 lib,
5 ...
6}: {
7
8}
modules/shared/homeManagerPrograms.nix created+71
......@@ -0,0 +1,71 @@
1{
2 pkgs,
3 userSettings,
4 ...
5}: {
6 nix-index.enable = true;
7 atuin = {
8 enable = true;
9 enableBashIntegration = true;
10 enableFishIntegration = true;
11 daemon.enable = true;
12 };
13
14 direnv = {
15 enable = true;
16 enableZshIntegration = true;
17 nix-direnv.enable = true;
18 };
19
20 kitty = {
21 enable = true;
22 themeFile = "Catppuccin-Mocha";
23 extraConfig = "font_family Iosevka NF
24 italic_font auto
25 bold_italic_font auto
26 bold_font auto";
27 };
28
29 bat = {
30 enable = true;
31 extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat];
32 };
33
34 hyfetch = {
35 enable = true;
36 settings = {
37 backend = "fastfetch";
38 preset = userSettings.sexuality;
39 mode = "rgb";
40 light_dark = "dark";
41 lightness = {
42 };
43 color_align = {
44 mode = "horizontal";
45 };
46 };
47 };
48
49 fish = {
50 enable = true;
51
52 plugins = [
53 {
54 name = "tide";
55 inherit (pkgs.fishPlugins.tide) src;
56 }
57 {
58 name = "!!";
59 inherit (pkgs.fishPlugins.bang-bang) src;
60 }
61 ];
62 shellAliases = {
63 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
64 };
65 shellInit = ''
66 test -r '/Users/${userSettings.username}/.opam/opam-init/init.fish' && source '/Users/${userSettings.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
67 batman --export-env | source
68 '';
69 };
70 home-manager.enable = true;
71}
modules/shared/packages.nix created+114
......@@ -0,0 +1,114 @@
1{pkgs, ...}:
2with pkgs; [
3 #general development
4 just
5 pkg-config
6 gnumake
7 caddy
8 pm2
9 clang-tools
10 wget
11 git
12 unzip
13 clang
14 cmake
15 gnupg
16
17 #ides
18 zed-editor
19 emacs
20
21 #virtualization
22 qemu
23 podman
24 docker
25
26 #productivity
27 glance
28 anki-bin
29 tailscale
30 openconnect
31
32 #nix tools
33 cachix
34 direnv
35 nh
36
37 #terminal stuff
38 (btop.override {cudaSupport = true;})
39 tmux
40 zellij
41 lazygit
42 fzf
43 neofetch
44 hyfetch
45 fastfetch
46 eza
47 ollama
48 uv
49 fd
50 ripgrep
51 file
52 fish
53
54 #image tools
55 imagemagick
56
57 #chatting apps
58 (discord.override {
59 withMoonlight = true;
60 })
61 vesktop
62 signal-desktop-bin
63
64 #media
65 spotify
66
67 #language servers
68 typst-live
69 lua-language-server
70 nil
71 nixd
72 texlab
73 texlivePackages.chktex
74
75 #formatters/linters
76 stylua
77 alejandra
78 statix
79
80 #neovim deps
81 lua51Packages.lua
82 lua51Packages.luarocks-nix
83 codespell
84 typst
85
86 #python
87 pyright
88 basedpyright
89 ruff
90 python312Packages.python
91 python312Packages.pynvim
92 python312Packages.pip
93
94 #programming languages
95 R
96 deno
97 ruby
98 nodePackages.npm
99 go
100 coq
101 elan
102
103 #browsers
104 tor
105 firefox
106
107 #math
108 texlive.combined.scheme-full
109
110 #fun things
111 cowsay
112 cmatrix
113 sl
114]