diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index 2bab9b85..4dca678e 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -1,5 +1,5 @@ { - system = { + nixos = { boot = { loader = { default = { @@ -90,7 +90,7 @@ enable = false; }; }; - sysd = { + services = { network = { blueman = { enable = true; @@ -167,6 +167,14 @@ }; }; }; + system = { + locale = { + enable = true; + timeZone = "Europe/Stockholm"; + defaultLocale = "en_US.UTF-8"; + extraLocale = "sv_SE.UTF-8"; + }; + }; utils = { android = { enable = true; diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix index 4fb860a1..c232fec0 100644 --- a/hosts/cnixpad/modules.nix +++ b/hosts/cnixpad/modules.nix @@ -1,5 +1,5 @@ { - system = { + nixos = { boot = { loader = { default = { @@ -73,7 +73,7 @@ enable = false; }; }; - sysd = { + services = { network = { blueman = { enable = true; @@ -142,6 +142,14 @@ }; }; }; + system = { + locale = { + enable = true; + timeZone = "Europe/Stockholm"; + defaultLocale = "en_US.UTF-8"; + extraLocale = "sv_SE.UTF-8"; + }; + }; utils = { android = { enable = true; @@ -166,7 +174,9 @@ }; misc = { enable = true; - desktop.enable = false; + desktop = { + enable = false; + }; }; nh = { enable = true; diff --git a/hosts/default.nix b/hosts/default.nix index 50ea01cd..949e2203 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -41,7 +41,7 @@ extraSpecialArgs = specialArgs; }; } - self.nixosModules.system + self.nixosModules.nixos inputs.chaotic.nixosModules.default inputs.agenix.nixosModules.default ]; @@ -59,7 +59,7 @@ extraSpecialArgs = specialArgs; }; } - self.nixosModules.system + self.nixosModules.nixos inputs.chaotic.nixosModules.default inputs.agenix.nixosModules.default ]; @@ -77,7 +77,7 @@ extraSpecialArgs = specialArgs; }; } - self.nixosModules.system + self.nixosModules.nixos inputs.chaotic.nixosModules.default inputs.agenix.nixosModules.default ]; diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix index 8edecf65..5f23b7b4 100644 --- a/hosts/toothpc/modules.nix +++ b/hosts/toothpc/modules.nix @@ -1,5 +1,5 @@ { - system = { + nixos = { boot = { loader = { default = { @@ -91,7 +91,7 @@ enable = true; }; }; - sysd = { + services = { network = { blueman = { enable = false; @@ -164,6 +164,14 @@ }; }; }; + system = { + locale = { + enable = true; + timeZone = "Europe/Stockholm"; + defaultLocale = "en_US.UTF-8"; + extraLocale = "sv_SE.UTF-8"; + }; + }; utils = { android = { enable = false; diff --git a/modules/default.nix b/modules/default.nix index 37b1a17c..5e6a931e 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -53,67 +53,69 @@ ./home/wm/utils/hyprpaper ]; }; - system = { + nixos = { imports = [ - ./system/boot/loader - ./system/boot/kernel + ./nixos/boot/loader + ./nixos/boot/kernel - ./system/gaming/gamemode - ./system/gaming/gamescope - ./system/gaming/lutris - ./system/gaming/steam + ./nixos/gaming/gamemode + ./nixos/gaming/gamescope + ./nixos/gaming/lutris + ./nixos/gaming/steam - ./system/gui/gnome - ./system/gui/hyprland + ./nixos/gui/gnome + ./nixos/gui/hyprland - ./system/hardware/bluetooth - ./system/hardware/graphics/amd - ./system/hardware/graphics/nvidia - ./system/hardware/logitech - ./system/hardware/network + ./nixos/hardware/bluetooth + ./nixos/hardware/graphics/amd + ./nixos/hardware/graphics/nvidia + ./nixos/hardware/logitech + ./nixos/hardware/network - ./system/studio/blender - ./system/studio/gimp - ./system/studio/inkscape - ./system/studio/beekeeper - ./system/studio/mysql-workbench + ./nixos/studio/blender + ./nixos/studio/gimp + ./nixos/studio/inkscape + ./nixos/studio/beekeeper + ./nixos/studio/mysql-workbench - ./system/sysd/network/blueman - ./system/sysd/network/mullvad - ./system/sysd/network/samba - ./system/sysd/network/openssh + ./nixos/services/network/blueman + ./nixos/services/network/mullvad + ./nixos/services/network/samba + ./nixos/services/network/openssh - ./system/sysd/security/agenix - ./system/sysd/security/gnome-keyring + ./nixos/services/security/agenix + ./nixos/services/security/gnome-keyring - ./system/sysd/session/dbus - ./system/sysd/session/dconf - ./system/sysd/session/xserver + ./nixos/services/session/dbus + ./nixos/services/session/dconf + ./nixos/services/session/xserver - ./system/sysd/system/fwupd - ./system/sysd/system/greetd - ./system/sysd/system/gvfs - ./system/sysd/system/locate - ./system/sysd/system/nix-ld - ./system/sysd/system/pcscd - ./system/sysd/system/pipewire - ./system/sysd/system/powerd - ./system/sysd/system/udisks - ./system/sysd/system/zram - ./system/sysd/system/kanata + ./nixos/services/system/fwupd + ./nixos/services/system/greetd + ./nixos/services/system/gvfs + ./nixos/services/system/locate + ./nixos/services/system/nix-ld + ./nixos/services/system/pcscd + ./nixos/services/system/pipewire + ./nixos/services/system/powerd + ./nixos/services/system/udisks + ./nixos/services/system/zram + ./nixos/services/system/kanata - ./system/utils/android - ./system/utils/anyrun - ./system/utils/brightnessctl - ./system/utils/chaotic - ./system/utils/corectrl - ./system/utils/microfetch - ./system/utils/misc - ./system/utils/nh - ./system/utils/npm - ./system/utils/obsidian - ./system/utils/yubikey - ./system/utils/zsh + ./nixos/system/locale + + ./nixos/utils/android + ./nixos/utils/anyrun + ./nixos/utils/brightnessctl + ./nixos/utils/chaotic + ./nixos/utils/corectrl + ./nixos/utils/microfetch + ./nixos/utils/misc + ./nixos/utils/nh + ./nixos/utils/npm + ./nixos/utils/obsidian + ./nixos/utils/yubikey + ./nixos/utils/zsh ]; }; options = { diff --git a/modules/system/boot/kernel/default.nix b/modules/nixos/boot/kernel/default.nix similarity index 92% rename from modules/system/boot/kernel/default.nix rename to modules/nixos/boot/kernel/default.nix index 16492f12..e49a4186 100644 --- a/modules/system/boot/kernel/default.nix +++ b/modules/nixos/boot/kernel/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkOption; - cfg = config.system.boot.kernel; + cfg = config.nixos.boot.kernel; in { options = { - system.boot.kernel = { + nixos.boot.kernel = { variant = mkOption { type = lib.types.enum ["stable" "latest" "cachyos"]; default = "latest"; @@ -30,7 +30,7 @@ in { extraBlacklistedModules = mkOption { type = lib.types.listOf lib.types.str; default = []; - description = "Additional kernel system.to blacklist."; + description = "Additional kernel nixos.to blacklist."; }; }; }; diff --git a/modules/system/boot/loader/default.nix b/modules/nixos/boot/loader/default.nix similarity index 85% rename from modules/system/boot/loader/default.nix rename to modules/nixos/boot/loader/default.nix index f695359b..11f5fb2c 100644 --- a/modules/system/boot/loader/default.nix +++ b/modules/nixos/boot/loader/default.nix @@ -6,10 +6,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkMerge mkForce; - cfg = config.system.boot.loader; + cfg = config.nixos.boot.loader; in { options = { - system.boot.loader = { + nixos.boot.loader = { default = { enable = mkEnableOption "Enable default boot loader configuration."; }; @@ -28,7 +28,7 @@ in { assertions = [ { assertion = !(cfg.default.enable && cfg.lanzaboote.enable); - message = "Only one of system.boot.loader.default.enable and system.boot.loader.lanzaboote.enable can be set to true."; + message = "Only one of nixos.boot.loader.default.enable and nixos.boot.loader.lanzaboote.enable can be set to true."; } ]; } diff --git a/modules/system/gaming/gamemode/default.nix b/modules/nixos/gaming/gamemode/default.nix similarity index 94% rename from modules/system/gaming/gamemode/default.nix rename to modules/nixos/gaming/gamemode/default.nix index a82afe47..8ef19543 100644 --- a/modules/system/gaming/gamemode/default.nix +++ b/modules/nixos/gaming/gamemode/default.nix @@ -6,14 +6,14 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.system.gaming.gamemode; + cfg = config.nixos.gaming.gamemode; pipewireLowLatencyModule = inputs.nix-gaming.nixosModules.pipewireLowLatency; in { imports = [ pipewireLowLatencyModule ]; options = { - system.gaming.gamemode = { + nixos.gaming.gamemode = { enable = mkEnableOption "Enables gamemode"; optimizeGpu.enable = mkOption { type = lib.types.bool; diff --git a/modules/system/gaming/gamescope/default.nix b/modules/nixos/gaming/gamescope/default.nix similarity index 70% rename from modules/system/gaming/gamescope/default.nix rename to modules/nixos/gaming/gamescope/default.nix index c6cc81e3..877c2055 100644 --- a/modules/system/gaming/gamescope/default.nix +++ b/modules/nixos/gaming/gamescope/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.gaming.gamescope; + cfg = config.nixos.gaming.gamescope; in { options = { - system.gaming.gamescope.enable = mkEnableOption "Enables gamescope"; + nixos.gaming.gamescope.enable = mkEnableOption "Enables gamescope"; }; config = mkIf cfg.enable { programs.gamescope = { diff --git a/modules/system/gaming/lutris/default.nix b/modules/nixos/gaming/lutris/default.nix similarity index 66% rename from modules/system/gaming/lutris/default.nix rename to modules/nixos/gaming/lutris/default.nix index 3694df55..55787a0a 100644 --- a/modules/system/gaming/lutris/default.nix +++ b/modules/nixos/gaming/lutris/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.gaming.lutris; + cfg = config.nixos.gaming.lutris; in { options = { - system.gaming.lutris.enable = mkEnableOption "Enables lutris"; + nixos.gaming.lutris.enable = mkEnableOption "Enables lutris"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/system/gaming/steam/default.nix b/modules/nixos/gaming/steam/default.nix similarity index 70% rename from modules/system/gaming/steam/default.nix rename to modules/nixos/gaming/steam/default.nix index 98d3f445..1fb49e45 100644 --- a/modules/system/gaming/steam/default.nix +++ b/modules/nixos/gaming/steam/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.gaming.steam; + cfg = config.nixos.gaming.steam; in { options = { - system.gaming.steam.enable = mkEnableOption "Enables steam"; + nixos.gaming.steam.enable = mkEnableOption "Enables steam"; }; config = mkIf cfg.enable { programs = { diff --git a/modules/system/gui/gnome/default.nix b/modules/nixos/gui/gnome/default.nix similarity index 74% rename from modules/system/gui/gnome/default.nix rename to modules/nixos/gui/gnome/default.nix index e1bebd56..492c05ed 100644 --- a/modules/system/gui/gnome/default.nix +++ b/modules/nixos/gui/gnome/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.gui.gnome; + cfg = config.nixos.gui.gnome; in { options = { - system.gui.gnome.enable = mkEnableOption "Enables gnome"; + nixos.gui.gnome.enable = mkEnableOption "Enables gnome"; }; config = mkIf cfg.enable { services = { diff --git a/modules/system/gui/hyprland/default.nix b/modules/nixos/gui/hyprland/default.nix similarity index 80% rename from modules/system/gui/hyprland/default.nix rename to modules/nixos/gui/hyprland/default.nix index c514b38a..0208c1ea 100644 --- a/modules/system/gui/hyprland/default.nix +++ b/modules/nixos/gui/hyprland/default.nix @@ -6,10 +6,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.gui.hyprland; + cfg = config.nixos.gui.hyprland; in { options = { - system.gui.hyprland.enable = mkEnableOption "Enables hyprland"; + nixos.gui.hyprland.enable = mkEnableOption "Enables hyprland"; }; config = mkIf cfg.enable { programs.hyprland = { diff --git a/modules/system/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix similarity index 66% rename from modules/system/hardware/bluetooth/default.nix rename to modules/nixos/hardware/bluetooth/default.nix index fe7751e2..08b0cf58 100644 --- a/modules/system/hardware/bluetooth/default.nix +++ b/modules/nixos/hardware/bluetooth/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.hardware.bluetooth; + cfg = config.nixos.hardware.bluetooth; in { options = { - system.hardware.bluetooth.enable = mkEnableOption "Enables bluetooth"; + nixos.hardware.bluetooth.enable = mkEnableOption "Enables bluetooth"; }; config = mkIf cfg.enable { hardware = { diff --git a/modules/system/hardware/graphics/amd/default.nix b/modules/nixos/hardware/graphics/amd/default.nix similarity index 80% rename from modules/system/hardware/graphics/amd/default.nix rename to modules/nixos/hardware/graphics/amd/default.nix index 7d339805..1606a41a 100644 --- a/modules/system/hardware/graphics/amd/default.nix +++ b/modules/nixos/hardware/graphics/amd/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.hardware.graphics.amd; + cfg = config.nixos.hardware.graphics.amd; in { options = { - system.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics"; + nixos.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics"; }; config = mkIf cfg.enable { hardware = { diff --git a/modules/system/hardware/graphics/nvidia/default.nix b/modules/nixos/hardware/graphics/nvidia/default.nix similarity index 95% rename from modules/system/hardware/graphics/nvidia/default.nix rename to modules/nixos/hardware/graphics/nvidia/default.nix index 95c1ab9d..762db238 100644 --- a/modules/system/hardware/graphics/nvidia/default.nix +++ b/modules/nixos/hardware/graphics/nvidia/default.nix @@ -15,10 +15,10 @@ exec "$@" ''; inherit (lib) types mkIf mkEnableOption mkOption; - cfg = config.system.hardware.graphics.nvidia; + cfg = config.nixos.hardware.graphics.nvidia; in { options = { - system.hardware.graphics.nvidia = { + nixos.hardware.graphics.nvidia = { enable = mkEnableOption "Enables NVidia graphics"; package = mkOption { type = types.enum ["stable" "beta" "production" "latest"]; diff --git a/modules/system/hardware/logitech/default.nix b/modules/nixos/hardware/logitech/default.nix similarity index 68% rename from modules/system/hardware/logitech/default.nix rename to modules/nixos/hardware/logitech/default.nix index 1b30832c..1cc003fd 100644 --- a/modules/system/hardware/logitech/default.nix +++ b/modules/nixos/hardware/logitech/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.hardware.logitech; + cfg = config.nixos.hardware.logitech; in { options = { - system.hardware.logitech.enable = mkEnableOption "Enables logitech"; + nixos.hardware.logitech.enable = mkEnableOption "Enables logitech"; }; config = mkIf cfg.enable { hardware = { diff --git a/modules/system/hardware/network/default.nix b/modules/nixos/hardware/network/default.nix similarity index 93% rename from modules/system/hardware/network/default.nix rename to modules/nixos/hardware/network/default.nix index 1c93a0b4..8cba7d61 100644 --- a/modules/system/hardware/network/default.nix +++ b/modules/nixos/hardware/network/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption types; - cfg = config.system.hardware.network; + cfg = config.nixos.hardware.network; in { options = { - system = { + nixos = { hardware = { network = { enable = mkEnableOption "Enable the custom networking module"; @@ -15,7 +15,7 @@ in { hostName = mkOption { type = types.str; default = "default-hostname"; - description = "Hostname for the system."; + description = "Hostname for the nixos."; }; interfaces = mkOption { diff --git a/modules/system/sysd/network/blueman/default.nix b/modules/nixos/services/network/blueman/default.nix similarity index 59% rename from modules/system/sysd/network/blueman/default.nix rename to modules/nixos/services/network/blueman/default.nix index d9e2df32..7d9f806b 100644 --- a/modules/system/sysd/network/blueman/default.nix +++ b/modules/nixos/services/network/blueman/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.network.blueman; + cfg = config.nixos.services.network.blueman; in { options = { - system.sysd.network.blueman.enable = mkEnableOption "Enables blueman"; + nixos.services.network.blueman.enable = mkEnableOption "Enables blueman"; }; config = mkIf cfg.enable { services = { diff --git a/modules/system/sysd/network/mullvad/default.nix b/modules/nixos/services/network/mullvad/default.nix similarity index 64% rename from modules/system/sysd/network/mullvad/default.nix rename to modules/nixos/services/network/mullvad/default.nix index 80fd1bce..2745a06f 100644 --- a/modules/system/sysd/network/mullvad/default.nix +++ b/modules/nixos/services/network/mullvad/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.network.mullvad; + cfg = config.nixos.services.network.mullvad; in { options = { - system.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad"; + nixos.services.network.mullvad.enable = mkEnableOption "Enables mullvad"; }; config = mkIf cfg.enable { services.mullvad-vpn = { diff --git a/modules/system/sysd/network/openssh/default.nix b/modules/nixos/services/network/openssh/default.nix similarity index 59% rename from modules/system/sysd/network/openssh/default.nix rename to modules/nixos/services/network/openssh/default.nix index 0c92232f..2b40478b 100644 --- a/modules/system/sysd/network/openssh/default.nix +++ b/modules/nixos/services/network/openssh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.network.openssh; + cfg = config.nixos.services.network.openssh; in { options = { - system.sysd.network.openssh.enable = mkEnableOption "Enables openssh"; + nixos.services.network.openssh.enable = mkEnableOption "Enables openssh"; }; config = mkIf cfg.enable { services.openssh = { diff --git a/modules/system/sysd/network/samba/default.nix b/modules/nixos/services/network/samba/default.nix similarity index 80% rename from modules/system/sysd/network/samba/default.nix rename to modules/nixos/services/network/samba/default.nix index dec70aca..e0b09d59 100644 --- a/modules/system/sysd/network/samba/default.nix +++ b/modules/nixos/services/network/samba/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.network.samba; + cfg = config.nixos.services.network.samba; in { options = { - system.sysd.network.samba.enable = mkEnableOption "Enables samba"; + nixos.services.network.samba.enable = mkEnableOption "Enables samba"; }; config = mkIf cfg.enable { services = { diff --git a/modules/system/sysd/security/agenix/default.nix b/modules/nixos/services/security/agenix/default.nix similarity index 94% rename from modules/system/sysd/security/agenix/default.nix rename to modules/nixos/services/security/agenix/default.nix index f2973002..35b52a37 100644 --- a/modules/system/sysd/security/agenix/default.nix +++ b/modules/nixos/services/security/agenix/default.nix @@ -7,10 +7,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.system.sysd.security.agenix; + cfg = config.nixos.services.security.agenix; in { options = { - system.sysd.security.agenix = { + nixos.services.security.agenix = { enable = mkEnableOption "Enables agenix system environment"; cnix.enable = mkOption { type = lib.types.bool; diff --git a/modules/system/sysd/security/gnome-keyring/default.nix b/modules/nixos/services/security/gnome-keyring/default.nix similarity index 54% rename from modules/system/sysd/security/gnome-keyring/default.nix rename to modules/nixos/services/security/gnome-keyring/default.nix index a4da5f89..52be524a 100644 --- a/modules/system/sysd/security/gnome-keyring/default.nix +++ b/modules/nixos/services/security/gnome-keyring/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.security.gnome-keyring; + cfg = config.nixos.services.security.gnome-keyring; in { options = { - system.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring"; + nixos.services.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring"; }; config = mkIf cfg.enable { services.gnome.gnome-keyring.enable = true; diff --git a/modules/system/sysd/session/dbus/default.nix b/modules/nixos/services/session/dbus/default.nix similarity index 67% rename from modules/system/sysd/session/dbus/default.nix rename to modules/nixos/services/session/dbus/default.nix index 93331718..f6bda7b4 100644 --- a/modules/system/sysd/session/dbus/default.nix +++ b/modules/nixos/services/session/dbus/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.session.dbus; + cfg = config.nixos.services.session.dbus; in { options = { - system.sysd.session.dbus.enable = mkEnableOption "Enables dbus"; + nixos.services.session.dbus.enable = mkEnableOption "Enables dbus"; }; config = mkIf cfg.enable { services.dbus = { diff --git a/modules/system/sysd/session/dconf/default.nix b/modules/nixos/services/session/dconf/default.nix similarity index 57% rename from modules/system/sysd/session/dconf/default.nix rename to modules/nixos/services/session/dconf/default.nix index 23066104..a18ef01d 100644 --- a/modules/system/sysd/session/dconf/default.nix +++ b/modules/nixos/services/session/dconf/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.session.dconf; + cfg = config.nixos.services.session.dconf; in { options = { - system.sysd.session.dconf.enable = mkEnableOption "Enables dconf"; + nixos.services.session.dconf.enable = mkEnableOption "Enables dconf"; }; config = mkIf cfg.enable { programs.dconf.enable = true; diff --git a/modules/system/sysd/session/xserver/default.nix b/modules/nixos/services/session/xserver/default.nix similarity index 87% rename from modules/system/sysd/session/xserver/default.nix rename to modules/nixos/services/session/xserver/default.nix index 811746ac..12c30c4f 100644 --- a/modules/system/sysd/session/xserver/default.nix +++ b/modules/nixos/services/session/xserver/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkOption types; - cfg = config.system.sysd.session.xserver; + cfg = config.nixos.services.session.xserver; in { options = { - system.sysd.session.xserver = { + nixos.services.session.xserver = { videoDrivers = mkOption { type = types.listOf (types.enum ["amdgpu" "nvidia"]); default = ["amdgpu"]; diff --git a/modules/system/sysd/system/fwupd/default.nix b/modules/nixos/services/system/fwupd/default.nix similarity index 58% rename from modules/system/sysd/system/fwupd/default.nix rename to modules/nixos/services/system/fwupd/default.nix index c60997d9..8f94acff 100644 --- a/modules/system/sysd/system/fwupd/default.nix +++ b/modules/nixos/services/system/fwupd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.fwupd; + cfg = config.nixos.services.system.fwupd; in { options = { - system.sysd.system.fwupd.enable = mkEnableOption "Enables fwupd"; + nixos.services.system.fwupd.enable = mkEnableOption "Enables fwupd"; }; config = mkIf cfg.enable { services.fwupd.enable = true; diff --git a/modules/system/sysd/system/greetd/default.nix b/modules/nixos/services/system/greetd/default.nix similarity index 94% rename from modules/system/sysd/system/greetd/default.nix rename to modules/nixos/services/system/greetd/default.nix index d0f880ad..ca55441a 100644 --- a/modules/system/sysd/system/greetd/default.nix +++ b/modules/nixos/services/system/greetd/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkMerge mkOption types; - cfg = config.system.sysd.system.greetd; + cfg = config.nixos.services.system.greetd; in { options = { - system.sysd.system.greetd = { + nixos.services.system.greetd = { enable = mkEnableOption { type = types.bool; default = false; diff --git a/modules/system/sysd/system/gvfs/default.nix b/modules/nixos/services/system/gvfs/default.nix similarity index 58% rename from modules/system/sysd/system/gvfs/default.nix rename to modules/nixos/services/system/gvfs/default.nix index bc4f8f0a..32d36031 100644 --- a/modules/system/sysd/system/gvfs/default.nix +++ b/modules/nixos/services/system/gvfs/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.gvfs; + cfg = config.nixos.services.system.gvfs; in { options = { - system.sysd.system.gvfs.enable = mkEnableOption "Enables gvfs"; + nixos.services.system.gvfs.enable = mkEnableOption "Enables gvfs"; }; config = mkIf cfg.enable { services.gvfs.enable = true; diff --git a/modules/system/sysd/system/kanata/default.nix b/modules/nixos/services/system/kanata/default.nix similarity index 74% rename from modules/system/sysd/system/kanata/default.nix rename to modules/nixos/services/system/kanata/default.nix index a1972f17..235c149f 100644 --- a/modules/system/sysd/system/kanata/default.nix +++ b/modules/nixos/services/system/kanata/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.kanata; + cfg = config.nixos.services.system.kanata; in { options = { - system.sysd.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping"; + nixos.services.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping"; }; config = mkIf cfg.enable { services.kanata = { diff --git a/modules/system/sysd/system/kanata/hhkbse.kbd b/modules/nixos/services/system/kanata/hhkbse.kbd similarity index 100% rename from modules/system/sysd/system/kanata/hhkbse.kbd rename to modules/nixos/services/system/kanata/hhkbse.kbd diff --git a/modules/system/sysd/system/locate/default.nix b/modules/nixos/services/system/locate/default.nix similarity index 66% rename from modules/system/sysd/system/locate/default.nix rename to modules/nixos/services/system/locate/default.nix index 7dde69ab..f39dda30 100644 --- a/modules/system/sysd/system/locate/default.nix +++ b/modules/nixos/services/system/locate/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.locate; + cfg = config.nixos.services.system.locate; in { options = { - system.sysd.system.locate.enable = mkEnableOption "Enables plocate"; + nixos.services.system.locate.enable = mkEnableOption "Enables plocate"; }; config = mkIf cfg.enable { services.locate = { diff --git a/modules/system/sysd/system/nix-ld/default.nix b/modules/nixos/services/system/nix-ld/default.nix similarity index 93% rename from modules/system/sysd/system/nix-ld/default.nix rename to modules/nixos/services/system/nix-ld/default.nix index 4ab3a7e0..a20d1b34 100644 --- a/modules/system/sysd/system/nix-ld/default.nix +++ b/modules/nixos/services/system/nix-ld/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.nix-ld; + cfg = config.nixos.services.system.nix-ld; in { options = { - system.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld"; + nixos.services.system.nix-ld.enable = mkEnableOption "Enables nix-ld"; }; config = mkIf cfg.enable { programs.nix-ld = { diff --git a/modules/system/sysd/system/pcscd/default.nix b/modules/nixos/services/system/pcscd/default.nix similarity index 58% rename from modules/system/sysd/system/pcscd/default.nix rename to modules/nixos/services/system/pcscd/default.nix index 2c969f72..52282d48 100644 --- a/modules/system/sysd/system/pcscd/default.nix +++ b/modules/nixos/services/system/pcscd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.pcscd; + cfg = config.nixos.services.system.pcscd; in { options = { - system.sysd.system.pcscd.enable = mkEnableOption "Enables pcscd"; + nixos.services.system.pcscd.enable = mkEnableOption "Enables pcscd"; }; config = mkIf cfg.enable { services.pcscd.enable = true; diff --git a/modules/system/sysd/system/pipewire/default.nix b/modules/nixos/services/system/pipewire/default.nix similarity index 73% rename from modules/system/sysd/system/pipewire/default.nix rename to modules/nixos/services/system/pipewire/default.nix index 35b22c64..fb2078cd 100644 --- a/modules/system/sysd/system/pipewire/default.nix +++ b/modules/nixos/services/system/pipewire/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.pipewire; + cfg = config.nixos.services.system.pipewire; in { options = { - system.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire"; + nixos.services.system.pipewire.enable = mkEnableOption "Enables pipewire"; }; config = mkIf cfg.enable { hardware.pulseaudio.enable = false; diff --git a/modules/system/sysd/system/powerd/default.nix b/modules/nixos/services/system/powerd/default.nix similarity index 62% rename from modules/system/sysd/system/powerd/default.nix rename to modules/nixos/services/system/powerd/default.nix index 26f89190..3a99ae25 100644 --- a/modules/system/sysd/system/powerd/default.nix +++ b/modules/nixos/services/system/powerd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.powerd; + cfg = config.nixos.services.system.powerd; in { options = { - system.sysd.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon"; + nixos.services.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon"; }; config = mkIf cfg.enable { services = { diff --git a/modules/system/sysd/system/udisks/default.nix b/modules/nixos/services/system/udisks/default.nix similarity index 57% rename from modules/system/sysd/system/udisks/default.nix rename to modules/nixos/services/system/udisks/default.nix index 48e8c33a..4ee71d95 100644 --- a/modules/system/sysd/system/udisks/default.nix +++ b/modules/nixos/services/system/udisks/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.udisks; + cfg = config.nixos.services.system.udisks; in { options = { - system.sysd.system.udisks.enable = mkEnableOption "Enables udisks"; + nixos.services.system.udisks.enable = mkEnableOption "Enables udisks"; }; config = mkIf cfg.enable { services.udisks2.enable = true; diff --git a/modules/system/sysd/system/zram/default.nix b/modules/nixos/services/system/zram/default.nix similarity index 57% rename from modules/system/sysd/system/zram/default.nix rename to modules/nixos/services/system/zram/default.nix index dc1665e5..6853b99b 100644 --- a/modules/system/sysd/system/zram/default.nix +++ b/modules/nixos/services/system/zram/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.sysd.system.zram; + cfg = config.nixos.services.system.zram; in { options = { - system.sysd.system.zram.enable = mkEnableOption "Enables zram"; + nixos.services.system.zram.enable = mkEnableOption "Enables zram"; }; config = mkIf cfg.enable { zramSwap.enable = true; diff --git a/modules/system/studio/beekeeper/default.nix b/modules/nixos/studio/beekeeper/default.nix similarity index 63% rename from modules/system/studio/beekeeper/default.nix rename to modules/nixos/studio/beekeeper/default.nix index 41dc051d..25bc0e8a 100644 --- a/modules/system/studio/beekeeper/default.nix +++ b/modules/nixos/studio/beekeeper/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.studio.beekeeper; + cfg = config.nixos.studio.beekeeper; in { options = { - system.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio"; + nixos.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/system/studio/blender/default.nix b/modules/nixos/studio/blender/default.nix similarity index 88% rename from modules/system/studio/blender/default.nix rename to modules/nixos/studio/blender/default.nix index c18aa5fa..b8b7ae36 100644 --- a/modules/system/studio/blender/default.nix +++ b/modules/nixos/studio/blender/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.system.studio.blender; + cfg = config.nixos.studio.blender; in { options = { - system.studio.blender = { + nixos.studio.blender = { enable = mkEnableOption "Enables Blender"; hip.enable = mkOption { type = lib.types.bool; diff --git a/modules/system/studio/gimp/default.nix b/modules/nixos/studio/gimp/default.nix similarity index 67% rename from modules/system/studio/gimp/default.nix rename to modules/nixos/studio/gimp/default.nix index d08626cd..4fe9263a 100644 --- a/modules/system/studio/gimp/default.nix +++ b/modules/nixos/studio/gimp/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.studio.gimp; + cfg = config.nixos.studio.gimp; in { options = { - system.studio.gimp.enable = mkEnableOption "Enables gimp"; + nixos.studio.gimp.enable = mkEnableOption "Enables gimp"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/system/studio/inkscape/default.nix b/modules/nixos/studio/inkscape/default.nix similarity index 66% rename from modules/system/studio/inkscape/default.nix rename to modules/nixos/studio/inkscape/default.nix index 5dd3c599..b926ae2a 100644 --- a/modules/system/studio/inkscape/default.nix +++ b/modules/nixos/studio/inkscape/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.studio.inkscape; + cfg = config.nixos.studio.inkscape; in { options = { - system.studio.inkscape.enable = mkEnableOption "Enables inkscape"; + nixos.studio.inkscape.enable = mkEnableOption "Enables inkscape"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/system/studio/mysql-workbench/default.nix b/modules/nixos/studio/mysql-workbench/default.nix similarity index 61% rename from modules/system/studio/mysql-workbench/default.nix rename to modules/nixos/studio/mysql-workbench/default.nix index cff48d59..64a0678a 100644 --- a/modules/system/studio/mysql-workbench/default.nix +++ b/modules/nixos/studio/mysql-workbench/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.studio.mysql-workbench; + cfg = config.nixos.studio.mysql-workbench; in { options = { - system.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench"; + nixos.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/system/locale/default.nix b/modules/nixos/system/locale/default.nix new file mode 100644 index 00000000..8a3a320a --- /dev/null +++ b/modules/nixos/system/locale/default.nix @@ -0,0 +1,64 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf mkOption mkDefault; + cfg = config.nixos.system.locale; + defaultCategories = [ + "LC_ADDRESS" + "LC_IDENTIFICATION" + "LC_MEASUREMENT" + "LC_MONETARY" + "LC_NAME" + "LC_NUMERIC" + "LC_PAPER" + "LC_TELEPHONE" + "LC_TIME" + ]; +in { + options = { + nixos.system.locale = { + enable = mkOption { + type = lib.types.bool; + default = true; + description = "Enable locale configuration."; + }; + timeZone = mkOption { + type = lib.types.str; + default = null; + description = "The system time zone (e.g., \"Europe/Stockholm\")."; + }; + defaultLocale = mkOption { + type = lib.types.str; + default = null; + description = "The default locale for the system (e.g., \"en_US.UTF-8\")."; + }; + extraLocale = mkOption { + type = lib.types.str; + default = null; + description = '' + The locale to use for specific LC_* categories. + If set, it will override the categories specified in `locale.categories`. + Example: "sv_SE.UTF-8". + ''; + }; + categories = mkOption { + type = lib.types.listOf lib.types.str; + default = defaultCategories; + description = '' + List of LC_* categories to override with `locale.extraLocale`. + Defaults to common locale categories. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + time.timeZone = mkDefault cfg.timeZone; + i18n.defaultLocale = mkDefault cfg.defaultLocale; + i18n.extraLocaleSettings = mkIf (cfg.extraLocale != null) ( + lib.foldl' (attrs: lc: attrs // {"${lc}" = cfg.extraLocale;}) {} cfg.categories + ); + }; +} diff --git a/modules/system/utils/android/default.nix b/modules/nixos/utils/android/default.nix similarity index 59% rename from modules/system/utils/android/default.nix rename to modules/nixos/utils/android/default.nix index d7901458..2098237d 100644 --- a/modules/system/utils/android/default.nix +++ b/modules/nixos/utils/android/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.android; + cfg = config.nixos.utils.android; in { options = { - system.utils.android.enable = mkEnableOption "Enables android tools"; + nixos.utils.android.enable = mkEnableOption "Enables android tools"; }; config = mkIf cfg.enable { programs.adb.enable = true; diff --git a/modules/system/utils/anyrun/default.nix b/modules/nixos/utils/anyrun/default.nix similarity index 65% rename from modules/system/utils/anyrun/default.nix rename to modules/nixos/utils/anyrun/default.nix index 09261c77..886b45b3 100644 --- a/modules/system/utils/anyrun/default.nix +++ b/modules/nixos/utils/anyrun/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.anyrun; + cfg = config.nixos.utils.anyrun; in { options = { - system.utils.anyrun.enable = mkEnableOption "Enables anyrun"; + nixos.utils.anyrun.enable = mkEnableOption "Enables anyrun"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/system/utils/brightnessctl/default.nix b/modules/nixos/utils/brightnessctl/default.nix similarity index 62% rename from modules/system/utils/brightnessctl/default.nix rename to modules/nixos/utils/brightnessctl/default.nix index 8f201a4d..552eee65 100644 --- a/modules/system/utils/brightnessctl/default.nix +++ b/modules/nixos/utils/brightnessctl/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.brightnessctl; + cfg = config.nixos.utils.brightnessctl; in { options = { - system.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl"; + nixos.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/system/utils/chaotic/default.nix b/modules/nixos/utils/chaotic/default.nix similarity index 96% rename from modules/system/utils/chaotic/default.nix rename to modules/nixos/utils/chaotic/default.nix index 73c600cf..5c18bed6 100644 --- a/modules/system/utils/chaotic/default.nix +++ b/modules/nixos/utils/chaotic/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.system.utils.chaotic; + cfg = config.nixos.utils.chaotic; in { options = { - system.utils.chaotic = { + nixos.utils.chaotic = { enable = mkEnableOption "Enables Chaotic AUR packages"; amd.enable = mkOption { type = lib.types.bool; diff --git a/modules/system/utils/corectrl/default.nix b/modules/nixos/utils/corectrl/default.nix similarity index 71% rename from modules/system/utils/corectrl/default.nix rename to modules/nixos/utils/corectrl/default.nix index 9bb5add8..8e645249 100644 --- a/modules/system/utils/corectrl/default.nix +++ b/modules/nixos/utils/corectrl/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.corectrl; + cfg = config.nixos.utils.corectrl; in { options = { - system.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl"; + nixos.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl"; }; config = mkIf cfg.enable { programs.corectrl = { diff --git a/modules/system/utils/microfetch/default.nix b/modules/nixos/utils/microfetch/default.nix similarity index 66% rename from modules/system/utils/microfetch/default.nix rename to modules/nixos/utils/microfetch/default.nix index 5a45ac93..00de022e 100644 --- a/modules/system/utils/microfetch/default.nix +++ b/modules/nixos/utils/microfetch/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.microfetch; + cfg = config.nixos.utils.microfetch; in { options = { - system.utils.microfetch.enable = mkEnableOption "Enables microfetch"; + nixos.utils.microfetch.enable = mkEnableOption "Enables microfetch"; }; config = mkIf cfg.enable { environment.systemPackages = [inputs.microfetch.packages.x86_64-linux.default]; diff --git a/modules/system/utils/misc/default.nix b/modules/nixos/utils/misc/default.nix similarity index 90% rename from modules/system/utils/misc/default.nix rename to modules/nixos/utils/misc/default.nix index 127fc869..7249912b 100644 --- a/modules/system/utils/misc/default.nix +++ b/modules/nixos/utils/misc/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.system.utils.misc; + cfg = config.nixos.utils.misc; in { options = { - system.utils.misc = { + nixos.utils.misc = { enable = mkEnableOption "Enables miscellaneous packages"; desktop.enable = mkOption { type = lib.types.bool; diff --git a/modules/system/utils/nh/default.nix b/modules/nixos/utils/nh/default.nix similarity index 91% rename from modules/system/utils/nh/default.nix rename to modules/nixos/utils/nh/default.nix index aaf88ecd..b89b981f 100644 --- a/modules/system/utils/nh/default.nix +++ b/modules/nixos/utils/nh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.system.utils.nh; + cfg = config.nixos.utils.nh; in { options = { - system.utils.nh = { + nixos.utils.nh = { enable = mkEnableOption "Enables nix helper"; clean = { enable = mkEnableOption "Enables nix helper cleaning"; diff --git a/modules/system/utils/npm/default.nix b/modules/nixos/utils/npm/default.nix similarity index 65% rename from modules/system/utils/npm/default.nix rename to modules/nixos/utils/npm/default.nix index 1c39e4d3..59544dbc 100644 --- a/modules/system/utils/npm/default.nix +++ b/modules/nixos/utils/npm/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.npm; + cfg = config.nixos.utils.npm; in { options = { - system.utils.npm.enable = mkEnableOption "Enables npm"; + nixos.utils.npm.enable = mkEnableOption "Enables npm"; }; config = mkIf cfg.enable { programs.npm = { diff --git a/modules/system/utils/obsidian/default.nix b/modules/nixos/utils/obsidian/default.nix similarity index 64% rename from modules/system/utils/obsidian/default.nix rename to modules/nixos/utils/obsidian/default.nix index 10f51ac3..4c231cb1 100644 --- a/modules/system/utils/obsidian/default.nix +++ b/modules/nixos/utils/obsidian/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.obsidian; + cfg = config.nixos.utils.obsidian; in { options = { - system.utils.obsidian.enable = mkEnableOption "Enables obsidian"; + nixos.utils.obsidian.enable = mkEnableOption "Enables obsidian"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/system/utils/yubikey/default.nix b/modules/nixos/utils/yubikey/default.nix similarity index 74% rename from modules/system/utils/yubikey/default.nix rename to modules/nixos/utils/yubikey/default.nix index a47b275d..5638c8c4 100644 --- a/modules/system/utils/yubikey/default.nix +++ b/modules/nixos/utils/yubikey/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.yubikey; + cfg = config.nixos.utils.yubikey; in { options = { - system.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities"; + nixos.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/system/utils/zsh/default.nix b/modules/nixos/utils/zsh/default.nix similarity index 62% rename from modules/system/utils/zsh/default.nix rename to modules/nixos/utils/zsh/default.nix index b7b85569..fc0b0a8c 100644 --- a/modules/system/utils/zsh/default.nix +++ b/modules/nixos/utils/zsh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.system.utils.zsh; + cfg = config.nixos.utils.zsh; in { options = { - system.utils.zsh.enable = mkEnableOption "Enables zsh shell"; + nixos.utils.zsh.enable = mkEnableOption "Enables zsh shell"; }; config = mkIf cfg.enable { programs.zsh.enable = cfg.enable; diff --git a/system/etc/default.nix b/system/etc/default.nix index 59351c44..70d1d624 100644 --- a/system/etc/default.nix +++ b/system/etc/default.nix @@ -1,7 +1,6 @@ { imports = [ # shared imports - ./locale ./fonts ./security ./xdg