From 04f22ed5fbf87eec7ecd5c5221775e8a1e3d3d89 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Fri, 25 Oct 2024 14:11:14 -0700 Subject: [PATCH] #17 Clean up unused files in nix/nix-lab/ --- nix/debug.txt | 1 - nix/nix-lab/.sops.yaml | 8 -- nix/nix-lab/k3s.nix | 16 --- nix/nix-lab/reference/configuration.nix | 122 ------------------ .../reference/hardware-configuration.nix | 41 ------ nix/nix-lab/secrets/secrets.yaml | 22 ---- nix/nix-lab/users/admin.nix | 11 -- 7 files changed, 221 deletions(-) delete mode 100644 nix/debug.txt delete mode 100644 nix/nix-lab/.sops.yaml delete mode 100644 nix/nix-lab/k3s.nix delete mode 100644 nix/nix-lab/reference/configuration.nix delete mode 100644 nix/nix-lab/reference/hardware-configuration.nix delete mode 100644 nix/nix-lab/secrets/secrets.yaml delete mode 100644 nix/nix-lab/users/admin.nix diff --git a/nix/debug.txt b/nix/debug.txt deleted file mode 100644 index e475d899..00000000 --- a/nix/debug.txt +++ /dev/null @@ -1 +0,0 @@ -0.55.0 (v0.55.0) diff --git a/nix/nix-lab/.sops.yaml b/nix/nix-lab/.sops.yaml deleted file mode 100644 index eb9107aa..00000000 --- a/nix/nix-lab/.sops.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# .sops.yaml -keys: - - &primary age1v5wy7epv5mm8ddf3cfv8m0e9w4s693dw7djpuytz9td8ycha5f0sv2se9n -creation_rules: - - path_regex: secrets/secrets.yaml$ - key_groups: - - age: - - *primary diff --git a/nix/nix-lab/k3s.nix b/nix/nix-lab/k3s.nix deleted file mode 100644 index 99a0ff05..00000000 --- a/nix/nix-lab/k3s.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ hostConf, ... }: { - services.k3s = { - enable = true; - role = "server"; - token = "AZAwcp1K7ZBx45yk"; - extraFlags = toString ([ - "--write-kubeconfig-mode \"0644\"" - "--cluster-init" - "--disable servicelb" - "--disable traefik" - "--disable local-storage" ] ++ - (if hostConf.name == "bard" then [] else ["--server https://192.168.1.31:6443"]) - ); - clusterInit = (hostConf.name == "bard"); - }; -} \ No newline at end of file diff --git a/nix/nix-lab/reference/configuration.nix b/nix/nix-lab/reference/configuration.nix deleted file mode 100644 index 017ac5c2..00000000 --- a/nix/nix-lab/reference/configuration.nix +++ /dev/null @@ -1,122 +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, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ config, lib, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # networking.hostName = "nixos"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - - - - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # hardware.pulseaudio.enable = true; - # OR - # services.pipewire = { - # enable = true; - # pulse.enable = true; - # }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.alice = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # packages = with pkgs; [ - # firefox - # tree - # ]; - # }; - - # List packages installed in system profile. To search, run: - # $ nix search wget - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.05"; # Did you read the comment? - -} - diff --git a/nix/nix-lab/reference/hardware-configuration.nix b/nix/nix-lab/reference/hardware-configuration.nix deleted file mode 100644 index ae1953da..00000000 --- a/nix/nix-lab/reference/hardware-configuration.nix +++ /dev/null @@ -1,41 +0,0 @@ -# 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 = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/e5c7ee1e-5eba-401e-acd4-2befe3bdbb2d"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/EAF3-BF41"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/d08436ff-93a9-4d8c-9995-6d8181c8dcb2"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s12f0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nix/nix-lab/secrets/secrets.yaml b/nix/nix-lab/secrets/secrets.yaml deleted file mode 100644 index 8a9d8904..00000000 --- a/nix/nix-lab/secrets/secrets.yaml +++ /dev/null @@ -1,22 +0,0 @@ -k3s: - token: ENC[AES256_GCM,data:yI8xXBv/cUcUVLxPy3GhSw==,iv:6TbQOfyc4qamr14kcC9oeb/eZ3XleFfxGsYmsTWDUKI=,tag:VrGhGDRbSYuYQ9fjiAc5xw==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1v5wy7epv5mm8ddf3cfv8m0e9w4s693dw7djpuytz9td8ycha5f0sv2se9n - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiRnB0MnU3Wi9uejQ4V0VQ - MnByUkp5VmNEMEd4YUI4ZkRVSmpGdFlZY1drCkdWVGdteFdKREMwRmxsSDVYdDV1 - Tm0rQUpiNWtVVVFnYTZLUEV1TC95MkUKLS0tIGRNUlBkNmFINW9uNnpqZEVBck9p - R1FtdVF1V2J4WG5mN2VKTVllNVpnbVkKwofj3NDv/MueDB/Zu6BBV8fIPrS0lS4p - SvW55wVI6v5rpMwpWtp66K1+4XeCst3fA3y7r+wRGVQcJGQIWkvEhw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-25T20:58:29Z" - mac: ENC[AES256_GCM,data:uycxJ3mQk8nPOOoFB/g/leAv8L19AwqK9hm9logTOk6VCGdtvoNMceE0r9xTkf6my2Kgfw64LvGE1yeSYD1CZbqHwSRWjhbA5qTKb6ySqnlQteYvSgf6fyFCnkQt7VXPgm0JtNabkjCqsTRzWDhjvtV5nSwK6LF+Fn57lnzM7hU=,iv:WJO47CyN8+aatU9TKpFdOf84+SREY2vrlXtvO1m0T4I=,tag:VFfmPZwuDJoFHxdzoqyamw==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.0 diff --git a/nix/nix-lab/users/admin.nix b/nix/nix-lab/users/admin.nix deleted file mode 100644 index b6fd6347..00000000 --- a/nix/nix-lab/users/admin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - jq - ]; - programs.home-manager = { - enable = true; - }; - home.stateVersion = "24.05"; -} \ No newline at end of file