updates for work machine, uses older version of fish
there is some sort of weird incompatibility with newer versions of fish, tmux, vim-tmux-navigator, and my work machine. downgrading fish fixed the issue.
This commit is contained in:
parent
75a323c5c1
commit
be3150c1dd
6 changed files with 49 additions and 5 deletions
17
flake.lock
17
flake.lock
|
@ -249,6 +249,22 @@
|
||||||
"type": "github"
|
"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": {
|
"nixvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"devshell": "devshell",
|
"devshell": "devshell",
|
||||||
|
@ -305,6 +321,7 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
|
"nixpkgs-old-fish": "nixpkgs-old-fish",
|
||||||
"nixvim": "nixvim"
|
"nixvim": "nixvim"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
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.url = "github:LnL7/nix-darwin/master";
|
||||||
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
|
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
|
@ -11,12 +12,13 @@
|
||||||
nixvim.inputs.nixpkgs.follows = "nixpkgs";
|
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 {
|
darwinConfigurations."tid27880sperrau" = nix-darwin.lib.darwinSystem {
|
||||||
modules = [
|
modules = [
|
||||||
{
|
{
|
||||||
system.configurationRevision = self.rev or self.dirtyRev or null;
|
system.configurationRevision = self.rev or self.dirtyRev or null;
|
||||||
|
programs.fish.package = nixpkgs-old-fish.legacyPackages.aarch64-darwin.fish;
|
||||||
}
|
}
|
||||||
./nix-darwin
|
./nix-darwin
|
||||||
./nix-darwin/hosts/tid27880sperrau
|
./nix-darwin/hosts/tid27880sperrau
|
||||||
|
@ -29,6 +31,7 @@
|
||||||
backupFileExtension = "before-home-manager";
|
backupFileExtension = "before-home-manager";
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit nixvim;
|
inherit nixvim;
|
||||||
|
inherit nixpkgs-old-fish;
|
||||||
};
|
};
|
||||||
users.sperrault = import ./home-manager/users/sperrault.nix;
|
users.sperrault = import ./home-manager/users/sperrault.nix;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ ... }:
|
{ nixpkgs-old-fish, ... }:
|
||||||
{
|
{
|
||||||
imports = [ ../default.nix ];
|
imports = [ ../default.nix ];
|
||||||
|
programs.fish.package = nixpkgs-old-fish.legacyPackages.aarch64-darwin.fish;
|
||||||
home = {
|
home = {
|
||||||
username = "sperrault";
|
username = "sperrault";
|
||||||
homeDirectory = "/Users/sperrault";
|
homeDirectory = "/Users/sperrault";
|
||||||
|
|
|
@ -58,14 +58,18 @@
|
||||||
casks = [
|
casks = [
|
||||||
"1password"
|
"1password"
|
||||||
"alfred"
|
"alfred"
|
||||||
|
"dash@6"
|
||||||
"fantastical"
|
"fantastical"
|
||||||
"firefox"
|
"firefox"
|
||||||
"font-atkinson-hyperlegible-next"
|
"font-atkinson-hyperlegible-next"
|
||||||
|
"font-maple-mono-nf"
|
||||||
"ghostty"
|
"ghostty"
|
||||||
"karabiner-elements"
|
"karabiner-elements"
|
||||||
"keepingyouawake"
|
"keepingyouawake"
|
||||||
"obsidian"
|
"obsidian"
|
||||||
|
"rectangle"
|
||||||
"tailscale"
|
"tailscale"
|
||||||
|
"unnaturalscrollwheels"
|
||||||
];
|
];
|
||||||
|
|
||||||
masApps = {
|
masApps = {
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
system.defaults = {
|
system.defaults = {
|
||||||
dock.persistent-apps = [
|
dock.persistent-apps = [
|
||||||
"/Applications/Firefox.app"
|
"/Applications/Firefox.app"
|
||||||
|
"/Applications/Things3.app"
|
||||||
"/System/Applications/Mail.app"
|
"/System/Applications/Mail.app"
|
||||||
"/Applications/Fantastical.app"
|
"/Applications/Fantastical.app"
|
||||||
"/Applications/Things3.app"
|
|
||||||
"/System/Applications/Messages.app"
|
"/System/Applications/Messages.app"
|
||||||
"/Applications/Discord.app"
|
"/Applications/Discord.app"
|
||||||
"/Applications/Obsidian.app"
|
"/Applications/Obsidian.app"
|
||||||
|
|
|
@ -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"
|
||||||
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue