From 9cedd06b8589a5d39a7a85e2efe646a8edebac53 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 8 May 2023 00:21:41 -0400 Subject: modules: merge base and nixos --- hosts/default.nix | 2 +- hosts/glados-wsl/default.nix | 2 +- hosts/glados/default.nix | 2 +- hosts/profiles.nix | 7 ++- modules/base/default.nix | 49 ----------------- modules/base/documentation.nix | 19 ------- modules/base/packages.nix | 34 ------------ modules/default.nix | 8 --- modules/desktop/audio.nix | 23 -------- modules/desktop/budgie/default.nix | 58 -------------------- modules/desktop/default.nix | 43 --------------- modules/desktop/fonts.nix | 37 ------------- modules/desktop/gnome/default.nix | 38 ------------- modules/desktop/plasma/default.nix | 32 ----------- modules/hardware/default.nix | 18 ------- modules/hardware/nvidia.nix | 33 ------------ modules/nixos/base/default.nix | 33 ++++++++++++ modules/nixos/base/documentation.nix | 19 +++++++ modules/nixos/base/locale.nix | 24 +++++++++ modules/nixos/base/network.nix | 26 +++++++++ modules/nixos/base/nix.nix | 44 ++++++++++++++++ modules/nixos/base/packages.nix | 34 ++++++++++++ modules/nixos/base/root.nix | 19 +++++++ modules/nixos/base/security.nix | 28 ++++++++++ modules/nixos/base/systemd.nix | 7 +++ modules/nixos/base/virtualisation.nix | 20 +++++++ modules/nixos/default.nix | 31 ++--------- modules/nixos/desktop/audio.nix | 23 ++++++++ modules/nixos/desktop/budgie/default.nix | 58 ++++++++++++++++++++ modules/nixos/desktop/default.nix | 43 +++++++++++++++ modules/nixos/desktop/fonts.nix | 37 +++++++++++++ modules/nixos/desktop/gnome/default.nix | 38 +++++++++++++ modules/nixos/desktop/plasma/default.nix | 32 +++++++++++ modules/nixos/hardware/default.nix | 18 +++++++ modules/nixos/hardware/nvidia.nix | 33 ++++++++++++ modules/nixos/locale.nix | 24 --------- modules/nixos/network.nix | 26 --------- modules/nixos/root.nix | 19 ------- modules/nixos/security.nix | 28 ---------- modules/nixos/server/default.nix | 79 +++++++++++++++++++++++++++ modules/nixos/server/secrets.nix | 25 +++++++++ modules/nixos/server/services/default.nix | 5 ++ modules/nixos/server/services/hercules.nix | 61 +++++++++++++++++++++ modules/nixos/systemd.nix | 7 --- modules/nixos/virtualisation.nix | 22 -------- modules/server/default.nix | 85 ------------------------------ modules/server/secrets.nix | 25 --------- modules/server/services/default.nix | 5 -- modules/server/services/hercules.nix | 61 --------------------- 49 files changed, 716 insertions(+), 728 deletions(-) delete mode 100644 modules/base/default.nix delete mode 100644 modules/base/documentation.nix delete mode 100644 modules/base/packages.nix delete mode 100644 modules/default.nix delete mode 100644 modules/desktop/audio.nix delete mode 100644 modules/desktop/budgie/default.nix delete mode 100644 modules/desktop/default.nix delete mode 100644 modules/desktop/fonts.nix delete mode 100644 modules/desktop/gnome/default.nix delete mode 100644 modules/desktop/plasma/default.nix delete mode 100644 modules/hardware/default.nix delete mode 100644 modules/hardware/nvidia.nix create mode 100644 modules/nixos/base/default.nix create mode 100644 modules/nixos/base/documentation.nix create mode 100644 modules/nixos/base/locale.nix create mode 100644 modules/nixos/base/network.nix create mode 100644 modules/nixos/base/nix.nix create mode 100644 modules/nixos/base/packages.nix create mode 100644 modules/nixos/base/root.nix create mode 100644 modules/nixos/base/security.nix create mode 100644 modules/nixos/base/systemd.nix create mode 100644 modules/nixos/base/virtualisation.nix create mode 100644 modules/nixos/desktop/audio.nix create mode 100644 modules/nixos/desktop/budgie/default.nix create mode 100644 modules/nixos/desktop/default.nix create mode 100644 modules/nixos/desktop/fonts.nix create mode 100644 modules/nixos/desktop/gnome/default.nix create mode 100644 modules/nixos/desktop/plasma/default.nix create mode 100644 modules/nixos/hardware/default.nix create mode 100644 modules/nixos/hardware/nvidia.nix delete mode 100644 modules/nixos/locale.nix delete mode 100644 modules/nixos/network.nix delete mode 100644 modules/nixos/root.nix delete mode 100644 modules/nixos/security.nix create mode 100644 modules/nixos/server/default.nix create mode 100644 modules/nixos/server/secrets.nix create mode 100644 modules/nixos/server/services/default.nix create mode 100644 modules/nixos/server/services/hercules.nix delete mode 100644 modules/nixos/systemd.nix delete mode 100644 modules/nixos/virtualisation.nix delete mode 100644 modules/server/default.nix delete mode 100644 modules/server/secrets.nix delete mode 100644 modules/server/services/default.nix delete mode 100644 modules/server/services/hercules.nix diff --git a/hosts/default.nix b/hosts/default.nix index d059b40..ef269e1 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -76,7 +76,7 @@ in { }; }; - nixosModules.getchoo = import ../modules; + nixosModules.getchoo = import ../modules/nixos; }; perSystem = { diff --git a/hosts/glados-wsl/default.nix b/hosts/glados-wsl/default.nix index 9133679..a05f3ea 100644 --- a/hosts/glados-wsl/default.nix +++ b/hosts/glados-wsl/default.nix @@ -11,7 +11,7 @@ wslu ]; - getchoo.nixos.networking.enable = false; + getchoo.base.networking.enable = false; wsl = { enable = true; diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix index b9f6ff9..4aef9e7 100644 --- a/hosts/glados/default.nix +++ b/hosts/glados/default.nix @@ -5,12 +5,12 @@ _: { ]; getchoo = { + base.virtualisation.enable = true; desktop.gnome.enable = true; hardware = { enable = true; nvidia.enable = true; }; - nixos.virtualisation.enable = true; }; home-manager.users.seth = { diff --git a/hosts/profiles.nix b/hosts/profiles.nix index ba49050..21f0a90 100644 --- a/hosts/profiles.nix +++ b/hosts/profiles.nix @@ -55,7 +55,7 @@ in { }; }; - getchoo.nixos.enable = true; + getchoo.base.enable = true; system.stateVersion = "23.05"; } ]; @@ -68,9 +68,8 @@ in { modules = [ ragenix.nixosModules.default - ../modules/base - ../modules/nixos - ../modules/server + ../modules/nixos/base + ../modules/nixos/server { getchoo.server.enable = true; diff --git a/modules/base/default.nix b/modules/base/default.nix deleted file mode 100644 index 72911a5..0000000 --- a/modules/base/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.base; - inherit (lib) mkDefault mkEnableOption mkIf; -in { - options.getchoo.base.enable = mkEnableOption "base module"; - - imports = [ - ./documentation.nix - ./packages.nix - ]; - - config = let - channelPath = "/etc/nix/channels/nixpkgs"; - in - mkIf cfg.enable { - getchoo.base = { - documentation.enable = mkDefault true; - defaultPackages.enable = mkDefault true; - }; - - nix = { - package = mkDefault pkgs.nixFlakes; - - gc = { - automatic = mkDefault true; - dates = mkDefault "weekly"; - options = mkDefault "--delete-older-than 7d"; - }; - - settings = { - auto-optimise-store = true; - experimental-features = ["nix-command" "flakes"]; - }; - - nixPath = [ - "nixpkgs=${channelPath}" - ]; - }; - - systemd.tmpfiles.rules = [ - "L+ ${channelPath} - - - - ${pkgs.path}" - ]; - }; -} diff --git a/modules/base/documentation.nix b/modules/base/documentation.nix deleted file mode 100644 index 9064507..0000000 --- a/modules/base/documentation.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.base.documentation; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.base.documentation.enable = mkEnableOption "base module documentation"; - - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [man-pages man-pages-posix]; - documentation = { - dev.enable = true; - man.enable = true; - }; - }; -} diff --git a/modules/base/packages.nix b/modules/base/packages.nix deleted file mode 100644 index a082196..0000000 --- a/modules/base/packages.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.base.defaultPackages; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.base.defaultPackages.enable = mkEnableOption "base module default packages"; - - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - cachix - hyfetch - neofetch - pinentry-curses - python311 - ]; - - programs = { - git.enable = true; - - gnupg = { - agent = { - enable = true; - pinentryFlavor = lib.mkDefault "curses"; - }; - }; - - vim.defaultEditor = true; - }; - }; -} diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index 4c3dbf8..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - imports = [ - ./base - ./desktop - ./hardware - ./nixos - ]; -} diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix deleted file mode 100644 index d04316b..0000000 --- a/modules/desktop/audio.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.getchoo.desktop.audio; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.desktop.audio.enable = mkEnableOption "enable audio support"; - - config = mkIf cfg.enable { - services = { - pipewire = { - enable = true; - wireplumber.enable = true; - alsa.enable = true; - jack.enable = true; - pulse.enable = true; - }; - }; - hardware.pulseaudio.enable = false; - }; -} diff --git a/modules/desktop/budgie/default.nix b/modules/desktop/budgie/default.nix deleted file mode 100644 index 440bbc6..0000000 --- a/modules/desktop/budgie/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - cfg = config.getchoo.desktop.budgie; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.desktop.budgie.enable = mkEnableOption "enable budgie"; - - config = mkIf cfg.enable { - getchoo.desktop.enable = true; - - services.xserver = { - displayManager.lightdm.greeters.slick = { - theme = { - name = "Materia-dark"; - package = pkgs.materia-theme; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; - }; - cursorTheme = { - name = "Breeze-gtk"; - package = pkgs.libsForQt5.breeze-gtk; - }; - }; - - desktopManager.budgie = { - enable = true; - extraGSettingsOverrides = '' - [org.gnome.desktop.interface:Budgie] - gtk-theme="Materia-dark" - icon-theme="Papirus-Dark" - cursor-theme="Breeze-gtk" - font-name="Noto Sans 10" - document-font-name="Noto Sans 10" - monospace-font-name="Fira Code 10" - enable-hot-corners=true - ''; - }; - }; - - environment.budgie.excludePackages = with pkgs; [ - qogir-theme - qogir-icon-theme - ]; - - environment.systemPackages = with pkgs; [ - alacritty - breeze-gtk - materia-theme - papirus-icon-theme - ]; - }; -} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix deleted file mode 100644 index 50b8854..0000000 --- a/modules/desktop/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.desktop; - inherit (lib) mkDefault mkEnableOption mkIf; -in { - imports = [ - ./audio.nix - ./budgie - ./fonts.nix - ./gnome - ./plasma - ]; - - options.getchoo.desktop.enable = mkEnableOption "desktop module"; - - config = mkIf cfg.enable { - getchoo = { - nixos.enable = true; - desktop = { - audio.enable = mkDefault true; - fonts.enable = mkDefault true; - }; - }; - - environment = { - noXlibs = lib.mkForce false; - systemPackages = with pkgs; [pinentry-curses wl-clipboard xclip]; - }; - - programs = { - dconf.enable = true; - firefox.enable = true; - xwayland.enable = true; - }; - - services.xserver.enable = true; - xdg.portal.enable = true; - }; -} diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix deleted file mode 100644 index 95b2e4d..0000000 --- a/modules/desktop/fonts.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - cfg = config.getchoo.desktop.fonts; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.desktop.fonts.enable = mkEnableOption "enable default fonts"; - - config = mkIf cfg.enable { - fonts = { - enableDefaultFonts = true; - - fonts = with pkgs; [ - corefonts - fira-code - (nerdfonts.override {fonts = ["FiraCode"];}) - noto-fonts - noto-fonts-extra - noto-fonts-emoji - noto-fonts-cjk-sans - ]; - - fontconfig = { - enable = true; - defaultFonts = { - serif = ["Noto Serif"]; - sansSerif = ["Noto Sans"]; - emoji = ["Noto Color Emoji"]; - monospace = ["Fira Code"]; - }; - }; - }; - }; -} diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix deleted file mode 100644 index fd3d34d..0000000 --- a/modules/desktop/gnome/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - cfg = config.getchoo.desktop.gnome; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.desktop.gnome.enable = mkEnableOption "enable gnome"; - - config = mkIf cfg.enable { - getchoo.desktop.enable = true; - - environment = { - gnome.excludePackages = with pkgs; [ - epiphany - gnome-tour - ]; - systemPackages = with pkgs; [ - adw-gtk3 - blackbox-terminal - pinentry-gnome - pinentry-gnome - ]; - }; - - services.xserver = { - displayManager.gdm = { - enable = true; - wayland = lib.mkForce true; - }; - desktopManager.gnome.enable = true; - }; - - programs.gnupg.agent.pinentryFlavor = "gnome3"; - }; -} diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix deleted file mode 100644 index 84960f3..0000000 --- a/modules/desktop/plasma/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.desktop.plasma; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.desktop.plasma.enable = mkEnableOption "enable plasma"; - - config = mkIf cfg.enable { - getchoo.desktop.enable = true; - - environment.systemPackages = with pkgs; [pinentry-qt]; - - services.xserver = { - displayManager.sddm.enable = true; - desktopManager.plasma5 = { - enable = true; - excludePackages = with pkgs.libsForQt5; [ - khelpcenter - plasma-browser-integration - print-manager - ]; - useQtScaling = true; - }; - }; - - programs.gnupg.agent.pinentryFlavor = "qt"; - }; -} diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix deleted file mode 100644 index cefa15c..0000000 --- a/modules/hardware/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.getchoo.hardware; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.hardware.enable = mkEnableOption "hardware module"; - - imports = [ - ./nvidia.nix - ]; - - config = mkIf cfg.enable { - hardware.enableAllFirmware = true; - }; -} diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix deleted file mode 100644 index c317226..0000000 --- a/modules/hardware/nvidia.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.hardware.nvidia; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.hardware.nvidia.enable = mkEnableOption "enable nvidia support"; - - config = mkIf cfg.enable { - getchoo.hardware.enable = true; - - hardware = { - nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.stable; - modesetting.enable = true; - }; - - opengl = { - enable = true; - # make steam work - driSupport32Bit = true; - extraPackages = with pkgs; [ - vaapiVdpau - ]; - }; - }; - - services.xserver.videoDrivers = ["nvidia"]; - }; -} diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix new file mode 100644 index 0000000..63700e1 --- /dev/null +++ b/modules/nixos/base/default.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + ... +}: let + cfg = config.getchoo.base; + inherit (lib) mkDefault mkEnableOption mkIf; +in { + options.getchoo.base.enable = mkEnableOption "base nixos module"; + + imports = [ + ./documentation.nix + ./locale.nix + ./network.nix + ./nix.nix + ./packages.nix + ./root.nix + ./security.nix + ./systemd.nix + ./virtualisation.nix + ]; + + config = mkIf cfg.enable { + getchoo.base = { + defaultPackages.enable = mkDefault true; + defaultLocale.enable = mkDefault true; + defaultRoot.enable = mkDefault true; + documentation.enable = mkDefault true; + networking.enable = mkDefault true; + nix-settings.enable = mkDefault true; + }; + }; +} diff --git a/modules/nixos/base/documentation.nix b/modules/nixos/base/documentation.nix new file mode 100644 index 0000000..9064507 --- /dev/null +++ b/modules/nixos/base/documentation.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.getchoo.base.documentation; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.base.documentation.enable = mkEnableOption "base module documentation"; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [man-pages man-pages-posix]; + documentation = { + dev.enable = true; + man.enable = true; + }; + }; +} diff --git a/modules/nixos/base/locale.nix b/modules/nixos/base/locale.nix new file mode 100644 index 0000000..b79d328 --- /dev/null +++ b/modules/nixos/base/locale.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + ... +}: let + cfg = config.getchoo.base.defaultLocale; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.base.defaultLocale.enable = mkEnableOption "enable default locale"; + + config = mkIf cfg.enable { + i18n = { + supportedLocales = [ + "en_US.UTF-8/UTF-8" + ]; + defaultLocale = "en_US.UTF-8"; + }; + + time = { + hardwareClockInLocalTime = true; + timeZone = "America/New_York"; + }; + }; +} diff --git a/modules/nixos/base/network.nix b/modules/nixos/base/network.nix new file mode 100644 index 0000000..dbcabac --- /dev/null +++ b/modules/nixos/base/network.nix @@ -0,0 +1,26 @@ +{ + config, + lib, + ... +}: let + cfg = config.getchoo.base.networking; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.base.networking.enable = mkEnableOption "enable networking"; + + config = mkIf cfg.enable { + networking.networkmanager = { + enable = true; + dns = "systemd-resolved"; + }; + services.resolved = { + enable = lib.mkDefault true; + dnssec = "allow-downgrade"; + extraConfig = '' + [Resolve] + DNS=1.1.1.1 1.0.0.1 + DNSOverTLS=yes + ''; + }; + }; +} diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix new file mode 100644 index 0000000..38fcef0 --- /dev/null +++ b/modules/nixos/base/nix.nix @@ -0,0 +1,44 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.getchoo.base.nix-settings; + inherit (lib) mkDefault mkEnableOption mkIf; +in { + options.getchoo.base.nix-settings.enable = mkEnableOption "base nix settings"; + + imports = [ + ./documentation.nix + ./packages.nix + ]; + + config = let + channelPath = "/etc/nix/channels/nixpkgs"; + in + mkIf cfg.enable { + nix = { + package = mkDefault pkgs.nixFlakes; + + gc = { + automatic = mkDefault true; + dates = mkDefault "weekly"; + options = mkDefault "--delete-older-than 7d"; + }; + + settings = { + auto-optimise-store = true; + experimental-features = ["nix-command" "flakes"]; + }; + + nixPath = [ + "nixpkgs=${channelPath}" + ]; + }; + + systemd.tmpfiles.rules = [ + "L+ ${channelPath} - - - - ${pkgs.path}" + ]; + }; +} diff --git a/modules/nixos/base/packages.nix b/modules/nixos/base/packages.nix new file mode 100644 index 0000000..a082196 --- /dev/null +++ b/modules/nixos/base/packages.nix @@ -0,0 +1,34 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.getchoo.base.defaultPackages; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.base.defaultPackages.enable = mkEnableOption "base module default packages"; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + cachix + hyfetch + neofetch + pinentry-curses + python311 + ]; + + programs = { + git.enable = true; + + gnupg = { + agent = { + enable = true; + pinentryFlavor = lib.mkDefault "curses"; + }; + }; + + vim.defaultEditor = true; + }; + }; +} diff --git a/modules/nixos/base/root.nix b/modules/nixos/base/root.nix new file mode 100644 index 0000000..5f8d7d4 --- /dev/null +++ b/modules/nixos/base/root.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + cfg = config.getchoo.base.defaultRoot; + inherit (lib) mkDefault mkEnableOption mkIf; +in { + options.getchoo.base.defaultRoot.enable = mkEnableOption "enable default root user"; + + config = mkIf cfg.enable { + users.users.root = { + home = mkDefault "/root"; + uid = mkDefault config.ids.uids.root; + group = mkDefault "root"; + passwordFile = mkDefault config.age.secrets.rootPassword.path; + }; + }; +} diff --git a/modules/nixos/base/security.nix b/modules/nixos/base/security.nix new file mode 100644 index 0000000..403cfa5 --- /dev/null +++ b/modules/nixos/base/security.nix @@ -0,0 +1,28 @@ +{ + lib, + pkgs, + ... +}: let + inherit (lib) mkDefault; +in { + security = { + apparmor.enable = mkDefault true; + audit.enable = mkDefault true; + auditd.enable = mkDefault true; + polkit.enable = mkDefault true; + rtkit.enable = mkDefault true; + sudo.execWheelOnly = true; + }; + + services.dbus.apparmor = mkDefault "enabled"; + + users = { + defaultUserShell = pkgs.bash; + mutableUsers = false; + }; + + nix.settings = { + allowed-users = ["root" "@wheel"]; + trusted-users = ["root"]; + }; +} diff --git a/modules/nixos/base/systemd.nix b/modules/nixos/base/systemd.nix new file mode 100644 index 0000000..2888c0b --- /dev/null +++ b/modules/nixos/base/systemd.nix @@ -0,0 +1,7 @@ +_: { + services = { + journald.extraConfig = '' + MaxRetentionSec=1w + ''; + }; +} diff --git a/modules/nixos/base/virtualisation.nix b/modules/nixos/base/virtualisation.nix new file mode 100644 index 0000000..7654fbb --- /dev/null +++ b/modules/nixos/base/virtualisation.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.getchoo.base.virtualisation; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.base.virtualisation.enable = mkEnableOption "enable podman"; + + config.virtualisation = mkIf cfg.enable { + podman = { + enable = true; + enableNvidia = true; + extraPackages = with pkgs; [podman-compose]; + }; + oci-containers.backend = "podman"; + }; +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index bbe334e..3ae2f08 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,30 +1,7 @@ -{ - config, - lib, - ... -}: let - cfg = config.getchoo.nixos; - inherit (lib) mkDefault mkEnableOption mkIf; -in { - options.getchoo.nixos.enable = mkEnableOption "base nixos module"; - +_: { imports = [ - ./locale.nix - ./network.nix - ./root.nix - ./security.nix - ./systemd.nix - ./virtualisation.nix + ./base + ./desktop + ./hardware ]; - - config = mkIf cfg.enable { - getchoo = { - base.enable = true; - nixos = { - defaultLocale.enable = mkDefault true; - defaultRoot.enable = mkDefault true; - networking.enable = mkDefault true; - }; - }; - }; } diff --git a/modules/nixos/desktop/audio.nix b/modules/nixos/desktop/audio.nix new file mode 100644 index 0000000..d04316b --- /dev/null +++ b/modules/nixos/desktop/audio.nix @@ -0,0 +1,23 @@ +{ + config, + lib, + ... +}: let + cfg = config.getchoo.desktop.audio; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.desktop.audio.enable = mkEnableOption "enable audio support"; + + config = mkIf cfg.enable { + services = { + pipewire = { + enable = true; + wireplumber.enable = true; + alsa.enable = true; + jack.enable = true; + pulse.enable = true; + }; + }; + hardware.pulseaudio.enable = false; + }; +} diff --git a/modules/nixos/desktop/budgie/default.nix b/modules/nixos/desktop/budgie/default.nix new file mode 100644 index 0000000..440bbc6 --- /dev/null +++ b/modules/nixos/desktop/budgie/default.nix @@ -0,0 +1,58 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.getchoo.desktop.budgie; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.desktop.budgie.enable = mkEnableOption "enable budgie"; + + config = mkIf cfg.enable { + getchoo.desktop.enable = true; + + services.xserver = { + displayManager.lightdm.greeters.slick = { + theme = { + name = "Materia-dark"; + package = pkgs.materia-theme; + }; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + cursorTheme = { + name = "Breeze-gtk"; + package = pkgs.libsForQt5.breeze-gtk; + }; + }; + + desktopManager.budgie = { + enable = true; + extraGSettingsOverrides = '' + [org.gnome.desktop.interface:Budgie] + gtk-theme="Materia-dark" + icon-theme="Papirus-Dark" + cursor-theme="Breeze-gtk" + font-name="Noto Sans 10" + document-font-name="Noto Sans 10" + monospace-font-name="Fira Code 10" + enable-hot-corners=true + ''; + }; + }; + + environment.budgie.excludePackages = with pkgs; [ + qogir-theme + qogir-icon-theme + ]; + + environment.systemPackages = with pkgs; [ + alacritty + breeze-gtk + materia-theme + papirus-icon-theme + ]; + }; +} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix new file mode 100644 index 0000000..2536a55 --- /dev/null +++ b/modules/nixos/desktop/default.nix @@ -0,0 +1,43 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.getchoo.desktop; + inherit (lib) mkDefault mkEnableOption mkIf; +in { + imports = [ + ./audio.nix + ./budgie + ./fonts.nix + ./gnome + ./plasma + ]; + + options.getchoo.desktop.enable = mkEnableOption "desktop module"; + + config = mkIf cfg.enable { + getchoo = { + base.enable = true; + desktop = { + audio.enable = mkDefault true; + fonts.enable = mkDefault true; + }; + }; + + environment = { + noXlibs = lib.mkForce false; + systemPackages = with pkgs; [pinentry-curses wl-clipboard xclip]; + }; + + programs = { + dconf.enable = true; + firefox.enable = true; + xwayland.enable = true; + }; + + services.xserver.enable = true; + xdg.portal.enable = true; + }; +} diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix new file mode 100644 index 0000000..95b2e4d --- /dev/null +++ b/modules/nixos/desktop/fonts.nix @@ -0,0 +1,37 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.getchoo.desktop.fonts; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.desktop.fonts.enable = mkEnableOption "enable default fonts"; + + config = mkIf cfg.enable { + fonts = { + enableDefaultFonts = true; + + fonts = with pkgs; [ + corefonts + fira-code + (nerdfonts.override {fonts = ["FiraCode"];}) + noto-fonts + noto-fonts-extra + noto-fonts-emoji + noto-fonts-cjk-sans + ]; + + fontconfig = { + enable = true; + defaultFonts = { + serif = ["Noto Serif"]; + sansSerif = ["Noto Sans"]; + emoji = ["Noto Color Emoji"]; + monospace = ["Fira Code"]; + }; + }; + }; + }; +} diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix new file mode 100644 index 0000000..fd3d34d --- /dev/null +++ b/modules/nixos/desktop/gnome/default.nix @@ -0,0 +1,38 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.getchoo.desktop.gnome; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.desktop.gnome.enable = mkEnableOption "enable gnome"; + + config = mkIf cfg.enable { + getchoo.desktop.enable = true; + + environment = { + gnome.excludePackages = with pkgs; [ + epiphany + gnome-tour + ]; + systemPackages = with pkgs; [ + adw-gtk3 + blackbox-terminal + pinentry-gnome + pinentry-gnome + ]; + }; + + services.xserver = { + displayManager.gdm = { + enable = true; + wayland = lib.mkForce true; + }; + desktopManager.gnome.enable = true; + }; + + programs.gnupg.agent.pinentryFlavor = "gnome3"; + }; +} diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix new file mode 100644 index 0000000..84960f3 --- /dev/null +++ b/modules/nixos/desktop/plasma/default.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.getchoo.desktop.plasma; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.desktop.plasma.enable = mkEnableOption "enable plasma"; + + config = mkIf cfg.enable { + getchoo.desktop.enable = true; + + environment.systemPackages = with pkgs; [pinentry-qt]; + + services.xserver = { + displayManager.sddm.enable = true; + desktopManager.plasma5 = { + enable = true; + excludePackages = with pkgs.libsForQt5; [ + khelpcenter + plasma-browser-integration + print-manager + ]; + useQtScaling = true; + }; + }; + + programs.gnupg.agent.pinentryFlavor = "qt"; + }; +} diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix new file mode 100644 index 0000000..cefa15c --- /dev/null +++ b/modules/nixos/hardware/default.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + ... +}: let + cfg = config.getchoo.hardware; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.hardware.enable = mkEnableOption "hardware module"; + + imports = [ + ./nvidia.nix + ]; + + config = mkIf cfg.enable { + hardware.enableAllFirmware = true; + }; +} diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix new file mode 100644 index 0000000..c317226 --- /dev/null +++ b/modules/nixos/hardware/nvidia.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.getchoo.hardware.nvidia; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.hardware.nvidia.enable = mkEnableOption "enable nvidia support"; + + config = mkIf cfg.enable { + getchoo.hardware.enable = true; + + hardware = { + nvidia = { + package = config.boot.kernelPackages.nvidiaPackages.stable; + modesetting.enable = true; + }; + + opengl = { + enable = true; + # make steam work + driSupport32Bit = true; + extraPackages = with pkgs; [ + vaapiVdpau + ]; + }; + }; + + services.xserver.videoDrivers = ["nvidia"]; + }; +} diff --git a/modules/nixos/locale.nix b/modules/nixos/locale.nix deleted file mode 100644 index c362a6d..0000000 --- a/modules/nixos/locale.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.getchoo.nixos.defaultLocale; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.nixos.defaultLocale.enable = mkEnableOption "enable default locale"; - - config = mkIf cfg.enable { - i18n = { - supportedLocales = [ - "en_US.UTF-8/UTF-8" - ]; - defaultLocale = "en_US.UTF-8"; - }; - - time = { - hardwareClockInLocalTime = true; - timeZone = "America/New_York"; - }; - }; -} diff --git a/modules/nixos/network.nix b/modules/nixos/network.nix deleted file mode 100644 index 7dce2b1..0000000 --- a/modules/nixos/network.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.getchoo.nixos.networking; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.nixos.networking.enable = mkEnableOption "enable networking"; - - config = mkIf cfg.enable { - networking.networkmanager = { - enable = true; - dns = "systemd-resolved"; - }; - services.resolved = { - enable = lib.mkDefault true; - dnssec = "allow-downgrade"; - extraConfig = '' - [Resolve] - DNS=1.1.1.1 1.0.0.1 - DNSOverTLS=yes - ''; - }; - }; -} diff --git a/modules/nixos/root.nix b/modules/nixos/root.nix deleted file mode 100644 index f2e5878..0000000 --- a/modules/nixos/root.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.getchoo.nixos.defaultRoot; - inherit (lib) mkDefault mkEnableOption mkIf; -in { - options.getchoo.nixos.defaultRoot.enable = mkEnableOption "enable default root user"; - - config = mkIf cfg.enable { - users.users.root = { - home = mkDefault "/root"; - uid = mkDefault config.ids.uids.root; - group = mkDefault "root"; - passwordFile = mkDefault config.age.secrets.rootPassword.path; - }; - }; -} diff --git a/modules/nixos/security.nix b/modules/nixos/security.nix deleted file mode 100644 index 403cfa5..0000000 --- a/modules/nixos/security.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - pkgs, - ... -}: let - inherit (lib) mkDefault; -in { - security = { - apparmor.enable = mkDefault true; - audit.enable = mkDefault true; - auditd.enable = mkDefault true; - polkit.enable = mkDefault true; - rtkit.enable = mkDefault true; - sudo.execWheelOnly = true; - }; - - services.dbus.apparmor = mkDefault "enabled"; - - users = { - defaultUserShell = pkgs.bash; - mutableUsers = false; - }; - - nix.settings = { - allowed-users = ["root" "@wheel"]; - trusted-users = ["root"]; - }; -} diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix new file mode 100644 index 0000000..504a333 --- /dev/null +++ b/modules/nixos/server/default.nix @@ -0,0 +1,79 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.getchoo.server; + inherit (lib) mkDefault mkEnableOption mkIf; +in { + options.getchoo.server.enable = mkEnableOption "enable server configuration"; + + imports = [ + ./secrets.nix + ./services + ]; + + config = mkIf cfg.enable { + getchoo.base = { + enable = true; + documentation.enable = false; + defaultPackages.enable = false; + networking.enable = false; + }; + + environment.systemPackages = [pkgs.cachix]; + + networking = { + firewall = let + ports = [80 420]; + in { + allowedUDPPorts = ports; + allowedTCPPorts = ports; + }; + }; + + nix = { + gc.options = "--delete-older-than 7d --max-freed 50G"; + settings = { + trusted-users = ["${config.networking.hostName}"]; + trusted-substituters = [ + "https://getchoo.cachix.org" + "https://nix-community.cachix.org" + "https://hercules-ci.cachix.org" + "https://wurzelpfropf.cachix.org" + ]; + + trusted-public-keys = [ + "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0=" + "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" + ]; + }; + }; + + programs = { + git.enable = mkDefault true; + vim.defaultEditor = mkDefault true; + }; + + security = { + pam.enableSSHAgentAuth = mkDefault true; + }; + + services = { + endlessh = { + enable = mkDefault true; + port = mkDefault 22; + openFirewall = mkDefault true; + }; + + openssh = { + enable = true; + passwordAuthentication = mkDefault false; + ports = mkDefault [420]; + }; + }; + }; +} diff --git a/modules/nixos/server/secrets.nix b/modules/nixos/server/secrets.nix new file mode 100644 index 0000000..c0290cd --- /dev/null +++ b/modules/nixos/server/secrets.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + self, + ... +}: let + cfg = config.getchoo.server.secrets; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.server.secrets = { + enable = mkEnableOption "enable secret management"; + }; + + config.age = let + baseDir = "${self}/secrets/hosts/${config.networking.hostName}"; + in + mkIf cfg.enable { + identityPaths = ["/etc/age/key"]; + + secrets = { + rootPassword.file = "${baseDir}/rootPassword.age"; + userPassword.file = "${baseDir}/userPassword.age"; + }; + }; +} diff --git a/modules/nixos/server/services/default.nix b/modules/nixos/server/services/default.nix new file mode 100644 index 0000000..68271b1 --- /dev/null +++ b/modules/nixos/server/services/default.nix @@ -0,0 +1,5 @@ +_: { + imports = [ + ./hercules.nix + ]; +} diff --git a/modules/nixos/server/services/hercules.nix b/modules/nixos/server/services/hercules.nix new file mode 100644 index 0000000..782e5a8 --- /dev/null +++ b/modules/nixos/server/services/hercules.nix @@ -0,0 +1,61 @@ +{ + config, + hercules-ci-agent, + lib, + pkgs, + self, + ... +}: let + cfg = config.getchoo.server.services.hercules-ci; + inherit (lib) mkEnableOption mkIf; +in { + options.getchoo.server.services.hercules-ci = { + enable = mkEnableOption "enable hercules-ci"; + secrets.enable = mkEnableOption "manage secrets for hercules-ci"; + }; + + config = mkIf cfg.enable { + age.secrets = let + baseDir = "${self}/secrets/hosts/${config.networking.hostName}"; + hercArgs = { + mode = "400"; + owner = "hercules-ci-agent"; + group = "hercules-ci-agent"; + }; + in + mkIf cfg.secrets.enable { + binaryCache = + { + file = "${baseDir}/binaryCache.age"; + } + // hercArgs; + + clusterToken = + { + file = "${baseDir}/clusterToken.age"; + } + // hercArgs; + + secretsJson = + { + file = "${baseDir}/secretsJson.age"; + } + // hercArgs; + }; + + environment.systemPackages = [ + hercules-ci-agent.packages.${pkgs.stdenv.hostPlatform.system}.hercules-ci-cli + ]; + + services = { + hercules-ci-agent = { + enable = true; + settings = { + binaryCachesPath = config.age.secrets.binaryCache.path; + clusterJoinTokenPath = config.age.secrets.clusterToken.path; + secretsJsonPath = config.age.secrets.secretsJson.path; + }; + }; + }; + }; +} diff --git a/modules/nixos/systemd.nix b/modules/nixos/systemd.nix deleted file mode 100644 index 2888c0b..0000000 --- a/modules/nixos/systemd.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - services = { - journald.extraConfig = '' - MaxRetentionSec=1w - ''; - }; -} diff --git a/modules/nixos/virtualisation.nix b/modules/nixos/virtualisation.nix deleted file mode 100644 index 932cc6d..0000000 --- a/modules/nixos/virtualisation.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.nixos.virtualisation; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.nixos.virtualisation.enable = mkEnableOption "enable podman"; - - config = mkIf cfg.enable { - virtualisation = { - podman = { - enable = true; - enableNvidia = true; - extraPackages = with pkgs; [podman-compose]; - }; - oci-containers.backend = "podman"; - }; - }; -} diff --git a/modules/server/default.nix b/modules/server/default.nix deleted file mode 100644 index 9692a82..0000000 --- a/modules/server/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.server; - inherit (lib) mkDefault mkEnableOption mkIf; -in { - options.getchoo.server.enable = mkEnableOption "enable server configuration"; - - imports = [ - ./secrets.nix - ./services - ]; - - config = mkIf cfg.enable { - getchoo = { - base = { - enable = true; - documentation.enable = false; - defaultPackages.enable = false; - }; - - nixos = { - enable = true; - networking.enable = false; - }; - }; - - environment.systemPackages = [pkgs.cachix]; - - networking = { - firewall = let - ports = [80 420]; - in { - allowedUDPPorts = ports; - allowedTCPPorts = ports; - }; - }; - - nix = { - gc.options = "--delete-older-than 7d --max-freed 50G"; - settings = { - trusted-users = ["${config.networking.hostName}"]; - trusted-substituters = [ - "https://getchoo.cachix.org" - "https://nix-community.cachix.org" - "https://hercules-ci.cachix.org" - "https://wurzelpfropf.cachix.org" - ]; - - trusted-public-keys = [ - "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0=" - "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" - ]; - }; - }; - - programs = { - git.enable = mkDefault true; - vim.defaultEditor = mkDefault true; - }; - - security = { - pam.enableSSHAgentAuth = mkDefault true; - }; - - services = { - endlessh = { - enable = mkDefault true; - port = mkDefault 22; - openFirewall = mkDefault true; - }; - - openssh = { - enable = true; - passwordAuthentication = mkDefault false; - ports = mkDefault [420]; - }; - }; - }; -} diff --git a/modules/server/secrets.nix b/modules/server/secrets.nix deleted file mode 100644 index c0290cd..0000000 --- a/modules/server/secrets.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - lib, - self, - ... -}: let - cfg = config.getchoo.server.secrets; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.server.secrets = { - enable = mkEnableOption "enable secret management"; - }; - - config.age = let - baseDir = "${self}/secrets/hosts/${config.networking.hostName}"; - in - mkIf cfg.enable { - identityPaths = ["/etc/age/key"]; - - secrets = { - rootPassword.file = "${baseDir}/rootPassword.age"; - userPassword.file = "${baseDir}/userPassword.age"; - }; - }; -} diff --git a/modules/server/services/default.nix b/modules/server/services/default.nix deleted file mode 100644 index 68271b1..0000000 --- a/modules/server/services/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - imports = [ - ./hercules.nix - ]; -} diff --git a/modules/server/services/hercules.nix b/modules/server/services/hercules.nix deleted file mode 100644 index 782e5a8..0000000 --- a/modules/server/services/hercules.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - config, - hercules-ci-agent, - lib, - pkgs, - self, - ... -}: let - cfg = config.getchoo.server.services.hercules-ci; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.server.services.hercules-ci = { - enable = mkEnableOption "enable hercules-ci"; - secrets.enable = mkEnableOption "manage secrets for hercules-ci"; - }; - - config = mkIf cfg.enable { - age.secrets = let - baseDir = "${self}/secrets/hosts/${config.networking.hostName}"; - hercArgs = { - mode = "400"; - owner = "hercules-ci-agent"; - group = "hercules-ci-agent"; - }; - in - mkIf cfg.secrets.enable { - binaryCache = - { - file = "${baseDir}/binaryCache.age"; - } - // hercArgs; - - clusterToken = - { - file = "${baseDir}/clusterToken.age"; - } - // hercArgs; - - secretsJson = - { - file = "${baseDir}/secretsJson.age"; - } - // hercArgs; - }; - - environment.systemPackages = [ - hercules-ci-agent.packages.${pkgs.stdenv.hostPlatform.system}.hercules-ci-cli - ]; - - services = { - hercules-ci-agent = { - enable = true; - settings = { - binaryCachesPath = config.age.secrets.binaryCache.path; - clusterJoinTokenPath = config.age.secrets.clusterToken.path; - secretsJsonPath = config.age.secrets.secretsJson.path; - }; - }; - }; - }; -} -- cgit v1.2.3