authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-10 20:29:48-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-10 20:29:48-07:00
log5e591b88fb2f4078f2c0c8c26857d7cf98d7351a
tree5a35cecbe343b65ee2658a7c587824b376e2b791
parent361f9a7e63b4a0171618d33dd4e9767b6263256f
parent81e27779d6edcc06a3ea7db3c16efc0d9689991f
signature Commit is signed but in an unrecognized format.

Merge branch 'main' of github.com:nmarks413/nix-config

4 files changed, 15 insertions(+), 11 deletions(-)

hosts/desktop/home.nix+1
...@@ -59,6 +59,7 @@ in {...@@ -59,6 +59,7 @@ in {
59 kdePackages.dolphin59 kdePackages.dolphin
60 #broken on macos60 #broken on macos
61 calibre61 calibre
62 mpv
62 ]63 ]
63 ++ [64 ++ [
64 zls.packages.x86_64-linux.zls65 zls.packages.x86_64-linux.zls
hosts/laptop/configuration.nix+8-9
...@@ -3,9 +3,10 @@...@@ -3,9 +3,10 @@
3 pkgs,3 pkgs,
4 ...4 ...
5}: {5}: {
6 environment.systemPackages = [6 environment.systemPackages = with pkgs; [
7 pkgs.home-manager7 home-manager
8 pkgs.neovim8 neovim
9 pinentry_mac
9 ];10 ];
1011
11 nixpkgs.config.allowUnfree = true;12 nixpkgs.config.allowUnfree = true;
...@@ -56,7 +57,7 @@...@@ -56,7 +57,7 @@
5657
57 onActivation = {58 onActivation = {
58 autoUpdate = true;59 autoUpdate = true;
59 cleanup = "uninstall";60 cleanup = "none";
60 upgrade = true;61 upgrade = true;
61 };62 };
6263
...@@ -66,18 +67,16 @@...@@ -66,18 +67,16 @@
6667
67 brews = [68 brews = [
68 "imagemagick"69 "imagemagick"
70 "opam"
69 ];71 ];
7072
71 casks = [73 casks = [
72 # "1password"
73 # "firefox"
74 # "obsidian"
75 # "raycast"
76 # "legcord"
77 "battle-net"74 "battle-net"
78 "stremio"75 "stremio"
79 "alt-tab"76 "alt-tab"
80 "legcord"77 "legcord"
78 "zulip"
79 "zen-browser"
81 ];80 ];
8281
83 masApps = {82 masApps = {
hosts/shared/home-programs.nix+2-1
...@@ -40,7 +40,7 @@...@@ -40,7 +40,7 @@
40 # custom_colors = [];40 # custom_colors = [];
41 # fore_back = null;41 # fore_back = null;
42 };42 };
43 distro = null;43 distro = "nixos";
44 pride_month_shown = [44 pride_month_shown = [
45 ];45 ];
46 pride_month_disable = false;46 pride_month_disable = false;
...@@ -59,6 +59,7 @@...@@ -59,6 +59,7 @@
59 shellAliases = {59 shellAliases = {
60 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";60 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
61 };61 };
62 shellInit = "test -r '/Users/nmarks/.opam/opam-init/init.fish' && source '/Users/nmarks/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true";
62 };63 };
6364
64 home-manager.enable = true;65 home-manager.enable = true;
hosts/shared/packages.nix+4-1
...@@ -11,6 +11,8 @@ with pkgs; [...@@ -11,6 +11,8 @@ with pkgs; [
11 git11 git
12 unzip12 unzip
13 clang13 clang
14 cmake
15 gnupg
1416
15 #ides17 #ides
16 zed-editor18 zed-editor
...@@ -65,12 +67,12 @@ with pkgs; [...@@ -65,12 +67,12 @@ with pkgs; [
65 #media67 #media
66 spotify68 spotify
67 qbittorrent69 qbittorrent
68 mpv
6970
70 #language servers71 #language servers
71 typst-live72 typst-live
72 lua-language-server73 lua-language-server
73 nil74 nil
75 nixd
74 texlab76 texlab
75 texlivePackages.chktex77 texlivePackages.chktex
7678
...@@ -100,6 +102,7 @@ with pkgs; [...@@ -100,6 +102,7 @@ with pkgs; [
100 nodePackages.npm102 nodePackages.npm
101 go103 go
102 coq104 coq
105 elan
103106
104 #browsers107 #browsers
105 tor108 tor