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 {
5959 kdePackages.dolphin
6060 #broken on macos
6161 calibre
62 mpv
6263 ]
6364 ++ [
6465 zls.packages.x86_64-linux.zls
hosts/laptop/configuration.nix+8-9
......@@ -3,9 +3,10 @@
33 pkgs,
44 ...
55}: {
6 environment.systemPackages = [
7 pkgs.home-manager
8 pkgs.neovim
6 environment.systemPackages = with pkgs; [
7 home-manager
8 neovim
9 pinentry_mac
910 ];
1011
1112 nixpkgs.config.allowUnfree = true;
......@@ -56,7 +57,7 @@
5657
5758 onActivation = {
5859 autoUpdate = true;
59 cleanup = "uninstall";
60 cleanup = "none";
6061 upgrade = true;
6162 };
6263
......@@ -66,18 +67,16 @@
6667
6768 brews = [
6869 "imagemagick"
70 "opam"
6971 ];
7072
7173 casks = [
72 # "1password"
73 # "firefox"
74 # "obsidian"
75 # "raycast"
76 # "legcord"
7774 "battle-net"
7875 "stremio"
7976 "alt-tab"
8077 "legcord"
78 "zulip"
79 "zen-browser"
8180 ];
8281
8382 masApps = {
hosts/shared/home-programs.nix+2-1
......@@ -40,7 +40,7 @@
4040 # custom_colors = [];
4141 # fore_back = null;
4242 };
43 distro = null;
43 distro = "nixos";
4444 pride_month_shown = [
4545 ];
4646 pride_month_disable = false;
......@@ -59,6 +59,7 @@
5959 shellAliases = {
6060 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
6161 };
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";
6263 };
6364
6465 home-manager.enable = true;
hosts/shared/packages.nix+4-1
......@@ -11,6 +11,8 @@ with pkgs; [
1111 git
1212 unzip
1313 clang
14 cmake
15 gnupg
1416
1517 #ides
1618 zed-editor
......@@ -65,12 +67,12 @@ with pkgs; [
6567 #media
6668 spotify
6769 qbittorrent
68 mpv
6970
7071 #language servers
7172 typst-live
7273 lua-language-server
7374 nil
75 nixd
7476 texlab
7577 texlivePackages.chktex
7678
......@@ -100,6 +102,7 @@ with pkgs; [
100102 nodePackages.npm
101103 go
102104 coq
105 elan
103106
104107 #browsers
105108 tor