Replace zsh with fish

Install nix-index and nix-index-database
Update flake inputs
This commit is contained in:
Pim Kunis 2024-09-24 22:19:37 +02:00
parent 5d675cbaad
commit f115729b24
3 changed files with 69 additions and 36 deletions

View file

@ -154,11 +154,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726730453, "lastModified": 1726775926,
"narHash": "sha256-Kdi7liMdbr1/uyMhMDl19O5b9LESxcnYgBRZblrJi9E=", "narHash": "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "a31fe5ef162f2f963308289e6e27d37e3948a983", "rev": "624fd86460e482017ed9c3c3c55a3758c06a4e7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -362,6 +362,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1726449931,
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixos-artwork": { "nixos-artwork": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -476,11 +496,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1726764615, "lastModified": 1726775124,
"narHash": "sha256-8cVUZZd9Z/bT0JIQy/hOPta2nhZjT2b6xW7xZhFMh1M=", "narHash": "sha256-10CcmbM/IoMRUDDg9K3ptHNsMUSjpDB//hYc8s/K9cM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "4cec60b7d77b33f845c35fcd222376c0ea866a77", "rev": "b8f61a42e5068cb93fac8a0267b4d4e88118bae4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -525,6 +545,7 @@
"disko": "disko", "disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nix-index-database": "nix-index-database",
"nixos-artwork": "nixos-artwork", "nixos-artwork": "nixos-artwork",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@ -595,15 +616,15 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1718122552, "lastModified": 1726776484,
"narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", "narHash": "sha256-SPnk08RnllF8CD9Ndbe828Z1OmlviJ+ZJLsiT7V/+4A=",
"owner": "danth", "owner": "pizzapim",
"repo": "stylix", "repo": "stylix",
"rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "rev": "d444b97c5e691a2a468000c939119798e42b4f0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "pizzapim",
"ref": "release-24.05", "ref": "release-24.05",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"

View file

@ -6,7 +6,12 @@
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
stylix.url = "github:danth/stylix/release-24.05"; stylix.url = "github:pizzapim/stylix/release-24.05";
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager?ref=release-24.05"; url = "github:nix-community/home-manager?ref=release-24.05";

View file

@ -3,6 +3,7 @@
./modules/home-manager/neovim ./modules/home-manager/neovim
./modules/home-manager/firefox ./modules/home-manager/firefox
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
inputs.nix-index-database.hmModules.nix-index
]; ];
xsession.enable = true; xsession.enable = true;
@ -152,6 +153,7 @@
atuin = { atuin = {
enable = true; enable = true;
flags = [ "--disable-up-arrow" ]; flags = [ "--disable-up-arrow" ];
enableFishIntegration = true;
settings = { settings = {
auto_sync = true; auto_sync = true;
@ -160,38 +162,43 @@
}; };
}; };
zsh = { fish = {
enable = true; enable = true;
autocd = true;
autosuggestion.enable = true;
prezto = { interactiveShellInit = ''
enable = true; set -U fish_greeting
utility.safeOps = false; '';
shellAbbrs = {
htop = "btop";
gp = "git push";
gco = "git checkout";
gd = "git diff";
gc = "git commit";
gpl = "git pull";
gb = "git branch";
ga = "git add";
gl = "git log";
gs = "git status";
tf = "tofu";
};
}; };
shellAliases = starship = {
let enable = true;
gitExe = lib.getExe config.programs.git.package; enableFishIntegration = true;
in enableTransience = true;
{ settings.nix_shell.heuristic = true;
htop = lib.getExe pkgs.btop;
gp = "${gitExe} push";
gco = "${gitExe} checkout";
gd = "${gitExe} diff";
gc = "${gitExe} commit";
gpl = "${gitExe} pull";
gb = "${gitExe} branch";
ga = "${gitExe} add";
gl = "${gitExe} log";
gs = "${gitExe} status";
tf = lib.getExe pkgs.opentofu;
}; };
nix-index = {
enable = true;
enableFishIntegration = true;
}; };
tmux = { tmux = {
enable = true; enable = true;
shell = lib.getExe config.programs.zsh.package; shell = lib.getExe config.programs.fish.package;
shortcut = "a"; shortcut = "a";
clock24 = true; clock24 = true;
newSession = true; newSession = true;