diff --git a/flake.nix b/flake.nix index bdacef2..2654e02 100644 --- a/flake.nix +++ b/flake.nix @@ -153,6 +153,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 488edd6..25b14c0 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -29,20 +29,14 @@ 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"; }]; + [ + { 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"; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index bc79e88..a7f880c 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -6,7 +6,15 @@ let in { imports = [ ./fwbook.hardware-configuration.nix ]; + # Skyg skyg.user.enabled = true; + skyg.server.admin.enable = 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 { @@ -16,7 +24,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/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 57dbbf9..85f0a85 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -1,7 +1,12 @@ { user }: -{ pkgs, lib, config, ... }: { +{ pkgs, lib, config, ... }: +{ 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; + skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; @@ -11,40 +16,6 @@ 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; @@ -60,12 +31,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..4896790 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -2,6 +2,8 @@ { pkgs, lib, config, ... }: { 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 6c77f62..5da546b 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -1,12 +1,24 @@ { 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; + skyg.server.admin.enable = true; # Nix Stores services.nix-serve = { enable = true; secretKeyFile = "/var/keys/cache-priv-key.pem"; + port = 5000; }; # firmware updater services.fwupd.enable = true; @@ -21,7 +33,7 @@ options = [ "nofail" ]; }; # Services - skyg.homelab.services.audiobookshelf = { + skyg.nixos.server.services.audiobookshelf = { enable = true; host = "0.0.0.0"; openFirewall = true; @@ -37,5 +49,8 @@ listenAddress = "0.0.0.0"; enableDelete = true; }; + # Firewall + networking.firewall.allowedUDPPorts = openPorts; + networking.firewall.allowedTCPPorts = openPorts; } diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 87c0533..26926c1 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -2,14 +2,16 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc2.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # 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.homelab.udevrules.coraltpu.enable = true; + skyg.nixos.server.udevrules.coraltpu.enable = true; # Containers virtualisation.oci-containers = { 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 43275ef..94ffb04 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -1,12 +1,44 @@ { 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; + skyg.nixos.common.ssh-server.enabled = true; + skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; # 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/skyg/default.nix b/modules/core/default.nix similarity index 85% rename from modules/skyg/default.nix rename to modules/core/default.nix index 7c5c34e..4953084 100644 --- a/modules/skyg/default.nix +++ b/modules/core/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./core.nix ./user.nix ./macos.nix ./nix-substituters.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/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/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/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/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/desktop/wayland.nix b/modules/desktop/wayland.nix deleted file mode 100644 index 1f1206a..0000000 --- a/modules/desktop/wayland.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - programs.xwayland.enable = true; - environment.systemPackages = with pkgs; [ - wayland - wayland-protocols - wayland-utils - ]; -} diff --git a/modules/desktop/wine.nix b/modules/desktop/wine.nix deleted file mode 100644 index d870d2d..0000000 --- a/modules/desktop/wine.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - wineWowPackages.stable - winetricks - wineWowPackages.waylandFull - ]; -} diff --git a/modules/desktop/x11.nix b/modules/desktop/x11.nix deleted file mode 100644 index b1b2227..0000000 --- a/modules/desktop/x11.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -{ - services.xserver = { - enable = true; - xkb.layout = "us"; - xkb.variant = ""; - }; -} diff --git a/modules/home/default.nix b/modules/home/default.nix index 5653ba8..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,49 +33,23 @@ in , name , ... }: { pkgs, ... }: { + fonts = fontsModule; home = homeModule // { username = name; homeDirectory = "/home/${name}"; packages = with pkgs; - [ jq nixpkgs-fmt ipfetch nixd ] - ++ (if enableDevelopmentKit then [ + [ + jq + nixpkgs-fmt + ipfetch + nixd + htop + ] + ++ (if enableDevelopmentKit then [ devenv 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/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/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/main.nix b/modules/main.nix index 15fc0ab..da8a304 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -17,27 +17,17 @@ }: { pkgs, ... }: { imports = [ - (import ./skyg) + (import ./core) (import ./nixos) - ] ++ (if desktop.enable then - [ (import ./desktop ({ user = user; } // desktop)) ] - else - [ ]) ++ (if os.enable then - [ - (import ./os ({ - user = user; - hostName = hostName; - } // os)) - ] - else - [ ]) - ++ (if enableNetworkDrives then [ (import ./network-drives.nix) ] else [ ]) - ; + (import ./network-drives.nix) + ]; # Share defaults skyg.user = user; skyg.core.hostName = hostName; skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; + skyg.networkDrives.enabled = enableNetworkDrives; + skyg.nixos.common.containers = (if os.enable then os.containers else { }); system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/network-drives.nix b/modules/network-drives.nix index 09ac2c9..e72d1b7 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -1,19 +1,41 @@ -{ ... }: { - 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."/torrents" = { + 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" ]; + }; + + fileSystems."/mnt/terra1/Data/apps" = { + device = "terra1.lab.internal:/mnt/Data/apps"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; }; } diff --git a/modules/nixos/common/containers/default.nix b/modules/nixos/common/containers/default.nix new file mode 100644 index 0000000..14e9b17 --- /dev/null +++ b/modules/nixos/common/containers/default.nix @@ -0,0 +1,26 @@ +{ lib, ... }: + +with lib; + +{ + imports = [ + ./docker.nix + ./podman.nix + ]; + options = { + skyg.nixos.common.containers = { + runtime = mkOption { + description = "Docker vs podman"; + type = types.str; + default = "docker"; + }; + enableOnBoot = mkOption { + type = types.bool; + 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..1f17e08 --- /dev/null +++ b/modules/nixos/common/containers/docker.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.skyg.nixos.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..b324940 --- /dev/null +++ b/modules/nixos/common/containers/podman.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.skyg.nixos.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/os/core.nix b/modules/nixos/common/core.nix similarity index 80% rename from modules/os/core.nix rename to modules/nixos/common/core.nix index 9a4e066..6cfa3ee 100644 --- a/modules/os/core.nix +++ b/modules/nixos/common/core.nix @@ -1,12 +1,7 @@ -{ user }: -{ pkgs, ... }: +{ pkgs, config, ... }: { # 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; [ @@ -16,7 +11,6 @@ # shell tools git usbutils - htop # system utils nfs-utils @@ -43,7 +37,7 @@ enable = true; systemCronJobs = [ "* 23 * * * root nix-collect-garbage --delete-older-than 1d" - "* 23 * * * ${user.name} nix-collect-garbage --delete-older-than 1d" + "* 23 * * * ${config.skyg.user.name} nix-collect-garbage --delete-older-than 1d" ]; }; } diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 1b7d70b..d535d37 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -2,5 +2,11 @@ { imports = [ ./hardware + ./containers + ./core.nix + ./networking.nix + ./user.nix + ./fonts.nix + ./ssh-server.nix ]; } diff --git a/modules/os/fonts.nix b/modules/nixos/common/fonts.nix similarity index 97% rename from modules/os/fonts.nix rename to modules/nixos/common/fonts.nix index fb558d5..dca9a71 100644 --- a/modules/os/fonts.nix +++ b/modules/nixos/common/fonts.nix @@ -1,6 +1,5 @@ { pkgs, ... }: { - # Fonts fonts = { packages = with pkgs; [ fira-code diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index 8e7ce89..de181d9 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -3,5 +3,10 @@ imports = [ ./fan2go.nix ./fancontrol.nix + ./sound.nix ]; + # Firmware Updater + services.fwupd.enable = true; + # Enable all license firmware + hardware.enableAllFirmware = true; } 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/hardware/sound.nix b/modules/nixos/common/hardware/sound.nix new file mode 100644 index 0000000..a791d1b --- /dev/null +++ b/modules/nixos/common/hardware/sound.nix @@ -0,0 +1,25 @@ +{ 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; + }; + }; +} 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 new file mode 100644 index 0000000..0e647fb --- /dev/null +++ b/modules/nixos/common/ssh-server.nix @@ -0,0 +1,34 @@ +{ config, lib, ... }: +with lib; + +let + cfg = config.skyg.nixos.common.ssh-server; +in +{ + options = { + skyg.nixos.common.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; + openFirewall = 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/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/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/default.nix b/modules/nixos/desktop/default.nix index 8b13789..83ff98f 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1 +1,26 @@ +{ config, lib, ... }: +with lib; +let + cfg = config.skyg.nixos.desktop; +in +{ + imports = [ + ./kde.nix + ./hyprland.nix + ./wayland.nix + ./x11.nix + ./packages.nix + ]; + + options = { + skyg.nixos.desktop = { + enabled = mkEnableOption + "Enable Desktop"; + }; + }; + config = mkIf cfg.enabled { + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + }; +} diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix new file mode 100644 index 0000000..4f9f5fd --- /dev/null +++ b/modules/nixos/desktop/hyprland.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.nixos.desktop.hyprland; +in +{ + options = { + skyg.nixos.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 new file mode 100644 index 0000000..50bbe2f --- /dev/null +++ b/modules/nixos/desktop/kde.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.nixos.desktop.kde; +in +{ + options = { + skyg.nixos.desktop.kde = { + enabled = mkEnableOption + "KDE"; + }; + }; + config = mkIf cfg.enabled { + services.desktopManager.plasma6.enable = true; + 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 + ]; + services.desktopManager.plasma6.notoPackage = pkgs.fira-code; + }; +} diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix new file mode 100644 index 0000000..3412d0f --- /dev/null +++ b/modules/nixos/desktop/packages.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.nixos.desktop; +in +{ + 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 + + # web + brave + + # mail + thunderbird + + # password + bitwarden-desktop + + # documents + onlyoffice-bin_latest + + # video + vlc + vlc-bittorrent + + # terminal + alacritty + alacritty-theme + + # wine + wineWowPackages.stable + winetricks + wineWowPackages.waylandFull + ]; + }; +} diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix new file mode 100644 index 0000000..62d8387 --- /dev/null +++ b/modules/nixos/desktop/wayland.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.nixos.desktop; +in +{ + 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 new file mode 100644 index 0000000..c109026 --- /dev/null +++ b/modules/nixos/desktop/x11.nix @@ -0,0 +1,13 @@ +{ config, lib, ... }: +let + cfg = config.skyg.nixos.desktop; +in +{ + config = lib.mkIf cfg.enabled { + services.xserver = { + enable = true; + xkb.layout = "us"; + xkb.variant = ""; + }; + }; +} 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/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/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/nixos/server/default.nix b/modules/nixos/server/default.nix index 17f1289..f6a6185 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -3,5 +3,9 @@ imports = [ ./audiobookshelf.nix ./coral-tpu-udev.nix + ./exporters.nix + ./ai-services.nix + ./jellyfin.nix + ./admin.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/nixos/server/jellyfin.nix b/modules/nixos/server/jellyfin.nix new file mode 100644 index 0000000..fca163a --- /dev/null +++ b/modules/nixos/server/jellyfin.nix @@ -0,0 +1,52 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.skyg.nixos.server.services.jellyfin; + user = "jellyfin"; + group = "jellyfin"; +in +{ + options = { + skyg.nixos.server.services.jellyfin = { + enable = mkEnableOption + "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/data"; + cacheDir = "/mnt/apps/jellyfin/cache"; + configDir = "/mnt/apps/jellyfin/config"; + 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" ]; + }; + }; +} 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 ]; -} diff --git a/modules/os/default.nix b/modules/os/default.nix deleted file mode 100644 index 1607245..0000000 --- a/modules/os/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ user -, hostName -, firewall -, enableFonts ? true -, enableNetworking ? true -, enableSSH ? true -, containers ? { runtime = null; } -, hardware ? { enable = false; } -, enablePrometheusExporters ? false -, ... -}: -{ pkgs, ... }: { - imports = [ - (import ./core.nix { user = user; }) - (import ./user.nix { user = user; }) - (import ./containers/default.nix ({ - user = user; - } // containers)) - ] ++ (if enableFonts then [ ./fonts.nix ] else [ ]) - ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) - ++ (if enableNetworking then - [ - (import ./networking.nix { - hostName = hostName; - firewall = firewall; - }) - ] - else - [ ]) ++ (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; - }; - }; -} 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; -} 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/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 [ ]; -} 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" - ]; - }; -} diff --git a/modules/skyg/core.nix b/modules/skyg/core.nix deleted file mode 100644 index f6ccef7..0000000 --- a/modules/skyg/core.nix +++ /dev/null @@ -1,22 +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 = { - users.users.root.shell = pkgs.zsh; - networking.hostName = cfg.hostName; - }; -} 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