diff --git a/flake.lock b/flake.lock index adf77e6..f8c2060 100644 --- a/flake.lock +++ b/flake.lock @@ -249,6 +249,22 @@ "type": "github" } }, + "nixpkgs-old-fish": { + "locked": { + "lastModified": 1703624527, + "narHash": "sha256-e5XNMNJ2Z61MEnXeMbGkLqWr0FfgH3y5X+9nV15pJak=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c407032be28ca2236f45c49cfb2b8b3885294f7f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c407032be28ca2236f45c49cfb2b8b3885294f7f", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -305,6 +321,7 @@ "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", + "nixpkgs-old-fish": "nixpkgs-old-fish", "nixvim": "nixvim" } }, diff --git a/flake.nix b/flake.nix index 3ad361f..f6406b6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs-old-fish.url = "github:NixOS/nixpkgs/c407032be28ca2236f45c49cfb2b8b3885294f7f"; nix-darwin.url = "github:LnL7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; @@ -11,12 +12,13 @@ nixvim.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager, nixvim }: + outputs = inputs@{ self, nix-darwin, nixpkgs, nixpkgs-old-fish, home-manager, nixvim }: { darwinConfigurations."tid27880sperrau" = nix-darwin.lib.darwinSystem { modules = [ { system.configurationRevision = self.rev or self.dirtyRev or null; + programs.fish.package = nixpkgs-old-fish.legacyPackages.aarch64-darwin.fish; } ./nix-darwin ./nix-darwin/hosts/tid27880sperrau @@ -29,6 +31,7 @@ backupFileExtension = "before-home-manager"; extraSpecialArgs = { inherit nixvim; + inherit nixpkgs-old-fish; }; users.sperrault = import ./home-manager/users/sperrault.nix; }; diff --git a/home-manager/users/sperrault.nix b/home-manager/users/sperrault.nix index 569a964..39cf642 100644 --- a/home-manager/users/sperrault.nix +++ b/home-manager/users/sperrault.nix @@ -1,6 +1,7 @@ -{ ... }: +{ nixpkgs-old-fish, ... }: { imports = [ ../default.nix ]; + programs.fish.package = nixpkgs-old-fish.legacyPackages.aarch64-darwin.fish; home = { username = "sperrault"; homeDirectory = "/Users/sperrault"; diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix index 475709a..7695e6d 100644 --- a/nix-darwin/default.nix +++ b/nix-darwin/default.nix @@ -58,14 +58,18 @@ casks = [ "1password" "alfred" + "dash@6" "fantastical" "firefox" "font-atkinson-hyperlegible-next" + "font-maple-mono-nf" "ghostty" "karabiner-elements" "keepingyouawake" "obsidian" + "rectangle" "tailscale" + "unnaturalscrollwheels" ]; masApps = { diff --git a/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix b/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix index 674fda7..6c14007 100644 --- a/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix +++ b/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix @@ -3,9 +3,9 @@ system.defaults = { dock.persistent-apps = [ "/Applications/Firefox.app" + "/Applications/Things3.app" "/System/Applications/Mail.app" "/Applications/Fantastical.app" - "/Applications/Things3.app" "/System/Applications/Messages.app" "/Applications/Discord.app" "/Applications/Obsidian.app" diff --git a/nix-darwin/hosts/tid27880sperrau/default.nix b/nix-darwin/hosts/tid27880sperrau/default.nix index facb35d..95f61ff 100644 --- a/nix-darwin/hosts/tid27880sperrau/default.nix +++ b/nix-darwin/hosts/tid27880sperrau/default.nix @@ -1,4 +1,23 @@ -{ ... }: -{ +{ ... }: { + system.defaults = { + dock.persistent-apps = [ + "/Applications/Firefox.app" + "/Applications/Things3.app" + "/System/Applications/Mail.app" + "/Applications/Fantastical.app" + "/Applications/Microsoft Outlook.app" + "/Applications/Microsoft Teams.app" + "/Applications/Slack.app" + "/Applications/Obsidian.app" + "/Applications/Ghostty.app" + ]; + }; + homebrew = { + casks = [ + "discord" + "postico" + "slack" + ]; + }; }