nix/flake.nix

@@ -20,7 +20,7 @@
   outputs = { self, nixpkgs, home-manager, dotfiles, darwin }: {
     darwinConfigurations."alymac" = darwin.lib.darwinSystem {
       system = "x86_64-darwin";
-      specialArgs = { inherit self; inherit dotfiles; };
+      specialArgs = { inherit dotfiles; };
       modules = [
         home-manager.darwinModules.home-manager
         ./hosts/alymac/default.nix

nix/hosts/alymac/default.nix

@@ -1,4 +1,4 @@
-{ self, pkgs, lib, dotfiles, ... }:
+{ pkgs, lib, dotfiles, ... }:
 
 with lib;
 let
@@ -79,7 +79,6 @@ let
 
     fonts = [
       nerdfonts
-      ibm-plex
     ];
 
     python = with python311Packages; [
@@ -178,7 +177,7 @@ in
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = { inherit self; inherit dotfiles; };
+    extraSpecialArgs = { inherit dotfiles; };
     users.alyxia = { pkgs, ... }: {
       # Defined further above, generates a list of files to import.
       imports = validFiles ./.;
@@ -210,6 +209,7 @@ in
 
     taps = [
       "drud/ddev"
+      "homebrew/cask"
       "homebrew/cask-versions"
       "int128/kubelogin"
     ];
@@ -220,17 +220,13 @@ in
       "composer"
       "croc"
       "ddev"
-      "deno"
       "dotnet"
-      "ferium"
       "gradle"
       "kubelogin"
       "mkcert"
       "nss"
       "pinentry-mac"
       "pkg-config"
-      "poetry"
-      "rustup"
       "sdl2"
 
       # Fyra crap, but from Homebrew because someone doesn't know how to
@@ -263,7 +259,6 @@ in
       "itch"
       "iterm2"
       "lens"
-      "minecraft"
       "obs"
       "orbstack"
       "phpstorm"

nix/hosts/alymac/nvim.nix

@@ -1,11 +1,11 @@
-{ self, pkgs, ... }:
+{ pkgs, dotfiles, ... }:
 
 {
   programs.neovim = {
     enable = true;
     package = pkgs.neovim-unwrapped;
 
-    extraConfig = ''source ~/.dotfiles/nvim/init.vim"source ${self}/nvim/init.vim'';
+    extraConfig = "source ${dotfiles}/nvim/init.vim";
 
     coc = {
       enable = true;

nix/hosts/alymac/zsh.nix

@@ -1,12 +1,11 @@
-{ self, ... }:
+{ dotfiles, ... }:
 
 {
   programs.zsh = {
     enable = true;
     initExtra = ''
       export GPG_TTY=$(tty)
-      source ~/.dotfiles/zsh/zshrc #source ${self}/zsh/zshrc
-      source "$HOME/.cargo/env"
+      source ${dotfiles}/zsh/zshrc
 
       [[ -d "$HOME/.local/bin" ]] || mkdir "$HOME/.local/bin"