wurzel/fruitbasket
9
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #69 from fsr/zsh-improvements

Browse source 
add agdsn zsh config and comma
This commit is contained in:
Rouven Seifert 2023-09-20 08:26:21 +02:00 committed by GitHub
parent da97f9e750 06ec7d6e32
commit d1da869558
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
flake.lock
View file

@ -78,6 +78,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1694921880,
"narHash": "sha256-yU36cs5UdzhTwsM9bUWUz43N//ELzQ1ro69C07pU/8E=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "9d2bcc47110b3b6217dfebd6761ba20bc78aedf2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694937365, "lastModified": 1694937365,
@ -96,11 +116,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1693675694, "lastModified": 1694908564,
"narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=", "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d", "rev": "596611941a74be176b98aeba9328aa9d01b8b322",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,6 +156,7 @@
"inputs": { "inputs": {
"course-management": "course-management", "course-management": "course-management",
"kpp": "kpp", "kpp": "kpp",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
@ -148,11 +169,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1694495315, "lastModified": 1695101768,
"narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=", "narHash": "sha256-1/j5/348l2+yxQUfkJCUpA6cDefS3H7V94kawk9uuRc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415", "rev": "4356a5a0c12c9dc1b6bdde0631c7600d9377ed8b",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -3,6 +3,8 @@
nixpkgs.url = github:nixos/nixpkgs/nixos-23.05; nixpkgs.url = github:nixos/nixpkgs/nixos-23.05;
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = github:Mic92/sops-nix;
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
kpp.url = "github:fsr/kpp"; kpp.url = "github:fsr/kpp";
kpp.inputs.nixpkgs.follows = "nixpkgs"; kpp.inputs.nixpkgs.follows = "nixpkgs";
course-management = { course-management = {
@ -10,7 +12,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, sops-nix, kpp, course-management, ... }@inputs: outputs = { self, nixpkgs, sops-nix, nix-index-database, kpp, course-management, ... }@inputs:
{ {
packages."x86_64-linux".quitte = self.nixosConfigurations.quitte.config.system.build.toplevel; packages."x86_64-linux".quitte = self.nixosConfigurations.quitte.config.system.build.toplevel;
packages."x86_64-linux".default = self.packages."x86_64-linux".quitte; packages."x86_64-linux".default = self.packages."x86_64-linux".quitte;
@ -23,6 +25,7 @@
modules = [ modules = [
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.kpp.nixosModules.default inputs.kpp.nixosModules.default
inputs.nix-index-database.nixosModules.nix-index
course-management.nixosModules.default course-management.nixosModules.default
./hosts/quitte/configuration.nix ./hosts/quitte/configuration.nix
./modules/bacula.nix ./modules/bacula.nix

18
modules/zsh.nix
View file

@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.command-not-found.enable = false;
programs.nix-index-database.comma.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# fzf # fzf
bat bat
duf duf
]; ];
users.defaultUserShell = pkgs.zsh;
programs.fzf = { programs.fzf = {
fuzzyCompletion = true;
keybindings = true; keybindings = true;
}; };
programs.zsh = { programs.zsh = {
@ -25,12 +25,14 @@
highlightStyle = "fg=#00bbbb,bold"; highlightStyle = "fg=#00bbbb,bold";
}; };
shellInit = shellInit = ''
'' zsh-newuser-install () {}
source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh '';
interactiveShellInit = ''
zsh-newuser-install () {} source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
''; source ${pkgs.agdsn-zsh-config}/etc/zsh/zshrc
'';
promptInit = "";
}; };
} }