Merge remote-tracking branch 'refs/remotes/origin/main'

.gitignore

@@ -0,0 +1,2 @@
+.env
+.gitea-actions-runner-token

client-configuration.nix

@@ -262,7 +262,6 @@
     xwayland-satellite # xwayland support
     fuzzel # menu
     networkmanagerapplet
-
     wireless-regdb
   ];
     

flake.nix

@@ -18,7 +18,7 @@
     nixosConfigurations."alien" = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
       modules = [
-        ./default-configuration.nix
+        ./client-configuration.nix
 	./alien-hardware-configuration.nix
         home-manager.nixosModules.home-manager
         {
@@ -33,7 +33,7 @@
     nixosConfigurations."thinkpad" = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
       modules = [
-        ./default-configuration.nix
+        ./client-configuration.nix
 	./thinkpad-hardware-configuration.nix
         home-manager.nixosModules.home-manager
         {
@@ -45,5 +45,20 @@
       }
       ];
     };
+    nixosConfigurations."predator" = nixpkgs.lib.nixosSystem {
+      specialArgs = { inherit inputs; };
+      modules = [
+        ./server-configuration.nix
+	./predator-hardware-configuration.nix
+        home-manager.nixosModules.home-manager
+        {
+        nixpkgs.overlays = [
+          (final: prev: {
+            ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama;
+          })
+	];
+      }
+      ];
+    };
   };
 }

predator-hardware-configuration.nix

@@ -0,0 +1,33 @@
+# 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, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+  networking.hostName = "predator";
+  services.logind.lidSwitch = "ignore";
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f4c64434-432c-436b-85b5-168350b33724";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/9566-B0E9";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

server-configuration.nix

@@ -0,0 +1,110 @@
+{ config, lib, pkgs, inputs, ... }:
+
+{
+  imports = [];
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  networking.networkmanager.enable = true;
+  networking.firewall.allowedTCPPorts = [22 42069];
+  services.openssh = {
+    enable = true;
+    ports = [22];
+    settings.X11Forwarding = true;
+  };  
+
+  systemd.services."gitea-runner-homelab".serviceConfig = {
+    ReadWritePaths = [ "/servers/site" ];
+    DynamicUser = lib.mkForce false;
+    User = lib.mkForce "gitea-runner";
+  };
+  
+  environment.binsh = "${pkgs.bash}/bin/bash";
+  services.gitea-actions-runner.instances."homelab" = {
+    enable = true;
+    url = "https://git.jeremyjanella.com";
+    tokenFile = "/servers/gitea/runner-token";
+    name = "predator";
+    labels = [ "homelab:host" "nixos:host" "predator:host" ];
+    settings = {
+     container.network = "host";
+    };
+  };
+  
+  time.timeZone = "America/Toronto";
+
+  virtualisation.docker.enable = true;
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    backupFileExtension = "not-nix"; # Add this line
+    users.jeremy = { pkgs, ... }: {
+      home.stateVersion = "25.11";
+	programs.neovim = { # Configure nvim
+      	enable = true;
+      	extraConfig = ''
+	    	set number relativenumber
+	    	set tabstop=2
+	    	set softtabstop=2
+	    	set shiftwidth=2
+	    	set expandtab
+	    	set cc=80
+	    	'';
+      };
+    };
+  };
+
+  users.users.jeremy = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "docker" "networkmanager" ]; 
+    shell = pkgs.bash;
+    home = "/home/jeremy";
+    createHome = true;
+    packages = with pkgs; [
+      nixfmt # nix file formatting
+      direnv # develop projects in custom environments
+    ];
+  };
+
+  users.users.gitea-runner = {
+    isSystemUser = true;
+    group = "gitea-runner";
+  };
+  users.groups.gitea-runner = {};
+
+  # Use https://search.nixos.org/ to find more packages (and options).
+  environment.systemPackages = with pkgs; [
+    gcc
+    htop
+    neovim
+    wget
+    ncdu
+    nmap
+    git
+    unzip
+    bluez # Bluetooth support
+    bluez-tools # Bluetooth tools
+    polkit_gnome
+    usbutils # for lsusb
+    networkmanagerapplet
+    wireguard-tools
+    inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.typst # bleeding edge html exports for typst
+  ];
+
+  environment.sessionVariables = {
+    SUDO_EDITOR = "nvim";
+  };
+
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+
+  system.stateVersion = "25.11";
+
+}
+