diff --git a/deploy/colmena.nix b/deploy/colmena.nix index 9581027..81b3aa0 100644 --- a/deploy/colmena.nix +++ b/deploy/colmena.nix @@ -18,8 +18,8 @@ let }; }; - nodes = lib.genAttrs hostDirNames (hostname: - mkNode hostname (utils.hostMeta ../hosts/${hostname}).deployment.tags + nodes = lib.genAttrs hostDirNames ( + hostname: mkNode hostname (utils.hostMeta ../hosts/${hostname}).deployment.tags ); in inputs.colmena.lib.makeHive { diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix index 6cb75f8..33c0a47 100644 --- a/home/hosts/andromache/default.nix +++ b/home/hosts/andromache/default.nix @@ -32,7 +32,7 @@ home = { stateVersion = "25.05"; - username = config.host.username; + inherit (config.host) username; homeDirectory = "/home/${config.host.username}"; }; diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix index 681e54a..b093f24 100644 --- a/home/hosts/astyanax/default.nix +++ b/home/hosts/astyanax/default.nix @@ -30,7 +30,7 @@ home = { stateVersion = "25.05"; - username = config.host.username; + inherit (config.host) username; homeDirectory = "/home/${config.host.username}"; }; diff --git a/home/modules/default.nix b/home/modules/default.nix index 997bc9d..0c53d84 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { options.nixgl.wrap = lib.mkOption { diff --git a/home/modules/secrets/default.nix b/home/modules/secrets/default.nix index 1175d68..d4eb45c 100644 --- a/home/modules/secrets/default.nix +++ b/home/modules/secrets/default.nix @@ -1,5 +1,4 @@ { - lib, pkgs, ... }: diff --git a/home/modules/waybar/settings.nix b/home/modules/waybar/settings.nix index 884b8f3..dfe34b8 100644 --- a/home/modules/waybar/settings.nix +++ b/home/modules/waybar/settings.nix @@ -1,5 +1,3 @@ -{ lib, ... }: - { programs.waybar.settings = [ { diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix index d03f499..220f993 100644 --- a/hosts/andromache/default.nix +++ b/hosts/andromache/default.nix @@ -95,7 +95,7 @@ in my.yubikey = { enable = false; - username = config.host.username; + inherit (config.host) username; keys = [ { handle = ""; diff --git a/hosts/eetion-02/default.nix b/hosts/eetion-02/default.nix index bf1ff85..e4c2a7e 100644 --- a/hosts/eetion-02/default.nix +++ b/hosts/eetion-02/default.nix @@ -16,7 +16,7 @@ }; ssh = { - username = config.host.username; + inherit (config.host) username; publicHostname = config.host.name; authorizedHosts = [ "andromache" diff --git a/hosts/eetion/default.nix b/hosts/eetion/default.nix index 6ebaad0..4b94d8f 100644 --- a/hosts/eetion/default.nix +++ b/hosts/eetion/default.nix @@ -17,7 +17,7 @@ }; ssh = { - username = config.host.username; + inherit (config.host) username; publicHostname = config.host.name; authorizedHosts = [ "andromache" diff --git a/hosts/hecuba/default.nix b/hosts/hecuba/default.nix index f0f8e6d..b0dd830 100644 --- a/hosts/hecuba/default.nix +++ b/hosts/hecuba/default.nix @@ -23,7 +23,7 @@ networking.hostName = config.host.name; ssh = { - username = config.host.username; + inherit (config.host) username; publicHostname = "server.hektormisplon.xyz"; authorizedHosts = [ "andromache" diff --git a/modules/boot/bootloader.nix b/modules/boot/bootloader.nix index 3a4014f..d39e4ca 100644 --- a/modules/boot/bootloader.nix +++ b/modules/boot/bootloader.nix @@ -1,5 +1,3 @@ -_: - { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/localization/default.nix b/modules/localization/default.nix index 45dea14..6029538 100644 --- a/modules/localization/default.nix +++ b/modules/localization/default.nix @@ -1,5 +1,3 @@ -_: - { time.timeZone = "Europe/Brussels"; i18n.defaultLocale = "en_US.UTF-8"; diff --git a/modules/x/default.nix b/modules/x/default.nix index d956a8f..4be8213 100644 --- a/modules/x/default.nix +++ b/modules/x/default.nix @@ -1,5 +1,3 @@ -_: - { services.xserver.windowManager.xmonad = { enable = true; diff --git a/utils/default.nix b/utils/default.nix index 372e7a5..911b33d 100644 --- a/utils/default.nix +++ b/utils/default.nix @@ -4,8 +4,10 @@ dirNames = path: builtins.attrNames (lib.filterAttrs (_: type: type == "directory") (builtins.readDir path)); - hostMeta = hostDir: - if builtins.pathExists (hostDir + "/meta.nix") - then import (hostDir + "/meta.nix") - else throw "meta.nix required in ${hostDir}"; + hostMeta = + hostDir: + if builtins.pathExists (hostDir + "/meta.nix") then + import (hostDir + "/meta.nix") + else + throw "meta.nix required in ${hostDir}"; }