Change config name

This commit is contained in:
Jakob Lechner 2023-06-22 12:03:23 +00:00
parent e0db6b0a6f
commit 905c043b17
No known key found for this signature in database
GPG key ID: 996082EFB5906C10
62 changed files with 82 additions and 81 deletions

View file

@ -2,7 +2,7 @@
let let
solarized = import ./solarized.nix; 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')" # 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 # if [ "$this_alacritty_pid" ]; then
@ -141,7 +141,7 @@ in
{ {
programs.alacritty = { 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 # The option `home-manager.users.jalr.xdg.configFile.dark.alacritty/alacritty-dark.yml' does not exist

View file

@ -4,7 +4,7 @@ let
xdg = config.xdg; xdg = config.xdg;
in in
{ {
config = lib.mkIf nixosConfig.myConfig.aws.enable { config = lib.mkIf nixosConfig.jalr.aws.enable {
# https://github.com/aws/aws-sdk/issues/30 # https://github.com/aws/aws-sdk/issues/30
home.sessionVariables = { home.sessionVariables = {
AWS_CONFIG_FILE = "${xdg.configHome}/aws/config"; AWS_CONFIG_FILE = "${xdg.configHome}/aws/config";
@ -19,7 +19,7 @@ in
(name: value: (name: value:
lib.attrsets.nameValuePair ("profile ${name}") (value) lib.attrsets.nameValuePair ("profile ${name}") (value)
) )
nixosConfig.myConfig.aws.accounts nixosConfig.jalr.aws.accounts
// //
{ {
"default" = { "default" = {

View file

@ -1,5 +1,5 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
claws-mail claws-mail
]; ];

View file

@ -8,7 +8,7 @@
lsof lsof
ncdu ncdu
ripgrep ripgrep
] ++ (if ! nixosConfig.myConfig.workstation.enable then [ ] else [ ] ++ (if ! nixosConfig.jalr.workstation.enable then [ ] else [
direnv direnv
dnsutils dnsutils
screen screen

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.tradebyte.enable { lib.mkIf nixosConfig.jalr.tradebyte.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
master.ferdium master.ferdium
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
mumble mumble
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
qtox qtox
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
tdesktop tdesktop
]; ];

View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
./${nixosConfig.myConfig.terminalEmulator}.nix ./${nixosConfig.jalr.terminalEmulator}.nix
./aws.nix ./aws.nix
./claws-mail.nix ./claws-mail.nix
./cli.nix ./cli.nix

View file

@ -1,7 +1,7 @@
{ nixosConfig, pkgs, ... }: { nixosConfig, pkgs, ... }:
{ {
programs.firefox = { programs.firefox = {
enable = nixosConfig.myConfig.gui.enable; enable = nixosConfig.jalr.gui.enable;
package = pkgs.firefox-esr; package = pkgs.firefox-esr;
profiles = { profiles = {
default = { default = {

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
master.betaflight-configurator master.betaflight-configurator
fpvout fpvout

View file

@ -4,11 +4,11 @@
programs = { programs = {
git = { git = {
enable = true; enable = true;
userName = nixosConfig.myConfig.git.user.name; userName = nixosConfig.jalr.git.user.name;
userEmail = nixosConfig.myConfig.git.user.email; userEmail = nixosConfig.jalr.git.user.email;
signing = { signing = {
key = nixosConfig.myConfig.gpg.defaultKey; key = nixosConfig.jalr.gpg.defaultKey;
signByDefault = nixosConfig.myConfig.git.signByDefault; signByDefault = nixosConfig.jalr.git.signByDefault;
}; };
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";

View file

@ -8,6 +8,6 @@ let
pkgs.gnuradio3_8Packages; pkgs.gnuradio3_8Packages;
}; };
in in
(lib.mkIf nixosConfig.myConfig.gui.enable { (lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = [ gnuradioEnv ]; home.packages = [ gnuradioEnv ];
}) })

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
gimp gimp
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
inkscape inkscape
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
krita krita
]; ];

View file

@ -1,5 +1,5 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
gcr # required for pinentry-gnome gcr # required for pinentry-gnome
geeqie geeqie

View file

@ -1,5 +1,5 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
jameica jameica
]; ];

View file

@ -1,5 +1,5 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
kicad kicad
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
mpv mpv
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
mute-indicator mute-indicator
]; ];

View file

@ -88,7 +88,7 @@
-- init.lua -- init.lua
-- this configuration applies to servers and workstations -- 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 -- this configuration applies to workstations only
-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
local lsp = require('lspconfig') local lsp = require('lspconfig')

View file

@ -2,7 +2,7 @@
{ {
programs.obs-studio = { programs.obs-studio = {
enable = nixosConfig.myConfig.gui.enable; enable = nixosConfig.jalr.gui.enable;
plugins = with pkgs; [ plugins = with pkgs; [
obs-studio-plugins.wlrobs obs-studio-plugins.wlrobs
]; ];

View file

@ -1,5 +1,5 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
openscad openscad
]; ];

View file

@ -19,7 +19,7 @@ in
pw pw
] ++ ] ++
( (
if nixosConfig.myConfig.gui.enable if nixosConfig.jalr.gui.enable
then with pkgs; [ then with pkgs; [
qtpass qtpass
pass-wayland pass-wayland

View file

@ -1,5 +1,5 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
pcmanfm pcmanfm
]; ];

View file

@ -1,5 +1,5 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.workstation.enable { lib.mkIf nixosConfig.jalr.workstation.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
python310 python310
python310Packages.virtualenv python310Packages.virtualenv

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
audacity audacity
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
easyeffects easyeffects
]; ];

View file

@ -1,6 +1,6 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
easyeffects easyeffects
pavucontrol pavucontrol

View file

@ -3,7 +3,7 @@
let let
solarized = import ../solarized.nix; solarized = import ../solarized.nix;
terminalEmulator = terminalEmulator =
if nixosConfig.myConfig.terminalEmulator == "alacritty" if nixosConfig.jalr.terminalEmulator == "alacritty"
then then
pkgs.writeShellScript "alacritty-sway-cwd" '' 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')" 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 exec ${pkgs.alacritty}/bin/alacritty
'' ''
else nixosConfig.myConfig.terminalEmulator; else nixosConfig.jalr.terminalEmulator;
cfg = config.wayland.windowManager.sway.config; cfg = config.wayland.windowManager.sway.config;
wallpaper = pkgs.fetchurl { wallpaper = pkgs.fetchurl {
url = "https://raw.githubusercontent.com/swaywm/sway/3b2bc894a5ebbcbbd6707d45a25d171779c2e874/assets/Sway_Wallpaper_Blue_1920x1080.png"; 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 { }; move-to-output = pkgs.callPackage ./move-to-output { };
in in
{ {
imports = lib.optionals nixosConfig.myConfig.gui.enable [ imports = lib.optionals nixosConfig.jalr.gui.enable [
./gammastep.nix ./gammastep.nix
./waybar.nix ./waybar.nix
./wofi.nix ./wofi.nix
./yubikey-touch-detector.nix ./yubikey-touch-detector.nix
]; ];
} // (lib.mkIf nixosConfig.myConfig.gui.enable { } // (lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
sway-contrib.grimshot # screenshots sway-contrib.grimshot # screenshots
wdisplays # graphical output manager wdisplays # graphical output manager

View file

@ -1,5 +1,5 @@
{ nixosConfig, lib, pkgs, ... }: { nixosConfig, lib, pkgs, ... }:
lib.mkIf nixosConfig.myConfig.gui.enable { lib.mkIf nixosConfig.jalr.gui.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
( (
tor-browser-bundle-bin.override { tor-browser-bundle-bin.override {

View file

@ -1,7 +1,7 @@
{ lib, ... }: { lib, ... }:
{ {
options.myConfig = { options.jalr = {
git = { git = {
user = { user = {
name = lib.mkOption { name = lib.mkOption {

View file

@ -98,7 +98,7 @@ in
./default.nix ./default.nix
]; ];
myConfig = { jalr = {
git = { git = {
user = { user = {
name = "Jakob Lechner"; name = "Jakob Lechner";

View file

@ -5,7 +5,7 @@
./default.nix ./default.nix
]; ];
myConfig = { jalr = {
git = { git = {
user = { user = {
name = "Jakob Lechner"; name = "Jakob Lechner";

View file

@ -55,7 +55,7 @@
# boot.loader.efi.efiSysMountPoint = "/boot/efi"; # boot.loader.efi.efiSysMountPoint = "/boot/efi";
# Define on which hard drive you want to install Grub. # Define on which hard drive you want to install Grub.
myConfig = { jalr = {
bootloader = "grub2"; bootloader = "grub2";
}; };

View file

@ -50,7 +50,7 @@
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", GROUP="users", MODE="0660" SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", GROUP="users", MODE="0660"
''; '';
myConfig = { jalr = {
bootloader = "systemd-boot"; bootloader = "systemd-boot";
uefi.enable = true; uefi.enable = true;
gui.enable = true; gui.enable = true;

View file

@ -48,7 +48,7 @@
services.udisks2.enable = true; services.udisks2.enable = true;
myConfig = { jalr = {
bootloader = "systemd-boot"; bootloader = "systemd-boot";
uefi.enable = true; uefi.enable = true;
gui.enable = true; gui.enable = true;

View file

@ -1,5 +1,5 @@
{ {
myConfig.qbittorrent = { jalr.qbittorrent = {
enable = true; enable = true;
downloadDir = "/sturzbach"; downloadDir = "/sturzbach";
fqdn = "sturzbach.jalr.de"; fqdn = "sturzbach.jalr.de";

View file

@ -44,7 +44,7 @@
SUBSYSTEM=="usb", ATTRS{idVendor}=="04e8", ATTRS{idProduct}=="6860", GROUP="dialout", MODE="0660" SUBSYSTEM=="usb", ATTRS{idVendor}=="04e8", ATTRS{idProduct}=="6860", GROUP="dialout", MODE="0660"
''; '';
myConfig = { jalr = {
bootloader = "grub2"; bootloader = "grub2";
gui.enable = true; gui.enable = true;
workstation.enable = true; workstation.enable = true;

View file

@ -40,7 +40,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
myConfig = { jalr = {
bootloader = "systemd-boot"; bootloader = "systemd-boot";
uefi.enable = true; uefi.enable = true;
}; };

View file

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.myConfig; cfg = config.jalr;
in in
{ {
options.myConfig = { options.jalr = {
autologin = { autologin = {
enable = pkgs.lib.mkEnableOption "Enable tty1 autologin"; enable = pkgs.lib.mkEnableOption "Enable tty1 autologin";
username = pkgs.lib.mkOption { username = pkgs.lib.mkOption {

View file

@ -1,7 +1,7 @@
{ lib, ... }: { lib, ... }:
{ {
options.myConfig.aws = { options.jalr.aws = {
enable = lib.mkEnableOption "Enable AWS CLI"; enable = lib.mkEnableOption "Enable AWS CLI";
accounts = with lib; mkOption { accounts = with lib; mkOption {
type = with types; attrsOf (submodule ({ config, name, ... }: { type = with types; attrsOf (submodule ({ config, name, ... }: {

View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
options.myConfig = { options.jalr = {
bootloader = lib.mkOption { bootloader = lib.mkOption {
type = lib.types.nullOr (lib.types.enum [ "systemd-boot" "grub2" ]); type = lib.types.nullOr (lib.types.enum [ "systemd-boot" "grub2" ]);
default = null; default = null;

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
lib.mkIf (config.myConfig.bootloader == "grub2") { lib.mkIf (config.jalr.bootloader == "grub2") {
boot.loader.grub = { boot.loader.grub = {
enable = true; enable = true;
}; };

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
lib.mkIf (config.myConfig.bootloader == "systemd-boot") { lib.mkIf (config.jalr.bootloader == "systemd-boot") {
boot = { boot = {
loader = { loader = {
systemd-boot = { systemd-boot = {

View file

@ -1,7 +1,7 @@
{ lib, ... }: { lib, ... }:
{ {
options.myConfig = { options.jalr = {
gui.enable = lib.mkEnableOption "GUI"; gui.enable = lib.mkEnableOption "GUI";
workstation.enable = lib.mkEnableOption "Workstation"; workstation.enable = lib.mkEnableOption "Workstation";
}; };

View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
config = lib.mkIf config.myConfig.workstation.enable { config = lib.mkIf config.jalr.workstation.enable {
services.dnsmasq = { services.dnsmasq = {
enable = true; enable = true;
resolveLocalQueries = true; resolveLocalQueries = true;

View file

@ -2,7 +2,7 @@
{ {
console.font = "Lat2-Terminus16"; 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" ]; }) (nerdfonts.override { fonts = [ "Iosevka" ]; })
font-awesome font-awesome
powerline-fonts powerline-fonts

View file

@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let portRange = { let
from = 1714; portRange = {
to = 1764; from = 1714;
}; to = 1764;
};
in in
lib.mkIf config.myConfig.gui.enable { lib.mkIf config.jalr.gui.enable {
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
networking.firewall.allowedTCPPortRanges = [ portRange ]; networking.firewall.allowedTCPPortRanges = [ portRange ];
networking.firewall.allowedUDPPortRanges = [ portRange ]; networking.firewall.allowedUDPPortRanges = [ portRange ];

View file

@ -1,16 +1,16 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.myConfig; cfg = config.jalr;
in in
{ {
options.myConfig = { options.jalr = {
libvirt = { libvirt = {
enable = pkgs.lib.mkEnableOption "Enable libvirt"; enable = pkgs.lib.mkEnableOption "Enable libvirt";
}; };
}; };
config = lib.mkIf cfg.libvirt.enable { 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 spice-gtk
virt-manager virt-manager
]; ];

View file

@ -32,7 +32,7 @@
}) })
] ]
# Tradebyte access points use legacy crypto # Tradebyte access points use legacy crypto
++ lib.optional config.myConfig.tradebyte.enable ( ++ lib.optional config.jalr.tradebyte.enable (
final: prev: final: prev:
let let
inherit (prev) callPackage; inherit (prev) callPackage;

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
lib.mkIf config.myConfig.gui.enable { lib.mkIf config.jalr.gui.enable {
#boot = { #boot = {
# kernelModules = [ "v4l2loopback" ]; # kernelModules = [ "v4l2loopback" ];
# extraModprobeConfig = '' # extraModprobeConfig = ''

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
lib.mkIf config.myConfig.gui.enable { lib.mkIf config.jalr.gui.enable {
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
lib.mkIf config.myConfig.gui.enable { lib.mkIf config.jalr.gui.enable {
services.printing = { services.printing = {
enable = true; enable = true;
drivers = [ pkgs.brlaser ]; drivers = [ pkgs.brlaser ];

View file

@ -1,9 +1,9 @@
{ config, inputs, lib, pkgs, ... }: { config, inputs, lib, pkgs, ... }:
let let
cfg = config.myConfig.qbittorrent; cfg = config.jalr.qbittorrent;
in in
{ {
options.myConfig.qbittorrent = { options.jalr.qbittorrent = {
enable = lib.mkEnableOption "the qbittorrent service"; enable = lib.mkEnableOption "the qbittorrent service";
homeDir = lib.mkOption { homeDir = lib.mkOption {
type = lib.types.path; type = lib.types.path;

View file

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.myConfig; cfg = config.jalr;
in in
{ {
options.myConfig = { options.jalr = {
sdr = { sdr = {
enable = pkgs.lib.mkEnableOption "Enable software defined radio"; enable = pkgs.lib.mkEnableOption "Enable software defined radio";
}; };

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
lib.mkIf config.myConfig.gui.enable { lib.mkIf config.jalr.gui.enable {
programs.sway = { programs.sway = {
enable = true; enable = true;
# FIXME: move to home manager # FIXME: move to home manager

View file

@ -1,7 +1,7 @@
{ lib, ... }: { lib, ... }:
{ {
options.myConfig = { options.jalr = {
tradebyte.enable = lib.mkEnableOption "TB.config"; tradebyte.enable = lib.mkEnableOption "TB.config";
}; };
} }

View file

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.myConfig; cfg = config.jalr;
in in
{ {
options.myConfig = { options.jalr = {
uefi.enable = pkgs.lib.mkEnableOption "System uses UEFI" // { default = false; }; uefi.enable = pkgs.lib.mkEnableOption "System uses UEFI" // { default = false; };
}; };
config = lib.mkIf cfg.uefi.enable { config = lib.mkIf cfg.uefi.enable {

View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
lib.mkIf config.myConfig.gui.enable { lib.mkIf config.jalr.gui.enable {
programs.wireshark = { programs.wireshark = {
enable = true; enable = true;
package = pkgs.wireshark; package = pkgs.wireshark;

View file

@ -1,13 +1,13 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
config = lib.mkIf config.myConfig.workstation.enable { config = lib.mkIf config.jalr.workstation.enable {
programs = { programs = {
ssh.startAgent = false; ssh.startAgent = false;
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
pinentryFlavor = if config.myConfig.gui.enable then "gnome3" else "tty"; pinentryFlavor = if config.jalr.gui.enable then "gnome3" else "tty";
}; };
}; };