From aa4d45d06306ca53a0783df0e1210877bcc32dd2 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 22 Jun 2023 12:03:23 +0000 Subject: [PATCH] Change config name --- home-manager/modules/alacritty.nix | 4 ++-- home-manager/modules/aws.nix | 4 ++-- home-manager/modules/claws-mail.nix | 2 +- home-manager/modules/cli.nix | 2 +- home-manager/modules/communication/ferdium.nix | 2 +- home-manager/modules/communication/mumble.nix | 2 +- home-manager/modules/communication/qtox.nix | 2 +- .../modules/communication/telegram-desktop.nix | 2 +- home-manager/modules/default.nix | 2 +- home-manager/modules/firefox/default.nix | 2 +- home-manager/modules/fpv.nix | 2 +- home-manager/modules/git.nix | 8 ++++---- home-manager/modules/gnuradio.nix | 2 +- home-manager/modules/graphics/gimp.nix | 2 +- home-manager/modules/graphics/inkscape.nix | 2 +- home-manager/modules/graphics/krita.nix | 2 +- home-manager/modules/gui.nix | 2 +- home-manager/modules/jameica.nix | 2 +- home-manager/modules/kicad.nix | 2 +- home-manager/modules/mpv.nix | 2 +- home-manager/modules/mute-indicator.nix | 2 +- home-manager/modules/neovim.nix | 2 +- home-manager/modules/obs-studio/default.nix | 2 +- home-manager/modules/openscad.nix | 2 +- home-manager/modules/pass.nix | 2 +- home-manager/modules/pcmanfm.nix | 2 +- home-manager/modules/python.nix | 2 +- home-manager/modules/sound/audacity.nix | 2 +- home-manager/modules/sound/easyeffects.nix | 2 +- home-manager/modules/sound/pipewire.nix | 2 +- home-manager/modules/sway/default.nix | 8 ++++---- home-manager/modules/tor-browser.nix | 2 +- home-manager/users/default.nix | 2 +- home-manager/users/jal.nix | 2 +- home-manager/users/jalr.nix | 2 +- hosts/aluminium/hardware-configuration.nix | 2 +- hosts/cadmium/configuration.nix | 2 +- hosts/hafnium/configuration.nix | 2 +- hosts/iron/services/sturzbach.nix | 2 +- hosts/jalr-t520/configuration.nix | 2 +- hosts/magnesium/configuration.nix | 2 +- modules/autologin.nix | 4 ++-- modules/aws.nix | 2 +- modules/bootloader/default.nix | 2 +- modules/bootloader/grub2.nix | 2 +- modules/bootloader/systemd-boot.nix | 2 +- modules/default.nix | 2 +- modules/dnsmasq.nix | 2 +- modules/fonts.nix | 2 +- modules/kdeconnect.nix | 11 ++++++----- modules/libvirt.nix | 6 +++--- modules/nix.nix | 2 +- modules/obs.nix | 2 +- modules/pipewire.nix | 2 +- modules/printers/hl3172cdw.nix | 2 +- modules/qbittorrent/default.nix | 4 ++-- modules/sdr.nix | 4 ++-- modules/sway.nix | 2 +- modules/tradebyte/default.nix | 2 +- modules/uefi.nix | 4 ++-- modules/wireshark.nix | 2 +- modules/yubikey-gpg.nix | 4 ++-- 62 files changed, 82 insertions(+), 81 deletions(-) diff --git a/home-manager/modules/alacritty.nix b/home-manager/modules/alacritty.nix index 17385c2..6974d18 100644 --- a/home-manager/modules/alacritty.nix +++ b/home-manager/modules/alacritty.nix @@ -2,7 +2,7 @@ let solarized = import ./solarized.nix; - #nixosConfig.myConfig.terminalEmulator.command = pkgs.writeShellScriptBin "alacritty-sway-cwd" '' + #nixosConfig.jalr.terminalEmulator.command = pkgs.writeShellScriptBin "alacritty-sway-cwd" '' # this_alacritty_pid="$(swaymsg -t get_tree | ${pkgs.jq} -e 'recurse(.nodes[]?) | select((.focused==true) and (.app_id=="Alacritty")).pid')" # if [ "$this_alacritty_pid" ]; then @@ -141,7 +141,7 @@ in { programs.alacritty = { - enable = nixosConfig.myConfig.gui.enable; + enable = nixosConfig.jalr.gui.enable; }; # The option `home-manager.users.jalr.xdg.configFile.dark.alacritty/alacritty-dark.yml' does not exist diff --git a/home-manager/modules/aws.nix b/home-manager/modules/aws.nix index 8fa7bd5..85bbd23 100644 --- a/home-manager/modules/aws.nix +++ b/home-manager/modules/aws.nix @@ -4,7 +4,7 @@ let xdg = config.xdg; in { - config = lib.mkIf nixosConfig.myConfig.aws.enable { + config = lib.mkIf nixosConfig.jalr.aws.enable { # https://github.com/aws/aws-sdk/issues/30 home.sessionVariables = { AWS_CONFIG_FILE = "${xdg.configHome}/aws/config"; @@ -19,7 +19,7 @@ in (name: value: lib.attrsets.nameValuePair ("profile ${name}") (value) ) - nixosConfig.myConfig.aws.accounts + nixosConfig.jalr.aws.accounts // { "default" = { diff --git a/home-manager/modules/claws-mail.nix b/home-manager/modules/claws-mail.nix index baf6a8c..ff32d39 100644 --- a/home-manager/modules/claws-mail.nix +++ b/home-manager/modules/claws-mail.nix @@ -1,5 +1,5 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ claws-mail ]; diff --git a/home-manager/modules/cli.nix b/home-manager/modules/cli.nix index 587d068..2a11311 100644 --- a/home-manager/modules/cli.nix +++ b/home-manager/modules/cli.nix @@ -8,7 +8,7 @@ lsof ncdu ripgrep - ] ++ (if ! nixosConfig.myConfig.workstation.enable then [ ] else [ + ] ++ (if ! nixosConfig.jalr.workstation.enable then [ ] else [ direnv dnsutils screen diff --git a/home-manager/modules/communication/ferdium.nix b/home-manager/modules/communication/ferdium.nix index 0109d07..ee8f39e 100644 --- a/home-manager/modules/communication/ferdium.nix +++ b/home-manager/modules/communication/ferdium.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.tradebyte.enable { +lib.mkIf nixosConfig.jalr.tradebyte.enable { home.packages = with pkgs; [ master.ferdium ]; diff --git a/home-manager/modules/communication/mumble.nix b/home-manager/modules/communication/mumble.nix index 3d873b3..4fb6026 100644 --- a/home-manager/modules/communication/mumble.nix +++ b/home-manager/modules/communication/mumble.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ mumble ]; diff --git a/home-manager/modules/communication/qtox.nix b/home-manager/modules/communication/qtox.nix index 265535d..85aa45b 100644 --- a/home-manager/modules/communication/qtox.nix +++ b/home-manager/modules/communication/qtox.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ qtox ]; diff --git a/home-manager/modules/communication/telegram-desktop.nix b/home-manager/modules/communication/telegram-desktop.nix index e49471d..d8876cc 100644 --- a/home-manager/modules/communication/telegram-desktop.nix +++ b/home-manager/modules/communication/telegram-desktop.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ tdesktop ]; diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix index 37637d0..b5f38f0 100644 --- a/home-manager/modules/default.nix +++ b/home-manager/modules/default.nix @@ -2,7 +2,7 @@ { imports = [ - ./${nixosConfig.myConfig.terminalEmulator}.nix + ./${nixosConfig.jalr.terminalEmulator}.nix ./aws.nix ./claws-mail.nix ./cli.nix diff --git a/home-manager/modules/firefox/default.nix b/home-manager/modules/firefox/default.nix index 8ef3197..39e227c 100644 --- a/home-manager/modules/firefox/default.nix +++ b/home-manager/modules/firefox/default.nix @@ -1,7 +1,7 @@ { nixosConfig, pkgs, ... }: { programs.firefox = { - enable = nixosConfig.myConfig.gui.enable; + enable = nixosConfig.jalr.gui.enable; package = pkgs.firefox-esr; profiles = { default = { diff --git a/home-manager/modules/fpv.nix b/home-manager/modules/fpv.nix index 0a0b3b8..9cc7d27 100644 --- a/home-manager/modules/fpv.nix +++ b/home-manager/modules/fpv.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ master.betaflight-configurator fpvout diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index fededfd..44afe70 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -4,11 +4,11 @@ programs = { git = { enable = true; - userName = nixosConfig.myConfig.git.user.name; - userEmail = nixosConfig.myConfig.git.user.email; + userName = nixosConfig.jalr.git.user.name; + userEmail = nixosConfig.jalr.git.user.email; signing = { - key = nixosConfig.myConfig.gpg.defaultKey; - signByDefault = nixosConfig.myConfig.git.signByDefault; + key = nixosConfig.jalr.gpg.defaultKey; + signByDefault = nixosConfig.jalr.git.signByDefault; }; extraConfig = { init.defaultBranch = "main"; diff --git a/home-manager/modules/gnuradio.nix b/home-manager/modules/gnuradio.nix index c878718..d3bec15 100644 --- a/home-manager/modules/gnuradio.nix +++ b/home-manager/modules/gnuradio.nix @@ -8,6 +8,6 @@ let pkgs.gnuradio3_8Packages; }; in -(lib.mkIf nixosConfig.myConfig.gui.enable { +(lib.mkIf nixosConfig.jalr.gui.enable { home.packages = [ gnuradioEnv ]; }) diff --git a/home-manager/modules/graphics/gimp.nix b/home-manager/modules/graphics/gimp.nix index a424b10..c64e108 100644 --- a/home-manager/modules/graphics/gimp.nix +++ b/home-manager/modules/graphics/gimp.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ gimp ]; diff --git a/home-manager/modules/graphics/inkscape.nix b/home-manager/modules/graphics/inkscape.nix index 189c77b..b4d3346 100644 --- a/home-manager/modules/graphics/inkscape.nix +++ b/home-manager/modules/graphics/inkscape.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ inkscape ]; diff --git a/home-manager/modules/graphics/krita.nix b/home-manager/modules/graphics/krita.nix index 9b1595c..f053c46 100644 --- a/home-manager/modules/graphics/krita.nix +++ b/home-manager/modules/graphics/krita.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ krita ]; diff --git a/home-manager/modules/gui.nix b/home-manager/modules/gui.nix index e6b3639..269af70 100644 --- a/home-manager/modules/gui.nix +++ b/home-manager/modules/gui.nix @@ -1,5 +1,5 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ gcr # required for pinentry-gnome geeqie diff --git a/home-manager/modules/jameica.nix b/home-manager/modules/jameica.nix index d8fd7d3..d9472e0 100644 --- a/home-manager/modules/jameica.nix +++ b/home-manager/modules/jameica.nix @@ -1,5 +1,5 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ jameica ]; diff --git a/home-manager/modules/kicad.nix b/home-manager/modules/kicad.nix index 5179138..17ea868 100644 --- a/home-manager/modules/kicad.nix +++ b/home-manager/modules/kicad.nix @@ -1,5 +1,5 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ kicad ]; diff --git a/home-manager/modules/mpv.nix b/home-manager/modules/mpv.nix index a9c1b81..5de2d7e 100644 --- a/home-manager/modules/mpv.nix +++ b/home-manager/modules/mpv.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ mpv ]; diff --git a/home-manager/modules/mute-indicator.nix b/home-manager/modules/mute-indicator.nix index eb04c75..ecde0cd 100644 --- a/home-manager/modules/mute-indicator.nix +++ b/home-manager/modules/mute-indicator.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ mute-indicator ]; diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix index ac3d2d7..36bb179 100644 --- a/home-manager/modules/neovim.nix +++ b/home-manager/modules/neovim.nix @@ -88,7 +88,7 @@ -- init.lua -- this configuration applies to servers and workstations '' - ] ++ lib.optional nixosConfig.myConfig.workstation.enable '' + ] ++ lib.optional nixosConfig.jalr.workstation.enable '' -- this configuration applies to workstations only -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md local lsp = require('lspconfig') diff --git a/home-manager/modules/obs-studio/default.nix b/home-manager/modules/obs-studio/default.nix index 4afb15d..545bcbd 100644 --- a/home-manager/modules/obs-studio/default.nix +++ b/home-manager/modules/obs-studio/default.nix @@ -2,7 +2,7 @@ { programs.obs-studio = { - enable = nixosConfig.myConfig.gui.enable; + enable = nixosConfig.jalr.gui.enable; plugins = with pkgs; [ obs-studio-plugins.wlrobs ]; diff --git a/home-manager/modules/openscad.nix b/home-manager/modules/openscad.nix index f4b5c6f..aa681d7 100644 --- a/home-manager/modules/openscad.nix +++ b/home-manager/modules/openscad.nix @@ -1,5 +1,5 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ openscad ]; diff --git a/home-manager/modules/pass.nix b/home-manager/modules/pass.nix index 67aee6f..ce3e446 100644 --- a/home-manager/modules/pass.nix +++ b/home-manager/modules/pass.nix @@ -19,7 +19,7 @@ in pw ] ++ ( - if nixosConfig.myConfig.gui.enable + if nixosConfig.jalr.gui.enable then with pkgs; [ qtpass pass-wayland diff --git a/home-manager/modules/pcmanfm.nix b/home-manager/modules/pcmanfm.nix index 0a658c3..49819d8 100644 --- a/home-manager/modules/pcmanfm.nix +++ b/home-manager/modules/pcmanfm.nix @@ -1,5 +1,5 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ pcmanfm ]; diff --git a/home-manager/modules/python.nix b/home-manager/modules/python.nix index b1860db..9dbf3e2 100644 --- a/home-manager/modules/python.nix +++ b/home-manager/modules/python.nix @@ -1,5 +1,5 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.workstation.enable { +lib.mkIf nixosConfig.jalr.workstation.enable { home.packages = with pkgs; [ python310 python310Packages.virtualenv diff --git a/home-manager/modules/sound/audacity.nix b/home-manager/modules/sound/audacity.nix index 9dbd835..2b6cc21 100644 --- a/home-manager/modules/sound/audacity.nix +++ b/home-manager/modules/sound/audacity.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ audacity ]; diff --git a/home-manager/modules/sound/easyeffects.nix b/home-manager/modules/sound/easyeffects.nix index 3a9d9ed..215ba9a 100644 --- a/home-manager/modules/sound/easyeffects.nix +++ b/home-manager/modules/sound/easyeffects.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ easyeffects ]; diff --git a/home-manager/modules/sound/pipewire.nix b/home-manager/modules/sound/pipewire.nix index 72ae522..0be3f41 100644 --- a/home-manager/modules/sound/pipewire.nix +++ b/home-manager/modules/sound/pipewire.nix @@ -1,6 +1,6 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ easyeffects pavucontrol diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix index 216b977..917a78d 100644 --- a/home-manager/modules/sway/default.nix +++ b/home-manager/modules/sway/default.nix @@ -3,7 +3,7 @@ let solarized = import ../solarized.nix; terminalEmulator = - if nixosConfig.myConfig.terminalEmulator == "alacritty" + if nixosConfig.jalr.terminalEmulator == "alacritty" then pkgs.writeShellScript "alacritty-sway-cwd" '' this_alacritty_pid="$(${pkgs.sway}/bin/swaymsg -t get_tree | ${pkgs.jq}/bin/jq -e 'recurse(.nodes[]?) | select((.focused==true) and (.app_id=="Alacritty")).pid')" @@ -18,7 +18,7 @@ let exec ${pkgs.alacritty}/bin/alacritty '' - else nixosConfig.myConfig.terminalEmulator; + else nixosConfig.jalr.terminalEmulator; cfg = config.wayland.windowManager.sway.config; wallpaper = pkgs.fetchurl { url = "https://raw.githubusercontent.com/swaywm/sway/3b2bc894a5ebbcbbd6707d45a25d171779c2e874/assets/Sway_Wallpaper_Blue_1920x1080.png"; @@ -29,13 +29,13 @@ let move-to-output = pkgs.callPackage ./move-to-output { }; in { - imports = lib.optionals nixosConfig.myConfig.gui.enable [ + imports = lib.optionals nixosConfig.jalr.gui.enable [ ./gammastep.nix ./waybar.nix ./wofi.nix ./yubikey-touch-detector.nix ]; -} // (lib.mkIf nixosConfig.myConfig.gui.enable { +} // (lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ sway-contrib.grimshot # screenshots wdisplays # graphical output manager diff --git a/home-manager/modules/tor-browser.nix b/home-manager/modules/tor-browser.nix index c362727..6053e70 100644 --- a/home-manager/modules/tor-browser.nix +++ b/home-manager/modules/tor-browser.nix @@ -1,5 +1,5 @@ { nixosConfig, lib, pkgs, ... }: -lib.mkIf nixosConfig.myConfig.gui.enable { +lib.mkIf nixosConfig.jalr.gui.enable { home.packages = with pkgs; [ ( tor-browser-bundle-bin.override { diff --git a/home-manager/users/default.nix b/home-manager/users/default.nix index 2ea4a37..26dd6aa 100644 --- a/home-manager/users/default.nix +++ b/home-manager/users/default.nix @@ -1,7 +1,7 @@ { lib, ... }: { - options.myConfig = { + options.jalr = { git = { user = { name = lib.mkOption { diff --git a/home-manager/users/jal.nix b/home-manager/users/jal.nix index e3d0c51..dbcd3f6 100644 --- a/home-manager/users/jal.nix +++ b/home-manager/users/jal.nix @@ -98,7 +98,7 @@ in ./default.nix ]; - myConfig = { + jalr = { git = { user = { name = "Jakob Lechner"; diff --git a/home-manager/users/jalr.nix b/home-manager/users/jalr.nix index ed7f71f..5e285ab 100644 --- a/home-manager/users/jalr.nix +++ b/home-manager/users/jalr.nix @@ -5,7 +5,7 @@ ./default.nix ]; - myConfig = { + jalr = { git = { user = { name = "Jakob Lechner"; diff --git a/hosts/aluminium/hardware-configuration.nix b/hosts/aluminium/hardware-configuration.nix index 5363e81..dcdb4c2 100644 --- a/hosts/aluminium/hardware-configuration.nix +++ b/hosts/aluminium/hardware-configuration.nix @@ -55,7 +55,7 @@ # boot.loader.efi.efiSysMountPoint = "/boot/efi"; # Define on which hard drive you want to install Grub. - myConfig = { + jalr = { bootloader = "grub2"; }; diff --git a/hosts/cadmium/configuration.nix b/hosts/cadmium/configuration.nix index 6a3f9e1..01e405d 100644 --- a/hosts/cadmium/configuration.nix +++ b/hosts/cadmium/configuration.nix @@ -50,7 +50,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", GROUP="users", MODE="0660" ''; - myConfig = { + jalr = { bootloader = "systemd-boot"; uefi.enable = true; gui.enable = true; diff --git a/hosts/hafnium/configuration.nix b/hosts/hafnium/configuration.nix index 65d45d7..76cf283 100644 --- a/hosts/hafnium/configuration.nix +++ b/hosts/hafnium/configuration.nix @@ -48,7 +48,7 @@ services.udisks2.enable = true; - myConfig = { + jalr = { bootloader = "systemd-boot"; uefi.enable = true; gui.enable = true; diff --git a/hosts/iron/services/sturzbach.nix b/hosts/iron/services/sturzbach.nix index b8775ea..8b07325 100644 --- a/hosts/iron/services/sturzbach.nix +++ b/hosts/iron/services/sturzbach.nix @@ -1,5 +1,5 @@ { - myConfig.qbittorrent = { + jalr.qbittorrent = { enable = true; downloadDir = "/sturzbach"; fqdn = "sturzbach.jalr.de"; diff --git a/hosts/jalr-t520/configuration.nix b/hosts/jalr-t520/configuration.nix index fd730c7..b483412 100644 --- a/hosts/jalr-t520/configuration.nix +++ b/hosts/jalr-t520/configuration.nix @@ -44,7 +44,7 @@ SUBSYSTEM=="usb", ATTRS{idVendor}=="04e8", ATTRS{idProduct}=="6860", GROUP="dialout", MODE="0660" ''; - myConfig = { + jalr = { bootloader = "grub2"; gui.enable = true; workstation.enable = true; diff --git a/hosts/magnesium/configuration.nix b/hosts/magnesium/configuration.nix index b4f9b97..5f24642 100644 --- a/hosts/magnesium/configuration.nix +++ b/hosts/magnesium/configuration.nix @@ -40,7 +40,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - myConfig = { + jalr = { bootloader = "systemd-boot"; uefi.enable = true; }; diff --git a/modules/autologin.nix b/modules/autologin.nix index a2b4440..b0b4576 100644 --- a/modules/autologin.nix +++ b/modules/autologin.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: let - cfg = config.myConfig; + cfg = config.jalr; in { - options.myConfig = { + options.jalr = { autologin = { enable = pkgs.lib.mkEnableOption "Enable tty1 autologin"; username = pkgs.lib.mkOption { diff --git a/modules/aws.nix b/modules/aws.nix index e2cc715..f94580a 100644 --- a/modules/aws.nix +++ b/modules/aws.nix @@ -1,7 +1,7 @@ { lib, ... }: { - options.myConfig.aws = { + options.jalr.aws = { enable = lib.mkEnableOption "Enable AWS CLI"; accounts = with lib; mkOption { type = with types; attrsOf (submodule ({ config, name, ... }: { diff --git a/modules/bootloader/default.nix b/modules/bootloader/default.nix index ade474c..22c07a5 100644 --- a/modules/bootloader/default.nix +++ b/modules/bootloader/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - options.myConfig = { + options.jalr = { bootloader = lib.mkOption { type = lib.types.nullOr (lib.types.enum [ "systemd-boot" "grub2" ]); default = null; diff --git a/modules/bootloader/grub2.nix b/modules/bootloader/grub2.nix index 3144bff..a2ec2ee 100644 --- a/modules/bootloader/grub2.nix +++ b/modules/bootloader/grub2.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf (config.myConfig.bootloader == "grub2") { +lib.mkIf (config.jalr.bootloader == "grub2") { boot.loader.grub = { enable = true; }; diff --git a/modules/bootloader/systemd-boot.nix b/modules/bootloader/systemd-boot.nix index 26ade2b..96cab4d 100644 --- a/modules/bootloader/systemd-boot.nix +++ b/modules/bootloader/systemd-boot.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf (config.myConfig.bootloader == "systemd-boot") { +lib.mkIf (config.jalr.bootloader == "systemd-boot") { boot = { loader = { systemd-boot = { diff --git a/modules/default.nix b/modules/default.nix index 808c62e..5c2a08e 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,7 @@ { lib, ... }: { - options.myConfig = { + options.jalr = { gui.enable = lib.mkEnableOption "GUI"; workstation.enable = lib.mkEnableOption "Workstation"; }; diff --git a/modules/dnsmasq.nix b/modules/dnsmasq.nix index 1c0a0b4..3e1d7ab 100644 --- a/modules/dnsmasq.nix +++ b/modules/dnsmasq.nix @@ -1,7 +1,7 @@ { lib, config, ... }: { - config = lib.mkIf config.myConfig.workstation.enable { + config = lib.mkIf config.jalr.workstation.enable { services.dnsmasq = { enable = true; resolveLocalQueries = true; diff --git a/modules/fonts.nix b/modules/fonts.nix index 2cf6898..656530b 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -2,7 +2,7 @@ { console.font = "Lat2-Terminus16"; - fonts.fonts = with pkgs; lib.mkIf config.myConfig.gui.enable [ + fonts.fonts = with pkgs; lib.mkIf config.jalr.gui.enable [ (nerdfonts.override { fonts = [ "Iosevka" ]; }) font-awesome powerline-fonts diff --git a/modules/kdeconnect.nix b/modules/kdeconnect.nix index a8d1d82..87cbf5d 100644 --- a/modules/kdeconnect.nix +++ b/modules/kdeconnect.nix @@ -1,11 +1,12 @@ { config, lib, pkgs, ... }: -let portRange = { - from = 1714; - to = 1764; -}; +let + portRange = { + from = 1714; + to = 1764; + }; in -lib.mkIf config.myConfig.gui.enable { +lib.mkIf config.jalr.gui.enable { programs.kdeconnect.enable = true; networking.firewall.allowedTCPPortRanges = [ portRange ]; networking.firewall.allowedUDPPortRanges = [ portRange ]; diff --git a/modules/libvirt.nix b/modules/libvirt.nix index 93f8443..b93f8c8 100644 --- a/modules/libvirt.nix +++ b/modules/libvirt.nix @@ -1,16 +1,16 @@ { config, lib, pkgs, ... }: let - cfg = config.myConfig; + cfg = config.jalr; in { - options.myConfig = { + options.jalr = { libvirt = { enable = pkgs.lib.mkEnableOption "Enable libvirt"; }; }; config = lib.mkIf cfg.libvirt.enable { - environment.systemPackages = with pkgs; lib.mkIf config.myConfig.gui.enable [ + environment.systemPackages = with pkgs; lib.mkIf config.jalr.gui.enable [ spice-gtk virt-manager ]; diff --git a/modules/nix.nix b/modules/nix.nix index c3cccdb..bb4a441 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -32,7 +32,7 @@ }) ] # Tradebyte access points use legacy crypto - ++ lib.optional config.myConfig.tradebyte.enable ( + ++ lib.optional config.jalr.tradebyte.enable ( final: prev: let inherit (prev) callPackage; diff --git a/modules/obs.nix b/modules/obs.nix index 837d23a..c4dbdd4 100644 --- a/modules/obs.nix +++ b/modules/obs.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.myConfig.gui.enable { +lib.mkIf config.jalr.gui.enable { #boot = { # kernelModules = [ "v4l2loopback" ]; # extraModprobeConfig = '' diff --git a/modules/pipewire.nix b/modules/pipewire.nix index 8c78a7c..cb4cf02 100644 --- a/modules/pipewire.nix +++ b/modules/pipewire.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.myConfig.gui.enable { +lib.mkIf config.jalr.gui.enable { sound.enable = true; hardware.pulseaudio.enable = false; diff --git a/modules/printers/hl3172cdw.nix b/modules/printers/hl3172cdw.nix index 49ae01e..b89b981 100644 --- a/modules/printers/hl3172cdw.nix +++ b/modules/printers/hl3172cdw.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.myConfig.gui.enable { +lib.mkIf config.jalr.gui.enable { services.printing = { enable = true; drivers = [ pkgs.brlaser ]; diff --git a/modules/qbittorrent/default.nix b/modules/qbittorrent/default.nix index 40eeb33..810685b 100644 --- a/modules/qbittorrent/default.nix +++ b/modules/qbittorrent/default.nix @@ -1,9 +1,9 @@ { config, inputs, lib, pkgs, ... }: let - cfg = config.myConfig.qbittorrent; + cfg = config.jalr.qbittorrent; in { - options.myConfig.qbittorrent = { + options.jalr.qbittorrent = { enable = lib.mkEnableOption "the qbittorrent service"; homeDir = lib.mkOption { type = lib.types.path; diff --git a/modules/sdr.nix b/modules/sdr.nix index 55ff119..a0b7686 100644 --- a/modules/sdr.nix +++ b/modules/sdr.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: let - cfg = config.myConfig; + cfg = config.jalr; in { - options.myConfig = { + options.jalr = { sdr = { enable = pkgs.lib.mkEnableOption "Enable software defined radio"; }; diff --git a/modules/sway.nix b/modules/sway.nix index dff050e..c9c0e5c 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.myConfig.gui.enable { +lib.mkIf config.jalr.gui.enable { programs.sway = { enable = true; # FIXME: move to home manager diff --git a/modules/tradebyte/default.nix b/modules/tradebyte/default.nix index e0c1b89..de83fba 100644 --- a/modules/tradebyte/default.nix +++ b/modules/tradebyte/default.nix @@ -1,7 +1,7 @@ { lib, ... }: { - options.myConfig = { + options.jalr = { tradebyte.enable = lib.mkEnableOption "TB.config"; }; } diff --git a/modules/uefi.nix b/modules/uefi.nix index a6701c3..8f4f855 100644 --- a/modules/uefi.nix +++ b/modules/uefi.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: let - cfg = config.myConfig; + cfg = config.jalr; in { - options.myConfig = { + options.jalr = { uefi.enable = pkgs.lib.mkEnableOption "System uses UEFI" // { default = false; }; }; config = lib.mkIf cfg.uefi.enable { diff --git a/modules/wireshark.nix b/modules/wireshark.nix index 6a407b5..878f649 100644 --- a/modules/wireshark.nix +++ b/modules/wireshark.nix @@ -1,5 +1,5 @@ { config, lib, pkgs, ... }: -lib.mkIf config.myConfig.gui.enable { +lib.mkIf config.jalr.gui.enable { programs.wireshark = { enable = true; package = pkgs.wireshark; diff --git a/modules/yubikey-gpg.nix b/modules/yubikey-gpg.nix index 4605b7d..5582a8c 100644 --- a/modules/yubikey-gpg.nix +++ b/modules/yubikey-gpg.nix @@ -1,13 +1,13 @@ { config, lib, pkgs, ... }: { - config = lib.mkIf config.myConfig.workstation.enable { + config = lib.mkIf config.jalr.workstation.enable { programs = { ssh.startAgent = false; gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = if config.myConfig.gui.enable then "gnome3" else "tty"; + pinentryFlavor = if config.jalr.gui.enable then "gnome3" else "tty"; }; };