make config work on macos

flake.nix

@@ -109,7 +109,6 @@
       "Natalies-MacBook-Air" = darwin.lib.darwinSystem {
         system = "aarch64-darwin";
         modules = [
-          # nh_darwin.nixDarwinModules.default
           {nixpkgs.overlays = overlays;}
           ./hosts/laptop/configuration.nix
           home-manager.darwinModules.home-manager
@@ -126,17 +125,9 @@
           }
         ];
         specialArgs = {
-          inherit nh_darwin;
           inherit inputs;
         };
       };
     };
-
-    # darwinPackages = self.darwinConfigurations."Natalie-MacBook-Air".pkgs;
-    # nixos = inputs.self.nixosConfigurations.nmarks;
-    #
-    #
-    # nmarks = inputs.self.nixosConfigurations.nmarks.config.system.build.toplevel;
-    # defaultPackage.x86_64-linux = inputs.self.nixosConfigurations.laptoptop.config.system.build.toplevel;
   };
 }

hosts/desktop/configuration.nix

@@ -276,6 +276,8 @@
     packages = with pkgs; [
       firefox
       vim
+      steam
+
       #  thunderbird
     ];
   };

hosts/desktop/home.nix

@@ -26,6 +26,38 @@ in {
       shared-packages = import ../shared/packages.nix {inherit pkgs;};
     in
       shared-packages
+      ++ [
+        #building macos apps hard :(
+        ghostty
+        stremio
+        julia
+
+        #gaming
+        bottles
+        lutris
+        mangohud
+        dxvk_2
+        steam-run
+        vulkan-tools
+        path-of-building
+        wineWowPackages.stable
+        winetricks
+
+        #window manager stuff
+        wofi
+        #linux tools
+        legcord
+        pavucontrol
+        ethtool
+        grub2
+        efibootmgr
+        distrobox
+        xdg-desktop-portal-gtk
+        xclip
+        kdePackages.dolphin
+        #broken on macos
+        calibre
+      ]
       ++ [
         zls.packages.x86_64-linux.zls
         rust-bin.stable.latest.default
@@ -43,5 +75,4 @@ in {
   programs = shared-programs;
 
   xdg.mimeApps.defaultApplications."inode/directory" = "dolphin.desktop";
-
 }

hosts/laptop/configuration.nix

@@ -3,23 +3,13 @@
   pkgs,
   ...
 }: {
-  # nixpkgs.overlays = [
-  #   (final: prev: {nh-darwin = nh_darwin.packages.${prev.system}.default;})
-  # ];
-  # environment.shellAliases.nh = "nh_darwin";
-
-  # programs.nh = {
-  #   enable = true;
-  #   clean.enable = true;
-  #   clean.extraArgs = "--keep-since 4d --keep 3";
-  #   flake = "/Users/nmarks/.dotfiles";
-  # };
-
   environment.systemPackages = [
     pkgs.home-manager
     pkgs.neovim
   ];
 
+  nixpkgs.config.allowUnfree = true;
+
   # Use a custom configuration.nix location.
   #environment.darwinConfig = "$HOME/.dotfiles/hosts/laptop";
 
@@ -31,8 +21,6 @@
     };
   };
 
-  nixpkgs.config.allowUnfree = true;
-
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs = {
     gnupg.agent.enable = true;
@@ -51,7 +39,7 @@
 
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
-  system.stateVersion = 4;
+  system.stateVersion = 6;
 
   # Install fonts
   fonts.packages = [
@@ -87,6 +75,7 @@
       "battle-net"
       "stremio"
       "alt-tab"
+      "legcord"
     ];
 
     masApps = {
@@ -94,6 +83,12 @@
     };
   };
 
+  security.pam.services.sudo_local = {
+    enable = true;
+    reattach = true;
+    touchIdAuth = true;
+  };
+
   # set some OSX preferences that I always end up hunting down and changing.
   system.defaults = {
     # minimal dock

hosts/laptop/home.nix

@@ -18,10 +18,6 @@
   # release notes.
   home.stateVersion = "23.05"; # Please read the comment before changing.
 
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
-
   home.packages = pkgs.callPackage ../shared/packages.nix {};
 
   programs = import ../shared/home-programs.nix {inherit config pkgs lib;};

hosts/shared/packages.nix

@@ -13,22 +13,25 @@ with pkgs; [
   unzip
   clang
 
+  #virtualization
+  qemu
+  podman
+  docker
+
   #productivity
   glance
-  wofi
   anki-bin
   tailscale
+  openconnect
+  wireguard-tools
 
   #nix tools
   cachix
   direnv
   comma
   nh
-  podman
-  docker
 
   #terminal stuff
-  ghostty
   (btop.override {cudaSupport = true;})
   tmux
   zellij
@@ -45,25 +48,11 @@ with pkgs; [
   ripgrep
   file
   fish
-  ethtool
-
-  #linux tools
-  pavucontrol
-  grub2
-  efibootmgr
-  distrobox
-  qemu
-  openconnect
-  wireguard-tools
-  xdg-desktop-portal-gtk
-  xclip
 
   #image tools
   imagemagick
 
   #chatting apps
-  legcord
-  webcord
   (discord.override {
     withMoonlight = true;
   })
@@ -71,10 +60,7 @@ with pkgs; [
   signal-desktop
 
   #media
-  calibre
-  kdePackages.dolphin
   spotify
-  stremio
   qbittorrent
   mpv
 
@@ -108,22 +94,11 @@ with pkgs; [
   R
   deno
   ruby
-  julia
   nodePackages.npm
   go
 
   #gaming
-  steam
-  bottles
-  path-of-building
-  lutris
-  wineWowPackages.stable
-  winetricks
-  dxvk_2
-  mangohud
-  vulkan-tools
   prismlauncher
-  steam-run
 
   #browsers
   tor