make config work on macos
6 files changed, 51 insertions(+), 61 deletions(-)
- flake.nix
hosts
desktop
shared
flake.nix-9
| ... | @@ -109,7 +109,6 @@ | ... | @@ -109,7 +109,6 @@ |
| 109 | "Natalies-MacBook-Air" = darwin.lib.darwinSystem { | 109 | "Natalies-MacBook-Air" = darwin.lib.darwinSystem { |
| 110 | system = "aarch64-darwin"; | 110 | system = "aarch64-darwin"; |
| 111 | modules = [ | 111 | modules = [ |
| 112 | # nh_darwin.nixDarwinModules.default | ||
| 113 | {nixpkgs.overlays = overlays;} | 112 | {nixpkgs.overlays = overlays;} |
| 114 | ./hosts/laptop/configuration.nix | 113 | ./hosts/laptop/configuration.nix |
| 115 | home-manager.darwinModules.home-manager | 114 | home-manager.darwinModules.home-manager |
| ... | @@ -126,17 +125,9 @@ | ... | @@ -126,17 +125,9 @@ |
| 126 | } | 125 | } |
| 127 | ]; | 126 | ]; |
| 128 | specialArgs = { | 127 | specialArgs = { |
| 129 | inherit nh_darwin; | ||
| 130 | inherit inputs; | 128 | inherit inputs; |
| 131 | }; | 129 | }; |
| 132 | }; | 130 | }; |
| 133 | }; | 131 | }; |
| 134 | |||
| 135 | # darwinPackages = self.darwinConfigurations."Natalie-MacBook-Air".pkgs; | ||
| 136 | # nixos = inputs.self.nixosConfigurations.nmarks; | ||
| 137 | # | ||
| 138 | # | ||
| 139 | # nmarks = inputs.self.nixosConfigurations.nmarks.config.system.build.toplevel; | ||
| 140 | # defaultPackage.x86_64-linux = inputs.self.nixosConfigurations.laptoptop.config.system.build.toplevel; | ||
| 141 | }; | 132 | }; |
| 142 | } | 133 | } |
hosts/desktop/configuration.nix+2
| ... | @@ -276,6 +276,8 @@ | ... | @@ -276,6 +276,8 @@ |
| 276 | packages = with pkgs; [ | 276 | packages = with pkgs; [ |
| 277 | firefox | 277 | firefox |
| 278 | vim | 278 | vim |
| 279 | steam | ||
| 280 | |||
| 279 | # thunderbird | 281 | # thunderbird |
| 280 | ]; | 282 | ]; |
| 281 | }; | 283 | }; |
hosts/desktop/home.nix+32-1
| ... | @@ -26,6 +26,38 @@ in { | ... | @@ -26,6 +26,38 @@ in { |
| 26 | shared-packages = import ../shared/packages.nix {inherit pkgs;}; | 26 | shared-packages = import ../shared/packages.nix {inherit pkgs;}; |
| 27 | in | 27 | in |
| 28 | shared-packages | 28 | shared-packages |
| 29 | ++ [ | ||
| 30 | #building macos apps hard :( | ||
| 31 | ghostty | ||
| 32 | stremio | ||
| 33 | julia | ||
| 34 | |||
| 35 | #gaming | ||
| 36 | bottles | ||
| 37 | lutris | ||
| 38 | mangohud | ||
| 39 | dxvk_2 | ||
| 40 | steam-run | ||
| 41 | vulkan-tools | ||
| 42 | path-of-building | ||
| 43 | wineWowPackages.stable | ||
| 44 | winetricks | ||
| 45 | |||
| 46 | #window manager stuff | ||
| 47 | wofi | ||
| 48 | #linux tools | ||
| 49 | legcord | ||
| 50 | pavucontrol | ||
| 51 | ethtool | ||
| 52 | grub2 | ||
| 53 | efibootmgr | ||
| 54 | distrobox | ||
| 55 | xdg-desktop-portal-gtk | ||
| 56 | xclip | ||
| 57 | kdePackages.dolphin | ||
| 58 | #broken on macos | ||
| 59 | calibre | ||
| 60 | ] | ||
| 29 | ++ [ | 61 | ++ [ |
| 30 | zls.packages.x86_64-linux.zls | 62 | zls.packages.x86_64-linux.zls |
| 31 | rust-bin.stable.latest.default | 63 | rust-bin.stable.latest.default |
| ... | @@ -43,5 +75,4 @@ in { | ... | @@ -43,5 +75,4 @@ in { |
| 43 | programs = shared-programs; | 75 | programs = shared-programs; |
| 44 | 76 | ||
| 45 | xdg.mimeApps.defaultApplications."inode/directory" = "dolphin.desktop"; | 77 | xdg.mimeApps.defaultApplications."inode/directory" = "dolphin.desktop"; |
| 46 | |||
| 47 | } | 78 | } |
hosts/laptop/configuration.nix+10-15
| ... | @@ -3,23 +3,13 @@ | ... | @@ -3,23 +3,13 @@ |
| 3 | pkgs, | 3 | pkgs, |
| 4 | ... | 4 | ... |
| 5 | }: { | 5 | }: { |
| 6 | # nixpkgs.overlays = [ | ||
| 7 | # (final: prev: {nh-darwin = nh_darwin.packages.${prev.system}.default;}) | ||
| 8 | # ]; | ||
| 9 | # environment.shellAliases.nh = "nh_darwin"; | ||
| 10 | |||
| 11 | # programs.nh = { | ||
| 12 | # enable = true; | ||
| 13 | # clean.enable = true; | ||
| 14 | # clean.extraArgs = "--keep-since 4d --keep 3"; | ||
| 15 | # flake = "/Users/nmarks/.dotfiles"; | ||
| 16 | # }; | ||
| 17 | |||
| 18 | environment.systemPackages = [ | 6 | environment.systemPackages = [ |
| 19 | pkgs.home-manager | 7 | pkgs.home-manager |
| 20 | pkgs.neovim | 8 | pkgs.neovim |
| 21 | ]; | 9 | ]; |
| 22 | 10 | ||
| 11 | nixpkgs.config.allowUnfree = true; | ||
| 12 | |||
| 23 | # Use a custom configuration.nix location. | 13 | # Use a custom configuration.nix location. |
| 24 | #environment.darwinConfig = "$HOME/.dotfiles/hosts/laptop"; | 14 | #environment.darwinConfig = "$HOME/.dotfiles/hosts/laptop"; |
| 25 | 15 | ||
| ... | @@ -31,8 +21,6 @@ | ... | @@ -31,8 +21,6 @@ |
| 31 | }; | 21 | }; |
| 32 | }; | 22 | }; |
| 33 | 23 | ||
| 34 | nixpkgs.config.allowUnfree = true; | ||
| 35 | |||
| 36 | # Create /etc/zshrc that loads the nix-darwin environment. | 24 | # Create /etc/zshrc that loads the nix-darwin environment. |
| 37 | programs = { | 25 | programs = { |
| 38 | gnupg.agent.enable = true; | 26 | gnupg.agent.enable = true; |
| ... | @@ -51,7 +39,7 @@ | ... | @@ -51,7 +39,7 @@ |
| 51 | 39 | ||
| 52 | # Used for backwards compatibility, please read the changelog before changing. | 40 | # Used for backwards compatibility, please read the changelog before changing. |
| 53 | # $ darwin-rebuild changelog | 41 | # $ darwin-rebuild changelog |
| 54 | system.stateVersion = 4; | 42 | system.stateVersion = 6; |
| 55 | 43 | ||
| 56 | # Install fonts | 44 | # Install fonts |
| 57 | fonts.packages = [ | 45 | fonts.packages = [ |
| ... | @@ -87,6 +75,7 @@ | ... | @@ -87,6 +75,7 @@ |
| 87 | "battle-net" | 75 | "battle-net" |
| 88 | "stremio" | 76 | "stremio" |
| 89 | "alt-tab" | 77 | "alt-tab" |
| 78 | "legcord" | ||
| 90 | ]; | 79 | ]; |
| 91 | 80 | ||
| 92 | masApps = { | 81 | masApps = { |
| ... | @@ -94,6 +83,12 @@ | ... | @@ -94,6 +83,12 @@ |
| 94 | }; | 83 | }; |
| 95 | }; | 84 | }; |
| 96 | 85 | ||
| 86 | security.pam.services.sudo_local = { | ||
| 87 | enable = true; | ||
| 88 | reattach = true; | ||
| 89 | touchIdAuth = true; | ||
| 90 | }; | ||
| 91 | |||
| 97 | # set some OSX preferences that I always end up hunting down and changing. | 92 | # set some OSX preferences that I always end up hunting down and changing. |
| 98 | system.defaults = { | 93 | system.defaults = { |
| 99 | # minimal dock | 94 | # minimal dock |
hosts/laptop/home.nix-4
| ... | @@ -18,10 +18,6 @@ | ... | @@ -18,10 +18,6 @@ |
| 18 | # release notes. | 18 | # release notes. |
| 19 | home.stateVersion = "23.05"; # Please read the comment before changing. | 19 | home.stateVersion = "23.05"; # Please read the comment before changing. |
| 20 | 20 | ||
| 21 | nixpkgs.config = { | ||
| 22 | allowUnfree = true; | ||
| 23 | }; | ||
| 24 | |||
| 25 | home.packages = pkgs.callPackage ../shared/packages.nix {}; | 21 | home.packages = pkgs.callPackage ../shared/packages.nix {}; |
| 26 | 22 | ||
| 27 | programs = import ../shared/home-programs.nix {inherit config pkgs lib;}; | 23 | programs = import ../shared/home-programs.nix {inherit config pkgs lib;}; |
hosts/shared/packages.nix+7-32
| ... | @@ -13,22 +13,25 @@ with pkgs; [ | ... | @@ -13,22 +13,25 @@ with pkgs; [ |
| 13 | unzip | 13 | unzip |
| 14 | clang | 14 | clang |
| 15 | 15 | ||
| 16 | #virtualization | ||
| 17 | qemu | ||
| 18 | podman | ||
| 19 | docker | ||
| 20 | |||
| 16 | #productivity | 21 | #productivity |
| 17 | glance | 22 | glance |
| 18 | wofi | ||
| 19 | anki-bin | 23 | anki-bin |
| 20 | tailscale | 24 | tailscale |
| 25 | openconnect | ||
| 26 | wireguard-tools | ||
| 21 | 27 | ||
| 22 | #nix tools | 28 | #nix tools |
| 23 | cachix | 29 | cachix |
| 24 | direnv | 30 | direnv |
| 25 | comma | 31 | comma |
| 26 | nh | 32 | nh |
| 27 | podman | ||
| 28 | docker | ||
| 29 | 33 | ||
| 30 | #terminal stuff | 34 | #terminal stuff |
| 31 | ghostty | ||
| 32 | (btop.override {cudaSupport = true;}) | 35 | (btop.override {cudaSupport = true;}) |
| 33 | tmux | 36 | tmux |
| 34 | zellij | 37 | zellij |
| ... | @@ -45,25 +48,11 @@ with pkgs; [ | ... | @@ -45,25 +48,11 @@ with pkgs; [ |
| 45 | ripgrep | 48 | ripgrep |
| 46 | file | 49 | file |
| 47 | fish | 50 | fish |
| 48 | ethtool | ||
| 49 | |||
| 50 | #linux tools | ||
| 51 | pavucontrol | ||
| 52 | grub2 | ||
| 53 | efibootmgr | ||
| 54 | distrobox | ||
| 55 | qemu | ||
| 56 | openconnect | ||
| 57 | wireguard-tools | ||
| 58 | xdg-desktop-portal-gtk | ||
| 59 | xclip | ||
| 60 | 51 | ||
| 61 | #image tools | 52 | #image tools |
| 62 | imagemagick | 53 | imagemagick |
| 63 | 54 | ||
| 64 | #chatting apps | 55 | #chatting apps |
| 65 | legcord | ||
| 66 | webcord | ||
| 67 | (discord.override { | 56 | (discord.override { |
| 68 | withMoonlight = true; | 57 | withMoonlight = true; |
| 69 | }) | 58 | }) |
| ... | @@ -71,10 +60,7 @@ with pkgs; [ | ... | @@ -71,10 +60,7 @@ with pkgs; [ |
| 71 | signal-desktop | 60 | signal-desktop |
| 72 | 61 | ||
| 73 | #media | 62 | #media |
| 74 | calibre | ||
| 75 | kdePackages.dolphin | ||
| 76 | spotify | 63 | spotify |
| 77 | stremio | ||
| 78 | qbittorrent | 64 | qbittorrent |
| 79 | mpv | 65 | mpv |
| 80 | 66 | ||
| ... | @@ -108,22 +94,11 @@ with pkgs; [ | ... | @@ -108,22 +94,11 @@ with pkgs; [ |
| 108 | R | 94 | R |
| 109 | deno | 95 | deno |
| 110 | ruby | 96 | ruby |
| 111 | julia | ||
| 112 | nodePackages.npm | 97 | nodePackages.npm |
| 113 | go | 98 | go |
| 114 | 99 | ||
| 115 | #gaming | 100 | #gaming |
| 116 | steam | ||
| 117 | bottles | ||
| 118 | path-of-building | ||
| 119 | lutris | ||
| 120 | wineWowPackages.stable | ||
| 121 | winetricks | ||
| 122 | dxvk_2 | ||
| 123 | mangohud | ||
| 124 | vulkan-tools | ||
| 125 | prismlauncher | 101 | prismlauncher |
| 126 | steam-run | ||
| 127 | 102 | ||
| 128 | #browsers | 103 | #browsers |
| 129 | tor | 104 | tor |