From ab0f1721ccd47dadfa71a0468e0305285dd6a096 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 12 Aug 2024 11:00:33 -0400 Subject: [PATCH 01/34] Fixed hm --- hosts/fwbook.nix | 1 + switch-nixos.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index bc79e88..e8c5125 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -38,6 +38,7 @@ in trezor-suite trezord ledger-live-desktop + alacritty ]; # udev rules for crypto wallets services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ]; diff --git a/switch-nixos.sh b/switch-nixos.sh index b0ea799..5bd8219 100755 --- a/switch-nixos.sh +++ b/switch-nixos.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e if [ ! -f .locks/.built_via_skg ]; then ./build-nixos.sh From 690af77bfa421bf5f9a700b9c3f29a7abc29a422 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 12 Aug 2024 11:27:29 -0400 Subject: [PATCH 02/34] CLena up --- hosts/fwbook.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index e8c5125..bc79e88 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -38,7 +38,6 @@ in trezor-suite trezord ledger-live-desktop - alacritty ]; # udev rules for crypto wallets services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ]; From 41f5bc048d75719b1af8263bf08b1821b38dd504 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 17 Aug 2024 21:13:12 -0400 Subject: [PATCH 03/34] Refactor of desktop --- hosts/fwbook.nix | 4 +++ modules/desktop/default.nix | 23 ------------- modules/desktop/kde.nix | 15 --------- modules/home/default.nix | 33 ------------------- modules/main.nix | 5 +-- modules/nixos/default.nix | 1 + modules/nixos/desktop/common.nix | 17 ++++++++++ modules/nixos/desktop/default.nix | 12 +++++++ modules/nixos/desktop/kde.nix | 29 +++++++++++++++++ modules/nixos/desktop/packages.nix | 43 +++++++++++++++++++++++++ modules/{ => nixos}/desktop/wayland.nix | 5 ++- modules/{ => nixos}/desktop/x11.nix | 0 12 files changed, 109 insertions(+), 78 deletions(-) delete mode 100644 modules/desktop/default.nix delete mode 100644 modules/desktop/kde.nix create mode 100644 modules/nixos/desktop/common.nix create mode 100644 modules/nixos/desktop/kde.nix create mode 100644 modules/nixos/desktop/packages.nix rename modules/{ => nixos}/desktop/wayland.nix (60%) rename modules/{ => nixos}/desktop/x11.nix (100%) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index bc79e88..4d20838 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -7,6 +7,10 @@ in { imports = [ ./fwbook.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.desktop = { + kde.enabled = true; + fonts = pkgs.fira-code; + }; services.fwupd.enable = true; services.fwupd.package = (import (builtins.fetchTarball { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix deleted file mode 100644 index 1924fb9..0000000 --- a/modules/desktop/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ user -, enableX11 ? false -, enableGnome ? false -, enableKDE ? false -, enableHypr ? false -, enableWine ? false -, ... -}: -{ pkgs, ... }: { - imports = [ ./wayland.nix ] ++ (if enableX11 then [ ./x11.nix ] else [ ]) - ++ (if enableGnome then [ ./gnome.nix ] else [ ]) - ++ (if enableWine then [ ./wine.nix ] else [ ]) - ++ (if enableKDE then [ ./kde.nix ] else [ ]) ++ (if enableHypr then - [ (import ./hyprland.nix { user = user; }) ] - else - [ ]); - - # Flatpak - services.flatpak.enable = true; - # Mobile Connect - programs.kdeconnect.enable = true; - # Web -} diff --git a/modules/desktop/kde.nix b/modules/desktop/kde.nix deleted file mode 100644 index 3d6f6f0..0000000 --- a/modules/desktop/kde.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: { - services.desktopManager.plasma6.enable = true; - services.desktopManager.plasma6.notoPackage = pkgs.fira-code; - services.desktopManager.plasma6.enableQt5Integration = true; - environment.plasma6.excludePackages = with pkgs.kdePackages; [ - konsole # terminal - elisa # media player - kate # text editor - gwenview # image viewer - ]; - environment.systemPackages = with pkgs; [ - kdePackages.plasma-browser-integration - konsave # save configs - ]; -} diff --git a/modules/home/default.nix b/modules/home/default.nix index c1b6f47..365e6b4 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -43,39 +43,6 @@ in devbox terraform kubectl - - # socials - slack - zoom-us - betterdiscordctl - discord - signal-desktop - whatsapp-for-linux - caprine-bin # facebook messenger - - # development - vscode - - # web - brave - - # mail - thunderbird - - # password - bitwarden-desktop - - # documents - onlyoffice-bin_latest - - # video - vlc - vlc-bittorrent - - # terminal - alacritty - alacritty-theme - ] else [ ]); }; diff --git a/modules/main.nix b/modules/main.nix index 15fc0ab..a284429 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -19,10 +19,7 @@ imports = [ (import ./skyg) (import ./nixos) - ] ++ (if desktop.enable then - [ (import ./desktop ({ user = user; } // desktop)) ] - else - [ ]) ++ (if os.enable then + ] ++ (if os.enable then [ (import ./os ({ user = user; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index e998ce2..5c53ea9 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -3,5 +3,6 @@ imports = [ ./common ./server + ./desktop ]; } diff --git a/modules/nixos/desktop/common.nix b/modules/nixos/desktop/common.nix new file mode 100644 index 0000000..6cda5cd --- /dev/null +++ b/modules/nixos/desktop/common.nix @@ -0,0 +1,17 @@ +{ lib, pkgs, ... }: + +with lib; + +{ + options = { + skyg.desktop = { + fonts = mkOption { + description = "Preferred Font"; + type = types.package; + default = pkgs.fira-code; + }; + }; + }; + + config = { }; +} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 8b13789..5d0ff68 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1 +1,13 @@ +{ ... }: +{ + imports = [ + ./common.nix + ./kde.nix + ./wayland.nix + ./x11.nix + ./packages.nix + ]; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; +} diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix new file mode 100644 index 0000000..286cb1b --- /dev/null +++ b/modules/nixos/desktop/kde.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.desktop.kde; +in +{ + options = { + skyg.skyg.desktop.kde = { + enable = mkEnableOption + "KDE"; + }; + }; + config = mkIf cfg.enable { + services.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; + services.desktopManager.plasma6.enableQt5Integration = true; + environment.plasma6.excludePackages = with pkgs.kdePackages; [ + konsole # terminal + elisa # media player + kate # text editor + gwenview # image viewer + ]; + environment.systemPackages = with pkgs; [ + kdePackages.plasma-browser-integration + konsave # save configs + ]; + }; +} diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix new file mode 100644 index 0000000..de41e5e --- /dev/null +++ b/modules/nixos/desktop/packages.nix @@ -0,0 +1,43 @@ +{ pkgs, ... }: +{ + # Flatpak + services.flatpak.enable = true; + # Mobile Connect + programs.kdeconnect.enable = true; + environment.systemPackages = with pkgs; [ + # copy to clipboard + wl-clipboard-x11 + xclip + # socials + slack + zoom-us + betterdiscordctl + discord + signal-desktop + whatsapp-for-linux + caprine-bin # facebook messenger + + # development + vscode + + # web + brave + + # mail + thunderbird + + # password + bitwarden-desktop + + # documents + onlyoffice-bin_latest + + # video + vlc + vlc-bittorrent + + # terminal + alacritty + alacritty-theme + ]; +} diff --git a/modules/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix similarity index 60% rename from modules/desktop/wayland.nix rename to modules/nixos/desktop/wayland.nix index 1f1206a..2168134 100644 --- a/modules/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -1,11 +1,10 @@ { pkgs, ... }: { - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - programs.xwayland.enable = true; + # Flatpak environment.systemPackages = with pkgs; [ wayland wayland-protocols wayland-utils ]; + programs.xwayland.enable = true; } diff --git a/modules/desktop/x11.nix b/modules/nixos/desktop/x11.nix similarity index 100% rename from modules/desktop/x11.nix rename to modules/nixos/desktop/x11.nix From 0adae1cea9bcdf416c030fa4d38d88ab79d5cfe0 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 17 Aug 2024 21:19:38 -0400 Subject: [PATCH 04/34] Moved over hyprland --- modules/desktop/hyprland.nix | 55 ------------------------ modules/desktop/wine.nix | 4 +- modules/nixos/desktop/default.nix | 1 + modules/nixos/desktop/hyprland.nix | 68 ++++++++++++++++++++++++++++++ modules/nixos/desktop/kde.nix | 6 +-- modules/nixos/desktop/packages.nix | 5 +++ 6 files changed, 78 insertions(+), 61 deletions(-) delete mode 100644 modules/desktop/hyprland.nix create mode 100644 modules/nixos/desktop/hyprland.nix diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix deleted file mode 100644 index e81ebc1..0000000 --- a/modules/desktop/hyprland.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ user }: -{ pkgs, ... }: { - programs.hyprland = { enable = true; }; - environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; - programs.waybar.enable = false; - environment.systemPackages = with pkgs; [ - # common utilities - busybox - scdoc - mpv - gcc - xdg-desktop-portal - # sound - pavucontrol - # notification daemon - dunst - libnotify - # hyprland - lxqt.lxqt-policykit - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - hyprlock - hypridle - hyprpaper - # color picker - hyprpicker - # nwg-shell - nwg-dock - nwg-dock-hyprland - nwg-launchers - nwg-displays - nwg-drawer - nwg-panel - gopsuinfo - nwg-look - nwg-menu - nwg-bar - # screenshots - swappy - hyprshot - # networking - networkmanagerapplet - meson - wl-clipboard - wlroots - cliphist - xdg-desktop-portal-wlr - # app launchers - rofi-wayland - wofi - ]; - services.mpd.enable = true; - services.pipewire.wireplumber.enable = true; - users.users.${user.name}.extraGroups = [ "input" ]; -} diff --git a/modules/desktop/wine.nix b/modules/desktop/wine.nix index d870d2d..b82902d 100644 --- a/modules/desktop/wine.nix +++ b/modules/desktop/wine.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - wineWowPackages.stable - winetricks - wineWowPackages.waylandFull + ]; } diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 5d0ff68..438bc67 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -3,6 +3,7 @@ imports = [ ./common.nix ./kde.nix + ./hyprland.nix ./wayland.nix ./x11.nix ./packages.nix diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix new file mode 100644 index 0000000..0dd16ca --- /dev/null +++ b/modules/nixos/desktop/hyprland.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.desktop.hyprland; +in +{ + options = { + skyg.desktop.hyprland = { + enabled = mkEnableOption + "Hyprland"; + }; + }; + config = mkIf cfg.enabled { + programs.hyprland = { enable = true; }; + environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; + programs.waybar.enable = false; + environment.systemPackages = with pkgs; [ + # common utilities + busybox + scdoc + mpv + gcc + xdg-desktop-portal + # sound + pavucontrol + # notification daemon + dunst + libnotify + # hyprland + lxqt.lxqt-policykit + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + hyprlock + hypridle + hyprpaper + # color picker + hyprpicker + # nwg-shell + nwg-dock + nwg-dock-hyprland + nwg-launchers + nwg-displays + nwg-drawer + nwg-panel + gopsuinfo + nwg-look + nwg-menu + nwg-bar + # screenshots + swappy + hyprshot + # networking + networkmanagerapplet + meson + wl-clipboard + wlroots + cliphist + xdg-desktop-portal-wlr + # app launchers + rofi-wayland + wofi + ]; + services.mpd.enable = true; + services.pipewire.wireplumber.enable = true; + users.users.${config.skyg.user.name}.extraGroups = [ "input" ]; + }; +} diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index 286cb1b..a2fd915 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -6,12 +6,12 @@ let in { options = { - skyg.skyg.desktop.kde = { - enable = mkEnableOption + skyg.desktop.kde = { + enabled = mkEnableOption "KDE"; }; }; - config = mkIf cfg.enable { + config = mkIf cfg.enabled { services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; services.desktopManager.plasma6.enableQt5Integration = true; diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index de41e5e..c0a6c2a 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -39,5 +39,10 @@ # terminal alacritty alacritty-theme + + # wine + wineWowPackages.stable + winetricks + wineWowPackages.waylandFull ]; } From 5fb36fc027e692c95628b65a12be99d8aa5b0fe4 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 17 Aug 2024 21:20:53 -0400 Subject: [PATCH 05/34] Deprecated old desktop config --- modules/desktop/gnome.nix | 12 ------------ modules/desktop/wine.nix | 6 ------ 2 files changed, 18 deletions(-) delete mode 100644 modules/desktop/gnome.nix delete mode 100644 modules/desktop/wine.nix diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix deleted file mode 100644 index b71beb5..0000000 --- a/modules/desktop/gnome.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - services.xserver.desktopManager.gnome.enable = true; - environment.systemPackages = with pkgs; [ - gnomeExtensions.vitals - ]; - # Exclude Gnome packages - environment.gnome.excludePackages = [ - pkgs.gnome-tour - pkgs.gnome-console - ]; -} diff --git a/modules/desktop/wine.nix b/modules/desktop/wine.nix deleted file mode 100644 index b82902d..0000000 --- a/modules/desktop/wine.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - - ]; -} From 3bfe90e7ef1a965d7b2b974242437517f2582489 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 17 Aug 2024 21:25:06 -0400 Subject: [PATCH 06/34] Partially migrated over network drives --- modules/main.nix | 3 ++- modules/network-drives.nix | 44 ++++++++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/modules/main.nix b/modules/main.nix index a284429..eb62ea9 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -19,6 +19,7 @@ imports = [ (import ./skyg) (import ./nixos) + (import ./network-drives.nix) ] ++ (if os.enable then [ (import ./os ({ @@ -28,13 +29,13 @@ ] else [ ]) - ++ (if enableNetworkDrives then [ (import ./network-drives.nix) ] else [ ]) ; # Share defaults skyg.user = user; skyg.core.hostName = hostName; skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; + skyg.networkDrives.enabled = enableNetworkDrives; system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/network-drives.nix b/modules/network-drives.nix index 09ac2c9..9cc4fdb 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -1,19 +1,35 @@ -{ ... }: { - fileSystems."/mnt/EightTerra/DownloadedTorrents" = { - device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; +{ lib +, config +, ... +}: +with lib; +let + cfg = config.skyg.networkDrives; +in +{ + options = { + skyg.networkDrives = { + enabled = mkEnableOption + "Network Drives"; + }; }; + config = mkIf cfg.enabled { + fileSystems."/mnt/EightTerra/DownloadedTorrents" = { + device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; - fileSystems."/mnt/EightTerra/k3s-cluster" = { - device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; + fileSystems."/mnt/EightTerra/k3s-cluster" = { + device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; - fileSystems."/mnt/EightTerra/NVR" = { - device = "tnas1.lab.internal:/mnt/EightTerra/NVR"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; + fileSystems."/mnt/EightTerra/NVR" = { + device = "tnas1.lab.internal:/mnt/EightTerra/NVR"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; }; } From 93d31e99b0cbdb7c2c589c261e58297e32488e44 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 16:46:02 -0400 Subject: [PATCH 07/34] Moved some os settings to new setup --- modules/home/default.nix | 12 +++-- modules/home/services.nix | 2 +- modules/nixos/common/core.nix | 87 ++++++++++++++++++++++++++++++++ modules/nixos/common/default.nix | 1 + modules/os/core.nix | 49 ------------------ modules/os/default.nix | 1 - 6 files changed, 97 insertions(+), 55 deletions(-) create mode 100644 modules/nixos/common/core.nix delete mode 100644 modules/os/core.nix diff --git a/modules/home/default.nix b/modules/home/default.nix index 365e6b4..21ace1b 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -35,11 +35,15 @@ in username = name; homeDirectory = "/home/${name}"; packages = with pkgs; - [ jq nixpkgs-fmt ipfetch nixd ] - ++ (if enableDevelopmentKit then [ - rye + [ + jq + nixpkgs-fmt + ipfetch + nixd + htop + ] + ++ (if enableDevelopmentKit then [ devenv - uv devbox terraform kubectl diff --git a/modules/home/services.nix b/modules/home/services.nix index 6a03bed..8a90247 100644 --- a/modules/home/services.nix +++ b/modules/home/services.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { gpg-agent = { enable = true; diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix new file mode 100644 index 0000000..863ce65 --- /dev/null +++ b/modules/nixos/common/core.nix @@ -0,0 +1,87 @@ +# { config, lib, pkgs, ... }: +# with lib; + +# let +# in +# { +# options = { +# skyg.desktop.kde = { +# enabled = mkEnableOption +# "KDE"; +# }; +# }; +# config = mkIf cfg.enabled { +# services.desktopManager.plasma6.enable = true; +# services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; +# services.desktopManager.plasma6.enableQt5Integration = true; +# environment.plasma6.excludePackages = with pkgs.kdePackages; [ +# konsole # terminal +# elisa # media player +# kate # text editor +# gwenview # image viewer +# ]; +# environment.systemPackages = with pkgs; [ +# kdePackages.plasma-browser-integration +# konsave # save configs +# ]; +# }; +# } + +{ pkgs, config, lib, ... }: +let + cfg = config.skyg.nixos; + defaultConfig = { + # System Packages + services.hydra.useSubstitutes = true; + programs.dconf.enable = true; + programs.nix-ld.enable = true; + environment.systemPackages = with pkgs; [ + # nix utils + appimage-run + + # shell tools + git + usbutils + + # system utils + nfs-utils + + # misc + glib-networking + glib + glibc + + # printer + system-config-printer + ]; + services.xserver.excludePackages = with pkgs; [ + xterm + ]; + # Set your time zone. + time.timeZone = "America/Toronto"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_CA.UTF-8"; + + # Storage Clean up + services.cron = { + enable = true; + systemCronJobs = [ + "* 23 * * * root nix-collect-garbage --delete-older-than 1d" + "* 23 * * * ${config.skyg.user.name} nix-collect-garbage --delete-older-than 1d" + ]; + }; + }; +in +{ + options = { + skyg.nixos.enableServe = lib.mkEnableOption "Enable nix serve"; + }; + + config = defaultConfig // (if cfg.enableServe then { + services.nix-serve = { + enable = true; + port = 5000; + }; + } else { }); +} diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 1b7d70b..a0d088b 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -2,5 +2,6 @@ { imports = [ ./hardware + ./core.nix ]; } diff --git a/modules/os/core.nix b/modules/os/core.nix deleted file mode 100644 index 9a4e066..0000000 --- a/modules/os/core.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ user }: -{ pkgs, ... }: -{ - # System Packages - services.hydra.useSubstitutes = true; - services.nix-serve = { - enable = true; - port = 5000; - }; - programs.dconf.enable = true; - programs.nix-ld.enable = true; - environment.systemPackages = with pkgs; [ - # nix utils - appimage-run - - # shell tools - git - usbutils - htop - - # system utils - nfs-utils - - # misc - glib-networking - glib - glibc - - # printer - system-config-printer - ]; - services.xserver.excludePackages = with pkgs; [ - xterm - ]; - # Set your time zone. - time.timeZone = "America/Toronto"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_CA.UTF-8"; - - # Storage Clean up - services.cron = { - enable = true; - systemCronJobs = [ - "* 23 * * * root nix-collect-garbage --delete-older-than 1d" - "* 23 * * * ${user.name} nix-collect-garbage --delete-older-than 1d" - ]; - }; -} diff --git a/modules/os/default.nix b/modules/os/default.nix index 1607245..db21d0e 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -11,7 +11,6 @@ }: { pkgs, ... }: { imports = [ - (import ./core.nix { user = user; }) (import ./user.nix { user = user; }) (import ./containers/default.nix ({ user = user; From 4a87f10d15414532abbebd68ade78937b6d1c3be Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 20:50:52 -0400 Subject: [PATCH 08/34] Moving fonts --- hosts/hl-minipc1.nix | 1 + modules/home/default.nix | 3 + modules/nixos/common/core.nix | 124 +++++++++++----------------------- modules/nixos/desktop/kde.nix | 1 - modules/os/default.nix | 3 +- modules/os/fonts.nix | 23 ------- modules/skyg/default.nix | 1 + 7 files changed, 46 insertions(+), 110 deletions(-) delete mode 100644 modules/os/fonts.nix diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 6c77f62..2237f7e 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -7,6 +7,7 @@ services.nix-serve = { enable = true; secretKeyFile = "/var/keys/cache-priv-key.pem"; + port = 5000; }; # firmware updater services.fwupd.enable = true; diff --git a/modules/home/default.nix b/modules/home/default.nix index 21ace1b..7fc25cf 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -3,6 +3,7 @@ let makeCommonGitConfigs = (import ./git.nix).makeCommonGitConfigs; programsModule = (import ./programs.nix); servicesModule = (import ./services.nix); + fontsModule = (import ./fonts.nix); homeModule = { stateVersion = stateVersion; shellAliases = { @@ -21,6 +22,7 @@ in }); }; services = servicesModule { pkgs = pkgs; }; + fonts = fontsModule; }; makeCommonUser = @@ -31,6 +33,7 @@ in , name , ... }: { pkgs, ... }: { + fonts = fontsModule; home = homeModule // { username = name; homeDirectory = "/home/${name}"; diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix index 863ce65..6cfa3ee 100644 --- a/modules/nixos/common/core.nix +++ b/modules/nixos/common/core.nix @@ -1,87 +1,43 @@ -# { config, lib, pkgs, ... }: -# with lib; - -# let -# in -# { -# options = { -# skyg.desktop.kde = { -# enabled = mkEnableOption -# "KDE"; -# }; -# }; -# config = mkIf cfg.enabled { -# services.desktopManager.plasma6.enable = true; -# services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; -# services.desktopManager.plasma6.enableQt5Integration = true; -# environment.plasma6.excludePackages = with pkgs.kdePackages; [ -# konsole # terminal -# elisa # media player -# kate # text editor -# gwenview # image viewer -# ]; -# environment.systemPackages = with pkgs; [ -# kdePackages.plasma-browser-integration -# konsave # save configs -# ]; -# }; -# } - -{ pkgs, config, lib, ... }: -let - cfg = config.skyg.nixos; - defaultConfig = { - # System Packages - services.hydra.useSubstitutes = true; - programs.dconf.enable = true; - programs.nix-ld.enable = true; - environment.systemPackages = with pkgs; [ - # nix utils - appimage-run - - # shell tools - git - usbutils - - # system utils - nfs-utils - - # misc - glib-networking - glib - glibc - - # printer - system-config-printer - ]; - services.xserver.excludePackages = with pkgs; [ - xterm - ]; - # Set your time zone. - time.timeZone = "America/Toronto"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_CA.UTF-8"; - - # Storage Clean up - services.cron = { - enable = true; - systemCronJobs = [ - "* 23 * * * root nix-collect-garbage --delete-older-than 1d" - "* 23 * * * ${config.skyg.user.name} nix-collect-garbage --delete-older-than 1d" - ]; - }; - }; -in +{ pkgs, config, ... }: { - options = { - skyg.nixos.enableServe = lib.mkEnableOption "Enable nix serve"; - }; + # System Packages + services.hydra.useSubstitutes = true; + programs.dconf.enable = true; + programs.nix-ld.enable = true; + environment.systemPackages = with pkgs; [ + # nix utils + appimage-run - config = defaultConfig // (if cfg.enableServe then { - services.nix-serve = { - enable = true; - port = 5000; - }; - } else { }); + # shell tools + git + usbutils + + # system utils + nfs-utils + + # misc + glib-networking + glib + glibc + + # printer + system-config-printer + ]; + services.xserver.excludePackages = with pkgs; [ + xterm + ]; + # Set your time zone. + time.timeZone = "America/Toronto"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_CA.UTF-8"; + + # Storage Clean up + services.cron = { + enable = true; + systemCronJobs = [ + "* 23 * * * root nix-collect-garbage --delete-older-than 1d" + "* 23 * * * ${config.skyg.user.name} nix-collect-garbage --delete-older-than 1d" + ]; + }; } diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index a2fd915..43837d8 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -13,7 +13,6 @@ in }; config = mkIf cfg.enabled { services.desktopManager.plasma6.enable = true; - services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; services.desktopManager.plasma6.enableQt5Integration = true; environment.plasma6.excludePackages = with pkgs.kdePackages; [ konsole # terminal diff --git a/modules/os/default.nix b/modules/os/default.nix index db21d0e..64390ad 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -15,8 +15,7 @@ (import ./containers/default.nix ({ user = user; } // containers)) - ] ++ (if enableFonts then [ ./fonts.nix ] else [ ]) - ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) + ] ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) ++ (if enableNetworking then [ (import ./networking.nix { diff --git a/modules/os/fonts.nix b/modules/os/fonts.nix deleted file mode 100644 index fb558d5..0000000 --- a/modules/os/fonts.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, ... }: -{ - # Fonts - fonts = { - packages = with pkgs; [ - fira-code - fira-code-symbols - font-awesome - mplus-outline-fonts.githubRelease - noto-fonts-emoji - ]; - enableDefaultPackages = true; - fontDir.enable = true; - fontconfig = { - enable = true; - defaultFonts = { - serif = [ "Fira Code" "DroidSansMono" ]; - sansSerif = [ "Fira Code" "DroidSansMono" ]; - monospace = [ "Fira Code" ]; - }; - }; - }; -} diff --git a/modules/skyg/default.nix b/modules/skyg/default.nix index 7c5c34e..c2bb296 100644 --- a/modules/skyg/default.nix +++ b/modules/skyg/default.nix @@ -4,6 +4,7 @@ ./core.nix ./user.nix ./macos.nix + ./fonts.nix ./nix-substituters.nix ]; } From 2ba65659e44211435ec2439d8094d72c93ca312e Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 20:51:00 -0400 Subject: [PATCH 09/34] Moving fonts --- modules/home/fonts.nix | 10 ++++++++++ modules/skyg/fonts.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 modules/home/fonts.nix create mode 100644 modules/skyg/fonts.nix diff --git a/modules/home/fonts.nix b/modules/home/fonts.nix new file mode 100644 index 0000000..15dbbe9 --- /dev/null +++ b/modules/home/fonts.nix @@ -0,0 +1,10 @@ +{ + fontconfig = { + enable = true; + defaultFonts = { + serif = [ "Fira Code" "DroidSansMono" ]; + sansSerif = [ "Fira Code" "DroidSansMono" ]; + monospace = [ "Fira Code" ]; + }; + }; +} diff --git a/modules/skyg/fonts.nix b/modules/skyg/fonts.nix new file mode 100644 index 0000000..b94bf2a --- /dev/null +++ b/modules/skyg/fonts.nix @@ -0,0 +1,26 @@ +{ config, pkgs, ... }: +{ + config = { + fonts = { + packages = with pkgs; [ + fira-code + fira-code-symbols + font-awesome + mplus-outline-fonts.githubRelease + noto-fonts-emoji + ]; + enableDefaultPackages = true; + fontDir.enable = true; + fontconfig = { + enable = true; + defaultFonts = { + serif = [ "Fira Code" "DroidSansMono" ]; + sansSerif = [ "Fira Code" "DroidSansMono" ]; + monospace = [ "Fira Code" ]; + }; + }; + }; + } // (if config.services.desktopManager.plasma6.enable then { + services.desktopManager.plasma6.notoPackage = pkgs.fira-code; + } else { }); +} From 7e09db3801e1d032bfeec116e3537941a729218b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 20:54:45 -0400 Subject: [PATCH 10/34] Fonts refactor --- modules/nixos/desktop/kde.nix | 1 + modules/skyg/fonts.nix | 40 ++++++++++++++++------------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index 43837d8..9df4166 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -24,5 +24,6 @@ in kdePackages.plasma-browser-integration konsave # save configs ]; + services.desktopManager.plasma6.notoPackage = pkgs.fira-code; }; } diff --git a/modules/skyg/fonts.nix b/modules/skyg/fonts.nix index b94bf2a..dca9a71 100644 --- a/modules/skyg/fonts.nix +++ b/modules/skyg/fonts.nix @@ -1,26 +1,22 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { - config = { - fonts = { - packages = with pkgs; [ - fira-code - fira-code-symbols - font-awesome - mplus-outline-fonts.githubRelease - noto-fonts-emoji - ]; - enableDefaultPackages = true; - fontDir.enable = true; - fontconfig = { - enable = true; - defaultFonts = { - serif = [ "Fira Code" "DroidSansMono" ]; - sansSerif = [ "Fira Code" "DroidSansMono" ]; - monospace = [ "Fira Code" ]; - }; + fonts = { + packages = with pkgs; [ + fira-code + fira-code-symbols + font-awesome + mplus-outline-fonts.githubRelease + noto-fonts-emoji + ]; + enableDefaultPackages = true; + fontDir.enable = true; + fontconfig = { + enable = true; + defaultFonts = { + serif = [ "Fira Code" "DroidSansMono" ]; + sansSerif = [ "Fira Code" "DroidSansMono" ]; + monospace = [ "Fira Code" ]; }; }; - } // (if config.services.desktopManager.plasma6.enable then { - services.desktopManager.plasma6.notoPackage = pkgs.fira-code; - } else { }); + }; } From 64ca5b86418bd832d23c3367d099d65ff557ce62 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 20:57:03 -0400 Subject: [PATCH 11/34] Added user --- modules/nixos/common/default.nix | 1 + modules/nixos/common/user.nix | 15 +++++++++++++++ modules/nixos/desktop/common.nix | 17 ----------------- modules/nixos/desktop/default.nix | 1 - modules/os/user.nix | 13 ------------- 5 files changed, 16 insertions(+), 31 deletions(-) create mode 100644 modules/nixos/common/user.nix delete mode 100644 modules/nixos/desktop/common.nix delete mode 100644 modules/os/user.nix diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index a0d088b..3634490 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -3,5 +3,6 @@ imports = [ ./hardware ./core.nix + ./user.nix ]; } diff --git a/modules/nixos/common/user.nix b/modules/nixos/common/user.nix new file mode 100644 index 0000000..673bec2 --- /dev/null +++ b/modules/nixos/common/user.nix @@ -0,0 +1,15 @@ +{ config, pkgs, ... }: +{ + users.users.root = { + shell = pkgs.zsh; + }; + users.users.${config.skyg.user.name} = { + shell = pkgs.zsh; + isNormalUser = true; + description = config.skyg.user.name; + extraGroups = [ + "networkmanager" + "wheel" + ]; + }; +} diff --git a/modules/nixos/desktop/common.nix b/modules/nixos/desktop/common.nix deleted file mode 100644 index 6cda5cd..0000000 --- a/modules/nixos/desktop/common.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, pkgs, ... }: - -with lib; - -{ - options = { - skyg.desktop = { - fonts = mkOption { - description = "Preferred Font"; - type = types.package; - default = pkgs.fira-code; - }; - }; - }; - - config = { }; -} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 438bc67..41805b8 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./common.nix ./kde.nix ./hyprland.nix ./wayland.nix diff --git a/modules/os/user.nix b/modules/os/user.nix deleted file mode 100644 index 79a41d0..0000000 --- a/modules/os/user.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ user }: -{ pkgs, ... }: -{ - users.users.${user.name} = { - shell = pkgs.zsh; - isNormalUser = true; - description = user.name; - extraGroups = [ - "networkmanager" - "wheel" - ]; - }; -} From 80305ec8d0ca55050498f0dd6368962e3d6e6825 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 20:59:51 -0400 Subject: [PATCH 12/34] Moved users to new form --- hosts/fwbook.nix | 1 - modules/os/default.nix | 1 - modules/skyg/core.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 4d20838..fdbbc46 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -9,7 +9,6 @@ in skyg.user.enabled = true; skyg.desktop = { kde.enabled = true; - fonts = pkgs.fira-code; }; services.fwupd.enable = true; services.fwupd.package = (import diff --git a/modules/os/default.nix b/modules/os/default.nix index 64390ad..c806f52 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -11,7 +11,6 @@ }: { pkgs, ... }: { imports = [ - (import ./user.nix { user = user; }) (import ./containers/default.nix ({ user = user; } // containers)) diff --git a/modules/skyg/core.nix b/modules/skyg/core.nix index f6ccef7..7b0e074 100644 --- a/modules/skyg/core.nix +++ b/modules/skyg/core.nix @@ -16,7 +16,6 @@ in }; config = { - users.users.root.shell = pkgs.zsh; networking.hostName = cfg.hostName; }; } From 723dd77cc36039d3b66521cda3e7734e10613a9c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:01:42 -0400 Subject: [PATCH 13/34] Moved hw to new form --- modules/nixos/common/hardware/bluetooth.nix | 7 ++++++ modules/nixos/common/hardware/default.nix | 14 +++++++++++ modules/nixos/common/hardware/sound.nix | 12 +++++++++ modules/os/default.nix | 2 +- modules/os/hardware.nix | 27 --------------------- 5 files changed, 34 insertions(+), 28 deletions(-) create mode 100644 modules/nixos/common/hardware/bluetooth.nix create mode 100644 modules/nixos/common/hardware/sound.nix delete mode 100644 modules/os/hardware.nix diff --git a/modules/nixos/common/hardware/bluetooth.nix b/modules/nixos/common/hardware/bluetooth.nix new file mode 100644 index 0000000..2946799 --- /dev/null +++ b/modules/nixos/common/hardware/bluetooth.nix @@ -0,0 +1,7 @@ +{ ... }: { + + # enables support for Bluetooth + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + services.blueman.enable = true; +} diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index 8e7ce89..2ef2e04 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -3,5 +3,19 @@ imports = [ ./fan2go.nix ./fancontrol.nix + ./sound.nix + ./bluetooth.nix ]; + # Firmware Updater + services.fwupd.enable = true; + # Enable all license firmware + hardware.enableAllFirmware = true; + + + + # Yubikey + services.yubikey-agent.enable = true; + + # Enable CUPS to print documents. + services.printing.enable = true; } diff --git a/modules/nixos/common/hardware/sound.nix b/modules/nixos/common/hardware/sound.nix new file mode 100644 index 0000000..c2a336b --- /dev/null +++ b/modules/nixos/common/hardware/sound.nix @@ -0,0 +1,12 @@ +{ ... }: { + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; +} diff --git a/modules/os/default.nix b/modules/os/default.nix index c806f52..b9ac6a3 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -14,7 +14,7 @@ (import ./containers/default.nix ({ user = user; } // containers)) - ] ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) + ] ++ (if enableNetworking then [ (import ./networking.nix { diff --git a/modules/os/hardware.nix b/modules/os/hardware.nix deleted file mode 100644 index b03cca8..0000000 --- a/modules/os/hardware.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ ... }: { - # Firmware Updater - services.fwupd.enable = true; - # Enable all license firmware - hardware.enableAllFirmware = true; - - # enables support for Bluetooth - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - services.blueman.enable = true; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - # Yubikey - services.yubikey-agent.enable = true; -} From 4b03beb264e1e82495c2fc5db6118a36b93c2091 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:06:19 -0400 Subject: [PATCH 14/34] Moved openssh --- hosts/hl-bigbox1.nix | 13 ++++++------ hosts/hl-fws1.nix | 1 + hosts/hl-minipc1.nix | 1 + hosts/hl-minipc2.nix | 1 + hosts/hl-terra1.nix | 1 + modules/nixos/common/default.nix | 1 + modules/nixos/common/ssh-server.nix | 33 +++++++++++++++++++++++++++++ modules/os/ssh.nix | 21 ------------------ 8 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 modules/nixos/common/ssh-server.nix delete mode 100644 modules/os/ssh.nix diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 57dbbf9..502427e 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; @@ -60,12 +61,12 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; }; # Steam Settings - users.users.steam = { - shell = pkgs.zsh; - isNormalUser = true; - description = "Steam User"; - extraGroups = [ "wheel" ]; - }; + users.users.steam = { + shell = pkgs.zsh; + isNormalUser = true; + description = "Steam User"; + extraGroups = [ "wheel" ]; + }; programs.steam = { enable = true; remotePlay.openFirewall = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index bbc3787..4e052c8 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 2237f7e..2163c32 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # Nix Stores services.nix-serve = { diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 87c0533..4f6a1fb 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc2.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 43275ef..e514b15 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -3,6 +3,7 @@ { imports = [ ./hl-terra1.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 3634490..d8c1c8f 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -4,5 +4,6 @@ ./hardware ./core.nix ./user.nix + ./ssh-server.nix ]; } diff --git a/modules/nixos/common/ssh-server.nix b/modules/nixos/common/ssh-server.nix new file mode 100644 index 0000000..aa321c3 --- /dev/null +++ b/modules/nixos/common/ssh-server.nix @@ -0,0 +1,33 @@ +{ config, lib, ... }: +with lib; + +let + cfg = config.skyg.ssh-server; +in +{ + options = { + skyg.ssh-server = { + enabled = mkEnableOption + "enable ssh server"; + masterPubKey = mkOption { + type = types.str; + default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared"; + }; + }; + }; + config = mkIf cfg.enabled { + services.openssh = { + enable = true; + settings.PasswordAuthentication = false; + settings.KbdInteractiveAuthentication = false; + settings.PermitRootLogin = "yes"; + }; + users.users.${config.skyg.user.name}.openssh.authorizedKeys.keys = [ + cfg.masterPubKey + ]; + users.users.root.openssh.authorizedKeys.keys = [ + cfg.masterPubKey + ]; + }; +} + diff --git a/modules/os/ssh.nix b/modules/os/ssh.nix deleted file mode 100644 index 8196846..0000000 --- a/modules/os/ssh.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ enableSSHServer, user }: -{ ... }: -{ - services.openssh = - if enableSSHServer then { - enable = true; - settings.PasswordAuthentication = false; - settings.KbdInteractiveAuthentication = false; - settings.PermitRootLogin = "yes"; - } else { - enable = false; - }; - users.users.${user.name}.openssh.authorizedKeys.keys = - if enableSSHServer then [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared" - ] else [ ]; - users.users.root.openssh.authorizedKeys.keys = - if enableSSHServer then [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared" - ] else [ ]; -} From 818e0f3ff3ff4539be09c5441348959cc50afa21 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:11:59 -0400 Subject: [PATCH 15/34] Moved firewall & networking --- modules/nixos/common/default.nix | 1 + modules/nixos/common/networking.nix | 34 +++++++++++++++++++++++++++++ modules/nixos/common/ssh-server.nix | 1 + modules/os/default.nix | 10 +-------- modules/os/networking.nix | 20 ----------------- modules/skyg/core.nix | 21 ------------------ modules/skyg/default.nix | 1 - 7 files changed, 37 insertions(+), 51 deletions(-) create mode 100644 modules/nixos/common/networking.nix delete mode 100644 modules/os/networking.nix delete mode 100644 modules/skyg/core.nix diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index d8c1c8f..3101be2 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -3,6 +3,7 @@ imports = [ ./hardware ./core.nix + ./networking.nix ./user.nix ./ssh-server.nix ]; diff --git a/modules/nixos/common/networking.nix b/modules/nixos/common/networking.nix new file mode 100644 index 0000000..f3b928a --- /dev/null +++ b/modules/nixos/common/networking.nix @@ -0,0 +1,34 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.skyg.core; +in +{ + options = { + skyg.core = { + hostName = mkOption { + description = "Machine Hostname"; + type = types.str; + }; + }; + }; + config = { + # Define hostname. + networking.hostName = cfg.hostName; + + # Enable networking + networking.networkmanager.enable = true; + + # NFS Support + services.nfs.server.enable = true; + + # Tailscale + services.tailscale.enable = true; + services.tailscale.useRoutingFeatures = "client"; + + # Disable the flaky nm service + systemd.services.NetworkManager-wait-online.enable = false; + }; +} diff --git a/modules/nixos/common/ssh-server.nix b/modules/nixos/common/ssh-server.nix index aa321c3..e0bce1d 100644 --- a/modules/nixos/common/ssh-server.nix +++ b/modules/nixos/common/ssh-server.nix @@ -18,6 +18,7 @@ in config = mkIf cfg.enabled { services.openssh = { enable = true; + openFirewall = true; settings.PasswordAuthentication = false; settings.KbdInteractiveAuthentication = false; settings.PermitRootLogin = "yes"; diff --git a/modules/os/default.nix b/modules/os/default.nix index b9ac6a3..0c82e7a 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -15,15 +15,7 @@ user = user; } // containers)) ] - ++ (if enableNetworking then - [ - (import ./networking.nix { - hostName = hostName; - firewall = firewall; - }) - ] - else - [ ]) ++ (if enableSSH then + ++ (if enableSSH then [ (import ./ssh.nix { enableSSHServer = true; diff --git a/modules/os/networking.nix b/modules/os/networking.nix deleted file mode 100644 index 952a0e7..0000000 --- a/modules/os/networking.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ hostName, firewall }: -{ pkgs, ... }: -{ - # Define your hostname. - networking.hostName = hostName; - - # Enable networking - networking.networkmanager.enable = true; - networking.firewall = firewall; - - # NFS Support - services.nfs.server.enable = true; - - # Tailscale - services.tailscale.enable = true; - services.tailscale.useRoutingFeatures = "client"; - - # Disable the flaky nm service - systemd.services.NetworkManager-wait-online.enable = false; -} diff --git a/modules/skyg/core.nix b/modules/skyg/core.nix deleted file mode 100644 index 7b0e074..0000000 --- a/modules/skyg/core.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.skyg.core; -in -{ - options = { - skyg.core = { - hostName = mkOption { - description = "Machine Hostname"; - type = types.str; - }; - }; - }; - - config = { - networking.hostName = cfg.hostName; - }; -} diff --git a/modules/skyg/default.nix b/modules/skyg/default.nix index c2bb296..dfd4752 100644 --- a/modules/skyg/default.nix +++ b/modules/skyg/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./core.nix ./user.nix ./macos.nix ./fonts.nix From a86fd67f5a7f9e7e128c5b15f97ae6b22dc6d676 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:19:08 -0400 Subject: [PATCH 16/34] Moved container config --- modules/nixos/common/containers/default.nix | 26 +++++++++++++++++++++ modules/nixos/common/containers/docker.nix | 21 +++++++++++++++++ modules/nixos/common/containers/podman.nix | 19 +++++++++++++++ modules/nixos/common/default.nix | 1 + modules/os/containers/default.nix | 17 -------------- modules/os/containers/docker.nix | 15 ------------ modules/os/containers/podman.nix | 14 ----------- 7 files changed, 67 insertions(+), 46 deletions(-) create mode 100644 modules/nixos/common/containers/default.nix create mode 100644 modules/nixos/common/containers/docker.nix create mode 100644 modules/nixos/common/containers/podman.nix delete mode 100644 modules/os/containers/default.nix delete mode 100644 modules/os/containers/docker.nix delete mode 100644 modules/os/containers/podman.nix diff --git a/modules/nixos/common/containers/default.nix b/modules/nixos/common/containers/default.nix new file mode 100644 index 0000000..2b61e9c --- /dev/null +++ b/modules/nixos/common/containers/default.nix @@ -0,0 +1,26 @@ +{ lib, ... }: + +with lib; + +{ + imports = [ + ./docker.nix + ./podman.nix + ]; + options = { + skyg.common.containers = { + runtime = mkOption { + description = "DOcker vs podman"; + type = types.str; + default = "docker"; + }; + enableOnBoot = mkOption { + type = types.boolean; + default = false; + }; + localDockerRegistries = mkOption { + type = types.listOf types.str; + }; + }; + }; +} diff --git a/modules/nixos/common/containers/docker.nix b/modules/nixos/common/containers/docker.nix new file mode 100644 index 0000000..8bcca9a --- /dev/null +++ b/modules/nixos/common/containers/docker.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.skyg.common.containers; +in +{ + config = lib.mkIf cfg.runtime == "docker" { + virtualisation.docker = { + enable = true; + autoPrune.enable = true; + enableOnBoot = cfg.enableOnBoot; + liveRestore = false; + daemon.settings = { + insecure-registries = cfg.localDockerRegistries; + }; + }; + environment.systemPackages = with pkgs; [ docker-compose ]; + users.users.${config.skyg.user.name}.extraGroups = [ "docker" ]; + virtualisation.oci-containers.backend = "docker"; + }; +} diff --git a/modules/nixos/common/containers/podman.nix b/modules/nixos/common/containers/podman.nix new file mode 100644 index 0000000..b21b924 --- /dev/null +++ b/modules/nixos/common/containers/podman.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.skyg.common.containers; +in +{ + config = lib.mkIf cfg.runtime == "podman" { + virtualisation.oci-containers.backend = "podman"; + virtualisation = { + podman = { + enable = true; + dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; + dockerSocket.enable = true; + autoPrune.enable = true; + }; + }; + environment.systemPackages = with pkgs; [ podman-compose podman-tui ]; + }; +} diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 3101be2..e5e42a4 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -2,6 +2,7 @@ { imports = [ ./hardware + ./containers ./core.nix ./networking.nix ./user.nix diff --git a/modules/os/containers/default.nix b/modules/os/containers/default.nix deleted file mode 100644 index f6dc6c9..0000000 --- a/modules/os/containers/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ user, runtime ? null, enableOnBoot ? false, localDockerRegistries ? [ ] }: -{ pkgs, ... }: { - virtualisation.containers.enable = true; - environment.systemPackages = with pkgs; [ dive ]; - imports = (if runtime == "podman" then - [ (import ./podman.nix { user = user; localDockerRegistries = localDockerRegistries; }) ] - else if runtime == "docker" then - [ - (import ./docker.nix { - user = user; - enableOnBoot = enableOnBoot; - localDockerRegistries = localDockerRegistries; - }) - ] - else - [ ]); -} diff --git a/modules/os/containers/docker.nix b/modules/os/containers/docker.nix deleted file mode 100644 index cb730fb..0000000 --- a/modules/os/containers/docker.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ user, enableOnBoot ? false, localDockerRegistries ? [ ], ... }: -{ pkgs, ... }: { - virtualisation.docker = { - enable = true; - autoPrune.enable = true; - enableOnBoot = enableOnBoot; - liveRestore = false; - daemon.settings = { - insecure-registries = localDockerRegistries; - }; - }; - environment.systemPackages = with pkgs; [ docker-compose ]; - users.users.${user.name}.extraGroups = [ "docker" ]; - virtualisation.oci-containers.backend = "docker"; -} diff --git a/modules/os/containers/podman.nix b/modules/os/containers/podman.nix deleted file mode 100644 index 30f242d..0000000 --- a/modules/os/containers/podman.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ user, ... }: -{ pkgs, ... }: { - virtualisation.oci-containers.backend = "podman"; - virtualisation = { - podman = { - enable = true; - dockerCompat = true; - defaultNetwork.settings.dns_enabled = true; - dockerSocket.enable = true; - autoPrune.enable = true; - }; - }; - environment.systemPackages = with pkgs; [ podman-compose podman-tui ]; -} From 1d0188e19908b440fe3e20c64f874374be49c56b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:27:16 -0400 Subject: [PATCH 17/34] Moved over containers --- modules/main.nix | 1 + modules/nixos/common/containers/default.nix | 4 ++-- modules/nixos/common/containers/docker.nix | 2 +- modules/nixos/common/containers/podman.nix | 2 +- modules/os/default.nix | 7 +------ 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/main.nix b/modules/main.nix index eb62ea9..2045f22 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -36,6 +36,7 @@ skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; skyg.networkDrives.enabled = enableNetworkDrives; + skyg.common.containers = (if os.enable then os.containers else { }); system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/nixos/common/containers/default.nix b/modules/nixos/common/containers/default.nix index 2b61e9c..07bc870 100644 --- a/modules/nixos/common/containers/default.nix +++ b/modules/nixos/common/containers/default.nix @@ -10,12 +10,12 @@ with lib; options = { skyg.common.containers = { runtime = mkOption { - description = "DOcker vs podman"; + description = "Docker vs podman"; type = types.str; default = "docker"; }; enableOnBoot = mkOption { - type = types.boolean; + type = types.bool; default = false; }; localDockerRegistries = mkOption { diff --git a/modules/nixos/common/containers/docker.nix b/modules/nixos/common/containers/docker.nix index 8bcca9a..ee8d8bc 100644 --- a/modules/nixos/common/containers/docker.nix +++ b/modules/nixos/common/containers/docker.nix @@ -4,7 +4,7 @@ let cfg = config.skyg.common.containers; in { - config = lib.mkIf cfg.runtime == "docker" { + config = lib.mkIf (cfg.runtime == "docker") { virtualisation.docker = { enable = true; autoPrune.enable = true; diff --git a/modules/nixos/common/containers/podman.nix b/modules/nixos/common/containers/podman.nix index b21b924..f3b7f01 100644 --- a/modules/nixos/common/containers/podman.nix +++ b/modules/nixos/common/containers/podman.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.common.containers; in { - config = lib.mkIf cfg.runtime == "podman" { + config = lib.mkIf (cfg.runtime == "podman") { virtualisation.oci-containers.backend = "podman"; virtualisation = { podman = { diff --git a/modules/os/default.nix b/modules/os/default.nix index 0c82e7a..82c9432 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -10,12 +10,7 @@ , ... }: { pkgs, ... }: { - imports = [ - (import ./containers/default.nix ({ - user = user; - } // containers)) - ] - ++ (if enableSSH then + imports = (if enableSSH then [ (import ./ssh.nix { enableSSHServer = true; From 3de38b8c9422a5e3a7fd663fde9354d232933f5b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:29:27 -0400 Subject: [PATCH 18/34] moved all os stuff to new config --- modules/main.nix | 11 +---------- modules/nixos/server/default.nix | 1 + modules/nixos/server/exporters.nix | 21 +++++++++++++++++++++ modules/os/default.nix | 23 ----------------------- modules/os/exporters.nix | 10 ---------- 5 files changed, 23 insertions(+), 43 deletions(-) create mode 100644 modules/nixos/server/exporters.nix delete mode 100644 modules/os/default.nix delete mode 100644 modules/os/exporters.nix diff --git a/modules/main.nix b/modules/main.nix index 2045f22..18f1501 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -20,16 +20,7 @@ (import ./skyg) (import ./nixos) (import ./network-drives.nix) - ] ++ (if os.enable then - [ - (import ./os ({ - user = user; - hostName = hostName; - } // os)) - ] - else - [ ]) - ; + ]; # Share defaults skyg.user = user; skyg.core.hostName = hostName; diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index 17f1289..b5b4324 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -3,5 +3,6 @@ imports = [ ./audiobookshelf.nix ./coral-tpu-udev.nix + ./exporters.nix ]; } diff --git a/modules/nixos/server/exporters.nix b/modules/nixos/server/exporters.nix new file mode 100644 index 0000000..18ead42 --- /dev/null +++ b/modules/nixos/server/exporters.nix @@ -0,0 +1,21 @@ +{ config, lib, ... }: +with lib; +let cfg = config.skyg.server.exporters; +in { + options = { + skyg.server.exporters = { + enable = mkEnableOption + "Enable Special prom exporters for servers"; + }; + }; + config = mkIf cfg.enable { + services.prometheus.exporters = { + node = { + enable = true; + enabledCollectors = [ "systemd" ]; + openFirewall = true; + port = 9100; + }; + }; + }; +} diff --git a/modules/os/default.nix b/modules/os/default.nix deleted file mode 100644 index 82c9432..0000000 --- a/modules/os/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ user -, hostName -, firewall -, enableFonts ? true -, enableNetworking ? true -, enableSSH ? true -, containers ? { runtime = null; } -, hardware ? { enable = false; } -, enablePrometheusExporters ? false -, ... -}: -{ pkgs, ... }: { - imports = (if enableSSH then - [ - (import ./ssh.nix { - enableSSHServer = true; - user = user; - }) - ] - else - [ ]) - ++ (if enablePrometheusExporters then [ ./exporters.nix ] else [ ]); -} diff --git a/modules/os/exporters.nix b/modules/os/exporters.nix deleted file mode 100644 index 691cdfa..0000000 --- a/modules/os/exporters.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: { - services.prometheus.exporters = { - node = { - enable = true; - enabledCollectors = [ "systemd" ]; - openFirewall = true; - port = 9100; - }; - }; -} From ebb321f67192ccb453f74363a896fcac28a223d8 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:36:32 -0400 Subject: [PATCH 19/34] Name refactor + move --- hosts/fwbook.nix | 2 +- hosts/hl-bigbox1.nix | 2 +- hosts/hl-fws1.nix | 2 +- hosts/hl-minipc1.nix | 4 ++-- hosts/hl-minipc2.nix | 4 ++-- hosts/hl-terra1.nix | 2 +- modules/main.nix | 2 +- modules/nixos/common/containers/default.nix | 2 +- modules/nixos/common/containers/docker.nix | 2 +- modules/nixos/common/containers/podman.nix | 2 +- modules/nixos/common/default.nix | 1 + modules/{skyg => nixos/common}/fonts.nix | 0 modules/nixos/common/hardware/fan2go.nix | 4 ++-- modules/nixos/common/hardware/fancontrol.nix | 4 ++-- modules/nixos/common/ssh-server.nix | 4 ++-- modules/nixos/desktop/hyprland.nix | 4 ++-- modules/nixos/desktop/kde.nix | 4 ++-- modules/nixos/server/audiobookshelf.nix | 4 ++-- modules/nixos/server/coral-tpu-udev.nix | 4 ++-- modules/skyg/default.nix | 1 - 20 files changed, 27 insertions(+), 27 deletions(-) rename modules/{skyg => nixos/common}/fonts.nix (100%) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index fdbbc46..38e76b8 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -7,7 +7,7 @@ in { imports = [ ./fwbook.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.desktop = { + skyg.nixos.desktop = { kde.enabled = true; }; services.fwupd.enable = true; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 502427e..376f3fc 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -2,7 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 4e052c8..83b33ed 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -2,7 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 2163c32..61234e7 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -2,7 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # Nix Stores services.nix-serve = { @@ -23,7 +23,7 @@ options = [ "nofail" ]; }; # Services - skyg.homelab.services.audiobookshelf = { + skyg.nixos.server.services.audiobookshelf = { enable = true; host = "0.0.0.0"; openFirewall = true; diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 4f6a1fb..c77a17c 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -2,7 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc2.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. @@ -10,7 +10,7 @@ boot.loader.efi.canTouchEfiVariables = true; # Special udev rule for google's coral tpu - skyg.homelab.udevrules.coraltpu.enable = true; + skyg.nixos.server.udevrules.coraltpu.enable = true; # Containers virtualisation.oci-containers = { diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index e514b15..59d71a3 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -3,7 +3,7 @@ { imports = [ ./hl-terra1.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/modules/main.nix b/modules/main.nix index 18f1501..b0fc538 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -27,7 +27,7 @@ skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; skyg.networkDrives.enabled = enableNetworkDrives; - skyg.common.containers = (if os.enable then os.containers else { }); + skyg.nixos.common.containers = (if os.enable then os.containers else { }); system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/nixos/common/containers/default.nix b/modules/nixos/common/containers/default.nix index 07bc870..14e9b17 100644 --- a/modules/nixos/common/containers/default.nix +++ b/modules/nixos/common/containers/default.nix @@ -8,7 +8,7 @@ with lib; ./podman.nix ]; options = { - skyg.common.containers = { + skyg.nixos.common.containers = { runtime = mkOption { description = "Docker vs podman"; type = types.str; diff --git a/modules/nixos/common/containers/docker.nix b/modules/nixos/common/containers/docker.nix index ee8d8bc..1f17e08 100644 --- a/modules/nixos/common/containers/docker.nix +++ b/modules/nixos/common/containers/docker.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - cfg = config.skyg.common.containers; + cfg = config.skyg.nixos.common.containers; in { config = lib.mkIf (cfg.runtime == "docker") { diff --git a/modules/nixos/common/containers/podman.nix b/modules/nixos/common/containers/podman.nix index f3b7f01..b324940 100644 --- a/modules/nixos/common/containers/podman.nix +++ b/modules/nixos/common/containers/podman.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: let - cfg = config.skyg.common.containers; + cfg = config.skyg.nixos.common.containers; in { config = lib.mkIf (cfg.runtime == "podman") { diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index e5e42a4..d535d37 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -6,6 +6,7 @@ ./core.nix ./networking.nix ./user.nix + ./fonts.nix ./ssh-server.nix ]; } diff --git a/modules/skyg/fonts.nix b/modules/nixos/common/fonts.nix similarity index 100% rename from modules/skyg/fonts.nix rename to modules/nixos/common/fonts.nix diff --git a/modules/nixos/common/hardware/fan2go.nix b/modules/nixos/common/hardware/fan2go.nix index 57c6d42..3da6198 100644 --- a/modules/nixos/common/hardware/fan2go.nix +++ b/modules/nixos/common/hardware/fan2go.nix @@ -5,7 +5,7 @@ , ... }: let - cfg = config.skyg.hardware.fan2go; + cfg = config.skyg.nixos.common.hardware.fan2go; fan2goConfig = pkgs.writeText "fan2go.yaml" '' dbPath: ${cfg.dbPath} @@ -65,7 +65,7 @@ let ''; in { - options.skyg.hardware.fan2go = with lib; { + options.skyg.nixos.common.hardware.fan2go = with lib; { enable = mkEnableOption "fan2go"; dbPath = mkOption { diff --git a/modules/nixos/common/hardware/fancontrol.nix b/modules/nixos/common/hardware/fancontrol.nix index a3bbe06..96d3413 100644 --- a/modules/nixos/common/hardware/fancontrol.nix +++ b/modules/nixos/common/hardware/fancontrol.nix @@ -4,10 +4,10 @@ , ... }: let - cfg = config.skyg.hardware.fancontrol; + cfg = config.skyg.nixos.common.hardware.fancontrol; in { - options.skyg.hardware.fancontrol = with lib; { + options.skyg.nixos.common.hardware.fancontrol = with lib; { enable = mkEnableOption "fancontrol"; configName = mkOption { type = types.str; diff --git a/modules/nixos/common/ssh-server.nix b/modules/nixos/common/ssh-server.nix index e0bce1d..0e647fb 100644 --- a/modules/nixos/common/ssh-server.nix +++ b/modules/nixos/common/ssh-server.nix @@ -2,11 +2,11 @@ with lib; let - cfg = config.skyg.ssh-server; + cfg = config.skyg.nixos.common.ssh-server; in { options = { - skyg.ssh-server = { + skyg.nixos.common.ssh-server = { enabled = mkEnableOption "enable ssh server"; masterPubKey = mkOption { diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix index 0dd16ca..4f9f5fd 100644 --- a/modules/nixos/desktop/hyprland.nix +++ b/modules/nixos/desktop/hyprland.nix @@ -2,11 +2,11 @@ with lib; let - cfg = config.skyg.desktop.hyprland; + cfg = config.skyg.nixos.desktop.hyprland; in { options = { - skyg.desktop.hyprland = { + skyg.nixos.desktop.hyprland = { enabled = mkEnableOption "Hyprland"; }; diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index 9df4166..50bbe2f 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -2,11 +2,11 @@ with lib; let - cfg = config.skyg.desktop.kde; + cfg = config.skyg.nixos.desktop.kde; in { options = { - skyg.desktop.kde = { + skyg.nixos.desktop.kde = { enabled = mkEnableOption "KDE"; }; diff --git a/modules/nixos/server/audiobookshelf.nix b/modules/nixos/server/audiobookshelf.nix index 755ea60..a91cc6d 100644 --- a/modules/nixos/server/audiobookshelf.nix +++ b/modules/nixos/server/audiobookshelf.nix @@ -2,10 +2,10 @@ with lib; -let cfg = config.skyg.homelab.services.audiobookshelf; +let cfg = config.skyg.nixos.server.services.audiobookshelf; in { options = { - skyg.homelab.services.audiobookshelf = { + skyg.nixos.server.services.audiobookshelf = { enable = mkEnableOption "Audiobookshelf, self-hosted audiobook and podcast server."; diff --git a/modules/nixos/server/coral-tpu-udev.nix b/modules/nixos/server/coral-tpu-udev.nix index dad16b9..efd1b8b 100644 --- a/modules/nixos/server/coral-tpu-udev.nix +++ b/modules/nixos/server/coral-tpu-udev.nix @@ -1,9 +1,9 @@ { config, lib, ... }: with lib; -let cfg = config.skyg.homelab.udevrules.coraltpu; +let cfg = config.skyg.nixos.server.udevrules.coraltpu; in { options = { - skyg.homelab.udevrules.coraltpu = { + skyg.nixos.server.udevrules.coraltpu = { enable = mkEnableOption "Enable Coral TPU Udev rules"; symlinkName = mkOption { diff --git a/modules/skyg/default.nix b/modules/skyg/default.nix index dfd4752..4953084 100644 --- a/modules/skyg/default.nix +++ b/modules/skyg/default.nix @@ -3,7 +3,6 @@ imports = [ ./user.nix ./macos.nix - ./fonts.nix ./nix-substituters.nix ]; } From 99dc92947c8d6feed4b479aaa439abbb7f49517a Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:39:19 -0400 Subject: [PATCH 20/34] renamed skyg folder to core --- modules/{skyg => core}/default.nix | 0 modules/{skyg => core}/macos.nix | 0 modules/{skyg => core}/nix-substituters.nix | 0 modules/{skyg => core}/user.nix | 0 modules/main.nix | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename modules/{skyg => core}/default.nix (100%) rename modules/{skyg => core}/macos.nix (100%) rename modules/{skyg => core}/nix-substituters.nix (100%) rename modules/{skyg => core}/user.nix (100%) diff --git a/modules/skyg/default.nix b/modules/core/default.nix similarity index 100% rename from modules/skyg/default.nix rename to modules/core/default.nix diff --git a/modules/skyg/macos.nix b/modules/core/macos.nix similarity index 100% rename from modules/skyg/macos.nix rename to modules/core/macos.nix diff --git a/modules/skyg/nix-substituters.nix b/modules/core/nix-substituters.nix similarity index 100% rename from modules/skyg/nix-substituters.nix rename to modules/core/nix-substituters.nix diff --git a/modules/skyg/user.nix b/modules/core/user.nix similarity index 100% rename from modules/skyg/user.nix rename to modules/core/user.nix diff --git a/modules/main.nix b/modules/main.nix index b0fc538..da8a304 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -17,7 +17,7 @@ }: { pkgs, ... }: { imports = [ - (import ./skyg) + (import ./core) (import ./nixos) (import ./network-drives.nix) ]; From 67dd88c1796770a99f0447a111ee27b4b485daa6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:43:05 -0400 Subject: [PATCH 21/34] Added more swap --- hosts/fwbook.hardware-configuration.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index 488edd6..dfaa27b 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -42,7 +42,13 @@ }; swapDevices = - [{ device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; }]; + [ + { device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; } + { + device = "/swapfile"; + size = 16 * 1024; # 16GB + } + ]; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; From 3064d530171d13e8434ef6eb0f3fc7e6198c2c67 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 19 Aug 2024 10:53:33 -0400 Subject: [PATCH 22/34] disabling desktop --- modules/nixos/desktop/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 41805b8..ea36b31 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,4 +1,9 @@ -{ ... }: +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.nixos.desktop; +in { imports = [ ./kde.nix @@ -8,6 +13,14 @@ ./packages.nix ]; - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; + options = { + skyg.nixos.desktop = { + enabled = mkEnableOption + "Enable Desktop"; + }; + }; + config = mkIf cfg.enabled { + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + }; } From 9228a1ae4076971ac6de434909604617b5d8eab6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 19 Aug 2024 10:55:29 -0400 Subject: [PATCH 23/34] More hiding of desktop --- hosts/fwbook.nix | 1 + modules/nixos/desktop/default.nix | 2 +- modules/nixos/desktop/packages.nix | 81 ++++++++++++++++-------------- modules/nixos/desktop/wayland.nix | 21 +++++--- modules/nixos/desktop/x11.nix | 15 ++++-- 5 files changed, 68 insertions(+), 52 deletions(-) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 38e76b8..35cdbe0 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -8,6 +8,7 @@ in imports = [ ./fwbook.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.desktop = { + enabled = true; kde.enabled = true; }; services.fwupd.enable = true; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index ea36b31..83ff98f 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index c0a6c2a..3412d0f 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -1,48 +1,53 @@ -{ pkgs, ... }: +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.nixos.desktop; +in { - # Flatpak - services.flatpak.enable = true; - # Mobile Connect - programs.kdeconnect.enable = true; - environment.systemPackages = with pkgs; [ - # copy to clipboard - wl-clipboard-x11 - xclip - # socials - slack - zoom-us - betterdiscordctl - discord - signal-desktop - whatsapp-for-linux - caprine-bin # facebook messenger + config = lib.mkIf cfg.enabled { + # Flatpak + services.flatpak.enable = true; + # Mobile Connect + programs.kdeconnect.enable = true; + environment.systemPackages = with pkgs; [ + # copy to clipboard + wl-clipboard-x11 + xclip + # socials + slack + zoom-us + betterdiscordctl + discord + signal-desktop + whatsapp-for-linux + caprine-bin # facebook messenger - # development - vscode + # development + vscode - # web - brave + # web + brave - # mail - thunderbird + # mail + thunderbird - # password - bitwarden-desktop + # password + bitwarden-desktop - # documents - onlyoffice-bin_latest + # documents + onlyoffice-bin_latest - # video - vlc - vlc-bittorrent + # video + vlc + vlc-bittorrent - # terminal - alacritty - alacritty-theme + # terminal + alacritty + alacritty-theme - # wine - wineWowPackages.stable - winetricks - wineWowPackages.waylandFull - ]; + # wine + wineWowPackages.stable + winetricks + wineWowPackages.waylandFull + ]; + }; } diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index 2168134..62d8387 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -1,10 +1,15 @@ -{ pkgs, ... }: +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.nixos.desktop; +in { - # Flatpak - environment.systemPackages = with pkgs; [ - wayland - wayland-protocols - wayland-utils - ]; - programs.xwayland.enable = true; + config = lib.mkIf cfg.enabled { + # Flatpak + environment.systemPackages = with pkgs; [ + wayland + wayland-protocols + wayland-utils + ]; + programs.xwayland.enable = true; + }; } diff --git a/modules/nixos/desktop/x11.nix b/modules/nixos/desktop/x11.nix index b1b2227..c109026 100644 --- a/modules/nixos/desktop/x11.nix +++ b/modules/nixos/desktop/x11.nix @@ -1,8 +1,13 @@ -{ ... }: +{ config, lib, ... }: +let + cfg = config.skyg.nixos.desktop; +in { - services.xserver = { - enable = true; - xkb.layout = "us"; - xkb.variant = ""; + config = lib.mkIf cfg.enabled { + services.xserver = { + enable = true; + xkb.layout = "us"; + xkb.variant = ""; + }; }; } From e1087fcdcdfb980035f167b816bd0c9eb7ca1ade Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 19 Aug 2024 11:01:11 -0400 Subject: [PATCH 24/34] moved bluetooth out --- hosts/fwbook.nix | 8 ++++++++ modules/nixos/common/hardware/bluetooth.nix | 7 ------- modules/nixos/common/hardware/default.nix | 9 --------- 3 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 modules/nixos/common/hardware/bluetooth.nix diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 35cdbe0..5400f31 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -20,7 +20,15 @@ in }) { inherit (pkgs) system; }).fwupd; services.fprintd.enable = true; + # Yubikey + services.yubikey-agent.enable = true; + # Enable CUPS to print documents. + services.printing.enable = true; + # Bluetooth hardware.bluetooth.settings.General = { ControllerMode = "bredr"; }; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + services.blueman.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/nixos/common/hardware/bluetooth.nix b/modules/nixos/common/hardware/bluetooth.nix deleted file mode 100644 index 2946799..0000000 --- a/modules/nixos/common/hardware/bluetooth.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: { - - # enables support for Bluetooth - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - services.blueman.enable = true; -} diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index 2ef2e04..de181d9 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -4,18 +4,9 @@ ./fan2go.nix ./fancontrol.nix ./sound.nix - ./bluetooth.nix ]; # Firmware Updater services.fwupd.enable = true; # Enable all license firmware hardware.enableAllFirmware = true; - - - - # Yubikey - services.yubikey-agent.enable = true; - - # Enable CUPS to print documents. - services.printing.enable = true; } From 3acdcd8d53d1421ad9d7e6bb12adaa73b1d73447 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 19 Aug 2024 11:03:55 -0400 Subject: [PATCH 25/34] hiding sound stuff --- hosts/fwbook.nix | 3 +++ modules/nixos/common/hardware/sound.nix | 33 +++++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 5400f31..e290f1a 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -6,11 +6,14 @@ let in { imports = [ ./fwbook.hardware-configuration.nix ]; + # Skyg skyg.user.enabled = true; skyg.nixos.desktop = { enabled = true; kde.enabled = true; }; + skyg.nixos.common.hardware.sound.enable = true; + # Firmware updater services.fwupd.enable = true; services.fwupd.package = (import (builtins.fetchTarball { diff --git a/modules/nixos/common/hardware/sound.nix b/modules/nixos/common/hardware/sound.nix index c2a336b..a791d1b 100644 --- a/modules/nixos/common/hardware/sound.nix +++ b/modules/nixos/common/hardware/sound.nix @@ -1,12 +1,25 @@ -{ ... }: { - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; +{ lib +, config +, ... +}: +let + cfg = config.skyg.nixos.common.hardware.sound; +in +{ + options.skyg.nixos.common.hardware.sound = with lib; { + enable = mkEnableOption "sound"; + }; + + config = lib.mkIf cfg.enable { + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; }; } From d41e5e7594d6975075d1fae67686ab8c377b0f37 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 19 Aug 2024 11:17:37 -0400 Subject: [PATCH 26/34] Firewall rules --- hosts/hl-minipc1.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 61234e7..b55a0d0 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -1,5 +1,14 @@ { user }: -{ pkgs, lib, config, ... }: { +{ pkgs, lib, config, ... }: +let + openPorts = [ + 5000 + 5001 + 8000 + 22 + ]; +in +{ imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; @@ -39,5 +48,8 @@ listenAddress = "0.0.0.0"; enableDelete = true; }; + # Firewall + networking.firewall.allowedUDPPorts = openPorts; + networking.firewall.allowedTCPPorts = openPorts; } From 725ad8289ef7e0970a314e761bffd0b6aefde2ed Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 19 Aug 2024 12:45:14 -0400 Subject: [PATCH 27/34] Added firewall rules --- hosts/hl-bigbox1.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 376f3fc..6dfaa3b 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -1,5 +1,15 @@ { user }: -{ pkgs, lib, config, ... }: { +{ pkgs, lib, config, ... }: +let + openPorts = [ + 22 + 11434 + 10400 + 10300 + 10200 + ]; +in +{ imports = [ ./hl-bigbox1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; @@ -79,4 +89,7 @@ steamPackages.steamcmd ollama ]; + # Networking + networking.firewall.allowedUDPPorts = openPorts; + networking.firewall.allowedTCPPorts = openPorts; } From 183e2dff202a51d6268d7fff074f94af03e34be5 Mon Sep 17 00:00:00 2001 From: minipc2 Date: Mon, 19 Aug 2024 12:48:11 -0400 Subject: [PATCH 28/34] Removed firewall from minipc2 --- hosts/hl-minipc2.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index c77a17c..26926c1 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -8,7 +8,8 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - + # Disable firewall + networking.firewall.enable = false; # Special udev rule for google's coral tpu skyg.nixos.server.udevrules.coraltpu.enable = true; From 9bb704fd0c401985daf8398217836ad2da301f5f Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Aug 2024 17:09:31 -0400 Subject: [PATCH 29/34] Added nfs exports to terra1 --- hosts/hl-terra1.hardware-configuration.nix | 9 ++++--- hosts/hl-terra1.nix | 30 ++++++++++++++++++++++ modules/network-drives.nix | 6 +++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/hosts/hl-terra1.hardware-configuration.nix b/hosts/hl-terra1.hardware-configuration.nix index b81f15a..2a084d9 100644 --- a/hosts/hl-terra1.hardware-configuration.nix +++ b/hosts/hl-terra1.hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: let kernel = config.boot.kernelPackages.kernel; @@ -60,7 +57,11 @@ in fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; - + fileSystems."/mnt/Data" = + { + device = "/dev/sda1"; + fsType = "btrfs"; + }; swapDevices = [ ]; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 59d71a3..c28fe3d 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -1,5 +1,18 @@ { user }: { pkgs, lib, config, ... }: +let + openPorts = [ + # nfs + 111 + 2049 + 4000 + 4001 + 4002 + 20048 + # ssh + 22 + ]; +in { imports = [ ./hl-terra1.hardware-configuration.nix ]; skyg.user.enabled = true; @@ -9,5 +22,22 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + environment.systemPackages = with pkgs; [ + btrfs-progs + ]; + # Firewall + networking.firewall.allowedUDPPorts = openPorts; + networking.firewall.allowedTCPPorts = openPorts; + # NFS + services.nfs.server = { + enable = true; + lockdPort = 4001; + mountdPort = 4002; + statdPort = 4000; + extraNfsdConfig = ''''; + exports = '' + /mnt/Data/apps 10.0.0.0/16(rw,wdelay,insecure,no_root_squash,no_subtree_check,sec=sys,rw,insecure,no_root_squash,no_all_squash) + ''; + }; } diff --git a/modules/network-drives.nix b/modules/network-drives.nix index 9cc4fdb..d149ba3 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -31,5 +31,11 @@ in fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; }; + + fileSystems."/mnt/terra1/Data/apps" = { + device = "terra1.lab.internal:/mnt/Data/apps"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; }; } From 25c575b53415a11f0893673d9482b380e2d0d944 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Aug 2024 17:13:08 -0400 Subject: [PATCH 30/34] using same network drives for laptop --- flake.nix | 1 + hosts/fwbook.hardware-configuration.nix | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 23700d5..2d54ebc 100644 --- a/flake.nix +++ b/flake.nix @@ -145,6 +145,7 @@ localNixCaches = localNixCaches; localDockerRegistries = localDockerRegistries; homeManagerVersion = homeManagerVersion; + enableNetworkDrives = true; desktop = { enable = true; user = user; diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index dfaa27b..25b14c0 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -29,18 +29,6 @@ options = [ "users" "nofail" ]; }; - fileSystems."/mnt/EightTerra/DownloadedTorrents" = { - device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; - - fileSystems."/mnt/EightTerra/k3s-cluster" = { - device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; - swapDevices = [ { device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; } From dc8e0b81d9e5c1c7b4d55562e54aa61712d714a9 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Aug 2024 20:57:29 -0400 Subject: [PATCH 31/34] Added jellyfin setup --- hosts/hl-bigbox1.nix | 48 +---------------------- modules/network-drives.nix | 2 +- modules/nixos/server/ai-services.nix | 57 ++++++++++++++++++++++++++++ modules/nixos/server/default.nix | 2 + modules/nixos/server/jellyfin.nix | 34 +++++++++++++++++ 5 files changed, 96 insertions(+), 47 deletions(-) create mode 100644 modules/nixos/server/ai-services.nix create mode 100644 modules/nixos/server/jellyfin.nix diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 6dfaa3b..b3dabba 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -1,18 +1,11 @@ { user }: { pkgs, lib, config, ... }: -let - openPorts = [ - 22 - 11434 - 10400 - 10300 - 10200 - ]; -in { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; + skyg.nixos.server.services.ai.enable = true; + skyg.nixos.server.services.jellyfin.enable = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; @@ -22,40 +15,6 @@ in boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; boot.kernelPackages = pkgs.linuxPackages_latest; - # Containers - virtualisation.oci-containers = { - containers = { - ollama = { - autoStart = true; - image = "ollama/ollama"; - extraOptions = [ "--gpus" "all" ]; - ports = [ "11434:11434" ]; - volumes = [ "ollama:/root/.ollama" ]; - }; - openwakeword = { - autoStart = true; - image = "rhasspy/wyoming-openwakeword"; - cmd = [ "--preload-model" "ok_nabu" ]; - ports = [ "10400:10400" ]; - }; - }; - }; - - # Wyoming Service - services.wyoming = { - faster-whisper.servers.main-eng = { - enable = true; - device = "cpu"; - model = "medium.en"; - language = "en"; - uri = "tcp://0.0.0.0:10300"; - }; - piper.servers.pier = { - enable = true; - uri = "tcp://0.0.0.0:10200"; - voice = "en_GB-alan-medium"; - }; - }; # Nvidia Settings services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.enable = true; @@ -89,7 +48,4 @@ in steamPackages.steamcmd ollama ]; - # Networking - networking.firewall.allowedUDPPorts = openPorts; - networking.firewall.allowedTCPPorts = openPorts; } diff --git a/modules/network-drives.nix b/modules/network-drives.nix index d149ba3..e72d1b7 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -14,7 +14,7 @@ in }; }; config = mkIf cfg.enabled { - fileSystems."/mnt/EightTerra/DownloadedTorrents" = { + fileSystems."/torrents" = { device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; diff --git a/modules/nixos/server/ai-services.nix b/modules/nixos/server/ai-services.nix new file mode 100644 index 0000000..123a8bc --- /dev/null +++ b/modules/nixos/server/ai-services.nix @@ -0,0 +1,57 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.skyg.nixos.server.services.ai; + openPorts = [ + 11434 + 10400 + 10300 + 10200 + ]; +in +{ + options = { + skyg.nixos.server.services.ai = { + enable = mkEnableOption + "Enable AI Services"; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedUDPPorts = openPorts; + networking.firewall.allowedTCPPorts = openPorts; + virtualisation.oci-containers = { + containers = { + ollama = { + autoStart = true; + image = "ollama/ollama"; + extraOptions = [ "--gpus" "all" ]; + ports = [ "11434:11434" ]; + volumes = [ "ollama:/root/.ollama" ]; + }; + openwakeword = { + autoStart = true; + image = "rhasspy/wyoming-openwakeword"; + cmd = [ "--preload-model" "ok_nabu" ]; + ports = [ "10400:10400" ]; + }; + }; + }; + services.wyoming = { + faster-whisper.servers.main-eng = { + enable = true; + device = "cpu"; + model = "medium.en"; + language = "en"; + uri = "tcp://0.0.0.0:10300"; + }; + piper.servers.pier = { + enable = true; + uri = "tcp://0.0.0.0:10200"; + voice = "en_GB-alan-medium"; + }; + }; + }; +} diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index b5b4324..b401b4c 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -4,5 +4,7 @@ ./audiobookshelf.nix ./coral-tpu-udev.nix ./exporters.nix + ./ai-services.nix + ./jellyfin.nix ]; } diff --git a/modules/nixos/server/jellyfin.nix b/modules/nixos/server/jellyfin.nix new file mode 100644 index 0000000..8a003fa --- /dev/null +++ b/modules/nixos/server/jellyfin.nix @@ -0,0 +1,34 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.skyg.nixos.server.services.jellyfin; +in +{ + options = { + skyg.nixos.server.services.jellyfin = { + enable = mkEnableOption + "Enable AI Services"; + }; + }; + + config = mkIf cfg.enable { + services.jellyfin = { + enable = true; + dataDir = "/mnt/apps/jellyfin/datadir"; + configDir = "/mnt/apps/jellyfin/configdir"; + openFirewall = true; + }; + fileSystems."/mnt/apps/jellyfin" = { + device = "terra1.lab.internal:/mnt/Data/apps/jellyfin"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; + fileSystems."/family-videos" = { + device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage/Video"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; + }; +} From 6ddf1846f6d769f2974d08daaf6bb6b075c444c6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Aug 2024 21:13:54 -0400 Subject: [PATCH 32/34] Added special folders + more jellyfin stuff --- hosts/fwbook.nix | 1 + hosts/hl-bigbox1.nix | 1 + hosts/hl-fws1.nix | 1 + hosts/hl-minipc1.nix | 1 + hosts/hl-terra1.nix | 1 + modules/nixos/server/admin.nix | 19 +++++++++++++++++++ modules/nixos/server/jellyfin.nix | 19 ++++++++++++++++++- 7 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 modules/nixos/server/admin.nix diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index e290f1a..a7f880c 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -8,6 +8,7 @@ in imports = [ ./fwbook.hardware-configuration.nix ]; # Skyg skyg.user.enabled = true; + skyg.server.admin.enable = true; skyg.nixos.desktop = { enabled = true; kde.enabled = true; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index b3dabba..85f0a85 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -6,6 +6,7 @@ skyg.nixos.common.ssh-server.enabled = true; skyg.nixos.server.services.ai.enable = true; skyg.nixos.server.services.jellyfin.enable = true; + skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 83b33ed..4896790 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -3,6 +3,7 @@ imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; + skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index b55a0d0..5da546b 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -12,6 +12,7 @@ in imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; + skyg.server.admin.enable = true; # Nix Stores services.nix-serve = { diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index c28fe3d..94ffb04 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -17,6 +17,7 @@ in imports = [ ./hl-terra1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; + skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/modules/nixos/server/admin.nix b/modules/nixos/server/admin.nix new file mode 100644 index 0000000..3dabf17 --- /dev/null +++ b/modules/nixos/server/admin.nix @@ -0,0 +1,19 @@ +{ config, lib, ... }: +with lib; +let cfg = config.skyg.server.admin; +in { + options = { + skyg.server.admin = { + enable = mkEnableOption + "Enable special linux user & groups"; + }; + }; + config = mkIf cfg.enable { + users.groups.shared-files = { + gid = 6660; + members = [ + config.skyg.user.name + ]; + }; + }; +} diff --git a/modules/nixos/server/jellyfin.nix b/modules/nixos/server/jellyfin.nix index 8a003fa..9d693f2 100644 --- a/modules/nixos/server/jellyfin.nix +++ b/modules/nixos/server/jellyfin.nix @@ -4,17 +4,34 @@ with lib; let cfg = config.skyg.nixos.server.services.jellyfin; + user = "jellyfin"; + group = "jellyfin"; in { options = { skyg.nixos.server.services.jellyfin = { enable = mkEnableOption - "Enable AI Services"; + "Enable Jellyfish"; }; }; config = mkIf cfg.enable { + users.users.${user} = { + uid = 7777; + isSystemUser = true; + }; + users.groups.${group} = { + gid = 7777; + members = [ + user + config.skyg.user.name + ]; + }; + users.groups.shared-files.members = [ + user + ]; services.jellyfin = { + inherit user group; enable = true; dataDir = "/mnt/apps/jellyfin/datadir"; configDir = "/mnt/apps/jellyfin/configdir"; From d26a4816853dbfa107fc2de62275a0c41267fe6a Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Aug 2024 21:14:56 -0400 Subject: [PATCH 33/34] Forgot adding to defaults --- modules/nixos/server/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index b401b4c..f6a6185 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -6,5 +6,6 @@ ./exporters.nix ./ai-services.nix ./jellyfin.nix + ./admin.nix ]; } From 27b2b8b96a164d25214510d7f4724d8bf37d28f6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 21 Aug 2024 09:33:51 -0400 Subject: [PATCH 34/34] Correct folders for jellyfin --- modules/nixos/server/jellyfin.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/nixos/server/jellyfin.nix b/modules/nixos/server/jellyfin.nix index 9d693f2..fca163a 100644 --- a/modules/nixos/server/jellyfin.nix +++ b/modules/nixos/server/jellyfin.nix @@ -33,8 +33,9 @@ in services.jellyfin = { inherit user group; enable = true; - dataDir = "/mnt/apps/jellyfin/datadir"; - configDir = "/mnt/apps/jellyfin/configdir"; + dataDir = "/mnt/apps/jellyfin/data"; + cacheDir = "/mnt/apps/jellyfin/cache"; + configDir = "/mnt/apps/jellyfin/config"; openFirewall = true; }; fileSystems."/mnt/apps/jellyfin" = {