Update to NixOS 23.05

This commit is contained in:
Paul-Henri Froidmont 2023-06-10 09:50:14 +02:00
parent 16bb0930b4
commit 1e9eabe6af
Signed by: phfroidmont
GPG key ID: BE948AFD7E7873BE
7 changed files with 154 additions and 117 deletions

View file

@ -31,16 +31,16 @@ in {
displayManager.lightdm = {
enable = true;
background = ../wallpaper.png;
greeters.mini = {
enable = true;
user = config.user.name;
extraConfig = ''
text-color = "#fbf1c7"
password-background-color = "#3c3836"
window-color = "#282828"
border-color = "#458588"
'';
};
#greeters.mini = {
# enable = true;
# user = config.user.name;
# extraConfig = ''
# text-color = "#fbf1c7"
# password-background-color = "#3c3836"
# window-color = "#282828"
# border-color = "#458588"
# '';
#};
};
};

View file

@ -4,68 +4,60 @@ with lib;
with lib.my;
let cfg = config.modules.desktop.zsh;
in {
options.modules.desktop.zsh = {
enable = mkBoolOpt false;
};
options.modules.desktop.zsh = { enable = mkBoolOpt false; };
config = mkIf cfg.enable {
environment.pathsToLink = [ "/share/zsh" ];
programs.zsh.enable = true;
users.users.${config.user.name} = {
shell = pkgs.zsh;
};
users.users.${config.user.name} = { shell = pkgs.zsh; };
home-manager.users.${config.user.name} = {
programs.zsh =
{
enable = true;
history = {
save = 50000;
size = 50000;
};
enableCompletion = true;
enableAutosuggestions = true;
enableSyntaxHighlighting = true;
initExtra = ''
source ${./p10k.zsh}
autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
zle -N up-line-or-beginning-search
zle -N down-line-or-beginning-search
[[ -n "$key[Up]" ]] && bindkey -- "$key[Up]" up-line-or-beginning-search
[[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
eval $(${pkgs.thefuck}/bin/thefuck --alias)
'';
oh-my-zsh = {
enable = true;
plugins = [
"git"
"terraform"
"systemd"
];
};
plugins = [
{
name = "powerlevel10k";
src = pkgs.zsh-powerlevel10k;
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
}
{
name = "powerlevel10k-config";
src = ./p10k.zsh;
}
{
name = "nix-zsh-completions";
src = pkgs.nix-zsh-completions;
}
{
name = "zsh-completions";
src = pkgs.zsh-completions;
}
];
programs.zsh = {
enable = true;
history = {
save = 50000;
size = 50000;
};
enableCompletion = true;
enableAutosuggestions = true;
enableSyntaxHighlighting = true;
initExtra = ''
source ${./p10k.zsh}
autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
zle -N up-line-or-beginning-search
zle -N down-line-or-beginning-search
[[ -n "$key[Up]" ]] && bindkey -- "$key[Up]" up-line-or-beginning-search
[[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
eval $(${pkgs.thefuck}/bin/thefuck --alias)
'';
oh-my-zsh = {
enable = true;
plugins = [ "git" "terraform" "systemd" ];
};
plugins = [
{
name = "powerlevel10k";
src = pkgs.zsh-powerlevel10k;
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
}
{
name = "powerlevel10k-config";
src = ./p10k.zsh;
}
{
name = "nix-zsh-completions";
src = pkgs.nix-zsh-completions;
}
{
name = "zsh-completions";
src = pkgs.zsh-completions;
}
];
};
};
};
}

View file

@ -11,10 +11,10 @@
# tmpfs = /tmp is mounted in ram. Doing so makes temp file management speedy
# on ssd systems, and volatile! Because it's wiped on reboot.
boot.tmpOnTmpfs = lib.mkDefault true;
boot.tmp.useTmpfs = lib.mkDefault true;
# If not using tmpfs, which is naturally purged on reboot, we must clean it
# /tmp ourselves. /tmp should be volatile storage!
boot.cleanTmpDir = lib.mkDefault (!config.boot.tmpOnTmpfs);
boot.tmp.cleanOnBoot = lib.mkDefault (!config.boot.tmpOnTmpfs);
# Fix a security hole in place for backwards compatibility. See desc in
# nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix