diff options
Diffstat (limited to 'users/seth')
24 files changed, 278 insertions, 245 deletions
diff --git a/users/seth/base/default.nix b/users/seth/base/default.nix index b6c7571..7b97b51 100644 --- a/users/seth/base/default.nix +++ b/users/seth/base/default.nix @@ -1,19 +1,13 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.seth; -in { +in +{ options.seth = { enable = lib.mkEnableOption "Seth's home configuration"; }; - imports = [ - ./standalone.nix - ]; + imports = [ ./standalone.nix ]; - config = lib.mkIf cfg.enable { - home.stateVersion = "23.11"; - }; + config = lib.mkIf cfg.enable { home.stateVersion = "23.11"; }; } diff --git a/users/seth/base/standalone.nix b/users/seth/base/standalone.nix index ce8863c..14845dc 100644 --- a/users/seth/base/standalone.nix +++ b/users/seth/base/standalone.nix @@ -3,24 +3,24 @@ lib, pkgs, ... -}: let +}: +let cfg = config.seth.standalone; enable = config.seth.enable && cfg.enable; -in { +in +{ options.seth.standalone = { enable = lib.mkEnableOption "Standalone options"; }; config = lib.mkIf enable { - _module.args.osConfig = {}; + _module.args.osConfig = { }; programs.home-manager.enable = true; home = { username = "seth"; homeDirectory = - if pkgs.stdenv.isDarwin - then "/Users/${config.home.username}" - else "/home/${config.home.username}"; + if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}"; }; }; } diff --git a/users/seth/desktop/budgie/default.nix b/users/seth/desktop/budgie/default.nix index bf72ee5..34ecbbd 100644 --- a/users/seth/desktop/budgie/default.nix +++ b/users/seth/desktop/budgie/default.nix @@ -1,16 +1,18 @@ -{ - lib, - osConfig, - ... -}: let +{ lib, osConfig, ... }: +let enable = osConfig.services.xserver.desktopManager.budgie.enable or false; -in { +in +{ config = lib.mkIf enable { dconf = { enable = true; settings = { "com.solus-project.budgie-panel:Budgie" = { - pinned-launchers = ["firefox.desktop" "nemo.desktop" "discord.desktop"]; + pinned-launchers = [ + "firefox.desktop" + "nemo.desktop" + "discord.desktop" + ]; }; }; }; diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix index 7f477df..9da094d 100644 --- a/users/seth/desktop/default.nix +++ b/users/seth/desktop/default.nix @@ -4,15 +4,15 @@ pkgs, osConfig, ... -}: let +}: +let cfg = config.seth.desktop; -in { +in +{ options.seth.desktop = { - enable = - lib.mkEnableOption "desktop" - // { - default = osConfig.desktop.enable or false; - }; + enable = lib.mkEnableOption "desktop" // { + default = osConfig.desktop.enable or false; + }; }; imports = [ @@ -35,19 +35,19 @@ in { "--enable-features=UseSkiaRenderer,WaylandWindowDecorations" ]; in - if pkgs.stdenv.isLinux - then - discord.overrideAttrs (old: { - desktopItem = old.desktopItem.override (old': { - exec = "${old'.exec} ${flags}"; - }); - }) - else discord + if pkgs.stdenv.isLinux then + discord.overrideAttrs (old: { + desktopItem = old.desktopItem.override (old': { + exec = "${old'.exec} ${flags}"; + }); + }) + else + discord ) pkgs.element-desktop pkgs.spotify - (pkgs.prismlauncher.override {withWaylandGLFW = true;}) + (pkgs.prismlauncher.override { withWaylandGLFW = true; }) ]; }; } diff --git a/users/seth/desktop/gnome/default.nix b/users/seth/desktop/gnome/default.nix index 2ed45b2..6550073 100644 --- a/users/seth/desktop/gnome/default.nix +++ b/users/seth/desktop/gnome/default.nix @@ -3,9 +3,11 @@ pkgs, osConfig, ... -}: let +}: +let enable = osConfig.services.xserver.desktopManager.gnome.enable or false; -in { +in +{ config = lib.mkIf enable { home = { packages = with pkgs; [ @@ -28,9 +30,7 @@ in { "org/gnome/shell" = { disable-user-extensions = false; - enabled-extensions = [ - ]; + enabled-extensions = [ "[email protected]" ]; favorite-apps = [ "chromium-browser.desktop" diff --git a/users/seth/desktop/plasma/default.nix b/users/seth/desktop/plasma/default.nix index c4a30a1..679b1cd 100644 --- a/users/seth/desktop/plasma/default.nix +++ b/users/seth/desktop/plasma/default.nix @@ -3,13 +3,13 @@ pkgs, osConfig, ... -}: let +}: +let enable = osConfig.services.desktopManager.plasma6.enable or false; -in { +in +{ config = lib.mkIf enable { - home.packages = with pkgs; [ - papirus-icon-theme - ]; + home.packages = with pkgs; [ papirus-icon-theme ]; xdg = { dataFile."konsole/catppuccin-mocha.colorscheme".source = diff --git a/users/seth/home.nix b/users/seth/home.nix index ca5b7c6..acfc535 100644 --- a/users/seth/home.nix +++ b/users/seth/home.nix @@ -1,5 +1,5 @@ { - imports = [./.]; + imports = [ ./. ]; seth = { enable = true; standalone.enable = true; diff --git a/users/seth/programs/chromium.nix b/users/seth/programs/chromium.nix index 5c44dec..da769ba 100644 --- a/users/seth/programs/chromium.nix +++ b/users/seth/programs/chromium.nix @@ -3,32 +3,32 @@ lib, pkgs, ... -}: let +}: +let cfg = config.seth.programs.chromium; -in { +in +{ options.seth.programs.chromium = { - enable = - lib.mkEnableOption "Chromium configuration" - // { - default = config.seth.desktop.enable; - }; + enable = lib.mkEnableOption "Chromium configuration" // { + default = config.seth.desktop.enable; + }; }; config = lib.mkIf cfg.enable { programs.chromium = { enable = true; - dictionaries = [pkgs.hunspellDictsChromium.en_US]; + dictionaries = [ pkgs.hunspellDictsChromium.en_US ]; extensions = [ # ublock origin - {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} + { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # bitwarden - {id = "nngceckbapebfimnlniiiahkandclblb";} + { id = "nngceckbapebfimnlniiiahkandclblb"; } # floccus bookmark sync - {id = "fnaicdffflnofjppbagibeoednhnbjhg";} + { id = "fnaicdffflnofjppbagibeoednhnbjhg"; } # tabby cat - {id = "mefhakmgclhhfbdadeojlkbllmecialg";} + { id = "mefhakmgclhhfbdadeojlkbllmecialg"; } ]; }; }; diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix index 81cfdb7..950c939 100644 --- a/users/seth/programs/default.nix +++ b/users/seth/programs/default.nix @@ -4,15 +4,15 @@ pkgs, inputs, ... -}: let +}: +let cfg = config.seth.programs; -in { +in +{ options.seth.programs = { - basePrograms.enable = - lib.mkEnableOption "base programs and configurations" - // { - default = config.seth.enable; - }; + basePrograms.enable = lib.mkEnableOption "base programs and configurations" // { + default = config.seth.enable; + }; }; imports = with inputs; [ diff --git a/users/seth/programs/firefox/arkenfox.nix b/users/seth/programs/firefox/arkenfox.nix index 7dfc121..de3992f 100644 --- a/users/seth/programs/firefox/arkenfox.nix +++ b/users/seth/programs/firefox/arkenfox.nix @@ -3,17 +3,17 @@ lib, inputs, ... -}: let +}: +let cfg = config.seth.programs.firefox.arkenfox; -in { - imports = [inputs.arkenfox.hmModules.arkenfox]; +in +{ + imports = [ inputs.arkenfox.hmModules.arkenfox ]; options.seth.programs.firefox.arkenfox = { - enable = - lib.mkEnableOption "Arkenfox settings for Firefox" - // { - default = config.seth.programs.firefox.enable; - }; + enable = lib.mkEnableOption "Arkenfox settings for Firefox" // { + default = config.seth.programs.firefox.enable; + }; }; config = lib.mkIf cfg.enable { @@ -23,51 +23,58 @@ in { version = "126.1"; }; - profiles.arkenfox.arkenfox = let - enableSections = sections: lib.genAttrs sections (_: {enable = true;}); - in - lib.recursiveUpdate { - enable = true; + profiles.arkenfox.arkenfox = + let + enableSections = + sections: + lib.genAttrs sections (_: { + enable = true; + }); + in + lib.recursiveUpdate + { + enable = true; - # enable safe browsing - "0400"."0403"."browser.safebrowsing.downloads.remote.enabled".value = true; + # enable safe browsing + "0400"."0403"."browser.safebrowsing.downloads.remote.enabled".value = true; - # fix hulu - "1200"."1201"."security.ssl.require_safe_negotiation".value = false; + # fix hulu + "1200"."1201"."security.ssl.require_safe_negotiation".value = false; - "2600"."2651"."browser.download.useDownloadDir" = { - enable = true; - value = true; - }; + "2600"."2651"."browser.download.useDownloadDir" = { + enable = true; + value = true; + }; - # disable rfp letterboxing - "4500"."4504"."privacy.resistFingerprinting.letterboxing".value = false; + # disable rfp letterboxing + "4500"."4504"."privacy.resistFingerprinting.letterboxing".value = false; - "5000" = { - "5003"."signon.rememberSignons".enable = true; - # enable search autocomplete - "5021"."keyword.enabled".value = true; - }; - } (enableSections [ - "0100" - "0200" - "0300" - "0400" - "0600" - "0700" - "0800" - "0900" - "1000" - "1200" - "1600" - "1700" - "2000" - "2400" - "2600" - "2700" - "2800" - "4500" - ]); + "5000" = { + "5003"."signon.rememberSignons".enable = true; + # enable search autocomplete + "5021"."keyword.enabled".value = true; + }; + } + (enableSections [ + "0100" + "0200" + "0300" + "0400" + "0600" + "0700" + "0800" + "0900" + "1000" + "1200" + "1600" + "1700" + "2000" + "2400" + "2600" + "2700" + "2800" + "4500" + ]); }; }; } diff --git a/users/seth/programs/firefox/default.nix b/users/seth/programs/firefox/default.nix index d497f2a..6544ec0 100644 --- a/users/seth/programs/firefox/default.nix +++ b/users/seth/programs/firefox/default.nix @@ -4,20 +4,18 @@ pkgs, inputs, ... -}: let +}: +let cfg = config.seth.programs.firefox; -in { +in +{ options.seth.programs.firefox = { - enable = - lib.mkEnableOption "Firefox configuration" - // { - default = config.seth.desktop.enable; - }; + enable = lib.mkEnableOption "Firefox configuration" // { + default = config.seth.desktop.enable; + }; }; - imports = [ - ./arkenfox.nix - ]; + imports = [ ./arkenfox.nix ]; config = lib.mkIf cfg.enable { home.sessionVariables = { diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix index 674b3c8..4832bc1 100644 --- a/users/seth/programs/git.nix +++ b/users/seth/programs/git.nix @@ -1,13 +1,15 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.seth.programs.git; -in { +in +{ options.seth.programs.git = { - enable = lib.mkEnableOption "Git configuration settings" // {default = config.seth.enable;}; - gh.enable = lib.mkEnableOption "GitHub CLI support" // {default = cfg.enable;}; + enable = lib.mkEnableOption "Git configuration settings" // { + default = config.seth.enable; + }; + gh.enable = lib.mkEnableOption "GitHub CLI support" // { + default = cfg.enable; + }; }; config = lib.mkIf cfg.enable { @@ -24,7 +26,10 @@ in { gitCredentialHelper = { enable = true; - hosts = ["https://github.com" "https://github.example.com"]; + hosts = [ + "https://github.com" + "https://github.example.com" + ]; }; }; @@ -38,7 +43,9 @@ in { }; extraConfig = { - init = {defaultBranch = "main";}; + init = { + defaultBranch = "main"; + }; }; signing = { diff --git a/users/seth/programs/gpg.nix b/users/seth/programs/gpg.nix index e709180..68276f9 100644 --- a/users/seth/programs/gpg.nix +++ b/users/seth/programs/gpg.nix @@ -4,11 +4,15 @@ pkgs, osConfig, ... -}: let +}: +let cfg = config.seth.programs.gpg; -in { +in +{ options.seth.programs.gpg = { - enable = lib.mkEnableOption "GnuPG configuration" // {default = config.seth.enable;}; + enable = lib.mkEnableOption "GnuPG configuration" // { + default = config.seth.enable; + }; }; config = lib.mkIf cfg.enable { diff --git a/users/seth/programs/mangohud.nix b/users/seth/programs/mangohud.nix index f104823..1668932 100644 --- a/users/seth/programs/mangohud.nix +++ b/users/seth/programs/mangohud.nix @@ -1,16 +1,12 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.seth.programs.mangohud; -in { +in +{ options.seth.programs.mangohud = { - enable = - lib.mkEnableOption "MangoHud configuration" - // { - default = config.seth.desktop.enable; - }; + enable = lib.mkEnableOption "MangoHud configuration" // { + default = config.seth.desktop.enable; + }; }; config = lib.mkIf cfg.enable { diff --git a/users/seth/programs/neovim.nix b/users/seth/programs/neovim.nix index 815b150..e5fc22c 100644 --- a/users/seth/programs/neovim.nix +++ b/users/seth/programs/neovim.nix @@ -4,26 +4,32 @@ pkgs, inputs, ... -}: let +}: +let cfg = config.seth.programs.neovim; -in { +in +{ options.seth.programs.neovim = { - enable = lib.mkEnableOption "Neovim configuration" // {default = config.seth.enable;}; + enable = lib.mkEnableOption "Neovim configuration" // { + default = config.seth.enable; + }; }; config = lib.mkIf cfg.enable { home.packages = [ - (let - getchvim = inputs.getchvim.packages.${pkgs.system}.default; - in + ( + let + getchvim = inputs.getchvim.packages.${pkgs.system}.default; + in # remove desktop file pkgs.symlinkJoin { name = "${getchvim.name}-nodesktop"; - paths = [getchvim]; + paths = [ getchvim ]; postBuild = '' rm -rf $out/share/{applications,icons} ''; - }) + } + ) ]; }; } diff --git a/users/seth/programs/ssh.nix b/users/seth/programs/ssh.nix index 7872510..2e0d3f4 100644 --- a/users/seth/programs/ssh.nix +++ b/users/seth/programs/ssh.nix @@ -3,11 +3,15 @@ lib, pkgs, ... -}: let +}: +let cfg = config.seth.programs.ssh; -in { +in +{ options.seth.programs.ssh = { - enable = lib.mkEnableOption "SSH configuration" // {default = config.seth.enable;}; + enable = lib.mkEnableOption "SSH configuration" // { + default = config.seth.enable; + }; }; config = lib.mkIf cfg.enable { @@ -15,35 +19,37 @@ in { enable = true; package = pkgs.openssh; - matchBlocks = let - sshDir = "${config.home.homeDirectory}/.ssh"; - in { - # git forges - "codeberg.org" = { - identityFile = "${sshDir}/codeberg"; - user = "git"; - }; + matchBlocks = + let + sshDir = "${config.home.homeDirectory}/.ssh"; + in + { + # git forges + "codeberg.org" = { + identityFile = "${sshDir}/codeberg"; + user = "git"; + }; - # linux packaging - "aur.archlinux.org" = { - identityFile = "${sshDir}/aur"; - user = "aur"; - }; + # linux packaging + "aur.archlinux.org" = { + identityFile = "${sshDir}/aur"; + user = "aur"; + }; - "pagure.io" = { - identityFile = "${sshDir}/copr"; - user = "git"; - }; + "pagure.io" = { + identityFile = "${sshDir}/copr"; + user = "git"; + }; - # router - "192.168.1.1" = { - identityFile = "${sshDir}/openwrt"; - user = "root"; - }; + # router + "192.168.1.1" = { + identityFile = "${sshDir}/openwrt"; + user = "root"; + }; - # servers - "atlas".user = "atlas"; - }; + # servers + "atlas".user = "atlas"; + }; }; services.ssh-agent.enable = pkgs.stdenv.isLinux; diff --git a/users/seth/programs/starship/default.nix b/users/seth/programs/starship/default.nix index b6082c1..fed7fd4 100644 --- a/users/seth/programs/starship/default.nix +++ b/users/seth/programs/starship/default.nix @@ -1,12 +1,12 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.seth.programs.starship; -in { +in +{ options.seth.programs.starship = { - enable = lib.mkEnableOption "Starship configuration" // {default = config.seth.enable;}; + enable = lib.mkEnableOption "Starship configuration" // { + default = config.seth.enable; + }; }; config = lib.mkIf cfg.enable { @@ -19,13 +19,11 @@ in { enableBashIntegration = false; enableZshIntegration = false; - settings = - { - format = "$all"; - palette = "catppuccin_mocha"; - command_timeout = 250; - } - // lib.importTOML ./starship.toml; + settings = { + format = "$all"; + palette = "catppuccin_mocha"; + command_timeout = 250; + } // lib.importTOML ./starship.toml; }; }; } diff --git a/users/seth/programs/vim.nix b/users/seth/programs/vim.nix index b07b090..37e5345 100644 --- a/users/seth/programs/vim.nix +++ b/users/seth/programs/vim.nix @@ -3,12 +3,16 @@ lib, pkgs, ... -}: let +}: +let cfg = config.seth.programs.vim; inherit (config.xdg) configHome dataHome stateHome; -in { +in +{ options.seth.programs.vim = { - enable = lib.mkEnableOption "Vim configuration" // {default = config.seth.enable;}; + enable = lib.mkEnableOption "Vim configuration" // { + default = config.seth.enable; + }; }; config = lib.mkIf cfg.enable { diff --git a/users/seth/programs/vscode.nix b/users/seth/programs/vscode.nix index a2be13c..87f988b 100644 --- a/users/seth/programs/vscode.nix +++ b/users/seth/programs/vscode.nix @@ -3,15 +3,15 @@ lib, pkgs, ... -}: let +}: +let cfg = config.seth.programs.vscode; -in { +in +{ options.seth.programs.vscode = { - enable = - lib.mkEnableOption "VSCode configuration" - // { - default = config.seth.desktop.enable; - }; + enable = lib.mkEnableOption "VSCode configuration" // { + default = config.seth.desktop.enable; + }; }; config = lib.mkIf cfg.enable { diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix index 216e609..3be0254 100644 --- a/users/seth/shell/bash.nix +++ b/users/seth/shell/bash.nix @@ -1,12 +1,12 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.seth.shell.bash; -in { +in +{ options.seth.shell.bash = { - enable = lib.mkEnableOption "Bash configuration" // {default = config.seth.enable;}; + enable = lib.mkEnableOption "Bash configuration" // { + default = config.seth.enable; + }; }; config = lib.mkIf cfg.enable { diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix index b86697c..bebd790 100644 --- a/users/seth/shell/default.nix +++ b/users/seth/shell/default.nix @@ -1,13 +1,15 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.seth.shell; -in { +in +{ options.seth.shell = { - aliases.enable = lib.mkEnableOption "Shell aliases" // {default = config.seth.enable;}; - variables.enable = lib.mkEnableOption "Shell variables" // {default = config.seth.enable;}; + aliases.enable = lib.mkEnableOption "Shell aliases" // { + default = config.seth.enable; + }; + variables.enable = lib.mkEnableOption "Shell variables" // { + default = config.seth.enable; + }; }; imports = [ diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix index 810d9fc..d910c05 100644 --- a/users/seth/shell/fish.nix +++ b/users/seth/shell/fish.nix @@ -3,12 +3,16 @@ lib, pkgs, ... -}: let +}: +let cfg = config.seth.shell.fish; -in { +in +{ options.seth.shell.fish = { enable = lib.mkEnableOption "Fish configuration"; - withPlugins = lib.mkEnableOption "Fish plugins" // {default = true;}; + withPlugins = lib.mkEnableOption "Fish plugins" // { + default = true; + }; }; config = lib.mkIf cfg.enable { @@ -37,15 +41,14 @@ in { } (lib.mkIf cfg.withPlugins { - plugins = let - mkFishPlugins = map (plugin: { - name = plugin; - inherit (pkgs.fishPlugins.${plugin}) src; - }); - in - mkFishPlugins [ - "autopair" - ]; + plugins = + let + mkFishPlugins = map (plugin: { + name = plugin; + inherit (pkgs.fishPlugins.${plugin}) src; + }); + in + mkFishPlugins [ "autopair" ]; }) ]; }; diff --git a/users/seth/shell/nu.nix b/users/seth/shell/nu.nix index 9b6deeb..f52f049 100644 --- a/users/seth/shell/nu.nix +++ b/users/seth/shell/nu.nix @@ -3,10 +3,12 @@ lib, pkgs, ... -}: let +}: +let cfg = config.seth.shell.nushell; theme = "catppuccin-${config.catppuccin.flavor}"; -in { +in +{ options.seth.shell.nushell = { enable = lib.mkEnableOption "Nushell configuration"; }; diff --git a/users/seth/shell/zsh.nix b/users/seth/shell/zsh.nix index 4ce116a..0983f15 100644 --- a/users/seth/shell/zsh.nix +++ b/users/seth/shell/zsh.nix @@ -3,12 +3,16 @@ lib, pkgs, ... -}: let +}: +let cfg = config.seth.shell.zsh; -in { +in +{ options.seth.shell.zsh = { enable = lib.mkEnableOption "Zsh configuration"; - withPlugins = lib.mkEnableOption "Zsh plugins" // {default = true;}; + withPlugins = lib.mkEnableOption "Zsh plugins" // { + default = true; + }; }; config = lib.mkIf cfg.enable { |