4 files changed, 11 insertions(+), 7 deletions(-)
hosts/desktop/home.nix+1| ... | @@ -57,6 +57,7 @@ in { | ... | @@ -57,6 +57,7 @@ in { |
| 57 | kdePackages.dolphin | 57 | kdePackages.dolphin |
| 58 | #broken on macos | 58 | #broken on macos |
| 59 | calibre | 59 | calibre |
| 60 | mpv | ||
| 60 | ] | 61 | ] |
| 61 | ++ [ | 62 | ++ [ |
| 62 | zls.packages.x86_64-linux.zls | 63 | zls.packages.x86_64-linux.zls |
hosts/laptop/configuration.nix+5-6| ... | @@ -6,6 +6,7 @@ | ... | @@ -6,6 +6,7 @@ |
| 6 | environment.systemPackages = [ | 6 | environment.systemPackages = [ |
| 7 | pkgs.home-manager | 7 | pkgs.home-manager |
| 8 | pkgs.neovim | 8 | pkgs.neovim |
| 9 | pkgs.pinentry_mac | ||
| 9 | ]; | 10 | ]; |
| 10 | 11 | ||
| 11 | nixpkgs.config.allowUnfree = true; | 12 | nixpkgs.config.allowUnfree = true; |
| ... | @@ -56,7 +57,7 @@ | ... | @@ -56,7 +57,7 @@ |
| 56 | 57 | ||
| 57 | onActivation = { | 58 | onActivation = { |
| 58 | autoUpdate = true; | 59 | autoUpdate = true; |
| 59 | cleanup = "uninstall"; | 60 | cleanup = "none"; |
| 60 | upgrade = true; | 61 | upgrade = true; |
| 61 | }; | 62 | }; |
| 62 | 63 | ||
| ... | @@ -66,18 +67,16 @@ | ... | @@ -66,18 +67,16 @@ |
| 66 | 67 | ||
| 67 | brews = [ | 68 | brews = [ |
| 68 | "imagemagick" | 69 | "imagemagick" |
| 70 | "opam" | ||
| 69 | ]; | 71 | ]; |
| 70 | 72 | ||
| 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 | ]; |
| 82 | 81 | ||
| 83 | masApps = { | 82 | masApps = { |
hosts/shared/home-programs.nix+1| ... | @@ -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 | }; |
| 63 | 64 | ||
| 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 | git | 11 | git |
| 12 | unzip | 12 | unzip |
| 13 | clang | 13 | clang |
| 14 | cmake | ||
| 15 | gnupg | ||
| 14 | 16 | ||
| 15 | #ides | 17 | #ides |
| 16 | zed-editor | 18 | zed-editor |
| ... | @@ -65,12 +67,12 @@ with pkgs; [ | ... | @@ -65,12 +67,12 @@ with pkgs; [ |
| 65 | #media | 67 | #media |
| 66 | spotify | 68 | spotify |
| 67 | qbittorrent | 69 | qbittorrent |
| 68 | mpv | ||
| 69 | 70 | ||
| 70 | #language servers | 71 | #language servers |
| 71 | typst-live | 72 | typst-live |
| 72 | lua-language-server | 73 | lua-language-server |
| 73 | nil | 74 | nil |
| 75 | nixd | ||
| 74 | texlab | 76 | texlab |
| 75 | texlivePackages.chktex | 77 | texlivePackages.chktex |
| 76 | 78 | ||
| ... | @@ -100,6 +102,7 @@ with pkgs; [ | ... | @@ -100,6 +102,7 @@ with pkgs; [ |
| 100 | nodePackages.npm | 102 | nodePackages.npm |
| 101 | go | 103 | go |
| 102 | coq | 104 | coq |
| 105 | elan | ||
| 103 | 106 | ||
| 104 | #gaming | 107 | #gaming |
| 105 | prismlauncher | 108 | prismlauncher |