From 1143e31f70355576cfc2f7b3063a9302b6f9de71 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 6 Jul 2024 18:02:44 -0400 Subject: seth: better document options --- users/seth/base/standalone.nix | 2 +- users/seth/desktop/default.nix | 7 ++++++- users/seth/home.nix | 1 + users/seth/programs/chromium.nix | 1 + users/seth/programs/firefox/arkenfox.nix | 2 +- users/seth/programs/firefox/default.nix | 1 + users/seth/programs/git.nix | 4 +++- users/seth/programs/gpg.nix | 1 + users/seth/programs/mangohud.nix | 1 + users/seth/programs/neovim.nix | 1 + users/seth/programs/ssh.nix | 1 + users/seth/programs/starship/default.nix | 1 + users/seth/programs/vim.nix | 1 + users/seth/programs/vscode.nix | 1 + users/seth/shell/bash.nix | 1 + users/seth/shell/default.nix | 7 +++++-- 16 files changed, 27 insertions(+), 6 deletions(-) (limited to 'users/seth') diff --git a/users/seth/base/standalone.nix b/users/seth/base/standalone.nix index 14845dc..884d3cc 100644 --- a/users/seth/base/standalone.nix +++ b/users/seth/base/standalone.nix @@ -10,7 +10,7 @@ let in { options.seth.standalone = { - enable = lib.mkEnableOption "Standalone options"; + enable = lib.mkEnableOption "standalone configuration options"; }; config = lib.mkIf enable { diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix index 9da094d..eb24099 100644 --- a/users/seth/desktop/default.nix +++ b/users/seth/desktop/default.nix @@ -10,8 +10,9 @@ let in { options.seth.desktop = { - enable = lib.mkEnableOption "desktop" // { + enable = lib.mkEnableOption "desktop (Linux) settings" // { default = osConfig.desktop.enable or false; + defaultText = lib.literalExpression "osConfig.desktop.enable or false"; }; }; @@ -22,8 +23,12 @@ in ]; config = lib.mkIf cfg.enable { + # This is meant for Linux + assertions = [ (lib.hm.assertions.assertPlatform "seth.desktop" pkgs lib.platforms.linux) ]; + home.packages = [ ( + # Add hardware acceleration flags on Linux let inherit (pkgs) discord; flags = lib.concatStringsSep " " [ diff --git a/users/seth/home.nix b/users/seth/home.nix index acfc535..646c75c 100644 --- a/users/seth/home.nix +++ b/users/seth/home.nix @@ -1,5 +1,6 @@ { imports = [ ./. ]; + seth = { enable = true; standalone.enable = true; diff --git a/users/seth/programs/chromium.nix b/users/seth/programs/chromium.nix index da769ba..7fc0c58 100644 --- a/users/seth/programs/chromium.nix +++ b/users/seth/programs/chromium.nix @@ -11,6 +11,7 @@ in options.seth.programs.chromium = { enable = lib.mkEnableOption "Chromium configuration" // { default = config.seth.desktop.enable; + defaultText = lib.literalExpression "config.seth.desktop.enable"; }; }; diff --git a/users/seth/programs/firefox/arkenfox.nix b/users/seth/programs/firefox/arkenfox.nix index de3992f..f6de39d 100644 --- a/users/seth/programs/firefox/arkenfox.nix +++ b/users/seth/programs/firefox/arkenfox.nix @@ -12,7 +12,7 @@ in options.seth.programs.firefox.arkenfox = { enable = lib.mkEnableOption "Arkenfox settings for Firefox" // { - default = config.seth.programs.firefox.enable; + default = true; }; }; diff --git a/users/seth/programs/firefox/default.nix b/users/seth/programs/firefox/default.nix index 6544ec0..55fe521 100644 --- a/users/seth/programs/firefox/default.nix +++ b/users/seth/programs/firefox/default.nix @@ -12,6 +12,7 @@ in options.seth.programs.firefox = { enable = lib.mkEnableOption "Firefox configuration" // { default = config.seth.desktop.enable; + defaultText = lib.literalExpression "config.seth.desktop.enable"; }; }; diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix index 4832bc1..210e0f1 100644 --- a/users/seth/programs/git.nix +++ b/users/seth/programs/git.nix @@ -6,9 +6,11 @@ in options.seth.programs.git = { enable = lib.mkEnableOption "Git configuration settings" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; + gh.enable = lib.mkEnableOption "GitHub CLI support" // { - default = cfg.enable; + default = true; }; }; diff --git a/users/seth/programs/gpg.nix b/users/seth/programs/gpg.nix index 68276f9..bd4428e 100644 --- a/users/seth/programs/gpg.nix +++ b/users/seth/programs/gpg.nix @@ -12,6 +12,7 @@ in options.seth.programs.gpg = { enable = lib.mkEnableOption "GnuPG configuration" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; }; diff --git a/users/seth/programs/mangohud.nix b/users/seth/programs/mangohud.nix index 1668932..eecb780 100644 --- a/users/seth/programs/mangohud.nix +++ b/users/seth/programs/mangohud.nix @@ -6,6 +6,7 @@ in options.seth.programs.mangohud = { enable = lib.mkEnableOption "MangoHud configuration" // { default = config.seth.desktop.enable; + defaultText = lib.literalExpression "config.seth.desktop.enable"; }; }; diff --git a/users/seth/programs/neovim.nix b/users/seth/programs/neovim.nix index e5fc22c..ecb4e57 100644 --- a/users/seth/programs/neovim.nix +++ b/users/seth/programs/neovim.nix @@ -12,6 +12,7 @@ in options.seth.programs.neovim = { enable = lib.mkEnableOption "Neovim configuration" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; }; diff --git a/users/seth/programs/ssh.nix b/users/seth/programs/ssh.nix index 2e0d3f4..608b09a 100644 --- a/users/seth/programs/ssh.nix +++ b/users/seth/programs/ssh.nix @@ -11,6 +11,7 @@ in options.seth.programs.ssh = { enable = lib.mkEnableOption "SSH configuration" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; }; diff --git a/users/seth/programs/starship/default.nix b/users/seth/programs/starship/default.nix index fed7fd4..fd455f0 100644 --- a/users/seth/programs/starship/default.nix +++ b/users/seth/programs/starship/default.nix @@ -6,6 +6,7 @@ in options.seth.programs.starship = { enable = lib.mkEnableOption "Starship configuration" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; }; diff --git a/users/seth/programs/vim.nix b/users/seth/programs/vim.nix index 37e5345..157e9fb 100644 --- a/users/seth/programs/vim.nix +++ b/users/seth/programs/vim.nix @@ -12,6 +12,7 @@ in options.seth.programs.vim = { enable = lib.mkEnableOption "Vim configuration" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; }; diff --git a/users/seth/programs/vscode.nix b/users/seth/programs/vscode.nix index 87f988b..18f939f 100644 --- a/users/seth/programs/vscode.nix +++ b/users/seth/programs/vscode.nix @@ -11,6 +11,7 @@ in options.seth.programs.vscode = { enable = lib.mkEnableOption "VSCode configuration" // { default = config.seth.desktop.enable; + defaultText = lib.literalExpression "config.seth.desktop.enable"; }; }; diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix index 3be0254..bf5b377 100644 --- a/users/seth/shell/bash.nix +++ b/users/seth/shell/bash.nix @@ -6,6 +6,7 @@ in options.seth.shell.bash = { enable = lib.mkEnableOption "Bash configuration" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; }; diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix index bebd790..34b1a98 100644 --- a/users/seth/shell/default.nix +++ b/users/seth/shell/default.nix @@ -4,11 +4,14 @@ let in { options.seth.shell = { - aliases.enable = lib.mkEnableOption "Shell aliases" // { + aliases.enable = lib.mkEnableOption "shell aliases" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; - variables.enable = lib.mkEnableOption "Shell variables" // { + + variables.enable = lib.mkEnableOption "shell variables" // { default = config.seth.enable; + defaultText = lib.literalExpression "config.seth.enable"; }; }; -- cgit v1.2.3