Compare commits

..

No commits in common. "5def708423e174acc902e5f14526e6d65099dcc5" and "321b85242f00da104517d3eb8ca5a7d6c6443446" have entirely different histories.

6 changed files with 34 additions and 8 deletions

6
flake.lock generated
View file

@ -296,11 +296,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712791164, "lastModified": 1712608508,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -152,8 +152,6 @@
./hosts/iso ./hosts/iso
./shared/vim.nix ./shared/vim.nix
./shared/tmux.nix ./shared/tmux.nix
./shared/zsh.nix
nix-index-database.nixosModules.nix-index
]; ];
}; };
}; };

View file

@ -2,6 +2,7 @@
{ {
imports = [ imports = [
"${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
./zsh.nix
]; ];
console = { console = {

27
hosts/iso/zsh.nix Normal file
View file

@ -0,0 +1,27 @@
{ pkgs, ... }:
{
programs.command-not-found.enable = false;
users.defaultUserShell = pkgs.zsh;
programs.fzf = {
fuzzyCompletion = true;
keybindings = true;
};
programs.zsh = {
enable = true;
autosuggestions = {
enable = true;
highlightStyle = "fg=#00bbbb,bold";
};
ohMyZsh = {
enable = true;
theme = "risto";
};
shellInit =
''
source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
zsh-newuser-install () {}
'';
};
}

View file

@ -12,11 +12,11 @@
substituters = [ substituters = [
"https://cache.rfive.de" "https://cache.rfive.de"
# temp disabled until logging error is resolved # temp disabled until logging error is resolved
"https://cache.ifsr.de" # "https://cache.ifsr.de"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw=" "cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw="
"cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg=" # "cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg="
]; ];
}; };
}; };

View file

@ -43,8 +43,8 @@
export MCFLY_RESULTS=30 export MCFLY_RESULTS=30
export MCFLY_INTERFACE_VIEW=BOTTOM export MCFLY_INTERFACE_VIEW=BOTTOM
export MCFLY_PROMPT="" export MCFLY_PROMPT=""
source ${pkgs.agdsn-zsh-config}/etc/zsh/zshrc
source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
source ${pkgs.agdsn-zsh-config}/etc/zsh/zshrc
unsetopt extendedglob unsetopt extendedglob