From 7292d10cd6de6712944b898c9c60e9fefbb24621 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Wed, 12 Jun 2024 22:46:36 -0400 Subject: [PATCH] Initial setup of bigboy dual booted --- flake.nix | 18 +- modules/home-manager/hosts/bigboy/gene.nix | 15 ++ modules/hosts/nixos/bigboy/default.nix | 177 ++++++++++++++++++ .../nixos/bigboy/hardware-configuration.nix | 39 ++++ modules/hosts/nixos/bigboy/secrets.yaml | 22 +++ 5 files changed, 262 insertions(+), 9 deletions(-) create mode 100644 modules/home-manager/hosts/bigboy/gene.nix create mode 100644 modules/hosts/nixos/bigboy/default.nix create mode 100644 modules/hosts/nixos/bigboy/hardware-configuration.nix create mode 100644 modules/hosts/nixos/bigboy/secrets.yaml diff --git a/flake.nix b/flake.nix index 9776b92..a9f2bbb 100644 --- a/flake.nix +++ b/flake.nix @@ -182,15 +182,15 @@ # NixOS hosts nixosConfigurations = { - # bigboy = nixosHostConfig { - # system = "x86_64-linux"; - # hostname = "bigbox"; - # username = "gene"; - # additionalModules = [ - # nixos-hardware.nixosModules.lenovo-thinkpad-p52 - # ]; - # additionalSpecialArgs = {}; - # }; + bigboy = nixosHostConfig { + system = "x86_64-linux"; + hostname = "bigboy"; + username = "gene"; + additionalModules = [ + nixos-hardware.nixosModules.lenovo-thinkpad-p52 + ]; + additionalSpecialArgs = {}; + }; hetznix01 = nixosHostConfig { system = "aarch64-linux"; hostname = "hetznix01"; diff --git a/modules/home-manager/hosts/bigboy/gene.nix b/modules/home-manager/hosts/bigboy/gene.nix new file mode 100644 index 0000000..ed6f870 --- /dev/null +++ b/modules/home-manager/hosts/bigboy/gene.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: { + home.stateVersion = "24.05"; + imports = [ + ../../common/all-cli.nix + ../../common/all-gui.nix + ../../common/all-linux.nix + ../../common/linux-apps/tilix.nix + ../../common/linux-apps/xfce4-terminal.nix + ]; + + programs.vscode = { + enable = true; + }; +} + diff --git a/modules/hosts/nixos/bigboy/default.nix b/modules/hosts/nixos/bigboy/default.nix new file mode 100644 index 0000000..cc7b7d6 --- /dev/null +++ b/modules/hosts/nixos/bigboy/default.nix @@ -0,0 +1,177 @@ +# 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, username, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ../../../system/common/linux/flatpaks.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.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. + # You can disable this if you're only using the Wayland session. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.desktopManager.plasma6.enable = true; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + xkb.variant = ""; + }; + + # Enable sound with pipewire. + 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.gene = { + isNormalUser = true; + description = "Gene Liverman"; + extraGroups = [ "networkmanager" "wheel" "dialout" "input" ]; + packages = with pkgs; [ + kdePackages.kate + # thunderbird + ]; + }; + + # Install firefox. + programs.firefox.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + angryipscanner + displaylink + gitkraken + libreoffice + meld + networkmanager-openvpn + slack + tilix + vivaldi + xfce.xfce4-terminal + zoom-us + ]; + + programs = { + _1password.enable = true; + _1password-gui = { + enable = true; + # Certain features, including CLI integration and system authentication support, + # require enabling PolKit integration on some desktop environments (e.g. Plasma). + polkitPolicyOwners = [ "${username}" ]; + }; + + ssh.askPassword = "ssh-askpass"; + + # common programs that really should be in another file + # required for setting to be picked up by xfce4-terminal + xfconf.enable = true; + }; + + services = { + fwupd.enable = true; + printing.enable = true; # Enable CUPS + }; + + sops = { + age.keyFile = /home/${username}/.config/sops/age/keys.txt; + defaultSopsFile = ./secrets.yaml; + secrets = { + local_git_config = { + owner = "${username}"; + path = "/home/${username}/.gitconfig-local"; + }; + local_private_env = { + owner = "${username}"; + path = "/home/${username}/.private-env"; + }; + }; + }; + + # 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? + +} diff --git a/modules/hosts/nixos/bigboy/hardware-configuration.nix b/modules/hosts/nixos/bigboy/hardware-configuration.nix new file mode 100644 index 0000000..57c4551 --- /dev/null +++ b/modules/hosts/nixos/bigboy/hardware-configuration.nix @@ -0,0 +1,39 @@ +# 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" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/79d48f97-18ba-4b98-afe6-8feb6a314c48"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/B208-923B"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + 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..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/hosts/nixos/bigboy/secrets.yaml b/modules/hosts/nixos/bigboy/secrets.yaml new file mode 100644 index 0000000..ce93d9c --- /dev/null +++ b/modules/hosts/nixos/bigboy/secrets.yaml @@ -0,0 +1,22 @@ +local_git_config: ENC[AES256_GCM,data:iBJM9cj6wPqxvYOt0Gu25nrPQeTtndyDZqCiGCTTpvJ/7U+lP7Y+PcI=,iv:Y1NOT86IOcgSPEfmvoc5eVuad3GFPLjnoPY+dCBQNUs=,tag:HvUxBkwEIMy1GWYGBWkDww==,type:str] +local_private_env: ENC[AES256_GCM,data:W4Ecx1f5RKqy1hkzrflL0OdRofNr9dLy+SbuLdiL6tSvde9InwezcW1zt07s+jdv,iv:geapIEV4Um8L1vTqJFRxoRx8tePnL90YezA9J5oUuYA=,tag:PGVFjwbFdhPu4msyXkukMA==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age196gl3k9aphy2mh5kgn50wkzn38m35cus8dqhtva6qcfmmxx3acgs6vx2dg + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPQlZlUmdxVnBXa1lSNERW + L1lCcFBVaEpKdi91djlNL0piSnZLUnhpYURVCkJFYXA1UGYwMDRZQm5IM2ZwdFB6 + MnZxOGRMMlNseWlybmU4WXBoUHFnMFkKLS0tIFNLVUtQNFhHeWcvZFNCTUM2NnhO + L2p0MmhjQkZYQjkvUjJVaDBiRG5yYTQKH+vx+bCgmQ4QUxOc0DIQOR6qR9FEgiA6 + 1AjemW35CFzN1N5VHlNZgAplgou8zNxQ8w+AvKuRJ79kDZBESLpltQ== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-05-20T20:13:00Z" + mac: ENC[AES256_GCM,data:DnIjvLCwQ7D3WW2NqF2YRCzCaq39lYtU1ACQ5+23ydFBsGKwhLxiohfJFXagcsZ966wq48PGQLEWU0VfDpK0wOlphwZasrS4ZfOrC+iEaykIpNIVus+xOCzd2AwSa8k1EM6r7gbs516iZciXLfNuBFrK1KHUZB1r4vkDZUJ3PdE=,iv:hP/7nInLumR/PELcLIxcccLwebcE6Bs4USoLxgFzYyM=,tag:nD5lbuRwEOYlC5L/GknHUA==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1