opdavies/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-add the features config prefix

Browse source
This commit is contained in:
Oliver Davies 2025-07-09 08:00:00 +01:00
parent 34cb9db3d4
commit 45433358ff
50 changed files with 245 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home-manager/opdavies/PW05CH3L.nix
View file

@ -3,6 +3,7 @@
{
imports = [ ../common ];
features = {
cli = {
bookmarkthis.enable = true;
direnv.enable = true;
@ -37,6 +38,7 @@
neovim.enable = true;
phpactor.enable = true;
};
};
xdg.configFile."pam-gnupg".text = ''
C0D940F9A390F286FCAAE8439D501171E39D0A47

2
home-manager/opdavies/lemp11.nix
View file

@ -1,6 +1,7 @@
{
imports = [ ../common ];
features = {
cli.zsh.enable = true;
desktop.media = {
@ -8,4 +9,5 @@
makemkv.enable = true;
mpv.enable = true;
};
};
}

2
home-manager/opdavies/nixedo.nix
View file

@ -5,7 +5,7 @@
./nixedo/email-filters.nix
];
cli = {
features.cli = {
fzf.enable = true;
starship.enable = true;
zsh.enable = true;

4
home-manager/opdavies/t480.nix
View file

@ -6,6 +6,7 @@
./t480/gammastep.nix
];
features = {
cli = {
bluetuith.enable = true;
bookmarkthis.enable = true;
@ -78,8 +79,7 @@
makemkv.enable = true;
mpv.enable = true;
};
# redshift.enable = true;
};
};
programs = {

2
hosts/PW05CH3L/configuration.nix
View file

@ -11,6 +11,7 @@
../../users/opdavies.nix
];
features = {
cli = {
docker.enable = true;
@ -22,6 +23,7 @@
];
};
};
};
wsl = {
enable = true;

2
hosts/lemp11/configuration.nix
View file

@ -18,12 +18,14 @@
../../users/eric.nix
];
features = {
core = {
bluetooth.enable = true;
zram.enable = true;
};
desktop.media.makemkv.enable = true;
};
nixpad.enable = true;

2
hosts/nixedo/configuration.nix
View file

@ -19,9 +19,11 @@
../../users/opdavies.nix
];
features = {
core.openssh.enable = true;
cli.podman.enable = true;
desktop.dconf.enable = true;
};
# TODO: why didn't it work when adding this to jitsi.nix?
nixpkgs.config.permittedInsecurePackages = [

2
hosts/t480/configuration.nix
View file

@ -19,6 +19,7 @@
../../users/opdavies.nix
];
features = {
cli = {
kanata = {
enable = true;
@ -55,6 +56,7 @@
st.enable = true;
thunar.enable = true;
};
};
services = {
auto-cpufreq.enable = true;

2
hosts/t490/configuration.nix
View file

@ -16,12 +16,14 @@
../../users/opdavies.nix
];
features = {
core = {
bluetooth.enable = true;
zram.enable = true;
};
desktop.dconf.enable = true;
};
nixpad.enable = true;

4
modules/home-manager/cli/bluetuith.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.cli.bluetuith;
cfg = config.features.cli.bluetuith;
in
{
options.cli.bluetuith.enable = mkEnableOption "Enable bluetuith";
options.features.cli.bluetuith.enable = mkEnableOption "Enable bluetuith";
config = mkIf cfg.enable {
home.packages = with pkgs; [

4
modules/home-manager/cli/bookmarkthis.nix
View file

@ -8,11 +8,11 @@
let
inherit (lib) mkEnableOption mkOption;
cfg = config.cli.${name};
cfg = config.features.cli.${name};
name = "bookmarkthis";
in
{
options.cli.${name} = {
options.features.cli.${name} = {
enable = mkEnableOption "Enable ${name}";
snippetsFile = mkOption {

4
modules/home-manager/cli/direnv.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.cli.direnv;
cfg = config.features.cli.direnv;
in
{
options.cli.direnv.enable = mkEnableOption "Enable direnv";
options.features.cli.direnv.enable = mkEnableOption "Enable direnv";
config = mkIf cfg.enable {
programs.direnv = {

4
modules/home-manager/cli/fzf.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.cli.fzf;
cfg = config.features.cli.fzf;
in
{
options.cli.fzf.enable = mkEnableOption "Enable fzf";
options.features.cli.fzf.enable = mkEnableOption "Enable fzf";
config = mkIf cfg.enable {
programs.fzf = {

4
modules/home-manager/cli/git.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.cli.git;
cfg = config.features.cli.git;
in
{
options.cli.git = {
options.features.cli.git = {
enable = mkEnableOption "Enable git";
user = mkOption {

4
modules/home-manager/cli/node.nix
View file

@ -3,12 +3,12 @@
with lib;
let
cfg = config.cli.node;
cfg = config.features.cli.node;
inherit (config.xdg) configHome dataHome stateHome;
in
{
options.cli.node.enable = mkEnableOption "Enable node";
options.features.cli.node.enable = mkEnableOption "Enable node";
config = mkIf cfg.enable {
xdg.configFile."${config.home.sessionVariables.NPM_CONFIG_USERCONFIG}".text = ''

4
modules/home-manager/cli/notes.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.cli.notes;
cfg = config.features.cli.notes;
in
{
options.cli.notes = {
options.features.cli.notes = {
enable = mkEnableOption "Enable notes";
directory = mkOption {

4
modules/home-manager/cli/ranger.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.cli.ranger;
cfg = config.features.cli.ranger;
in
{
options.cli.ranger.enable = mkEnableOption "Enable ranger";
options.features.cli.ranger.enable = mkEnableOption "Enable ranger";
config = mkIf cfg.enable {
programs.ranger.enable = true;

4
modules/home-manager/cli/starship.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.cli.starship;
cfg = config.features.cli.starship;
in
{
options.cli.starship.enable = mkEnableOption "Enable starship";
options.features.cli.starship.enable = mkEnableOption "Enable starship";
config = mkIf cfg.enable {
programs.starship =

4
modules/home-manager/cli/sxhkd.nix
View file

@ -1,13 +1,13 @@
{ config, lib, pkgs, ... }:
let
cfg = config.cli.${service};
cfg = config.features.cli.${service};
service = "sxhkd";
inherit (lib) getExe mkIf mkEnableOption;
in
{
options.cli.${service} = {
options.features.cli.${service} = {
enable = mkEnableOption "Enable ${service}";
};

4
modules/home-manager/cli/tmux-sessionizer.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.cli.tmux-sessionizer;
cfg = config.features.cli.tmux-sessionizer;
in
{
options.cli.tmux-sessionizer = {
options.features.cli.tmux-sessionizer = {
enable = mkEnableOption "Enable tmux-sessionizer";
enableDmenuIntegration = mkEnableOption "Enable dmenu integration";

4
modules/home-manager/cli/tmux.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.cli.tmux;
cfg = config.features.cli.tmux;
in
{
options.cli.tmux.enable = mkEnableOption "Enable tmux";
options.features.cli.tmux.enable = mkEnableOption "Enable tmux";
config = mkIf cfg.enable {
programs.tmux = {

4
modules/home-manager/cli/todos.nix
View file

@ -7,12 +7,12 @@
let
name = "todos";
cfg = config.cli.${name};
cfg = config.features.cli.${name};
inherit (lib) mkOption types;
in
{
options.cli.${name} = {
options.features.cli.${name} = {
enable = lib.mkEnableOption "Enable ${name}";
directory = mkOption {

4
modules/home-manager/cli/zsh/default.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.cli.zsh;
cfg = config.features.cli.zsh;
in
{
options.cli.zsh.enable = mkEnableOption "Enable zsh";
options.features.cli.zsh.enable = mkEnableOption "Enable zsh";
config = mkIf cfg.enable {
programs.zsh = {

4
modules/home-manager/coding/neovim/default.nix
View file

@ -8,14 +8,14 @@
with lib;
let
cfg = config.coding.neovim;
cfg = config.features.coding.neovim;
in
{
imports = [
inputs.nixvim.homeManagerModules.nixvim
];
options.coding.neovim.enable = mkEnableOption "Enable neovim";
options.features.coding.neovim.enable = mkEnableOption "Enable neovim";
config = mkIf cfg.enable {
programs.nixvim = {

4
modules/home-manager/coding/phpactor/default.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.coding.phpactor;
cfg = config.features.coding.phpactor;
in
{
options.coding.phpactor.enable = mkEnableOption "Enable phpactor";
options.features.coding.phpactor.enable = mkEnableOption "Enable phpactor";
config = mkIf cfg.enable {
xdg.configFile.phpactor = {

4
modules/home-manager/desktop/browsers/chromium.nix
View file

@ -1,13 +1,13 @@
{ config, lib, ... }:
let
cfg = config.desktop.browsers.${name};
cfg = config.features.desktop.browsers.${name};
name = "chromium";
inherit (lib) mkEnableOption mkIf;
in
{
options.desktop.browsers.${name}.enable = mkEnableOption "Enable ${name}";
options.features.desktop.browsers.${name}.enable = mkEnableOption "Enable ${name}";
config = mkIf cfg.enable {
programs.${name}.enable = true;

4
modules/home-manager/desktop/browsers/firefox.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.desktop.browsers.firefox;
cfg = config.features.desktop.browsers.firefox;
in
{
options.desktop.browsers.firefox = {
options.features.desktop.browsers.firefox = {
enable = mkEnableOption "Enable firefox";
homepageUrl = mkOption {

4
modules/home-manager/desktop/browsers/qutebrowser.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.desktop.browsers.qutebrowser;
cfg = config.features.desktop.browsers.qutebrowser;
in
{
options.desktop.browsers.qutebrowser.enable =
options.features.desktop.browsers.qutebrowser.enable =
mkEnableOption "Enable qutebrowser";
config = mkIf cfg.enable {

4
modules/home-manager/desktop/flameshot.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.desktop.flameshot;
cfg = config.features.desktop.flameshot;
in
{
options.desktop.flameshot.enable = mkEnableOption "Enable flameshot";
options.features.desktop.flameshot.enable = mkEnableOption "Enable flameshot";
config = mkIf cfg.enable {
services.flameshot = {

4
modules/home-manager/desktop/gtk.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.desktop.gtk;
cfg = config.features.desktop.gtk;
in
{
options.desktop.gtk.enable = mkEnableOption "Enable gtk";
options.features.desktop.gtk.enable = mkEnableOption "Enable gtk";
config = mkIf cfg.enable {
gtk = with pkgs; {

4
modules/home-manager/desktop/media/handbrake.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.desktop.media.handbrake;
cfg = config.features.desktop.media.handbrake;
in
{
options.desktop.media.handbrake.enable = mkEnableOption "Enable handbrake";
options.features.desktop.media.handbrake.enable = mkEnableOption "Enable handbrake";
config = mkIf cfg.enable {
home.packages = with pkgs; [

4
modules/home-manager/desktop/media/makemkv.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.desktop.media.makemkv;
cfg = config.features.desktop.media.makemkv;
in
{
options.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
options.features.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
config = mkIf cfg.enable {
home.packages = with pkgs; [

4
modules/home-manager/desktop/media/mpv.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.desktop.media.mpv;
cfg = config.features.desktop.media.mpv;
in
{
options.desktop.media.mpv.enable = mkEnableOption "Enable mpv";
options.features.desktop.media.mpv.enable = mkEnableOption "Enable mpv";
config = mkIf cfg.enable {
programs.mpv = {

4
modules/home-manager/desktop/redshift.nix
View file

@ -1,12 +1,12 @@
{ config, lib, ... }:
let
cfg = config.desktop.redshift;
cfg = config.features.desktop.redshift;
inherit (lib) mkEnableOption mkIf;
in
{
options.desktop.redshift = {
options.features.desktop.redshift = {
enable = mkEnableOption "Enable redshift";
};

4
modules/nixos/cli/docker.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.cli.docker;
cfg = config.features.cli.docker;
in
{
options.cli.docker.enable = mkEnableOption "Enable docker";
options.features.cli.docker.enable = mkEnableOption "Enable docker";
config = mkIf cfg.enable {
virtualisation = {

4
modules/nixos/cli/kanata.nix
View file

@ -1,13 +1,13 @@
{ config, lib, ... }:
let
cfg = config.cli.${service};
cfg = config.features.cli.${service};
service = "kanata";
inherit (lib) mkEnableOption mkIf mkOption types;
in
{
options.cli.${service} = {
options.features.cli.${service} = {
enable = mkEnableOption "Enable ${service}";
devices = mkOption {

4
modules/nixos/cli/password-store.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.cli.password-store;
cfg = config.features.cli.password-store;
in
{
options.cli.password-store = {
options.features.cli.password-store = {
enable = mkEnableOption "Enable pass";
extensions = mkOption {

4
modules/nixos/cli/podman.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.cli.podman;
cfg = config.features.cli.podman;
in
{
options.cli.podman.enable = mkEnableOption "Enable podman";
options.features.cli.podman.enable = mkEnableOption "Enable podman";
config = mkIf cfg.enable {
virtualisation = {

4
modules/nixos/core/bluetooth.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.core.bluetooth;
cfg = config.features.core.bluetooth;
in
{
options.core.bluetooth.enable = mkEnableOption "Enable bluetooth";
options.features.core.bluetooth.enable = mkEnableOption "Enable bluetooth";
config = mkIf cfg.enable {
hardware.bluetooth.enable = true;

4
modules/nixos/core/openssh.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.core.openssh;
cfg = config.features.core.openssh;
in
{
options.core.openssh.enable = mkEnableOption "Enable openssh";
options.features.core.openssh.enable = mkEnableOption "Enable openssh";
config = mkIf cfg.enable {
services.openssh = {

4
modules/nixos/core/pipewire.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.core.pipewire;
cfg = config.features.core.pipewire;
in
{
options.core.pipewire.enable = mkEnableOption "Enable pipewire";
options.features.core.pipewire.enable = mkEnableOption "Enable pipewire";
config = mkIf cfg.enable {
services.pipewire = {

4
modules/nixos/core/xbanish.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.core.xbanish;
cfg = config.features.core.xbanish;
in
{
options.core.xbanish.enable = mkEnableOption "Enable xbanish";
options.features.core.xbanish.enable = mkEnableOption "Enable xbanish";
config = mkIf cfg.enable {
services.xbanish.enable = true;

4
modules/nixos/core/zram.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.core.zram;
cfg = config.features.core.zram;
in
{
options.core.zram.enable = mkEnableOption "Enable zram";
options.features.core.zram.enable = mkEnableOption "Enable zram";
config = mkIf cfg.enable {
zramSwap = {

4
modules/nixos/desktop/dconf.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.desktop.dconf;
cfg = config.features.desktop.dconf;
in
{
options.desktop.dconf.enable = mkEnableOption "Enable dconf";
options.features.desktop.dconf.enable = mkEnableOption "Enable dconf";
config = mkIf cfg.enable {
programs.dconf.enable = true;

4
modules/nixos/desktop/dwm/default.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.desktop.dwm;
cfg = config.features.desktop.dwm;
in
{
options.desktop.dwm.enable = mkEnableOption "Enable dwm";
options.features.desktop.dwm.enable = mkEnableOption "Enable dwm";
config = mkIf cfg.enable {
services = {

4
modules/nixos/desktop/fonts.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.desktop.fonts;
cfg = config.features.desktop.fonts;
in
{
options.desktop.fonts.enable = mkEnableOption "Enable fonts";
options.features.desktop.fonts.enable = mkEnableOption "Enable fonts";
config = mkIf cfg.enable {
fonts = {

4
modules/nixos/desktop/media/makemkv.nix
View file

@ -3,10 +3,10 @@
with lib;
let
cfg = config.desktop.media.makemkv;
cfg = config.features.desktop.media.makemkv;
in
{
options.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
options.features.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
config = mkIf cfg.enable {
boot.kernelModules = [ "sg" ];

4
modules/nixos/desktop/st.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.desktop.st;
cfg = config.features.desktop.st;
in
{
options.desktop.st.enable = mkEnableOption "Enable st";
options.features.desktop.st.enable = mkEnableOption "Enable st";
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [

4
modules/nixos/desktop/thunar.nix
View file

@ -8,10 +8,10 @@
with lib;
let
cfg = config.desktop.thunar;
cfg = config.features.desktop.thunar;
in
{
options.desktop.thunar.enable = mkEnableOption "Enable thunar";
options.features.desktop.thunar.enable = mkEnableOption "Enable thunar";
config = mkIf cfg.enable {
programs.thunar = {

4
users/opdavies.nix
View file

@ -18,8 +18,8 @@ with lib;
"networkmanager"
"wheel"
]
++ optional config.cli.docker.enable "docker"
++ optional config.cli.podman.enable "podman";
++ optional config.features.cli.docker.enable "docker"
++ optional config.features.cli.podman.enable "podman";
packages = with pkgs; [
comma