Change config name

2023-06-22 12:03:23 +00:00 · 2023-06-22 12:03:23 +00:00 · aa4d45d063
commit aa4d45d063
parent 94eda4ba47
62 changed files with 82 additions and 81 deletions
--- 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
--- 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" = {
--- 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
  ];
--- 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
--- 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
  ];
--- 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
  ];
--- 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
  ];
--- 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
  ];
--- 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
--- 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 = {
--- 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
--- 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";
--- 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 ];
 })
--- 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
  ];
--- 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
  ];
--- 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
  ];
--- 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
--- 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
  ];
--- 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
  ];
--- 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
  ];
--- 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
  ];
--- 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')
--- 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
    ];
--- 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
  ];
--- 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
--- 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
  ];
--- 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
--- 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
  ];
--- 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
  ];
--- 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
--- 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
--- 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 {
--- 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 {
--- 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";
--- 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";
--- 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";
  };

--- 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;
--- 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;
--- 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";
--- 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;
--- 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;
  };
--- 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 {
--- 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, ... }: {
--- 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;
--- 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;
  };
--- 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 = {
--- 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";
  };
--- 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;
--- 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
--- 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 ];
--- 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
    ];
--- 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;
--- 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 = ''
--- 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;

--- 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 ];
--- 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;
--- 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";
    };
--- 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
--- 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";
  };
 }
--- 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 {
--- 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;
--- 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";
      };
    };