diff --git a/nixos-bu/configuration.nix b/nixos-bu/configuration.nix deleted file mode 100644 index e3cf690..0000000 --- a/nixos-bu/configuration.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, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./k3s.nix - ./users.nix - ./settings.nix - ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "minisf1"; # Define your hostname. - system.stateVersion = "23.05"; # Did you read the comment? - -} diff --git a/nixos-bu/k3s.nix b/nixos-bu/k3s.nix deleted file mode 100644 index a119115..0000000 --- a/nixos-bu/k3s.nix +++ /dev/null @@ -1,29 +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. - 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; [ - pkgs.k3s - nfs-utils - dig - argocd - pkgs.git - ]; - services.k3s.enable = true; - services.k3s.role = "server"; - services.k3s.extraFlags = toString [ - ]; - networking.firewall.allowedTCPPorts = [ 22 80 443 ]; - networking.firewall.allowedUDPPorts = [ 80 443 ]; -} diff --git a/nixos-bu/settings.nix b/nixos-bu/settings.nix deleted file mode 100644 index 7c83a2b..0000000 --- a/nixos-bu/settings.nix +++ /dev/null @@ -1,19 +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; -} diff --git a/nixos-bu/users.nix b/nixos-bu/users.nix deleted file mode 100644 index 3e3d8ff..0000000 --- a/nixos-bu/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 - ]; - -} diff --git a/os/nixos/example-configuration.nix b/os/nixos/example-configuration.nix index 6d6c600..5777a86 100644 --- a/os/nixos/example-configuration.nix +++ b/os/nixos/example-configuration.nix @@ -2,6 +2,7 @@ { imports = [ + ./hardware-configuration.nix (import ./main.nix { hostName = ""; stateVersion = "23.05";