diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/appflakes/immich/README.md b/appflakes/immich/README.md old mode 100644 new mode 100755 diff --git a/appflakes/immich/flake.lock b/appflakes/immich/flake.lock old mode 100644 new mode 100755 diff --git a/appflakes/immich/flake.nix b/appflakes/immich/flake.nix old mode 100644 new mode 100755 diff --git a/appflakes/octofriend/README.md b/appflakes/octofriend/README.md old mode 100644 new mode 100755 diff --git a/appflakes/octofriend/flake.lock b/appflakes/octofriend/flake.lock old mode 100644 new mode 100755 diff --git a/appflakes/octofriend/flake.nix b/appflakes/octofriend/flake.nix old mode 100644 new mode 100755 diff --git a/appflakes/octofriend/result b/appflakes/octofriend/result deleted file mode 120000 index ee7aad2..0000000 --- a/appflakes/octofriend/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/cmq4skpafnf055fyjmk8qxjhvbxl0xws-octofriend-git-6d9c260 \ No newline at end of file diff --git a/desktop/3dprinting.nix b/desktop/3dprinting.nix old mode 100644 new mode 100755 diff --git a/desktop/daw.nix b/desktop/daw.nix old mode 100644 new mode 100755 diff --git a/desktop/dev.nix b/desktop/dev.nix old mode 100644 new mode 100755 diff --git a/desktop/dnm.nix b/desktop/dnm.nix old mode 100644 new mode 100755 diff --git a/desktop/gaming.nix b/desktop/gaming.nix old mode 100644 new mode 100755 diff --git a/desktop/media.nix b/desktop/media.nix old mode 100644 new mode 100755 diff --git a/desktop/office.nix b/desktop/office.nix old mode 100644 new mode 100755 diff --git a/desktop/plasma.nix b/desktop/plasma.nix old mode 100644 new mode 100755 diff --git a/desktop/stp-elc-udmshare.nix b/desktop/stp-elc-udmshare.nix old mode 100644 new mode 100755 diff --git a/desktop/tailscale.nix b/desktop/tailscale.nix old mode 100644 new mode 100755 diff --git a/desktop/virtualization.nix b/desktop/virtualization.nix old mode 100644 new mode 100755 diff --git a/docs/README-unstable and stable packages.md b/docs/README-unstable and stable packages.md old mode 100644 new mode 100755 diff --git a/docs/agents.md b/docs/agents.md old mode 100644 new mode 100755 diff --git a/flake.lock b/flake.lock old mode 100644 new mode 100755 diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 index d6049fc..d98481c --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,7 @@ # Common desktop modules commonDesktopModules = [ ./systems/common.nix + ./systems/desktop.nix ./users/jsutter.nix ./desktop/plasma.nix ./desktop/dev.nix @@ -78,7 +79,7 @@ modules = commonDesktopModules ++ [ ./systems/labrizor.nix ./users/jsutter.nix - ./desktop/3dprinting.nix + ./desktop/3dprinting.nix ]; }; warp = mkSystem { @@ -88,6 +89,13 @@ ./systems/warp.nix ]; }; + skip = mkSystem { + modules = [ + ./systems/common.nix + ./users/jsutter.nix + ./systems/skip.nix + ]; + }; }; }; } diff --git a/servers/README.md b/servers/README.md old mode 100644 new mode 100755 diff --git a/servers/common.nix b/servers/common.nix old mode 100644 new mode 100755 diff --git a/servers/forgejo.nix b/servers/forgejo.nix old mode 100644 new mode 100755 diff --git a/servers/hugo.nix b/servers/hugo.nix old mode 100644 new mode 100755 diff --git a/systems/aurora.nix b/systems/aurora.nix old mode 100644 new mode 100755 diff --git a/systems/common.nix b/systems/common.nix old mode 100644 new mode 100755 index 94f584c..b19f31b --- a/systems/common.nix +++ b/systems/common.nix @@ -61,12 +61,6 @@ # Services security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; services.openssh.enable = true; security.polkit.enable = true; programs.zsh.enable = true; @@ -103,7 +97,6 @@ python3 pv whois - kdePackages.xdg-desktop-portal-kde fwupd usbutils # lsusb pciutils # lspci @@ -113,23 +106,8 @@ nvme-cli smartmontools ripgrep - mesa-demos ]; - services.flatpak.enable = true; - - fonts.packages = with pkgs; [ - noto-fonts-color-emoji - noto-fonts-cjk-sans - liberation_ttf - fira-code - fira-code-symbols - mplus-outline-fonts.githubRelease - dina-font - proggyfonts - ]; - - services.xserver.excludePackages = [ pkgs.xterm ]; documentation.nixos.enable = false; systemd.network.wait-online.enable = false; diff --git a/systems/desktop.nix b/systems/desktop.nix new file mode 100755 index 0000000..d47fc54 --- /dev/null +++ b/systems/desktop.nix @@ -0,0 +1,29 @@ +{ config, pkgs, ... }: + + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + environment.systemPackages = with pkgs; [ + kdePackages.xdg-desktop-portal-kde + mesa-demos + ]; + + services.flatpak.enable = true; + + fonts.packages = with pkgs; [ + noto-fonts-color-emoji + noto-fonts-cjk-sans + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + proggyfonts + ]; + + services.xserver.excludePackages = [ pkgs.xterm ]; +} diff --git a/systems/framework.nix b/systems/framework.nix old mode 100644 new mode 100755 diff --git a/systems/labrizor.nix b/systems/labrizor.nix old mode 100644 new mode 100755 diff --git a/systems/skip01.nix b/systems/skip.nix old mode 100644 new mode 100755 similarity index 89% rename from systems/skip01.nix rename to systems/skip.nix index 8b1f7f9..deb8e98 --- a/systems/skip01.nix +++ b/systems/skip.nix @@ -1,5 +1,14 @@ { config, lib, pkgs, modulesPath, ... }: { - networking.hostName = "skip01"; + networking.hostName = "skip"; + + fileSystems."/" = + { device = "/dev/disk/by-partlabel/primary"; + fsType = "ext4"; + }; + fileSystems."/boot" = + { device = "/dev/disk/by-partlabel/ESP"; + fsType = "vfat"; + }; # CPU Settings for 13th gen Intel Core i5 hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -19,8 +28,6 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - # No graphics support needed for headless server - # Power management optimized for server use powerManagement = { enable = true; diff --git a/systems/warp.nix b/systems/warp.nix old mode 100644 new mode 100755 index 0ceafa2..caa3a92 --- a/systems/warp.nix +++ b/systems/warp.nix @@ -1,32 +1,33 @@ { config, lib, pkgs, modulesPath, ... }: { - networking.hostName = "warp"; + networking.hostName = "skip01"; - # CPU Settings for 13th gen Intel Core + fileSystems."/" = + { device = "/dev/disk/by-partlabel/primary"; + fsType = "ext4"; + }; + fileSystems."/boot" = + { device = "/dev/disk/by-partlabel/ESP"; + fsType = "vfat"; + }; + + # CPU Settings for 13th gen Intel Core i5 hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; # Boot and kernel modules for Intel NUC - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - - # File system configuration - placeholder for actual hardware - fileSystems."/" = { - device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; - }; - boot.initrd.kernelModules = []; - boot.kernelModules = [ "kvm-intel" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; # No graphics drivers needed for headless + boot.kernelModules = [ "kvm-intel" ]; # Intel virtualization support boot.extraModulePackages = []; # Server-specific kernel parameters boot.kernelParams = [ - "intel_iommu=on" + "intel_iommu=on" # Enable IOMMU for virtualization ]; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - # No graphics support needed for headless server - # Power management optimized for server use powerManagement = { enable = true; @@ -46,16 +47,16 @@ }; }; - # Swap configuration + # Swap configuration (smaller for server use) swapDevices = [ { device = "/swapfile"; - size = 8192; + size = 8192; # 8GB swap for server workload priority = 0; } ]; - # Enable hardware monitoring + # Enable hardware monitoring (CLI only) hardware.sensor.iio.enable = true; # Network performance tuning for server use @@ -70,9 +71,8 @@ # Disable unnecessary services for server use services.xserver.enable = lib.mkForce false; services.pipewire.enable = lib.mkForce false; - services.flatpak.enable = lib.mkForce false; - # Enable container support for server services + # Enable container support for future server services virtualisation.docker.enable = true; virtualisation.podman.enable = lib.mkDefault true; } diff --git a/users/aksutter.nix b/users/aksutter.nix old mode 100644 new mode 100755 diff --git a/users/common-home.nix b/users/common-home.nix old mode 100644 new mode 100755 diff --git a/users/isutter.nix b/users/isutter.nix old mode 100644 new mode 100755 diff --git a/users/jsutter.nix b/users/jsutter.nix old mode 100644 new mode 100755