Switch to 4 space indentation

This commit is contained in:
SebastianStork 2024-03-17 13:15:01 +01:00
parent a4cc33577c
commit d7aed49725
32 changed files with 796 additions and 783 deletions

View file

@ -1,25 +1,25 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.auto-cpufreq.enable = lib.mkEnableOption "";
options.myConfig.auto-cpufreq.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.auto-cpufreq.enable {
services.auto-cpufreq = {
enable = true;
settings = {
charger = {
governor = "powersave";
turbo = "never";
energy_performance_preference = "power";
config = lib.mkIf config.myConfig.auto-cpufreq.enable {
services.auto-cpufreq = {
enable = true;
settings = {
charger = {
governor = "powersave";
turbo = "never";
energy_performance_preference = "power";
};
battery = {
governor = "powersave";
turbo = "never";
energy_performance_preference = "power";
};
};
};
battery = {
governor = "powersave";
turbo = "never";
energy_performance_preference = "power";
};
};
};
};
}

View file

@ -1,15 +1,15 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.auto-gc.enable = lib.mkEnableOption "";
options.myConfig.auto-gc.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.auto-gc.enable {
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
config = lib.mkIf config.myConfig.auto-gc.enable {
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
};
};
}

View file

@ -1,16 +1,16 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.bluetooth.enable = lib.mkEnableOption "";
options.myConfig.bluetooth.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.bluetooth.enable {
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
config = lib.mkIf config.myConfig.bluetooth.enable {
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
};
services.blueman.enable = true;
hardware.logitech.wireless.enable = true;
};
services.blueman.enable = true;
hardware.logitech.wireless.enable = true;
};
}

View file

@ -1,20 +1,20 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.boot-loader.systemd-boot.enable = lib.mkEnableOption "";
options.myConfig.boot-loader.systemd-boot.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.boot-loader.systemd-boot.enable {
boot.tmp.cleanOnBoot = true;
boot.loader = {
systemd-boot = {
enable = true;
editor = false;
configurationLimit = 50;
};
efi.canTouchEfiVariables = true;
timeout = 3;
config = lib.mkIf config.myConfig.boot-loader.systemd-boot.enable {
boot.tmp.cleanOnBoot = true;
boot.loader = {
systemd-boot = {
enable = true;
editor = false;
configurationLimit = 50;
};
efi.canTouchEfiVariables = true;
timeout = 3;
};
};
};
}

View file

@ -1,16 +1,16 @@
{
inputs,
config,
lib,
...
inputs,
config,
lib,
...
}: {
imports = [inputs.nix-index-database.nixosModules.nix-index];
imports = [inputs.nix-index-database.nixosModules.nix-index];
options.myConfig.comma.enable = lib.mkEnableOption "";
options.myConfig.comma.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.comma.enable {
programs.command-not-found.enable = false;
programs.nix-index.enable = true;
programs.nix-index-database.comma.enable = true;
};
config = lib.mkIf config.myConfig.comma.enable {
programs.command-not-found.enable = false;
programs.nix-index.enable = true;
programs.nix-index-database.comma.enable = true;
};
}

View file

@ -1,18 +1,18 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.de.qtile.enable = lib.mkEnableOption "";
options.myConfig.de.qtile.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.qtile.enable {
services.xserver = {
enable = true;
config = lib.mkIf config.myConfig.de.qtile.enable {
services.xserver = {
enable = true;
windowManager.qtile.enable = true;
desktopManager.wallpaper.mode = "fill";
windowManager.qtile.enable = true;
desktopManager.wallpaper.mode = "fill";
};
myConfig.x-input.enable = true;
};
myConfig.x-input.enable = true;
};
}

View file

@ -1,19 +1,19 @@
{
imports = [
./flatpak.nix
./vm.nix
./wlan.nix
./doas.nix
./vpn.nix
./comma.nix
./auto-gc.nix
./sops.nix
./bluetooth.nix
./auto-cpufreq.nix
./x-input.nix
./de.nix
./dm.nix
./sound.nix
./boot-loader.nix
];
imports = [
./flatpak.nix
./vm.nix
./wlan.nix
./doas.nix
./vpn.nix
./comma.nix
./auto-gc.nix
./sops.nix
./bluetooth.nix
./auto-cpufreq.nix
./x-input.nix
./de.nix
./dm.nix
./sound.nix
./boot-loader.nix
];
}

View file

@ -1,20 +1,20 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.dm.lightdm.enable = lib.mkEnableOption "";
options.myConfig.dm.lightdm.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.dm.lightdm.enable {
services.xserver = {
enable = true;
config = lib.mkIf config.myConfig.dm.lightdm.enable {
services.xserver = {
enable = true;
displayManager.lightdm = {
enable = true;
greeters.slick.enable = true;
};
displayManager.lightdm = {
enable = true;
greeters.slick.enable = true;
};
};
myConfig.x-input.enable = true;
};
myConfig.x-input.enable = true;
};
}

View file

@ -1,25 +1,25 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.doas.enable = lib.mkEnableOption "";
options.myConfig.doas.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.doas.enable {
security.sudo.enable = false;
config = lib.mkIf config.myConfig.doas.enable {
security.sudo.enable = false;
security.doas = {
enable = true;
extraRules = [
{
groups = ["wheel"];
keepEnv = true;
persist = true;
}
];
security.doas = {
enable = true;
extraRules = [
{
groups = ["wheel"];
keepEnv = true;
persist = true;
}
];
};
environment.shellAliases.sudo = "doas";
programs.bash.interactiveShellInit = lib.mkIf config.myConfig.shell.bash.enable "complete -F _command doas";
};
environment.shellAliases.sudo = "doas";
programs.bash.interactiveShellInit = lib.mkIf config.myConfig.shell.bash.enable "complete -F _command doas";
};
}

View file

@ -1,30 +1,30 @@
{
config,
pkgs,
lib,
...
config,
pkgs,
lib,
...
}: {
options.myConfig.flatpak.enable = lib.mkEnableOption "";
options.myConfig.flatpak.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.flatpak.enable {
services.flatpak.enable = true;
config = lib.mkIf config.myConfig.flatpak.enable {
services.flatpak.enable = true;
xdg.portal = {
enable = true;
extraPortals = [pkgs.xdg-desktop-portal-gtk];
config.common.default = "*";
};
home-manager.sharedModules = [
{
xdg = {
enable = true;
systemDirs.data = [
"/var/lib/flatpak/exports/share"
"/home/seb/.local/share/flatpak/exports/share"
];
xdg.portal = {
enable = true;
extraPortals = [pkgs.xdg-desktop-portal-gtk];
config.common.default = "*";
};
}
];
};
home-manager.sharedModules = [
{
xdg = {
enable = true;
systemDirs.data = [
"/var/lib/flatpak/exports/share"
"/home/seb/.local/share/flatpak/exports/share"
];
};
}
];
};
}

View file

@ -1,17 +1,17 @@
{
inputs,
config,
lib,
...
inputs,
config,
lib,
...
}: {
imports = [inputs.sops-nix.nixosModules.sops];
imports = [inputs.sops-nix.nixosModules.sops];
options.myConfig.sops.enable = lib.mkEnableOption "";
options.myConfig.sops.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.sops.enable {
sops = {
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
defaultSopsFile = ../../hosts/dell-laptop/secrets.yaml;
config = lib.mkIf config.myConfig.sops.enable {
sops = {
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
defaultSopsFile = ../../hosts/dell-laptop/secrets.yaml;
};
};
};
}

View file

@ -1,19 +1,19 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.sound.pipewire.enable = lib.mkEnableOption "";
options.myConfig.sound.pipewire.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.sound.pipewire.enable {
security.rtkit.enable = true;
hardware.pulseaudio.enable = false;
services.pipewire = {
enable = true;
wireplumber.enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
config = lib.mkIf config.myConfig.sound.pipewire.enable {
security.rtkit.enable = true;
hardware.pulseaudio.enable = false;
services.pipewire = {
enable = true;
wireplumber.enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
};
};
}

View file

@ -1,28 +1,28 @@
{
config,
pkgs,
lib,
...
config,
pkgs,
lib,
...
}: {
options.myConfig.vm.qemu.enable = lib.mkEnableOption "";
options.myConfig.vm.qemu.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.vm.qemu.enable {
virtualisation.libvirtd.enable = true;
config = lib.mkIf config.myConfig.vm.qemu.enable {
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
programs.virt-manager.enable = true;
environment.systemPackages = [
pkgs.quickemu
pkgs.quickgui
];
environment.systemPackages = [
pkgs.quickemu
pkgs.quickgui
];
home-manager.sharedModules = [
{
dconf.settings."org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"];
uris = ["qemu:///system"];
};
}
];
};
home-manager.sharedModules = [
{
dconf.settings."org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"];
uris = ["qemu:///system"];
};
}
];
};
}

View file

@ -1,37 +1,37 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.vpn.lgs.enable = lib.mkEnableOption "";
options.myConfig.vpn.lgs.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.vpn.lgs.enable {
sops.secrets = {
"vpn/lgs/crt" = {};
"vpn/lgs/key" = {};
config = lib.mkIf config.myConfig.vpn.lgs.enable {
sops.secrets = {
"vpn/lgs/crt" = {};
"vpn/lgs/key" = {};
};
services.openvpn.servers.lgs = {
autoStart = false;
config = ''
dev tap
persist-tun
persist-key
data-ciphers AES-128-GCM:AES-256-CBC
data-ciphers-fallback AES-256-CBC
auth SHA1
tls-client
client
resolv-retry infinite
remote 194.9.190.11 1194 udp4
nobind
auth-user-pass
ca ${config.sops.secrets."vpn/lgs/crt".path}
tls-auth ${config.sops.secrets."vpn/lgs/key".path} 1
remote-cert-tls server
explicit-exit-notify
'';
};
};
services.openvpn.servers.lgs = {
autoStart = false;
config = ''
dev tap
persist-tun
persist-key
data-ciphers AES-128-GCM:AES-256-CBC
data-ciphers-fallback AES-256-CBC
auth SHA1
tls-client
client
resolv-retry infinite
remote 194.9.190.11 1194 udp4
nobind
auth-user-pass
ca ${config.sops.secrets."vpn/lgs/crt".path}
tls-auth ${config.sops.secrets."vpn/lgs/key".path} 1
remote-cert-tls server
explicit-exit-notify
'';
};
};
}

View file

@ -1,96 +1,96 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.wlan.enable = lib.mkEnableOption "";
options.myConfig.wlan.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.wlan.enable {
sops.secrets."wlan.env" = {};
config = lib.mkIf config.myConfig.wlan.enable {
sops.secrets."wlan.env" = {};
networking.networkmanager = {
enable = true;
networking.networkmanager = {
enable = true;
ensureProfiles = {
environmentFiles = [config.sops.secrets."wlan.env".path];
ensureProfiles = {
environmentFiles = [config.sops.secrets."wlan.env".path];
profiles = {
home = {
connection = {
id = "home";
uuid = "24b856a6-27eb-4c4f-b85c-f59ab0824965";
type = "wifi";
interface-name = "wlp2s0";
};
wifi = {
mode = "infrastructure";
ssid = "$HOME_SSID";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "wpa-psk";
psk = "$HOME_PSK";
};
ipv4 = {method = "auto";};
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
};
profiles = {
home = {
connection = {
id = "home";
uuid = "24b856a6-27eb-4c4f-b85c-f59ab0824965";
type = "wifi";
interface-name = "wlp2s0";
};
wifi = {
mode = "infrastructure";
ssid = "$HOME_SSID";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "wpa-psk";
psk = "$HOME_PSK";
};
ipv4 = {method = "auto";};
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
};
mobile = {
connection = {
id = "mobile";
uuid = "e3a749cf-a103-4e1e-a50c-4a4898bafcf6";
type = "wifi";
interface-name = "wlp2s0";
};
wifi = {
mode = "infrastructure";
ssid = "$MOBILE_SSID";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "wpa-psk";
psk = "$MOBILE_PSK";
};
ipv4 = {method = "auto";};
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
};
mobile = {
connection = {
id = "mobile";
uuid = "e3a749cf-a103-4e1e-a50c-4a4898bafcf6";
type = "wifi";
interface-name = "wlp2s0";
};
wifi = {
mode = "infrastructure";
ssid = "$MOBILE_SSID";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "wpa-psk";
psk = "$MOBILE_PSK";
};
ipv4 = {method = "auto";};
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
};
school = {
connection = {
id = "school";
uuid = "bfdf4e7f-d2c4-4ab6-b833-37ecd5199b22";
type = "wifi";
interface-name = "wlp2s0";
school = {
connection = {
id = "school";
uuid = "bfdf4e7f-d2c4-4ab6-b833-37ecd5199b22";
type = "wifi";
interface-name = "wlp2s0";
};
wifi = {
mode = "infrastructure";
ssid = "$SCHOOL_SSID";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "wpa-eap";
};
"802-1x" = {
domain-suffix-match = "lgs-hu.eu";
eap = "ttls;";
identity = "$SCHOOL_ID";
password = "$SCHOOL_PSK";
phase2-auth = "pap";
};
ipv4 = {method = "auto";};
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
};
};
};
wifi = {
mode = "infrastructure";
ssid = "$SCHOOL_SSID";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "wpa-eap";
};
"802-1x" = {
domain-suffix-match = "lgs-hu.eu";
eap = "ttls;";
identity = "$SCHOOL_ID";
password = "$SCHOOL_PSK";
phase2-auth = "pap";
};
ipv4 = {method = "auto";};
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
};
};
};
};
};
}

View file

@ -1,29 +1,29 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.x-input.enable = lib.mkEnableOption "";
options.myConfig.x-input.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.x-input.enable {
services.xserver = {
enable = true;
xkb = {
layout = "de";
variant = "nodeadkeys";
};
config = lib.mkIf config.myConfig.x-input.enable {
services.xserver = {
enable = true;
xkb = {
layout = "de";
variant = "nodeadkeys";
};
libinput = {
enable = true;
libinput = {
enable = true;
touchpad = {
accelProfile = "adaptive";
naturalScrolling = true;
disableWhileTyping = true;
touchpad = {
accelProfile = "adaptive";
naturalScrolling = true;
disableWhileTyping = true;
};
mouse.accelProfile = "flat";
};
};
mouse.accelProfile = "flat";
};
};
};
}