Refactor
All checks were successful
/ check (push) Successful in 1m37s

This commit is contained in:
Oliver Davies 2025-07-09 08:00:00 +01:00
parent 45433358ff
commit 52821346ba
7 changed files with 51 additions and 96 deletions

View file

@ -9,11 +9,8 @@
direnv.enable = true; direnv.enable = true;
fzf.enable = true; fzf.enable = true;
git = { git.enable = true;
enable = true; git.user.emailAddress = "oliver.davies@tfw.wales";
user.emailAddress = "oliver.davies@tfw.wales";
};
node.enable = true; node.enable = true;
notes.enable = true; notes.enable = true;
@ -21,14 +18,11 @@
starship.enable = true; starship.enable = true;
tmux.enable = true; tmux.enable = true;
tmux-sessionizer = { tmux-sessionizer.enable = true;
enable = true; tmux-sessionizer.searchPaths = [
"${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}:2"
searchPaths = [ "${config.xdg.userDirs.documents}:1"
"${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}:2" ];
"${config.xdg.userDirs.documents}:1"
];
};
todos.enable = true; todos.enable = true;
zsh.enable = true; zsh.enable = true;

View file

@ -13,41 +13,32 @@
direnv.enable = true; direnv.enable = true;
fzf.enable = true; fzf.enable = true;
git = { git.enable = true;
enable = true; git.user.emailAddress = "oliver@oliverdavies.uk";
user.emailAddress = "oliver@oliverdavies.uk";
};
node.enable = true; node.enable = true;
notes = { notes.enable = true;
enable = true; notes.directory = "${config.xdg.userDirs.documents}/wiki/notes";
directory = "${config.xdg.userDirs.documents}/wiki/notes";
};
ranger.enable = true; ranger.enable = true;
sxhkd.enable = true; sxhkd.enable = true;
starship.enable = true; starship.enable = true;
tmux.enable = true; tmux.enable = true;
tmux-sessionizer = { tmux-sessionizer.enable = true;
enable = true;
enableDmenuIntegration = true;
searchPaths = tmux-sessionizer.searchPaths =
let let
inherit (config.xdg.userDirs) documents extraConfig; inherit (config.xdg.userDirs) documents extraConfig;
repos = extraConfig.XDG_REPOS_DIR; repos = extraConfig.XDG_REPOS_DIR;
in in
[ [
repos repos
"${repos}/*" "${repos}/*"
documents documents
]; ];
};
todos.enable = true; todos.enable = true;
zsh.enable = true; zsh.enable = true;
@ -62,11 +53,8 @@
browsers = { browsers = {
chromium.enable = true; chromium.enable = true;
firefox = { firefox.enable = true;
enable = true; firefox.homepageUrl = "https://nixedo.oliverdavies.uk";
homepageUrl = "https://nixedo.oliverdavies.uk";
};
qutebrowser.enable = true; qutebrowser.enable = true;
}; };

View file

@ -15,13 +15,10 @@
cli = { cli = {
docker.enable = true; docker.enable = true;
password-store = { password-store.enable = true;
enable = true; password-store.extensions = with pkgs.passExtensions; [
pass-otp
extensions = with pkgs.passExtensions; [ ];
pass-otp
];
};
}; };
}; };

View file

@ -32,15 +32,11 @@
# Bootloader. # Bootloader.
boot = { boot = {
loader = { loader = {
systemd-boot = { efi.canTouchEfiVariables = true;
enable = true; efi.efiSysMountPoint = "/boot/efi";
configurationLimit = 25;
};
efi = { systemd-boot.enable = true;
canTouchEfiVariables = true; systemd-boot.configurationLimit = 25;
efiSysMountPoint = "/boot/efi";
};
}; };
}; };

View file

@ -33,10 +33,7 @@
services.logind.lidSwitchExternalPower = "ignore"; services.logind.lidSwitchExternalPower = "ignore";
boot.loader = { boot.loader = {
efi = { efi.canTouchEfiVariables = true;
canTouchEfiVariables = true;
};
systemd-boot.enable = true; systemd-boot.enable = true;
}; };

View file

@ -21,23 +21,17 @@
features = { features = {
cli = { cli = {
kanata = { kanata.enable = true;
enable = true; kanata.devices = [
"/dev/input/by-path/platform-i8042-serio-0-event-kbd"
];
devices = [ password-store.enable = true;
"/dev/input/by-path/platform-i8042-serio-0-event-kbd" password-store.extensions = with pkgs.passExtensions; [
]; pass-audit
}; pass-otp
pass-update
password-store = { ];
enable = true;
extensions = with pkgs.passExtensions; [
pass-audit
pass-otp
pass-update
];
};
}; };
core = { core = {
@ -73,14 +67,10 @@
boot = { boot = {
loader = { loader = {
systemd-boot = { systemd-boot.enable = true;
enable = true; systemd-boot.configurationLimit = 10;
configurationLimit = 10;
};
efi = { efi.canTouchEfiVariables = true;
canTouchEfiVariables = true;
};
}; };
}; };

View file

@ -17,11 +17,8 @@
]; ];
features = { features = {
core = { core.bluetooth.enable = true;
bluetooth.enable = true; core.zram.enable = true;
zram.enable = true;
};
desktop.dconf.enable = true; desktop.dconf.enable = true;
}; };
@ -29,14 +26,10 @@
boot = { boot = {
loader = { loader = {
systemd-boot = { efi.canTouchEfiVariables = true;
enable = true;
configurationLimit = 10;
};
efi = { systemd-boot.enable = true;
canTouchEfiVariables = true; systemd-boot.configurationLimit = 10;
};
}; };
}; };