From c43a5cbe042cc42f0951a99dc0c036388d496bb8 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 23 Feb 2025 15:39:02 -0500 Subject: [PATCH] clean up --- os/nixos/amd-packages.nix | 18 --------------- os/nixos/example-configuration.nix | 13 ----------- os/nixos/k3s.nix | 36 ------------------------------ os/nixos/main.nix | 23 ------------------- os/nixos/settings.nix | 21 ----------------- os/nixos/users.nix | 21 ----------------- 6 files changed, 132 deletions(-) delete mode 100644 os/nixos/amd-packages.nix delete mode 100644 os/nixos/example-configuration.nix delete mode 100644 os/nixos/k3s.nix delete mode 100644 os/nixos/main.nix delete mode 100644 os/nixos/settings.nix delete mode 100644 os/nixos/users.nix diff --git a/os/nixos/amd-packages.nix b/os/nixos/amd-packages.nix deleted file mode 100644 index 5fd3ea6..0000000 --- a/os/nixos/amd-packages.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - rocmPackages.rocm-smi - rocmPackages.rpp - rocmPackages.rocm-core - rocmPackages.rocm-runtime - rocmPackages.hipblas - rocmPackages.llvm.clang - amdgpu_top - amdctl - ]; - boot.initrd.kernelModules = [ "amdgpu" ]; - hardware.opengl.extraPackages = with pkgs; [ - rocmPackages.clr.icd - amdvlk - ]; -} diff --git a/os/nixos/example-configuration.nix b/os/nixos/example-configuration.nix deleted file mode 100644 index 5777a86..0000000 --- a/os/nixos/example-configuration.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: -{ - imports = - [ - ./hardware-configuration.nix - (import ./main.nix { - hostName = ""; - stateVersion = "23.05"; - dbConnectionStr = ""; - K3SToken = ""; - }) - ]; -} \ No newline at end of file diff --git a/os/nixos/k3s.nix b/os/nixos/k3s.nix deleted file mode 100644 index 69ddb47..0000000 --- a/os/nixos/k3s.nix +++ /dev/null @@ -1,36 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). -{ - hostName, - dbConnectionStr, - K3SToken -}: -{ config, pkgs, ... }: - -{ - # Bootloader. - boot.initrd = { - supportedFilesystems = [ "nfs" ]; - kernelModules = [ "nfs" ]; - }; - i18n.defaultLocale = "en_CA.UTF-8"; - services.nfs.server.enable = true; - services.rpcbind.enable = true; - environment.systemPackages = with pkgs; [ - k3s - nfs-utils - git - tmux - ]; - services.k3s.enable = true; - services.k3s.role = "server"; - services.k3s.extraFlags = toString [ - "--tls-san" - hostName - "--datastore-endpoint" dbConnectionStr - "--token" K3SToken - ]; - networking.firewall.allowedTCPPorts = [ 22 80 443 ]; - networking.firewall.allowedUDPPorts = [ 80 443 ]; -} diff --git a/os/nixos/main.nix b/os/nixos/main.nix deleted file mode 100644 index 85ae804..0000000 --- a/os/nixos/main.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - hostName, - stateVersion, - dbConnectionStr, - K3SToken, -}: -{ config, pkgs, ... }: -{ - imports = - [ - (import ./k3s.nix { - hostName = hostName; - dbConnectionStr = dbConnectionStr; - K3SToken = K3SToken; - }) - ./users.nix - ./settings.nix - ]; - - # Bootloader. - networking.hostName = hostName; - system.stateVersion = stateVersion; -} diff --git a/os/nixos/settings.nix b/os/nixos/settings.nix deleted file mode 100644 index ea264e8..0000000 --- a/os/nixos/settings.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - # Bootloader. - networking.networkmanager.enable = true; - time.timeZone = "America/Toronto"; - i18n.defaultLocale = "en_CA.UTF-8"; - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; - nixpkgs.config.allowUnfree = true; - services.openssh.enable = true; - networking.firewall.enable = false; - nix.optimise.automatic = true; - nix.optimise.dates = [ "01:30" ]; -} diff --git a/os/nixos/users.nix b/os/nixos/users.nix deleted file mode 100644 index 3e3d8ff..0000000 --- a/os/nixos/users.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - users.users.ari = { - isNormalUser = true; - description = "Ari"; - extraGroups = [ "networkmanager" "wheel" "root" ]; - packages = with pkgs; []; - }; - - environment.systemPackages = with pkgs; [ - pciutils - usbutils - jq - ]; - -}