Reset from zero

nixos/base.nix

@@ -0,0 +1,69 @@
+# Things every machine will have...
+
+{ inputs, outputs, lib, config, pkgs, ... }: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    ./users/noe.nix
+    ./features/sops.nix
+  ];
+
+  boot.tmp.cleanOnBoot = true;
+
+  # Set ET
+  time.timeZone = lib.mkDefault "America/New_York";
+  
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  home-manager.extraSpecialArgs = { inherit inputs outputs; };
+
+  # A very fishy fish.
+  programs.fish = {
+    enable = true;
+  };
+  
+  programs.git.enable = true;
+
+  users.defaultUserShell = pkgs.fish;
+
+  services.openssh.enable = lib.mkDefault true;
+
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+  };
+
+  nixpkgs = {
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.unstable-packages
+    ];
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  nix = {
+    gc.automatic = true;
+    settings = {
+      experimental-features = "nix-command flakes";
+      #auto-optimize-store = true;
+    };
+  };
+
+#  system.copySystemConfiguration = true;
+}

nixos/client.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }: {
+  imports = [
+    ./base.nix
+    ./features/fonts.nix
+  ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  boot.kernelPackages = pkgs.linuxPackages_zen;
+
+  environment.systemPackages = with pkgs; [
+    firefox
+    curl
+    btop
+    htop
+    neofetch
+  ];
+}

nixos/features/fonts.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }: {
+
+  fonts = {
+    packages = with pkgs; [
+      atkinson-hyperlegible
+      (nerdfonts.override { fonts = [ "FiraCode" ]; })
+    ];
+
+    fontDir.enable = true;
+    
+    enableDefaultPackages = true;
+    
+    fontconfig.defaultFonts = {
+      sansSerif = [ "Atkinson Hyperlegible" ];
+      serif = [ "Atkinson Hyperlegible" ];
+      monospace = [ "FiraCode Nerd Font" "Fira Code" ];
+    };
+  };
+
+}

nixos/features/podman.nix

@@ -0,0 +1,18 @@
+{ config, pkgs, ... }: {
+
+  virtualisation = {
+    docker.enable = false;
+    podman = {
+      enable = true;
+      dockerSocket.enable = true;
+      defaultNetwork.settings.dns_enabled = true;
+      defaultNetwork.settings.ipv6_enabled = true;
+    };
+  };
+
+  networking.firewall = {
+    # interfaces.podman0.allowedUDPPorts = [ 53 ];
+    trustedInterfaces = [ "podman0" ];
+  };
+  
+}

nixos/features/sops.nix

@@ -0,0 +1,9 @@
+{ inputs, ... }: {
+  imports = [ 
+    inputs.sops-nix.nixosModules.sops
+  ];
+
+  sops.defaultSopsFile = ../../secrets/default.yaml;
+  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+#  sops.secrets.default = {};
+}

nixos/features/sound.nix

@@ -0,0 +1,12 @@
+{ pkgs, config, ... }: {
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+}

nixos/features/systemd-boot.nix

@@ -0,0 +1,4 @@
+{ pkgs, config, ... }: {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+}

nixos/features/tailscale.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+  services.tailscale = {
+    enable = true;
+  };
+}

nixos/features/wifi.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, ... }: {
+
+  networking.networkmanager = {
+    enable = true;
+  };
+
+  # TODO: WiFi password automation
+
+}

nixos/features/xfce.nix

@@ -0,0 +1,22 @@
+{ pkgs, ... }: {
+  imports = [
+    ./sound.nix
+  ];
+
+  services.xserver = {
+    enable = true;
+    
+    displayManager = {
+      sddm.enable = true;
+      defaultSession = "xfce";
+    };
+    
+    desktopManager = {
+      xterm.enable = false;
+      xfce.enable = true;
+    };
+
+    layout = "us";
+    xkbVariant = "";
+  };
+}

nixos/hosts/blueberry/default.nix

@@ -0,0 +1,55 @@
+{ config, ... }: {
+
+  imports = [
+    ./hardware-configuration.nix
+    ../../server.nix
+    ../../features/systemd-boot.nix
+    ../../features/podman.nix
+  ];
+
+  networking.hostName = "blueberry";
+  system.stateVersion = "23.05";
+  services.qemuGuest.enable = true;
+
+  sops.secrets."saerro/database/url" = {
+    sopsFile = ../../../secrets/blueberry/default.yaml;
+  };
+
+  sops.secrets."saerro/database/password" = {
+    sopsFile = ../../../secrets/blueberry/default.yaml;
+  };
+
+  sops.secrets."saerro/ws_addr" = {
+    sopsFile = ../../../secrets/blueberry/default.yaml;
+  };
+
+  pods.enable = true;
+  pods.pods.saerro = {
+    routes = let 
+      route = { port = "8003"; }; 
+    in {
+      "saerro.ps2.live" = route;
+      "saerro-new.ps2.live" = route;
+    };
+    
+    exportPorts = [
+      "0.0.0.0:8003:8003"
+    ];
+
+    containers = {
+      api = {
+        image = "ghcr.io/genudine/saerro/api:latest";
+        environment = {
+          PORT = "8003";
+          WEBSOCKET_HEALTHCHECK = "http://127.0.0.1:8004/healthz";
+        };
+        secrets = {
+          DATABASE_ADDR = config.sops.secrets."saerro/database/url".path;
+        };
+        ports = [
+          "8003:8003";
+        ];
+      };
+    };
+  };
+}

nixos/hosts/blueberry/hardware-configuration.nix

@@ -0,0 +1,37 @@
+# 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 + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/cc75594b-3158-455a-9230-b634128713ae";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/1FFC-3FAC";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  # 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.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
+

nixos/hosts/thonkpad/default.nix

@@ -0,0 +1,15 @@
+{ lib, config, pkgs, outputs, ... }: {
+  imports = [
+    ./hardware-configuration.nix
+    ../../client.nix
+    
+    ../../features/wifi.nix
+    ../../features/xfce.nix
+    ../../features/tailscale.nix
+  ];
+
+  home-manager.users.noe = import ../../../home-manager/noe/hosts/thonkpad.nix;
+
+  networking.hostName = "thonkpad";
+  system.stateVersion = "24.05";
+}

nixos/hosts/thonkpad/hardware-configuration.nix

@@ -0,0 +1,38 @@
+# 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" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/8b2ea978-a219-4634-ad9e-80c31edc7787";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/9C1A-EB83";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  # 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.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

nixos/hosts/thonkpad/orig.nix

@@ -0,0 +1,163 @@
+# 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
+      ../../client.nix
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.kernelPackages = pkgs.linuxPackages_zen;
+
+  networking.hostName = "thonkpad"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+  
+  services.tailscale = {
+    enable = true;
+  };
+
+  # Set your time zone.
+  time.timeZone = "America/New_York";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  # Enable the X11 windowing system.
+
+
+  # Configure keymap in X11
+  services.xserver = {
+    enable = true;
+    displayManager = {
+      defaultSession = "xfce";
+      sddm.enable = true;
+      #sddm.wayland.enable = true;
+    };
+    desktopManager = {
+      xterm.enable = false;
+      xfce.enable = true;
+    };
+    layout = "us";
+    xkbVariant = "";
+  };
+
+  # Enable CUPS to print documents.
+  #services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.noe = {
+    isNormalUser = true;
+    description = "noe";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+      firefox
+    ];
+  };
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [ 
+     curl
+     kitty
+     git
+     zsh
+  ];
+
+  # 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;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.05"; # Did you read the comment?
+  
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+  };
+
+  fonts = {
+    packages = with pkgs; [
+      atkinson-hyperlegible
+      (nerdfonts.override { fonts = [ "FiraCode" ]; })
+    ];
+    fontDir.enable = true;
+    enableDefaultPackages = true;
+    fontconfig.defaultFonts = {
+      sansSerif = [ "Atkinson Hyperlegible" ];
+      serif = [ "Atkinson Hyperlegible" ];
+      monospace = [ "FiraCode Nerd Font" "Fira Code" ];
+    };
+  };
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+}

nixos/server.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, ... }: {
+  
+  imports = [
+    ./base.nix
+
+    ./features/tailscale.nix
+  ];
+
+  services.openssh.settings.PasswordAuthentication = false;
+
+  system.autoUpgrade = {
+    enable = true;
+    allowReboot = true;
+    rebootWindow = {
+      lower = "05:00";
+      upper = "07:00";
+    };
+  };
+  
+}

nixos/users/noe.nix

@@ -0,0 +1,28 @@
+{ config, pkgs, ... }: {
+  users.users.noe = {
+    hashedPasswordFile = config.sops.secrets."users/noe/password".path;
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    shell = pkgs.fish;
+    openssh.authorizedKeys.keys = [
+      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrjnDY3hlN3cOCMBpcoh4GWdnG5nc9ZeOXJ7MtJVL3I'' 
+      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBs6/s+973H28jOrvN0zr1eayT+thrs61l1qV7uFhw8I'' 
+    ];
+  };
+
+  environment.systemPackages = [ pkgs.nixos-rebuild ];
+  security.sudo.extraRules = [
+    {
+      users = [ "noe" ];
+      commands = [
+        { command = "${pkgs.nixos-rebuild}/bin/nixos-rebuild"; options = [ "NOPASSWD" "SETENV" ]; }
+        { command = "/run/current-system/sw/bin/nixos-rebuild"; options = [ "NOPASSWD" "SETENV" ]; }
+        { command = "${pkgs.systemd}/bin/systemctl"; options = [ "NOPASSWD" "SETENV" ]; }
+        { command = "/run/current-system/sw/bin/shutdown"; options = [ "NOPASSWD" "SETENV" ]; }
+        { command = "/run/current-system/sw/bin/reboot"; options = [ "NOPASSWD" "SETENV" ]; }
+      ];
+    }
+  ];
+
+  sops.secrets."users/noe/password".neededForUsers = true;
+}