From e39c4b3f79d736fa1da5d79880b6a4fc587a7b4f Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Sun, 2 Jun 2024 17:49:36 -0700
Subject: [PATCH 01/10] Added initial_setup.sh for setup bootstrapping

---
 initial_setup.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/initial_setup.sh b/initial_setup.sh
index d3fcce6..0e40eb0 100755
--- a/initial_setup.sh
+++ b/initial_setup.sh
@@ -38,3 +38,21 @@ if [[ "$SCRIPT_DIR" != "$NIXOS_REPO_CONFIG_PATH" ]]; then
     exec "$NIXOS_REPO_CONFIG_PATH/initial_setup.sh"
     exit
 fi
+
+# If this is a new host, create the config path
+if [ ! -d "$HOST_CONFIG_PATH" ]; then
+    mkdir -p "$HOST_CONFIG_PATH"
+fi
+
+# Copy initial config files from nixos setup, and symlink to our repo, if not set up yet
+if [ ! -L "/etc/nixos" ]; then
+    # Copy the existing config files
+    cp /etc/nixos/configuration.nix "$HOST_CONFIG_PATH/."
+    cp /etc/nixos/hardware-configuration.nix "$HOST_CONFIG_PATH/."
+
+    # Backup the existing nixos config folder
+    sudo mv /etc/nixos /etc/nixos_bkp
+
+    # Create symlink
+    sudo ln -s "$NIXOS_REPO_CONFIG_PATH" /etc/nixos
+fi

From 22ccb548c731e7f41969bb4cfc37edea91edc4b0 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Sat, 27 Jul 2024 23:29:33 -0700
Subject: [PATCH 02/10] Closer to the daily driver setup that's without
 annoyances, if barebones

---
 .gitignore                         |   5 +
 flake.lock                         |  48 +++++++
 hosts/cap-nr200p/configuration.nix | 221 +++++++++++++++++++++++++++++
 modules/nixos/hyprland.nix         |  74 ++++++++++
 4 files changed, 348 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 flake.lock
 create mode 100644 hosts/cap-nr200p/configuration.nix
 create mode 100644 modules/nixos/hyprland.nix

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9240914
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/.idea/inspectionProfiles/profiles_settings.xml
+/.idea/.gitignore
+/.idea/modules.xml
+/.idea/nixos.iml
+/.idea/vcs.xml
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..4a145dc
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,48 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722119539,
+        "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1722062969,
+        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix
new file mode 100644
index 0000000..ac48dc0
--- /dev/null
+++ b/hosts/cap-nr200p/configuration.nix
@@ -0,0 +1,221 @@
+# 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
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "cap-nr200p"; # Define your hostname.  #-#
+  # 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;
+
+  # Enable flakes
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];  #-#
+
+  # Set your time zone.
+  time.timeZone = "America/Los_Angeles";
+
+  # 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.
+  # services.xserver.enable = true;
+
+  # Enable the XFCE Desktop Environment.
+  # services.xserver.displayManager.lightdm.enable = true;
+  # services.xserver.desktopManager.xfce.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # 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.caperren = {
+    isNormalUser = true;
+    description = "Corwin Perren";
+    extraGroups = [ "networkmanager" "wheel" "input" ];
+    packages = with pkgs; [
+    #  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; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+    lf
+    git
+    wofi    
+    nvtopPackages.full
+    htop
+    iftop
+    iotop
+    pulsemixer
+    arandr
+    util-linux
+    usbutils
+    telegram-desktop
+    discord
+    # spotify
+    pavucontrol
+    networkmanagerapplet
+    pasystray
+    glava
+    spotify-player
+    hyprpicker 
+    unetbootin
+    lf
+    dnsutils
+    unzip
+    playerctl
+    google-chrome
+    killall
+    jetbrains.pycharm-professional
+    wget
+    jq
+    rofi-bluetooth
+    wl-clipboard
+    networkmanager
+    alsaUtils
+    nixfmt-rfc-style
+  ];
+
+  fonts.fontDir.enable = true;
+  fonts.fontconfig.enable = true;
+  fonts.fontconfig.antialias = true;
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-emoji
+    liberation_ttf
+    fira-code
+    fira-code-symbols
+    jetbrains-mono
+    mplus-outline-fonts.githubRelease
+    dina-font
+    proggyfonts
+    font-awesome
+    nerdfonts
+  ];
+
+  programs.thunar.enable = true;
+    programs.thunar.plugins = with pkgs.xfce; [
+    thunar-archive-plugin
+    thunar-volman
+  ];
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.tumbler.enable = true; # Thumbnail support for images
+
+  hardware.bluetooth.enable = true; # enables support for Bluetooth
+  hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
+  services.blueman.enable = true;
+
+  security.sudo = {
+    enable = true;
+    extraRules = [{
+      commands = [
+        {
+          command = "${pkgs.systemd}/bin/reboot";
+          options = [ "NOPASSWD" ];
+        }
+        {
+          command = "${pkgs.systemd}/bin/poweroff";
+          options = [ "NOPASSWD" ];
+        }
+      ];
+      groups = [ "wheel" ];
+    }];
+  };
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+    gamescopeSession.enable = true;
+  };
+
+  # 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 = "23.11"; # Did you read the comment?
+
+}
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
new file mode 100644
index 0000000..c00aeeb
--- /dev/null
+++ b/modules/nixos/hyprland.nix
@@ -0,0 +1,74 @@
+{ pkgs, config, ... }: {
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+  };
+
+  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;
+  };
+
+  environment.sessionVariables = {
+    # If your cursor becomes invisible
+    WLR_NO_HARDWARE_CURSORS = "1";
+    # Hint electron apps to use wayland
+    NIXOS_OZONE_WL = "1";
+  };
+
+  services.xserver = {
+    enable = true;
+    videoDrivers = [ "nvidia" ];
+    displayManager.gdm = {
+      enable = true;
+      wayland = true;
+    };
+  };
+
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "caperren";
+  };
+  
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
+  hardware.nvidia = {
+    # Enable modesetting for Wayland compositors (hyprland)
+    modesetting.enable = true;
+    # Use the open source version of the kernel module (for driver 515.43.04+)
+    # open = true;
+    # Enable the Nvidia settings menu
+    nvidiaSettings = true;
+    # Select the appropriate driver version for your specific GPU
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+  environment.systemPackages = [
+    pkgs.hyprland
+    pkgs.kitty
+    pkgs.waybar
+    pkgs.dunst
+    pkgs.libnotify
+    pkgs.rofi-wayland
+    pkgs.nwg-look
+    pkgs.desktop-file-utils
+    pkgs.grim
+    pkgs.slurp
+    pkgs.nwg-displays
+
+  (pkgs.waybar.overrideAttrs (oldAttrs: {
+      mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+    })
+  )
+  ];
+
+  xdg.portal.enable = true;
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+}

From d32da7ad5e115f8432ddeecce243301d95917762 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Sun, 28 Jul 2024 03:00:57 -0700
Subject: [PATCH 03/10] Formatting

---
 flake.nix                                   | 27 +++++++++
 hosts/cap-nr200p/configuration.nix          | 63 ++++++++++++---------
 hosts/cap-nr200p/hardware-configuration.nix | 52 +++++++++++++++++
 modules/nixos/hyprland.nix                  | 10 ++--
 4 files changed, 120 insertions(+), 32 deletions(-)
 create mode 100644 flake.nix
 create mode 100644 hosts/cap-nr200p/hardware-configuration.nix

diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..00268c3
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,27 @@
+{
+  description = "Nixos config flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs =
+    { self, nixpkgs, ... }@inputs:
+    {
+      nixosConfigurations.default = nixpkgs.lib.nixosSystem {
+        specialArgs = {
+          inherit inputs;
+        };
+        modules = [
+          ./hosts/cap-nr200p/configuration.nix
+          ./modules/nixos/hyprland.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
+    };
+}
diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix
index ac48dc0..5a0f998 100644
--- a/hosts/cap-nr200p/configuration.nix
+++ b/hosts/cap-nr200p/configuration.nix
@@ -5,10 +5,10 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -25,7 +25,10 @@
   networking.networkmanager.enable = true;
 
   # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];  #-#
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ]; # -#
 
   # Set your time zone.
   time.timeZone = "America/Los_Angeles";
@@ -84,14 +87,18 @@
   users.users.caperren = {
     isNormalUser = true;
     description = "Corwin Perren";
-    extraGroups = [ "networkmanager" "wheel" "input" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "input"
+    ];
     packages = with pkgs; [
-    #  thunderbird
+      #  thunderbird
     ];
   };
 
   # Install firefox.
-  programs.firefox.enable = true;  #-#
+  programs.firefox.enable = true; # -#
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -99,11 +106,11 @@
   # 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
+    #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    #  wget
     lf
     git
-    wofi    
+    wofi
     nvtopPackages.full
     htop
     iftop
@@ -120,7 +127,7 @@
     pasystray
     glava
     spotify-player
-    hyprpicker 
+    hyprpicker
     unetbootin
     lf
     dnsutils
@@ -156,7 +163,7 @@
   ];
 
   programs.thunar.enable = true;
-    programs.thunar.plugins = with pkgs.xfce; [
+  programs.thunar.plugins = with pkgs.xfce; [
     thunar-archive-plugin
     thunar-volman
   ];
@@ -169,19 +176,21 @@
 
   security.sudo = {
     enable = true;
-    extraRules = [{
-      commands = [
-        {
-          command = "${pkgs.systemd}/bin/reboot";
-          options = [ "NOPASSWD" ];
-        }
-        {
-          command = "${pkgs.systemd}/bin/poweroff";
-          options = [ "NOPASSWD" ];
-        }
-      ];
-      groups = [ "wheel" ];
-    }];
+    extraRules = [
+      {
+        commands = [
+          {
+            command = "${pkgs.systemd}/bin/reboot";
+            options = [ "NOPASSWD" ];
+          }
+          {
+            command = "${pkgs.systemd}/bin/poweroff";
+            options = [ "NOPASSWD" ];
+          }
+        ];
+        groups = [ "wheel" ];
+      }
+    ];
   };
 
   programs.steam = {
@@ -202,7 +211,7 @@
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
-  services.openssh.enable = true;  #-#
+  services.openssh.enable = true; # -#
 
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
diff --git a/hosts/cap-nr200p/hardware-configuration.nix b/hosts/cap-nr200p/hardware-configuration.nix
new file mode 100644
index 0000000..76bae84
--- /dev/null
+++ b/hosts/cap-nr200p/hardware-configuration.nix
@@ -0,0 +1,52 @@
+# 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 = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/0ffc75db-278d-4d96-99ee-4d17e6b1a9c2";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/5BDD-941D";
+    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.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index c00aeeb..d908a23 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -1,4 +1,5 @@
-{ pkgs, config, ... }: {
+{ pkgs, config, ... }:
+{
   programs.hyprland = {
     enable = true;
     xwayland.enable = true;
@@ -34,7 +35,7 @@
     enable = true;
     user = "caperren";
   };
-  
+
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
@@ -63,10 +64,9 @@
     pkgs.slurp
     pkgs.nwg-displays
 
-  (pkgs.waybar.overrideAttrs (oldAttrs: {
+    (pkgs.waybar.overrideAttrs (oldAttrs: {
       mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-    })
-  )
+    }))
   ];
 
   xdg.portal.enable = true;

From 4e25d55512732ead5cf6241718c68a5bc1a6c452 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Thu, 1 Aug 2024 23:03:37 -0700
Subject: [PATCH 04/10] Added podman, probably other bits

---
 hosts/cap-nr200p/configuration.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix
index 5a0f998..f2bd57d 100644
--- a/hosts/cap-nr200p/configuration.nix
+++ b/hosts/cap-nr200p/configuration.nix
@@ -143,6 +143,8 @@
     networkmanager
     alsaUtils
     nixfmt-rfc-style
+    mako
+    podman
   ];
 
   fonts.fontDir.enable = true;

From 08bfd4be4b0ffb3988e0d1048e9760f12185beea Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Thu, 1 Aug 2024 23:05:15 -0700
Subject: [PATCH 05/10] Flake update

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4a145dc..09d6f23 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722119539,
-        "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
+        "lastModified": 1722462338,
+        "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
+        "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722062969,
-        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
+        "lastModified": 1722421184,
+        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
+        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
         "type": "github"
       },
       "original": {

From 4155ac86ee1a9cba4c2411ea0d640ff8327698cb Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Wed, 25 Jun 2025 04:14:23 -0700
Subject: [PATCH 06/10] Save before consolidation

---
 .gitignore                         |   7 +-
 flake.lock                         |  12 +-
 hosts/cap-nr200p/configuration.nix | 212 +++++++++++++++++++++++++++--
 modules/nixos/hyprland.nix         |  17 ++-
 4 files changed, 222 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9240914..664a1e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/.idea/inspectionProfiles/profiles_settings.xml
-/.idea/.gitignore
-/.idea/modules.xml
-/.idea/nixos.iml
-/.idea/vcs.xml
+/.idea
+flake.lock
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 09d6f23..cb18004 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722462338,
-        "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
+        "lastModified": 1750798083,
+        "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
+        "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722421184,
-        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
+        "lastModified": 1750741721,
+        "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
+        "rev": "4b1164c3215f018c4442463a27689d973cffd750",
         "type": "github"
       },
       "original": {
diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix
index f2bd57d..06a86d0 100644
--- a/hosts/cap-nr200p/configuration.nix
+++ b/hosts/cap-nr200p/configuration.nix
@@ -1,8 +1,8 @@
-# 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’).
+# 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, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports = [
@@ -10,6 +10,32 @@
     ./hardware-configuration.nix
   ];
 
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  boot = {
+    # Make v4l2loopback kernel module available to NixOS.
+    extraModulePackages = with config.boot.kernelPackages; [
+      v4l2loopback
+    ];
+    # Activate kernel module(s).
+    kernelModules = [
+      # Virtual camera.
+      "v4l2loopback"
+      # Virtual Microphone. Custom DroidCam v4l2loopback driver needed for audio.
+      # "snd-aloop"
+    ];
+  };
+
+  boot.extraModprobeConfig = ''
+    # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming
+    # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams
+    # https://github.com/umlaeute/v4l2loopback
+    options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
+  '';
+
+  # 
+  nix.settings.download-buffer-size = 524288000;
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -24,6 +50,10 @@
   # Enable networking
   networking.networkmanager.enable = true;
 
+  # hardware.u2f.enable = true;
+
+  services.flatpak.enable = true;
+
   # Enable flakes
   nix.settings.experimental-features = [
     "nix-command"
@@ -64,8 +94,16 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+
+  hardware.xone.enable = true;
+
   # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -91,11 +129,36 @@
       "networkmanager"
       "wheel"
       "input"
+      "dialout"
+      "plugdev"
+      "adbusers"
     ];
     packages = with pkgs; [
       #  thunderbird
     ];
   };
+#  users.users.crestline = {
+#    isNormalUser = true;
+#    description = "Crestline";
+#    extraGroups = [
+#      "networkmanager"
+#      "wheel"
+#      "input"
+#      "dialout"
+#    ];
+#    packages = with pkgs; [
+#      #  thunderbird
+#    ];
+
+ # };
+
+
+  #services.displayManager.autoLogin = {
+  #   enable = true;
+  #   user = "crestline";
+  #};
+
+  #services.xserver.displayManager.gdm.autoLogin.delay = 60;
 
   # Install firefox.
   programs.firefox.enable = true; # -#
@@ -122,6 +185,8 @@
     telegram-desktop
     discord
     # spotify
+    vscode-with-extensions
+    swayimg
     pavucontrol
     networkmanagerapplet
     pasystray
@@ -135,18 +200,138 @@
     playerctl
     google-chrome
     killall
-    jetbrains.pycharm-professional
+    #jetbrains.pycharm-professional
     wget
     jq
     rofi-bluetooth
     wl-clipboard
     networkmanager
-    alsaUtils
+    alsa-utils
     nixfmt-rfc-style
     mako
     podman
+    kicad
+    obsidian
+    speedcrunch
+    deadbeef
+    vlc
+    sox
+    audacity
+    platformio
+
+    # flatcam
+    pcb2gcode
+    jetbrains-toolbox
+    arduino-ide
+    # python311Full
+    gcc
+    stm32cubemx
+    stm32flash
+    easyeffects
+    ncspot
+    #yubikey-personalization-gui
+    #yubikey-manager-qt
+    #zoom-us
+    mangohud
+    distrobox
+    # plex-desktop
+    rpi-imager
+    rpiboot
+    imagemagick
+    prusa-slicer
+    freecad
+    wlogout
+    gparted
+    nix-update
+    ffmpeg-full
+    projectm_3
+    heroic
+    flameshot
+    krename
+    xfce.mousepad
+    yt-dlp
+    soapysdr
+    soapyrtlsdr
+    # sdrpp
+    # brave
+    python3
+    #nodejs_23
+    streamdeck-ui
+    scrcpy
+    kanshi
+    #wsmancli
+    #realvnc-vnc-viewer
+    ncdu    
+    hyprlock
+    openrgb-with-all-plugins
+    swayidle
+    transmission_4-qt
+    nixos-generators
+    openwsman
+    wsmancli
+    bs-manager
   ];
 
+  services.monado = {
+    enable = true;
+    defaultRuntime = true;
+    highPriority = true;
+  };
+
+ services.hardware.openrgb.enable = true;
+
+ services.meshcentral.enable = true;
+ programs.ydotool.enable = true;
+ programs.adb.enable = true;
+
+ hardware.logitech.wireless.enable = true;
+ hardware.logitech.wireless.enableGraphical = true;
+
+ services.sunshine = {
+    enable = true;
+    autoStart = true;
+    capSysAdmin = true;
+    openFirewall = true;
+    
+  };
+
+   programs.bash.shellAliases = {
+      nixrebuild = "cd /etc/nixos && sudo nixos-rebuild switch --flake .#default";
+      nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#default";
+      nixedit = "sudo nano /etc/nixos/hosts/cap-nr200p/configuration.nix";
+      scrwebcam = "sudo pkill scrcpy ; sudo modprobe -r v4l2loopback ; sudo modprobe v4l2loopback && nohup scrcpy --camera-facing=back --video-source=camera --v4l2-sink=/dev/video0 --no-window --no-audio-playback 2>&1 1>/dev/null";
+    };
+
+  
+  virtualisation.waydroid.enable = true;
+  hardware.steam-hardware.enable = true;
+
+  virtualisation.podman = {
+    enable = true;
+    dockerCompat = true;
+  }; 
+
+  services.udev.extraRules = ''
+    # ST-LINK V2
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2_%n"
+
+    # ST-LINK V2.1
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2-1_%n"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3752", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2-1_%n"
+
+    # ST-LINK V3
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374d", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3loader_%n"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374e", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3753", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n"
+
+    # CP2101 - CP 2104
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE="600", TAG+="uaccess", SYMLINK+="usb2ser_%n"
+
+    # ATEN UC-232A
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0557", ATTRS{idProduct}=="2008", MODE="600", TAG+="uaccess", SYMLINK+="usb2ser_aten_%n"
+  '';
+
   fonts.fontDir.enable = true;
   fonts.fontconfig.enable = true;
   fonts.fontconfig.antialias = true;
@@ -161,7 +346,8 @@
     dina-font
     proggyfonts
     font-awesome
-    nerdfonts
+    nerd-fonts.symbols-only
+    nerd-fonts.jetbrains-mono
   ];
 
   programs.thunar.enable = true;
@@ -176,6 +362,9 @@
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
   services.blueman.enable = true;
 
+  
+  hardware.rtl-sdr.enable = true;
+
   security.sudo = {
     enable = true;
     extraRules = [
@@ -202,6 +391,13 @@
     gamescopeSession.enable = true;
   };
 
+  programs.gamescope = {
+    enable = true;
+    capSysNice = true;
+  };
+
+
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index d908a23..8237e1f 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -20,21 +20,23 @@
     WLR_NO_HARDWARE_CURSORS = "1";
     # Hint electron apps to use wayland
     NIXOS_OZONE_WL = "1";
+    # Fix waiting on vsync
+    __GL_SYNC_TO_VBLANK = "0";
   };
 
   services.xserver = {
     enable = true;
     videoDrivers = [ "nvidia" ];
-    displayManager.gdm = {
+  };
+  services.displayManager.gdm = {
       enable = true;
       wayland = true;
-    };
   };
 
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "caperren";
-  };
+#   services.displayManager.autoLogin = {
+#     enable = true;
+#     user = "caperren";
+#  };
 
   hardware.graphics = {
     enable = true;
@@ -45,7 +47,8 @@
     # Enable modesetting for Wayland compositors (hyprland)
     modesetting.enable = true;
     # Use the open source version of the kernel module (for driver 515.43.04+)
-    # open = true;
+    # Actually, just overridden to false for now
+    open = false;
     # Enable the Nvidia settings menu
     nvidiaSettings = true;
     # Select the appropriate driver version for your specific GPU

From f201a761d3b34666a5f433ca3bbeb89316f8d7f2 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Wed, 25 Jun 2025 04:21:02 -0700
Subject: [PATCH 07/10] Updated flake.nix

---
 flake.nix | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 00268c3..33be7a1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -11,17 +12,58 @@
   };
 
   outputs =
-    { self, nixpkgs, ... }@inputs:
     {
-      nixosConfigurations.default = nixpkgs.lib.nixosSystem {
+      self,
+      nixpkgs,
+      home-manager,
+      nixos-hardware,
+      ...
+    }@inputs:
+    {
+
+      nixosConfigurations.cap-slim7 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
         };
+        modules = [
+          ./hosts/cap-slim7/configuration.nix
+          ./modules/nixos/hyprland-amd.nix
+          inputs.home-manager.nixosModules.default
+          nixos-hardware.nixosModules.lenovo-legion-16arha7
+        ];
+      };
+
+      nixosConfigurations.cap-nr200p = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
         modules = [
           ./hosts/cap-nr200p/configuration.nix
           ./modules/nixos/hyprland.nix
           inputs.home-manager.nixosModules.default
         ];
       };
+
+      homeConfigurations = {
+        "caperren@cap-slim7" = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          extraModules = [
+            ./home/caperren/common.nix
+            ./home/caperren/laptop.nix
+          ];
+          username = "caperren";
+          homeDirectory = "/home/caperren";
+        };
+
+        "caperren@cap-nr200p" = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          extraModules = [
+            ./home/caperren/common.nix
+            ./home/caperren/desktop1.nix
+          ];
+          username = "caperren";
+          homeDirectory = "/home/caperren";
+        };
+    };
+
     };
 }

From 0d4d60413b8f4f3279c1875508e2d7a6213cbfd9 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Wed, 25 Jun 2025 04:24:19 -0700
Subject: [PATCH 08/10] Added cap-slim7 current config

---
 flake.lock                                 |  48 ---
 hosts/cap-slim7/configuration.nix          | 434 +++++++++++++++++++++
 hosts/cap-slim7/hardware-configuration.nix |  57 +++
 modules/nixos/hyprland-amd.nix             |  82 ++++
 4 files changed, 573 insertions(+), 48 deletions(-)
 delete mode 100644 flake.lock
 create mode 100644 hosts/cap-slim7/configuration.nix
 create mode 100644 hosts/cap-slim7/hardware-configuration.nix
 create mode 100644 modules/nixos/hyprland-amd.nix

diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index cb18004..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750798083,
-        "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1750741721,
-        "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "4b1164c3215f018c4442463a27689d973cffd750",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/hosts/cap-slim7/configuration.nix b/hosts/cap-slim7/configuration.nix
new file mode 100644
index 0000000..75b3b65
--- /dev/null
+++ b/hosts/cap-slim7/configuration.nix
@@ -0,0 +1,434 @@
+# 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
+  ];
+
+  #boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # 
+  nix.settings.download-buffer-size = 524288000;
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub.configurationLimit = 8;
+
+  networking.hostName = "cap-slim7"; # Define your hostname.  #-#
+  # 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";
+
+  #security.sudo.extraConfig = ''
+  #  Defaults        timestamp_timeout=15
+  #'';
+
+  #  security.polkit.extraConfig = ''
+  #    polkit.addRule(function(action, subject) {
+  #      if ((action.id == "org.freedesktop.login1.reboot" ||
+  #          action.id == "org.freedesktop.login1.poweroff") &&
+  #          subject.isInGroup("powerusers")) {
+  #        return polkit.Result.YES;
+  #      }
+  #    });
+  #  '';
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Enable flakes
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ]; # -#
+
+  # Set your time zone.
+  time.timeZone = "America/Los_Angeles";
+  # time.timeZone = "Pacific/Honolulu";
+  #time.timeZone = "Europe/Oslo";
+  # services.tzupdate.enable = true;
+
+  # 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.
+  # services.xserver.enable = true;
+
+  # Enable the XFCE Desktop Environment.
+  # services.xserver.displayManager.lightdm.enable = true;
+  # services.xserver.desktopManager.xfce.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  services.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.caperren = {
+    isNormalUser = true;
+    description = "Corwin Perren";
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "input"
+      "dialout"
+      "plugdev"
+      "adbusers"
+    ];
+    packages = with pkgs; [
+      #  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; [
+    #      droidcam-obs
+    #     teensyduino
+    #    ];
+    #    plugins = with obs-studio-plugins; [
+    # PKGS END
+    # bottles
+    # lenovo-legion
+    obs-studio
+    #(wrapOBS {
+    #arduino-ide
+    #audacity
+    #deadbeef
+    #dolphin-emu
+    #dualsensectl
+    #easyeffects
+    #flameshot
+    #gcc
+    #glmark2
+    #heroic
+    #jetbrains.pycharm-professional
+    #lf
+    #lf
+    #librewolf
+    #lutris
+    #meshcentral
+    #pcb2gcode
+    #projectm_3
+    #python311Full
+    #qemu
+    #quickemu
+    #rofi-bluetooth
+    #s-tui
+    #scrcpy
+    #sox
+    #stm32cubemx
+    #stm32flash
+    #teensy-udev-rules
+    #transmission_4-qt
+    #via
+    #vlc
+    #vscode
+    #winetricks
+    #})
+    vlc
+    alsa-utils
+    arandr
+    brightnessctl
+    discord
+    dnsutils
+    git
+    glava
+    google-chrome
+    htop
+    hyprpicker
+    iftop
+    iotop
+    jetbrains-toolbox
+    flameshot
+    jq
+    kanshi
+    killall
+    mako
+    ncdu
+    networkmanager
+    networkmanagerapplet
+    nixfmt-rfc-style
+    nodejs
+    nvtopPackages.full
+    obsidian
+    pasystray
+    pavucontrol
+    playerctl
+    podman
+    powertop
+    pulsemixer
+    speedcrunch
+    spotify-player
+    streamdeck-ui
+    telegram-desktop
+    unetbootin
+    unzip
+    usbutils
+    util-linux
+    wget
+    wl-clipboard
+    wlogout
+    wofi
+    xfce.mousepad
+    imagemagick
+    hyprlock
+    # plex-desktop
+    darktable
+    arduino
+    yt-dlp
+    nmap
+    signal-desktop
+    swayidle
+    hyprlock
+    pciutils
+    s-tui
+    woeusb
+    gparted
+  ];
+
+  hardware.logitech.wireless.enable = true;
+  hardware.logitech.wireless.enableGraphical = true;
+
+  #programs.adb.enable = true;
+  services.meshcentral.enable = true;
+  services.xserver.videoDrivers = [
+    "displaylink"
+    "modesetting"
+  ];
+  programs.ydotool.enable = true;
+
+  #boot.extraModulePackages = with config.boot.kernelPackages; [
+  #  v4l2loopback
+  #];
+  #boot.extraModprobeConfig = ''
+  #  options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
+  #'';
+
+  #programs.virt-manager.enable = true;
+  #users.groups.libvirtd.members = [ "caperren" ];
+  #virtualisation.libvirtd.enable = true;
+  #virtualisation.spiceUSBRedirection.enable = true;
+  #services.spice-vdagentd.enable = true;
+
+  # services.automatic-timezoned.enable = true;
+
+  programs.bash.shellAliases = {
+    nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#default; }";
+    nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#default";
+    nixedit = "sudo nano /etc/nixos/hosts/cap-slim7/configuration.nix";
+
+    conservebatt = "sudo bash -c 'echo 1 > /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode && cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode'";
+    noconservebatt = "sudo bash -c 'echo 0 > /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode && cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode'";
+
+    yesway = "nohup waybar >/dev/null 2>&1 &";
+    noway = "pkill waybar";
+
+  };
+
+  #programs.appimage = {
+  #  enable = true;
+  #  binfmt = true;
+  #};
+
+  #  services.power-profiles-daemon.enable = true;
+
+  services.tlp = {
+    enable = true;
+    settings = {
+      ##### Defaults ######
+      # WIFI
+      WIFI_PWR_ON_AC = "off";
+      WIFI_PWR_ON_BAT = "off";
+
+      # AC
+      CPU_MIN_PERF_ON_AC = 0;
+
+      # BATT
+      CPU_MIN_PERF_ON_BAT = 0;
+      CPU_MAX_PERF_ON_BAT = 35;
+
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+
+      START_CHARGE_THRESH_BAT0 = 1; # On non-thinkpad lenovo, this sets conservation mode to 0
+      STOP_CHARGE_THRESH_BAT0 = 1; # ..., but to 1
+
+      ###### Airplane Settings #####
+      # AC
+      #            CPU_MAX_PERF_ON_AC = 35;
+
+      #            CPU_SCALING_GOVERNOR_ON_AC = "powersave";
+      #            CPU_ENERGY_PERF_POLICY_ON_AC = "power";
+
+      ###### Normal Settings ######
+      # AC
+      CPU_MAX_PERF_ON_AC = 100;
+
+      CPU_SCALING_GOVERNOR_ON_AC = "performanc";
+      CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+
+      # BATT
+
+      ##### Special Overrides #####
+      #Optional helps save long term battery health
+      #            START_CHARGE_THRESH_BAT0 = 0; # On non-thinkpad lenovo, this sets conservation mode to 0
+      #            STOP_CHARGE_THRESH_BAT0 = 0; # ..., but to 1
+    };
+  };
+
+  #hardware.keyboard.qmk.enable = true;
+  #services.udev.packages = [ pkgs.via ];
+  services.udev.extraRules = ''
+    # ST-LINK V2
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2_%n"
+
+    # ST-LINK V2.1
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2-1_%n"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3752", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2-1_%n"
+
+    # ST-LINK V3
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374d", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3loader_%n"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374e", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3753", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n"
+
+    # CP2101 - CP 2104
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE="600", TAG+="uaccess", SYMLINK+="usb2ser_%n"
+
+    # ATEN UC-232A
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0557", ATTRS{idProduct}=="2008", MODE="600", TAG+="uaccess", SYMLINK+="usb2ser_aten_%n"
+  '';
+
+  fonts.fontDir.enable = true;
+  fonts.fontconfig.enable = true;
+  fonts.fontconfig.antialias = true;
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-emoji
+    liberation_ttf
+    fira-code
+    fira-code-symbols
+    jetbrains-mono
+    mplus-outline-fonts.githubRelease
+    dina-font
+    proggyfonts
+    font-awesome
+    nerd-fonts.symbols-only
+    nerd-fonts.jetbrains-mono
+  ];
+
+  programs.thunar.enable = true;
+  programs.thunar.plugins = with pkgs.xfce; [
+    thunar-archive-plugin
+    thunar-volman
+  ];
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.tumbler.enable = true; # Thumbnail support for images
+
+  hardware.bluetooth.enable = true; # enables support for Bluetooth
+  hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
+  services.blueman.enable = true;
+
+  security.sudo = {
+    enable = true;
+    extraRules = [
+      {
+        commands = [
+          {
+            command = "${pkgs.systemd}/bin/reboot";
+            options = [ "NOPASSWD" ];
+          }
+          {
+            command = "${pkgs.systemd}/bin/poweroff";
+            options = [ "NOPASSWD" ];
+          }
+        ];
+        groups = [ "wheel" ];
+      }
+    ];
+  };
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+    gamescopeSession.enable = true;
+  };
+
+  # 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 = "23.11"; # Did you read the comment?
+}
diff --git a/hosts/cap-slim7/hardware-configuration.nix b/hosts/cap-slim7/hardware-configuration.nix
new file mode 100644
index 0000000..2283132
--- /dev/null
+++ b/hosts/cap-slim7/hardware-configuration.nix
@@ -0,0 +1,57 @@
+# 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 = [
+    "nvme"
+    "xhci_pci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/93e767dd-ab7d-4d00-8518-711775be8dbb";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/F741-591C";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/e9f31987-118e-4ccc-98dd-ebc127faf1a5"; }
+  ];
+
+  # 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.enp8s0f4u1u1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/modules/nixos/hyprland-amd.nix b/modules/nixos/hyprland-amd.nix
new file mode 100644
index 0000000..216c819
--- /dev/null
+++ b/modules/nixos/hyprland-amd.nix
@@ -0,0 +1,82 @@
+{ pkgs, config, ... }:
+{
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+  };
+
+#  programs.waybar = {
+#    enable = true;
+##    systemd.enable = true;
+#  };
+
+  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;
+  };
+
+  #  environment.sessionVariables = {
+  # If your cursor becomes invisible
+  #    WLR_NO_HARDWARE_CURSORS = "1";
+  # Hint electron apps to use wayland
+  #    NIXOS_OZONE_WL = "1";
+  # Fix waiting on vsync
+  #    __GL_SYNC_TO_VBLANK = "0";
+  #  };
+
+  services.xserver = {
+    enable = true;
+    videoDrivers = [ "amdgpu" ];
+  };    
+  services.displayManager.gdm = {
+      enable = true;
+      wayland = true;
+  };
+
+  #  services.displayManager.autoLogin = {
+  #    enable = true;
+  #    user = "caperren";
+  #  };
+
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
+  #  hardware.nvidia = {
+  # Enable modesetting for Wayland compositors (hyprland)
+  #    modesetting.enable = true;
+  # Use the open source version of the kernel module (for driver 515.43.04+)
+  # Actually, just overridden to false for now
+  #    open = false;
+  # Enable the Nvidia settings menu
+  #    nvidiaSettings = true;
+  # Select the appropriate driver version for your specific GPU
+  #    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  #  };
+  environment.systemPackages = [
+    pkgs.hyprland
+    pkgs.kitty
+    pkgs.waybar
+    pkgs.dunst
+    pkgs.libnotify
+    pkgs.rofi-wayland
+    pkgs.nwg-look
+    pkgs.desktop-file-utils
+    pkgs.grim
+    pkgs.slurp
+    pkgs.nwg-displays
+
+    (pkgs.waybar.overrideAttrs (oldAttrs: {
+      mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+    }))
+  ];
+
+  xdg.portal.enable = true;
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+}

From c5d1e140cd6f86c9af57f60bbfe89ccd936b23e1 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Wed, 25 Jun 2025 04:38:36 -0700
Subject: [PATCH 09/10] Normalize shell aliases

---
 hosts/cap-nr200p/configuration.nix | 79 +++++++++++++++---------------
 hosts/cap-slim7/configuration.nix  | 13 ++---
 2 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix
index 06a86d0..a9cdbe1 100644
--- a/hosts/cap-nr200p/configuration.nix
+++ b/hosts/cap-nr200p/configuration.nix
@@ -1,8 +1,13 @@
-# 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 
+# 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, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   imports = [
@@ -33,7 +38,7 @@
     options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
   '';
 
-  # 
+  #
   nix.settings.download-buffer-size = 524288000;
 
   # Bootloader.
@@ -100,8 +105,6 @@
     openFirewall = true;
   };
 
-  hardware.xone.enable = true;
-
   # Enable sound with pipewire.
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -137,21 +140,20 @@
       #  thunderbird
     ];
   };
-#  users.users.crestline = {
-#    isNormalUser = true;
-#    description = "Crestline";
-#    extraGroups = [
-#      "networkmanager"
-#      "wheel"
-#      "input"
-#      "dialout"
-#    ];
-#    packages = with pkgs; [
-#      #  thunderbird
-#    ];
-
- # };
+  #  users.users.crestline = {
+  #    isNormalUser = true;
+  #    description = "Crestline";
+  #    extraGroups = [
+  #      "networkmanager"
+  #      "wheel"
+  #      "input"
+  #      "dialout"
+  #    ];
+  #    packages = with pkgs; [
+  #      #  thunderbird
+  #    ];
 
+  # };
 
   #services.displayManager.autoLogin = {
   #   enable = true;
@@ -261,7 +263,7 @@
     kanshi
     #wsmancli
     #realvnc-vnc-viewer
-    ncdu    
+    ncdu
     hyprlock
     openrgb-with-all-plugins
     swayidle
@@ -278,38 +280,38 @@
     highPriority = true;
   };
 
- services.hardware.openrgb.enable = true;
+  services.hardware.openrgb.enable = true;
 
- services.meshcentral.enable = true;
- programs.ydotool.enable = true;
- programs.adb.enable = true;
+  services.meshcentral.enable = true;
+  programs.ydotool.enable = true;
+  programs.adb.enable = true;
 
- hardware.logitech.wireless.enable = true;
- hardware.logitech.wireless.enableGraphical = true;
+  hardware.logitech.wireless.enable = true;
+  hardware.logitech.wireless.enableGraphical = true;
 
- services.sunshine = {
+  services.sunshine = {
     enable = true;
     autoStart = true;
     capSysAdmin = true;
     openFirewall = true;
-    
+
   };
 
-   programs.bash.shellAliases = {
-      nixrebuild = "cd /etc/nixos && sudo nixos-rebuild switch --flake .#default";
-      nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#default";
-      nixedit = "sudo nano /etc/nixos/hosts/cap-nr200p/configuration.nix";
-      scrwebcam = "sudo pkill scrcpy ; sudo modprobe -r v4l2loopback ; sudo modprobe v4l2loopback && nohup scrcpy --camera-facing=back --video-source=camera --v4l2-sink=/dev/video0 --no-window --no-audio-playback 2>&1 1>/dev/null";
-    };
+  programs.bash.shellAliases = {
+    nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#$(hostname); }";
+    nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname)";
+    nixedit = "sudo nano /etc/nixos/hosts/$(hostname)/configuration.nix";
+
+    scrwebcam = "sudo pkill scrcpy ; sudo modprobe -r v4l2loopback ; sudo modprobe v4l2loopback && nohup scrcpy --camera-facing=back --video-source=camera --v4l2-sink=/dev/video0 --no-window --no-audio-playback 2>&1 1>/dev/null";
+  };
 
-  
   virtualisation.waydroid.enable = true;
   hardware.steam-hardware.enable = true;
 
   virtualisation.podman = {
     enable = true;
     dockerCompat = true;
-  }; 
+  };
 
   services.udev.extraRules = ''
     # ST-LINK V2
@@ -362,7 +364,6 @@
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
   services.blueman.enable = true;
 
-  
   hardware.rtl-sdr.enable = true;
 
   security.sudo = {
@@ -396,8 +397,6 @@
     capSysNice = true;
   };
 
-
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/hosts/cap-slim7/configuration.nix b/hosts/cap-slim7/configuration.nix
index 75b3b65..ddb74c4 100644
--- a/hosts/cap-slim7/configuration.nix
+++ b/hosts/cap-slim7/configuration.nix
@@ -263,16 +263,9 @@
   # services.automatic-timezoned.enable = true;
 
   programs.bash.shellAliases = {
-    nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#default; }";
-    nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#default";
-    nixedit = "sudo nano /etc/nixos/hosts/cap-slim7/configuration.nix";
-
-    conservebatt = "sudo bash -c 'echo 1 > /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode && cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode'";
-    noconservebatt = "sudo bash -c 'echo 0 > /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode && cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode'";
-
-    yesway = "nohup waybar >/dev/null 2>&1 &";
-    noway = "pkill waybar";
-
+    nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#$(hostname); }";
+    nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname)";
+    nixedit = "sudo nano /etc/nixos/hosts/$(hostname)/configuration.nix";
   };
 
   #programs.appimage = {

From d0fe4b0a3bd71f44a47e4de0f6e539df12060e95 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Wed, 25 Jun 2025 04:44:38 -0700
Subject: [PATCH 10/10] Add limit five

---
 hosts/cap-nr200p/configuration.nix | 2 ++
 hosts/cap-slim7/configuration.nix  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix
index a9cdbe1..5af509f 100644
--- a/hosts/cap-nr200p/configuration.nix
+++ b/hosts/cap-nr200p/configuration.nix
@@ -302,6 +302,8 @@
     nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname)";
     nixedit = "sudo nano /etc/nixos/hosts/$(hostname)/configuration.nix";
 
+    nixlimitfive = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | head -n -5 | cut -d ' ' -f2 | xargs -I {} sudo nix-env --delete-generations --profile /nix/var/nix/profiles/system {}";
+
     scrwebcam = "sudo pkill scrcpy ; sudo modprobe -r v4l2loopback ; sudo modprobe v4l2loopback && nohup scrcpy --camera-facing=back --video-source=camera --v4l2-sink=/dev/video0 --no-window --no-audio-playback 2>&1 1>/dev/null";
   };
 
diff --git a/hosts/cap-slim7/configuration.nix b/hosts/cap-slim7/configuration.nix
index ddb74c4..c5ee952 100644
--- a/hosts/cap-slim7/configuration.nix
+++ b/hosts/cap-slim7/configuration.nix
@@ -266,6 +266,8 @@
     nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#$(hostname); }";
     nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname)";
     nixedit = "sudo nano /etc/nixos/hosts/$(hostname)/configuration.nix";
+
+    nixlimitfive = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | head -n -5 | cut -d ' ' -f2 | xargs -I {} sudo nix-env --delete-generations --profile /nix/var/nix/profiles/system {}";
   };
 
   #programs.appimage = {