[btrfs] Add role and migrate nix-book

[nix-book] Update drive UUID
[nix-book] Add beesd
2025-07-29 16:14:29 -07:00 · 2025-07-29 15:48:04 -07:00 · 2025-07-29 15:48:04 -07:00 · 2025-07-29 15:48:04 -07:00 · 2025-07-29 15:48:04 -07:00 · 2025-07-29 15:29:48 -07:00
44 changed files with 2496 additions and 614 deletions
--- a/.goosehints
+++ b/.goosehints
@@ -0,0 +1,21 @@
 NixOS Configurations Repository
 ================================
 Overview:
 ---------
 This repository hosts modular and reproducible NixOS configurations managed via Nix flakes. It is structured to separate concerns across machine-specific setups, common roles, and custom packages.
 Directory Structure:
 ----------------------
 • packages/      - Custom Nix packages leveraged across various configurations.
 • roles/         - Role-based configurations (e.g., kodi, bluetooth) each with its own module (default.nix) for inclusion in machine setups.
 • machines/      - Machine-specific configurations (e.g., nix-book, z790prors, boxy, wixos) including configuration.nix and hardware-configuration.nix tailored for each hardware.
 • home/          - Home-manager configurations for personal environments and application settings (e.g., home-nix-book.nix, home-z790prors.nix).
 Design Principles:
 ------------------
 • Modularity: Clear separation between roles, machines, and packages allows for flexible and reusable configurations.
 • Declarative & Reproducible: Using Nix flakes guarantees a fully declarative setup that can be effortlessly reproduced across systems.
 • Scalability: The structure is designed to accommodate adding new roles or machines with minimal disruption to existing configurations.
 This file serves as a concise guide for navigating and understanding the repository from an advanced Nix perspective. Further documentation can be found within the respective directories or individual README files where applicable.
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,110 @@
 # CLAUDE.md
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 ## Repository Overview
 This is a NixOS configuration repository using flakes, managing multiple machines and home-manager configurations. The repository follows a modular architecture with reusable "roles" that can be composed for different machines.
 ## Architecture
 ### Flake Structure
 - **flake.nix**: Main entry point defining inputs (nixpkgs, home-manager, plasma-manager, etc.) and outputs for multiple NixOS configurations
 - **Machines**: `nix-book`, `boxy`, `wixos` (WSL configuration)
 - **Home configurations**: Standalone home-manager configuration for user `johno`
 ### Directory Structure
 - `machines/`: Machine-specific configurations with hardware-configuration.nix
 - `roles/`: Modular system configurations (audio, bluetooth, desktop, users, etc.)
 - `home/`: Home Manager configurations and user-specific modules
 - `home/modules/`: User environment modules (emacs, i3+sway, plasma-manager, tmux)
 - `packages/`: Custom package definitions
 ### Role-Based Configuration System
 The repository uses a custom "roles" system where each role is a NixOS module with enable options:
 - `roles.desktop`: Desktop environment with sub-options for X11, Wayland, KDE, gaming, SDDM
 - `roles.audio`: Audio configuration
 - `roles.bluetooth`: Bluetooth support
 - `roles.users`: User account management
 - `roles.virtualisation`: Virtualization setup
 - `roles.kodi`: Kodi media center
 Example role usage in machine configuration:
 ```nix
 roles = {
  audio.enable = true;
  desktop = {
    enable = true;
    gaming = true;
    kde = true;
    wayland = true;
  };
  users.enable = true;
 };
 ```
 ## Common Commands
 ### Building and Switching Configurations
 ```bash
 # Build and switch to a specific machine configuration
 sudo nixos-rebuild switch --flake .#<hostname>
 # Build without switching
 nixos-rebuild build --flake .#<hostname>
 # Build home-manager configuration only
 home-manager switch --flake .#johno
 ```
 ### Available Machine Configurations
 - `nix-book`: Uses `home/home-nix-book.nix`
 - `boxy`: Gaming desktop with AMD GPU, uses `home/home.nix`
 - `wixos`: WSL configuration, uses `home/home.nix`
 ### Flake Operations
 ```bash
 # Update flake inputs
 nix flake update
 # Check flake
 nix flake check
 # Show flake info
 nix flake show
 ```
 ### Bootstrap New Machine
 Use the provided bootstrap script:
 ```bash
 sudo ./bootstrap.sh <hostname>
 ```
 This script pulls from the remote git repository and applies the configuration.
 ## Development Workflow
 ### Adding New Machines
 1. Create new directory in `machines/<hostname>/`
 2. Add `configuration.nix` with role assignments
 3. Include hardware-configuration.nix (generated by nixos-generate-config)
 4. Add nixosConfiguration to flake.nix outputs
 ### Adding New Roles
 1. Create directory in `roles/<role-name>/`
 2. Create `default.nix` with module definition using mkEnableOption
 3. Add role import to `roles/default.nix`
 4. Configure role options in machine configurations
 ### Home Manager Modules
 - Located in `home/modules/`
 - Each module has its own `default.nix`
 - Imported in main home configuration files
 ## Key Configuration Details
 - **Experimental features**: nix-command and flakes are enabled
 - **User**: Primary user is `johno` with trusted-user privileges
 - **Locale**: en_US.UTF-8, America/Los_Angeles timezone
 - **SSH**: OpenSSH enabled on all configurations
 - **Garbage collection**: Automatic, deletes older than 10 days
 - **Unfree packages**: Allowed globally
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -0,0 +1,11 @@
 #!/usr/bin/env bash
 # bootstrap.sh
 # Usage: sudo ./bootstrap.sh <hostname>
 set -euo pipefail
 NEW_HOSTNAME="${1:?missing hostname}"
 FLAKE_URI="git+https://git.johnogle.info/johno/nixos-configs.git#${NEW_HOSTNAME}"
 export NIX_CONFIG="experimental-features = nix-command flakes"
 nixos-rebuild switch --flake "$FLAKE_URI"
--- a/build-liveusb.sh
+++ b/build-liveusb.sh
@@ -0,0 +1,19 @@
 #!/usr/bin/env bash
 # Build Live USB ISO from flake configuration
 # Creates an uncompressed ISO suitable for Ventoy and other USB boot tools
 set -e
 echo "Building Live USB ISO..."
 nix build .#nixosConfigurations.live-usb.config.system.build.isoImage --show-trace
 if [ -f "./result/iso/"*.iso ]; then
    iso_file=$(ls ./result/iso/*.iso)
    echo "✅ Build complete!"
    echo "📁 ISO location: $iso_file"
    echo "💾 Ready for Ventoy or dd to USB"
 else
    echo "❌ Build failed - no ISO file found"
    exit 1
 fi
--- a/flake.lock
+++ b/flake.lock
@@ -1,38 +1,41 @@
 {
  "nodes": {
-    "aquamarine": {
+    "flake-compat": {
-      "inputs": {
+      "flake": false,
        "hyprutils": [
          "hyprland",
          "hyprutils"
        ],
        "hyprwayland-scanner": [
          "hyprland",
          "hyprwayland-scanner"
        ],
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
        ],
        "systems": [
          "hyprland",
          "systems"
        ]
      },
      "locked": {
-        "lastModified": 1725199881,
+        "lastModified": 1747046372,
-        "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "hyprwm",
+        "owner": "edolstra",
-        "repo": "aquamarine",
+        "repo": "flake-compat",
-        "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
-        "owner": "hyprwm",
+        "owner": "edolstra",
-        "repo": "aquamarine",
+        "repo": "flake-compat",
        "type": "github"
      }
    },
    "google-cookie-retrieval": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1752428473,
        "narHash": "sha256-IsE7fdAYbRlZuc0H5FtPfhhuHvlxnDGoAxdlnjpVNCU=",
        "ref": "refs/heads/main",
        "rev": "1fad66b55144ab6beaecd900172a21ac3c34dc52",
        "revCount": 10,
        "type": "git",
        "url": "https://git.johnogle.info/johno/google-cookie-retrieval.git"
      },
      "original": {
        "type": "git",
        "url": "https://git.johnogle.info/johno/google-cookie-retrieval.git"
      }
    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -40,11 +43,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725694918,
+        "lastModified": 1752402455,
-        "narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=",
+        "narHash": "sha256-mCHfZhQKdTj2JhCFcqfOfa3uKZbwUkPQbd0/zPnhOE8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda",
+        "rev": "bf893ad4cbf46610dd1b620c974f824e266cd1df",
        "type": "github"
      },
      "original": {
@@ -53,197 +56,49 @@
        "type": "github"
      }
    },
-    "hy3": {
+    "nixos-wsl": {
      "inputs": {
-        "hyprland": [
+        "flake-compat": "flake-compat",
-          "hyprland"
+        "nixpkgs": "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1725573970,
+        "lastModified": 1752199438,
-        "narHash": "sha256-KJKO4b5Gl+7t3hF+X56Y0W/Lxf2OxWl/aLgzbiN3+hI=",
+        "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=",
-        "owner": "outfoxxed",
+        "owner": "nix-community",
-        "repo": "hy3",
+        "repo": "NixOS-WSL",
-        "rev": "e91460d63627cdad417cac2c09897be58094e2e0",
+        "rev": "d34d9412556d3a896e294534ccd25f53b6822e80",
        "type": "github"
      },
      "original": {
-        "owner": "outfoxxed",
+        "owner": "nix-community",
-        "repo": "hy3",
+        "ref": "main",
-        "type": "github"
+        "repo": "NixOS-WSL",
      }
    },
    "hyprcursor": {
      "inputs": {
        "hyprlang": [
          "hyprland",
          "hyprlang"
        ],
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
        ],
        "systems": [
          "hyprland",
          "systems"
        ]
      },
      "locked": {
        "lastModified": 1722623071,
        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
        "type": "github"
      },
      "original": {
        "owner": "hyprwm",
        "repo": "hyprcursor",
        "type": "github"
      }
    },
    "hyprland": {
      "inputs": {
        "aquamarine": "aquamarine",
        "hyprcursor": "hyprcursor",
        "hyprlang": "hyprlang",
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
        "nixpkgs": [
          "nixpkgs"
        ],
        "systems": "systems",
        "xdph": "xdph"
      },
      "locked": {
        "lastModified": 1725738873,
        "narHash": "sha256-8OT3XRoPoAhiYHMT/hQ6uKE4o7Z99a1Y+711oEPV+dg=",
        "ref": "refs/heads/main",
        "rev": "70add904c40924a761059e4009a8c0f1e43d76a3",
        "revCount": 5194,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
      },
      "original": {
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
      }
    },
    "hyprland-protocols": {
      "inputs": {
        "nixpkgs": [
          "hyprland",
          "xdph",
          "nixpkgs"
        ],
        "systems": [
          "hyprland",
          "xdph",
          "systems"
        ]
      },
      "locked": {
        "lastModified": 1721326555,
        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
        "type": "github"
      },
      "original": {
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
        "type": "github"
      }
    },
    "hyprlang": {
      "inputs": {
        "hyprutils": [
          "hyprland",
          "hyprutils"
        ],
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
        ],
        "systems": [
          "hyprland",
          "systems"
        ]
      },
      "locked": {
        "lastModified": 1725188252,
        "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
        "owner": "hyprwm",
        "repo": "hyprlang",
        "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
        "type": "github"
      },
      "original": {
        "owner": "hyprwm",
        "repo": "hyprlang",
        "type": "github"
      }
    },
    "hyprutils": {
      "inputs": {
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
        ],
        "systems": [
          "hyprland",
          "systems"
        ]
      },
      "locked": {
        "lastModified": 1724966483,
        "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
        "owner": "hyprwm",
        "repo": "hyprutils",
        "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
        "type": "github"
      },
      "original": {
        "owner": "hyprwm",
        "repo": "hyprutils",
        "type": "github"
      }
    },
    "hyprwayland-scanner": {
      "inputs": {
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
        ],
        "systems": [
          "hyprland",
          "systems"
        ]
      },
      "locked": {
        "lastModified": 1721324119,
        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
        "type": "github"
      },
      "original": {
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1725634671,
+        "lastModified": 1751792365,
-        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1751984180,
        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
        "type": "github"
      },
      "original": {
@@ -253,58 +108,37 @@
        "type": "github"
      }
    },
-    "root": {
+    "plasma-manager": {
      "inputs": {
-        "home-manager": "home-manager",
+        "home-manager": [
-        "hy3": "hy3",
+          "home-manager"
        "hyprland": "hyprland",
        "nixpkgs": "nixpkgs"
      }
    },
    "systems": {
      "locked": {
        "lastModified": 1689347949,
        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
        "owner": "nix-systems",
        "repo": "default-linux",
        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
        "repo": "default-linux",
        "type": "github"
      }
    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": "hyprland-protocols",
        "hyprlang": [
          "hyprland",
          "hyprlang"
        ],
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
        ],
        "systems": [
          "hyprland",
          "systems"
        ]
      },
      "locked": {
-        "lastModified": 1725203932,
+        "lastModified": 1748196248,
-        "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
+        "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
-        "owner": "hyprwm",
+        "owner": "nix-community",
-        "repo": "xdg-desktop-portal-hyprland",
+        "repo": "plasma-manager",
-        "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
+        "rev": "b7697abe89967839b273a863a3805345ea54ab56",
        "type": "github"
      },
      "original": {
-        "owner": "hyprwm",
+        "owner": "nix-community",
-        "repo": "xdg-desktop-portal-hyprland",
+        "repo": "plasma-manager",
        "type": "github"
      }
    },
    "root": {
      "inputs": {
        "google-cookie-retrieval": "google-cookie-retrieval",
        "home-manager": "home-manager",
        "nixos-wsl": "nixos-wsl",
        "nixpkgs": "nixpkgs_2",
        "plasma-manager": "plasma-manager"
      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -3,53 +3,103 @@
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    hyprland = {
+    plasma-manager = {
-      type = "git";
+      url = "github:nix-community/plasma-manager";
      url = "https://github.com/hyprwm/Hyprland";
      submodules = true;
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.home-manager.follows = "home-manager";
    };
-    hy3 = {
+
-      url = "github:outfoxxed/hy3";
+    google-cookie-retrieval = {
-      inputs.hyprland.follows = "hyprland";
+      url = "git+https://git.johnogle.info/johno/google-cookie-retrieval.git";
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };
-  outputs = { self, nixpkgs, ... } @ inputs: {
+  outputs = { self, nixpkgs, nixos-wsl, ... } @ inputs: let
-    nixosConfigurations.z790prors-nix = nixpkgs.lib.nixosSystem {
+    baseModules = [
-      system = "x86_64-linux";
+      ./roles
      specialArgs = { inherit inputs; };
      modules = [ 
        ./machines/z790prors/configuration.nix 
        inputs.hyprland.homeManagerModules.default
      inputs.home-manager.nixosModules.home-manager
      {
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = { inherit inputs; };
+        home-manager.sharedModules = [
          inputs.plasma-manager.homeManagerModules.plasma-manager
        ];
        home-manager.extraSpecialArgs = {
          globalInputs = inputs;
        };
      }
    ];
  in {
    nixosConfigurations.nix-book = nixpkgs.lib.nixosSystem rec {
      system = "x86_64-linux";
      modules = baseModules ++ [
        ./machines/nix-book/configuration.nix
        {
          home-manager.users.johno = import ./home/home-nix-book.nix;
          home-manager.extraSpecialArgs = { inherit system; };
        }
      ];
    };
-    nixosConfigurations.nix-book = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.boxy = nixpkgs.lib.nixosSystem rec {
      system = "x86_64-linux";
-      specialArgs = { inherit inputs; };
+      modules = baseModules ++ [
-      modules = [
+        ./machines/boxy/configuration.nix
        ./machines/nix-book/configuration.nix
 	inputs.hyprland.homeManagerModules.default
        inputs.home-manager.nixosModules.home-manager
        {
-          inputs.home-manager.useGlobalPkgs = true;
+          home-manager.users.johno = import ./home/home.nix;
-          inputs.home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = { inherit system; };
          inputs.home-manager.extraSpecialArgs = { inherit inputs; };
        }
      ];
    };
    nixosConfigurations.wixos = nixpkgs.lib.nixosSystem rec {
      system = "x86_64-linux";
      modules = baseModules ++ [
        nixos-wsl.nixosModules.default
        ./machines/wixos/configuration.nix
        inputs.home-manager.nixosModules.home-manager
        {
          home-manager.users.johno = import ./home/home.nix;
          home-manager.extraSpecialArgs = { inherit system; };
        }
      ];
    };
    # Live USB ISO configuration
    nixosConfigurations.live-usb = nixpkgs.lib.nixosSystem rec {
      system = "x86_64-linux";
      modules = baseModules ++ [
        ./machines/live-usb/configuration.nix
        {
          home-manager.users.nixos = { ... }: {
            imports = [ ./home/home.nix ];
            home.username = nixpkgs.lib.mkForce "nixos";
            home.homeDirectory = nixpkgs.lib.mkForce "/home/nixos";
          };
          home-manager.extraSpecialArgs = { inherit system; };
        }
      ];
    };
    homeConfigurations."johno" = inputs.home-manager.lib.homeManagerConfiguration {
      pkgs = inputs.nixpkgs.legacyPackages."x86_64-linux";
      modules = [
        inputs.plasma-manager.homeManagerModules.plasma-manager
        ./home/home.nix
      ];
      extraSpecialArgs = {
        system = "x86_64-linux";
        globalInputs = inputs;
      };
    };
  };
 }
--- a/1
+++ b/1
--- a/home/home-nix-book.nix
+++ b/home/home-nix-book.nix
@@ -0,0 +1,11 @@
 { config, lib, pkgs, ... }:
 {
  imports = [
    ./home.nix
  ];
  home.i3_sway.extraSwayConfig = {
    output.eDP-1.scale = "1.75";
  };
 }
--- a/home/home.nix
+++ b/home/home.nix
@@ -0,0 +1,204 @@
 { pkgs, customPkgs, globalInputs, system, ... }:
 let
  customPkgs = pkgs.callPackage ../packages {};
 in
 {
  # Home Manager needs a bit of information about you and the paths it should
  # manage.
  home.username = "johno";
  home.homeDirectory = "/home/johno";
  # This value determines the Home Manager release that your configuration is
  # compatible with. This helps avoid breakage when a new Home Manager release
  # introduces backwards incompatible changes.
  #
  # You should not change this value, even if you update Home Manager. If you do
  # want to update the value, then make sure to first check the Home Manager
  # release notes.
  home.stateVersion = "24.05"; # Please read the comment before changing.
  # The home.packages option allows you to install Nix packages into your
  # environment.
  home.packages = [
    # # Adds the 'hello' command to your environment. It prints a friendly
    # # "Hello, world!" when run.
    # pkgs.hello
    # # It is sometimes useful to fine-tune packages, for example, by applying
    # # overrides. You can do that directly here, just don't forget the
    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
    # # fonts?
    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
    # # You can also create simple shell scripts directly inside your
    # # configuration. For example, this adds a command 'my-hello' to your
    # # environment:
    # (pkgs.writeShellScriptBin "my-hello" ''
    #   echo "Hello, ${config.home.username}!"
    # '')
    pkgs.bitwarden
    pkgs.claude-code
    pkgs.codex
    pkgs.dunst
    pkgs.element-desktop
    pkgs.fd
    #pkgs.fluffychat # security vulnerability in current version
    pkgs.goose-cli
    pkgs.gzip
    pkgs.htop
    pkgs.jellyfin-media-player
    pkgs.keepassxc
    pkgs.killall
    pkgs.kitty
    pkgs.less
    pkgs.moonlight-qt
    pkgs.ncdu
    pkgs.nextcloud-talk-desktop
    pkgs.openscad-unstable
    pkgs.pandoc
    #pkgs.pinentry-qt
    #pkgs.pytest
    pkgs.shellcheck
    pkgs.solaar # Logitech management software
    (pkgs.snapcast.override { pulseaudioSupport = true; })
    pkgs.tmux
    pkgs.waybar
    pkgs.wofi
    pkgs.vlc
    ## Kubernetes cluster management
    pkgs.kubectl
    pkgs.kubernetes-helm
    globalInputs.google-cookie-retrieval.packages.${system}.default
  ];
  # Home Manager is pretty good at managing dotfiles. The primary way to manage
  # plain files is through 'home.file'.
  home.file = {
    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
    # # symlink to the Nix store copy.
    # ".screenrc".source = dotfiles/screenrc;
    # # You can also set the file content immediately.
    # ".gradle/gradle.properties".text = ''
    #   org.gradle.console=verbose
    #   org.gradle.daemon.idletimeout=3600000
    # '';
  };
  targets.genericLinux.enable = true;
  # Home Manager can also manage your environment variables through
  # 'home.sessionVariables'. These will be explicitly sourced when using a
  # shell provided by Home Manager. If you don't want to manage your shell
  # through Home Manager then you have to manually source 'hm-session-vars.sh'
  # located at either
  #
  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
  #
  # or
  #
  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
  #
  # or
  #
  #  /etc/profiles/per-user/johno/etc/profile.d/hm-session-vars.sh
  #
  home.sessionVariables = {
  };
  home.sessionPath = [
  ];
  imports = [
    ./modules/emacs
    ./modules/i3+sway
    ./modules/plasma-manager
    ./modules/tmux
  ];
  programs.bash = {
    enable = true;
    initExtra = ''
      codex() {
        local key
        key="$(rbw get openai-api-key-codex)"
        OPENAI_API_KEY="$key" command codex "$@"
      }
    '';
  };
  # Let Home Manager install and manage itself.
  programs.home-manager.enable = true;
  programs.command-not-found.enable = true;
  programs.firefox = {
    enable = true;
  };
  programs.git = {
    enable = true;
    userName = "John Ogle";
    userEmail = "john@ogle.fyi";
    extraConfig = {
      safe.directory = "/etc/nixos";
    };
  };
  programs.jq.enable = true;
  programs.k9s.enable = true;
  programs.neovim = {
    enable = true;
    viAlias = true;
    vimAlias = true;
  };
  programs.rbw = {
    enable = true;
    settings = {
      email = "john@johnogle.info";
      base_url = "https://bitwarden.johnogle.info";
      pinentry = pkgs.pinentry-qt;
    };
  };
  programs.spotify-player.enable = true;
  programs.ssh = {
    enable = true;
    addKeysToAgent = "yes";
    matchBlocks = {
      "nucdeb1" = {
        hostname = "nucdeb1.oglehome";
        user = "root";
      };
    };
  };
  services.kdeconnect = {
    enable = true;
    indicator = true;
    package = pkgs.kdePackages.kdeconnect-kde;
  };
  services.gnome-keyring = {
    enable = true;
  };
  services.syncthing = {
    enable = true;
    tray = {
      enable = true;
      command = "syncthingtray --wait";
    };
  };
  xdg.enable = true;
 }
--- a/home/modules/emacs/default.nix
+++ b/home/modules/emacs/default.nix
@@ -0,0 +1,47 @@
 { config, lib, pkgs, ... }:
 with lib;
 let
  doomEmacs = pkgs.fetchFromGitHub {
    owner = "doomemacs";
    repo = "doomemacs";
    rev = "8406c1ff22b95bd0f816de4a0223fa3ce3c82568";
    sha256 = "sha256-rOkgOdmLESVAbOeEM9nJTzxyI+akdk48Ed2VlktOy3Q=";
  };
 in
 {
  config = {
    home.packages = [
      pkgs.emacs
      pkgs.emacs-all-the-icons-fonts
      pkgs.fira-code
      pkgs.fontconfig
      pkgs.graphviz
      pkgs.isort
      pkgs.nerd-fonts.fira-code
      pkgs.nerd-fonts.droid-sans-mono
      pkgs.nil # nix lsp language server
      pkgs.nixfmt-rfc-style
      (pkgs.ripgrep.override {withPCRE2 = true;})
      pkgs.pipenv
      pkgs.poetry
      pkgs.python3
    ];
    fonts.fontconfig.enable = true;
    home.file."${config.xdg.configHome}/emacs".source = doomEmacs;
    home.sessionPath = [
      "${config.xdg.configHome}/emacs/bin"
    ];
    home.sessionVariables = {
      DOOMDIR = "${config.xdg.configHome}/doom";
      DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
    };
    home.file."${config.xdg.configHome}/doom".source = ./doom;
  };
 }
--- a/home/modules/emacs/doom/config.el
+++ b/home/modules/emacs/doom/config.el
@@ -0,0 +1,116 @@
 ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
 ;; Place your private configuration here! Remember, you do not need to run 'doom
 ;; sync' after modifying this file!
 ;; Some functionality uses this to identify you, e.g. GPG configuration, email
 ;; clients, file templates and snippets. It is optional.
 ;; (setq user-full-name "John Doe"
 ;;       user-mail-address "john@doe.com")
 ;; Doom exposes five (optional) variables for controlling fonts in Doom:
 ;;
 ;; - `doom-font' -- the primary font to use
 ;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
 ;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
 ;;   presentations or streaming.
 ;; - `doom-symbol-font' -- for symbols
 ;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
 ;;
 ;; See 'C-h v doom-font' for documentation and more examples of what they
 ;; accept. For example:
 ;;
 ;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
 ;;      doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
 ;;
 ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
 ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
 ;; refresh your font settings. If Emacs still can't find your font, it likely
 ;; wasn't installed correctly. Font issues are rarely Doom issues!
 (setq doom-font (font-spec :family "Fira Code"))
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
 (setq doom-theme 'doom-one)
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
 (setq display-line-numbers-type t)
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
 (setq org-directory "~/org/")
 (after! org
  (setq org-agenda-span 'week
        my-agenda-dirs '("projects" "roam")
        org-agenda-files (cons org-directory (mapcan (lambda (x) (directory-files-recursively
                                                                  (expand-file-name x org-directory)
                                                                  "\.org$"))
                                                     my-agenda-dirs))
        org-log-done 'time
        org-agenda-custom-commands '(("n" "Agenda"
                                      ((agenda "")
                                       (tags-todo "-someday-recurring")))
                                     ("s" "Someday Items"
                                      ((tags-todo "+someday"))))
        org-todo-keywords '((sequence "TODO(t)" "IN-PROGRESS(p)" "WAIT(w)" "|" "DONE(d)" "KILL(k)"))
        org-journal-file-type 'weekly
        org-journal-file-format "%Y-%m-%d.org"
        org-capture-templates
          '(("t" "Todo" entry (file+headline "~/org/todo.org" "Inbox")
             "* TODO %? \n %i \n%a" :prepend t))))
 ;; (use-package! org-caldav
 ;;   :defer t
 ;;   :config
 ;;   (setq org-caldav-url "https://nextcloud.johnogle.info/remote.php/dav/calendars/johno"
 ;;         org-caldav-calendar-id "personal"
 ;;         org-icalendar-timezone "America/Los_Angeles"
 ;;         org-caldav-inbox "~/org/calendar.org"
 ;;         org-caldav-files nil
 ;;         org-caldav-sync-direction 'cal->org))
 (defun my/get-rbw-password (alias)
  "Return the password for ALIAS via rbw, unlocking the vault only if needed."
  (let* ((cmd     (format "rbw get %s 2>&1" alias))
         (output  (shell-command-to-string cmd)))
    (string-trim output)))
 (use-package! gptel
  :defer t
  :config
  (setq! gptel-api-key (my/get-rbw-password "openai-api-key-chatgpt-el")))
 ;; Whenever you reconfigure a package, make sure to wrap your config in an
 ;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
 ;;
 ;;   (after! PACKAGE
 ;;     (setq x y))
 ;;
 ;; The exceptions to this rule:
 ;;
 ;;   - Setting file/directory variables (like `org-directory')
 ;;   - Setting variables which explicitly tell you to set them before their
 ;;     package is loaded (see 'C-h v VARIABLE' to look up their documentation).
 ;;   - Setting doom variables (which start with 'doom-' or '+').
 ;;
 ;; Here are some additional functions/macros that will help you configure Doom.
 ;;
 ;; - `load!' for loading external *.el files relative to this one
 ;; - `use-package!' for configuring packages
 ;; - `after!' for running code after a package has loaded
 ;; - `add-load-path!' for adding directories to the `load-path', relative to
 ;;   this file. Emacs searches the `load-path' when you load packages with
 ;;   `require' or `use-package'.
 ;; - `map!' for binding new keys
 ;;
 ;; To get information about any of these functions/macros, move the cursor over
 ;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
 ;; This will open documentation for it, including demos of how they are used.
 ;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
 ;; etc).
 ;;
 ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
 ;; they are implemented.
--- a/home/modules/emacs/doom/init.el
+++ b/home/modules/emacs/doom/init.el
@@ -0,0 +1,191 @@
 ;;; init.el -*- lexical-binding: t; -*-
 ;; This file controls what Doom modules are enabled and what order they load
 ;; in. Remember to run 'doom sync' after modifying it!
 ;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
 ;;      documentation. There you'll find a link to Doom's Module Index where all
 ;;      of our modules are listed, including what flags they support.
 ;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
 ;;      'C-c c k' for non-vim users) to view its documentation. This works on
 ;;      flags as well (those symbols that start with a plus).
 ;;
 ;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
 ;;      directory (for easy access to its source code).
 (doom! :input
       ;;bidi              ; (tfel ot) thgir etirw uoy gnipleh
       ;;chinese
       ;;japanese
       ;;layout            ; auie,ctsrnm is the superior home row
       :completion
       ;;company           ; the ultimate code completion backend
       (corfu +orderless)  ; complete with cap(f), cape and a flying feather!
       ;;helm              ; the *other* search engine for love and life
       ;;ido               ; the other *other* search engine...
       ;;ivy               ; a search engine for love and life
       vertico           ; the search engine of the future
       :ui
       ;;deft              ; notational velocity for Emacs
       doom              ; what makes DOOM look the way it does
       doom-dashboard    ; a nifty splash screen for Emacs
       ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
       (emoji +unicode)  ; 🙂
       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
       ;;indent-guides     ; highlighted indent columns
       ;;ligatures         ; ligatures and symbols to make your code pretty again
       ;;minimap           ; show a map of the code on the side
       modeline          ; snazzy, Atom-inspired modeline, plus API
       ;;nav-flash         ; blink cursor line after big motions
       ;;neotree           ; a project drawer, like NERDTree for vim
       ophints           ; highlight the region an operation acts on
       (popup +defaults)   ; tame sudden yet inevitable temporary windows
       ;;tabs              ; a tab bar for Emacs
       ;;treemacs          ; a project drawer, like neotree but cooler
       ;;unicode           ; extended unicode support for various languages
       (vc-gutter +pretty) ; vcs diff in the fringe
       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
       ;;window-select     ; visually switch windows
       workspaces        ; tab emulation, persistence & separate workspaces
       ;;zen               ; distraction-free coding or writing
       :editor
       (evil +everywhere); come to the dark side, we have cookies
       file-templates    ; auto-snippets for empty files
       fold              ; (nigh) universal code folding
       ;;(format +onsave)  ; automated prettiness
       ;;god               ; run Emacs commands without modifier keys
       ;;lispy             ; vim for lisp, for people who don't like vim
       ;;multiple-cursors  ; editing in many places at once
       ;;objed             ; text object editing for the innocent
       ;;parinfer          ; turn lisp into python, sort of
       ;;rotate-text       ; cycle region at point between text candidates
       snippets          ; my elves. They type so I don't have to
       ;;word-wrap         ; soft wrapping with language-aware indent
       :emacs
       dired             ; making dired pretty [functional]
       electric          ; smarter, keyword-based electric-indent
       ;;ibuffer         ; interactive buffer management
       undo              ; persistent, smarter undo for your inevitable mistakes
       vc                ; version-control and Emacs, sitting in a tree
       :term
       ;;eshell            ; the elisp shell that works everywhere
       ;;shell             ; simple shell REPL for Emacs
       ;;term              ; basic terminal emulator for Emacs
       ;;vterm             ; the best terminal emulation in Emacs
       :checkers
       syntax              ; tasing you for every semicolon you forget
       ;;(spell +flyspell) ; tasing you for misspelling mispelling
       ;;grammar           ; tasing grammar mistake every you make
       :tools
       ansible
       ;;biblio            ; Writes a PhD for you (citation needed)
       ;;collab            ; buffers with friends
       ;;debugger          ; FIXME stepping through code, to help you add bugs
       ;;direnv
       docker
       ;;editorconfig      ; let someone else argue about tabs vs spaces
       ;;ein               ; tame Jupyter notebooks with emacs
       (eval +overlay)     ; run code, run (also, repls)
       lookup              ; navigate your code and its documentation
       lsp               ; M-x vscode
       magit             ; a git porcelain for Emacs
       ;;make              ; run make tasks from Emacs
       ;;pass              ; password manager for nerds
       pdf               ; pdf enhancements
       ;;prodigy           ; FIXME managing external services & code builders
       ;;terraform         ; infrastructure as code
       ;;tmux              ; an API for interacting with tmux
       tree-sitter       ; syntax and parsing, sitting in a tree...
       ;;upload            ; map local to remote projects via ssh/ftp
       :os
       (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
       tty               ; improve the terminal Emacs experience
       :lang
       ;;agda              ; types of types of types of types...
       ;;beancount         ; mind the GAAP
       ;;(cc +lsp)         ; C > C++ == 1
       ;;clojure           ; java with a lisp
       ;;common-lisp       ; if you've seen one lisp, you've seen them all
       ;;coq               ; proofs-as-programs
       ;;crystal           ; ruby at the speed of c
       ;;csharp            ; unity, .NET, and mono shenanigans
       ;;data              ; config/data formats
       ;;(dart +flutter)   ; paint ui and not much else
       ;;dhall
       ;;elixir            ; erlang done right
       ;;elm               ; care for a cup of TEA?
       emacs-lisp        ; drown in parentheses
       ;;erlang            ; an elegant language for a more civilized age
       ;;ess               ; emacs speaks statistics
       ;;factor
       ;;faust             ; dsp, but you get to keep your soul
       ;;fortran           ; in FORTRAN, GOD is REAL (unless declared INTEGER)
       ;;fsharp            ; ML stands for Microsoft's Language
       ;;fstar             ; (dependent) types and (monadic) effects and Z3
       ;;gdscript          ; the language you waited for
       ;;(go +lsp)         ; the hipster dialect
       ;;(graphql +lsp)    ; Give queries a REST
       ;;(haskell +lsp)    ; a language that's lazier than I am
       ;;hy                ; readability of scheme w/ speed of python
       ;;idris             ; a language you can depend on
       ;;json              ; At least it ain't XML
       ;;(java +lsp)       ; the poster child for carpal tunnel syndrome
       ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
       ;;julia             ; a better, faster MATLAB
       ;;kotlin            ; a better, slicker Java(Script)
       ;;latex             ; writing papers in Emacs has never been so fun
       ;;lean              ; for folks with too much to prove
       ;;ledger            ; be audit you can be
       ;;lua               ; one-based indices? one-based indices
       markdown          ; writing docs for people to ignore
       ;;nim               ; python + lisp at the speed of c
       (nix +tree-sitter)               ; I hereby declare "nix geht mehr!"
       ;;ocaml             ; an objective camel
       (org +roam2)               ; organize your plain life in plain text
       ;;php               ; perl's insecure younger brother
       ;;plantuml          ; diagrams for confusing people more
       ;;purescript        ; javascript, but functional
       (python +poetry)            ; beautiful is better than ugly
       ;;qt                ; the 'cutest' gui framework ever
       ;;racket            ; a DSL for DSLs
       ;;raku              ; the artist formerly known as perl6
       ;;rest              ; Emacs as a REST client
       ;;rst               ; ReST in peace
       ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
       ;;(rust +lsp)       ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
       ;;scala             ; java, but good
       ;;(scheme +guile)   ; a fully conniving family of lisps
       sh                ; she sells {ba,z,fi}sh shells on the C xor
       ;;sml
       ;;solidity          ; do you need a blockchain? No.
       ;;swift             ; who asked for emoji variables?
       ;;terra             ; Earth and Moon in alignment for performance.
       ;;web               ; the tubes
       ;;yaml              ; JSON, but readable
       ;;zig               ; C, but simpler
       :email
       ;;(mu4e +org +gmail)
       ;;notmuch
       ;;(wanderlust +gmail)
       :app
       ;;calendar
       ;;emms
       ;;everywhere        ; *leave* Emacs!? You must be joking
       ;;irc               ; how neckbeards socialize
       ;;(rss +org)        ; emacs as an RSS reader
       :config
       ;;literate
       (default +bindings +smartparens))
--- a/home/modules/emacs/doom/packages.el
+++ b/home/modules/emacs/doom/packages.el
@@ -0,0 +1,54 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; $DOOMDIR/packages.el
 ;; To install a package with Doom you must declare them here and run 'doom sync'
 ;; on the command line, then restart Emacs for the changes to take effect -- or
 ;; use 'M-x doom/reload'.
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
 ;; (package! some-package)
 ;; To install a package directly from a remote git repo, you must specify a
 ;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
 ;; https://github.com/radian-software/straight.el#the-recipe-format
 ;; (package! another-package
 ;;   :recipe (:host github :repo "username/repo"))
 ;; If the package you are trying to install does not contain a PACKAGENAME.el
 ;; file, or is located in a subdirectory of the repo, you'll need to specify
 ;; `:files' in the `:recipe':
 ;; (package! this-package
 ;;   :recipe (:host github :repo "username/repo"
 ;;            :files ("some-file.el" "src/lisp/*.el")))
 ;; If you'd like to disable a package included with Doom, you can do so here
 ;; with the `:disable' property:
 ;; (package! builtin-package :disable t)
 ;; You can override the recipe of a built in package without having to specify
 ;; all the properties for `:recipe'. These will inherit the rest of its recipe
 ;; from Doom or MELPA/ELPA/Emacsmirror:
 ;; (package! builtin-package :recipe (:nonrecursive t))
 ;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
 ;; Specify a `:branch' to install a package from a particular branch or tag.
 ;; This is required for some packages whose default branch isn't 'master' (which
 ;; our package manager can't deal with; see radian-software/straight.el#279)
 ;; (package! builtin-package :recipe (:branch "develop"))
 ;; Use `:pin' to specify a particular commit to install.
 ;; (package! builtin-package :pin "1a2b3c4d5e")
 ;; Doom's packages are pinned to a specific commit and updated from release to
 ;; release. The `unpin!' macro allows you to unpin single packages...
 ;; (unpin! pinned-package)
 ;; ...or multiple packages
 ;; (unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;; (unpin! t)
 ;; (package! org-caldav)
 (package! gptel :recipe (:nonrecursive t))
--- a/home/modules/i3+sway/default.nix
+++ b/home/modules/i3+sway/default.nix
@@ -0,0 +1,146 @@
 { config, lib, ... }:
 with lib;
 let
  cfg = config.home.i3_sway;
  i3_cfg = config.xsession.windowManager.i3.config;
  shared_config = recursiveUpdate rec {
    modifier = "Mod4";
    terminal = "kitty";
    defaultWorkspace = "workspace number 1";
    keybindings = {
      "${shared_config.modifier}+Return" = "exec ${terminal}";
      "${shared_config.modifier}+Shift+q" = "kill";
      "${shared_config.modifier}+d" = "exec ${i3_cfg.menu}";
      "${shared_config.modifier}+h" = "focus left";
      "${shared_config.modifier}+j" = "focus down";
      "${shared_config.modifier}+k" = "focus up";
      "${shared_config.modifier}+l" = "focus right";
      "${shared_config.modifier}+Shift+h" = "move left";
      "${shared_config.modifier}+Shift+j" = "move down";
      "${shared_config.modifier}+Shift+k" = "move up";
      "${shared_config.modifier}+Shift+l" = "move right";
      "${shared_config.modifier}+Left" = "focus left";
      "${shared_config.modifier}+Down" = "focus down";
      "${shared_config.modifier}+Up" = "focus up";
      "${shared_config.modifier}+Right" = "focus right";
      "${shared_config.modifier}+Shift+Left" = "move left";
      "${shared_config.modifier}+Shift+Down" = "move down";
      "${shared_config.modifier}+Shift+Up" = "move up";
      "${shared_config.modifier}+Shift+Right" = "move right";
      #"${shared_config.modifier}+h" = "split h";
      "${shared_config.modifier}+v" = "split v";
      "${shared_config.modifier}+f" = "fullscreen toggle";
      "${shared_config.modifier}+s" = "layout stacking";
      "${shared_config.modifier}+w" = "layout tabbed";
      "${shared_config.modifier}+e" = "layout toggle split";
      "${shared_config.modifier}+Shift+space" = "floating toggle";
      "${shared_config.modifier}+space" = "focus mode_toggle";
      "${shared_config.modifier}+a" = "focus parent";
      "${shared_config.modifier}+Shift+minus" = "move scratchpad";
      "${shared_config.modifier}+minus" = "scratchpad show";
      "${shared_config.modifier}+1" = "workspace number 1";
      "${shared_config.modifier}+2" = "workspace number 2";
      "${shared_config.modifier}+3" = "workspace number 3";
      "${shared_config.modifier}+4" = "workspace number 4";
      "${shared_config.modifier}+5" = "workspace number 5";
      "${shared_config.modifier}+6" = "workspace number 6";
      "${shared_config.modifier}+7" = "workspace number 7";
      "${shared_config.modifier}+8" = "workspace number 8";
      "${shared_config.modifier}+9" = "workspace number 9";
      "${shared_config.modifier}+0" = "workspace number 10";
      "${shared_config.modifier}+Shift+1" =
        "move container to workspace number 1";
      "${shared_config.modifier}+Shift+2" =
        "move container to workspace number 2";
      "${shared_config.modifier}+Shift+3" =
        "move container to workspace number 3";
      "${shared_config.modifier}+Shift+4" =
        "move container to workspace number 4";
      "${shared_config.modifier}+Shift+5" =
        "move container to workspace number 5";
      "${shared_config.modifier}+Shift+6" =
        "move container to workspace number 6";
      "${shared_config.modifier}+Shift+7" =
        "move container to workspace number 7";
      "${shared_config.modifier}+Shift+8" =
        "move container to workspace number 8";
      "${shared_config.modifier}+Shift+9" =
        "move container to workspace number 9";
      "${shared_config.modifier}+Shift+0" =
        "move container to workspace number 10";
      "${shared_config.modifier}+Shift+c" = "reload";
      "${shared_config.modifier}+Shift+r" = "restart";
      "${shared_config.modifier}+r" = "mode resize";
      "XF86MonBrightnessUp" = "exec brightnessctl s +5%";
      "XF86MonBrightnessDown" = "exec brightnessctl s 5%-";
    };
  } cfg.extraSharedConfig;
 in {
  options.home.i3_sway = {
    extraSharedConfig = mkOption {
      default = {};
    };
    extraI3Config = mkOption {
      default = {};
    };
    extraSwayConfig = mkOption {
      default = {};
    };
  };
  config = {
    xsession.windowManager.i3 = let
      base_i3_config = recursiveUpdate shared_config {
        keybindings = {
          "${shared_config.modifier}+Shift+e" =
            "exec i3-nagbar -t warning -m 'Do you want to exit i3?' -b 'Yes' 'i3-msg exit'";
        };
      };
    in {
      enable = true;
      config = recursiveUpdate base_i3_config cfg.extraI3Config;
    };
    wayland.windowManager.sway = let
      base_sway_config = recursiveUpdate shared_config {
        keybindings = {
          "${shared_config.modifier}+Shift+e" =
            "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
        };
        input = {
          "type:keyboard" = {
            xkb_options = "caps:escape";
          };
          "type:touchpad" = {
            tap = "enabled";
            tap_button_map = "lrm";
            drag = "enabled";
            natural_scroll = "disabled";
            dwt = "enabled";
          };
        };
      };
    in {
      enable = true;
      config = recursiveUpdate base_sway_config cfg.extraSwayConfig;
    };
  };
 }
--- a/home/modules/plasma-manager/default.nix
+++ b/home/modules/plasma-manager/default.nix
@@ -0,0 +1,127 @@
 { config, lib, pkgs, ... }:
 # The current KDE config can be output with the command:
 # nix run github:nix-community/plasma-manager
 #
 # Plasma-manager options documentation
 # https://nix-community.github.io/plasma-manager/options.xhtml
 #
 # TODO: (ambitious) Add Kmail support to plasma-manager
 {
  programs.plasma = {
    enable = true;
    overrideConfig = true;
    hotkeys.commands."launch-konsole" = {
      name = "Launch Konsole";
      key = "Meta+Return";
      command = "konsole";
    };
    shortcuts = {
      kmix = {
        "decrease_microphone_volume" = "Microphone Volume Down";
        "decrease_volume" = "Volume Down";
        "decrease_volume_small" = "Shift+Volume Down";
        "increase_microphone_volume" = "Microphone Volume Up";
        "increase_volume" = "Volume Up";
        "increase_volume_small" = "Shift+Volume Up";
        "mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
        "mute" = "Volume Mute";
      };
      mediacontrol = {
        "mediavolumedown" = "none,,Media volume down";
        "mediavolumeup" = "none,,Media volume up";
        "nextmedia" = "Media Next";
        "pausemedia" = "Media Pause";
        "playmedia" = "none,,Play media playback";
        "playpausemedia" = "Media Play";
        "previousmedia" = "Media Previous";
        "stopmedia" = "Media Stop";
      };
      ksmserver = {
        "Lock Session" = ["Meta+Ctrl+Q" "Screensaver" "Screensaver,Lock Session"];
      };
      kwin = {
        "Window Close" = "Meta+Shift+Q";
        "Kill Window" = "Meta+Ctrl+Esc";
        "Window Operations Menu" = "Alt+F3";
        "Window Resize" = "Meta+R,,Resize Window";
        "Overview" = "Meta+W";
        "Grid View" = "Meta+G";
        "Edit Tiles" = "Meta+T";
        "Activate Window Demanding Attention" = "Meta+Ctrl+A";
        "Show Desktop" = "Meta+D";
        "Walk Through Windows" = "Alt+Tab";
        "Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
        "Walk Through Windows of Current Application" = "Alt+`";
        "Walk Through Windows of Current Application (Reverse)" = "Alt+~";
        "Window Fullscreen" = "Meta+Shift+F,,Make Window Fullscreen";
        "Window Quick Tile Bottom" = "Meta+Down";
        "Window Quick Tile Left" = "Meta+Left";
        "Window Quick Tile Right" = "Meta+Right";
        "Window Quick Tile Top" = "Meta+Up";
        "view_actual_size" = "Meta+0";
        "view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
        "view_zoom_out" = "Meta+-";
      };
      "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down";
      "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down";
      "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down";
      "org_kde_powerdevil"."Hibernate" = "Hibernate";
      "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up";
      "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up";
      "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up";
      "org_kde_powerdevil"."PowerDown" = "Power Down";
      "org_kde_powerdevil"."PowerOff" = "Power Off";
      "org_kde_powerdevil"."Sleep" = "Sleep";
      "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off";
      "org_kde_powerdevil"."Turn Off Screen" = [ ];
      "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"];
      plasmashell = {
        "activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
        "activate task manager entry 1" = "none,,";
        "activate task manager entry 2" = "none,,";
        "activate task manager entry 3" = "none,,";
        "activate task manager entry 4" = "none,,";
        "activate task manager entry 5" = "none,,";
        "activate task manager entry 6" = "none,,";
        "activate task manager entry 7" = "none,,";
        "activate task manager entry 8" = "none,,";
        "activate task manager entry 9" = "none,,";
        "activate task manager entry 10" = "none,,";
        "show activity switcher" = "none,,";
      };
    };
    configFile = {
      kwinrc.Desktops.Number = {
        value = 10;
        immutable = true;
      };
      kcminputrc.Libinput = {
        AccelerationProfile = "adaptive";
        PointerAcceleration = 0.5;
      };
      kcminputrc.Mouse = {
        X11LibInputXAccelProfileFlat = false;
        XLbInptAccelProfileFlat = false;
      };
      kdeglobals.KDE.LookAndFeelPackage = "org.kde.breezedark.desktop";
    };
  };
 }
--- a/home/modules/tmux/default.nix
+++ b/home/modules/tmux/default.nix
@@ -0,0 +1,52 @@
 { config, lib, pkgs, ... }:
 let
  tokyo-night = pkgs.tmuxPlugins.mkTmuxPlugin {
    pluginName = "tokyo-night";
    rtpFilePath = "tokyo-night.tmux";
    version = "1.6.1";
    src = pkgs.fetchFromGitHub {
      owner = "janoamaral";
      repo = "tokyo-night-tmux";
      rev = "d610ced20d5f602a7995854931440e4a1e0ab780";
      sha256 = "sha256-17vEgkL7C51p/l5gpT9dkOy0bY9n8l0/LV51mR1k+V8=";
    };
  };
 in
 {
  programs.tmux.enable = true;
  programs.tmux.terminal = "tmux-direct";
  programs.tmux.keyMode = "vi";
  programs.tmux.escapeTime = 0;
  programs.tmux.mouse = true;
  programs.tmux.newSession = true;
  programs.tmux.historyLimit = 50000;
  programs.tmux.clock24 = true;
  programs.tmux.baseIndex = 1;
  programs.tmux.prefix = "M-\\\\";
  programs.tmux.plugins = with pkgs; [
    tmuxPlugins.cpu
    tmuxPlugins.battery
    tmuxPlugins.better-mouse-mode
    tmuxPlugins.net-speed
    tmuxPlugins.online-status
    tmuxPlugins.pain-control
    tmuxPlugins.tilish
    tmuxPlugins.yank
    {
      plugin = tmuxPlugins.resurrect;
      extraConfig = "set -g @resurrect-strategy-nvim 'session'";
    }
    {
      plugin = tmuxPlugins.continuum;
      extraConfig = ''
        set -g @continuum-restore 'on'
        set -g @continuum-save-interval '15' # minutes
      '';
    }
    tokyo-night
  ];
 }
--- a/machines/boxy/configuration.nix
+++ b/machines/boxy/configuration.nix
@@ -0,0 +1,69 @@
 # 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`).
 { lib, pkgs, ... }:
 with lib;
 {
  imports =
    [ # Include the results of the hardware scan.
      ./hardware-configuration.nix
    ];
  roles = {
    audio.enable = true;
    bluetooth.enable = true;
    desktop = {
      enable = true;
      gaming = true;
      kde = true;
      sddm = true;
      wayland = true;
    };
    kodi = {
      enable = true;
      autologin = false;
      wayland = true;
    };
    users.enable = true;
  };
  # Use the systemd-boot EFI boot loader.
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;
  networking.hostName = "boxy"; # Define your hostname.
  services.xserver.videoDrivers = [ "amdgpu" ];
  hardware.graphics.enable = true;
  hardware.graphics.enable32Bit = true;
  hardware.graphics.extraPackages = with pkgs; [
    amdvlk
  ];
  hardware.graphics.extraPackages32 = with pkgs; [
    driversi686Linux.amdvlk
  ];
  # 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?
 }
--- a/machines/boxy/hardware-configuration.nix
+++ b/machines/boxy/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" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
  boot.initrd.kernelModules = [ "amdgpu" ];
  boot.kernelModules = [ "kvm-amd" ];
  boot.extraModulePackages = [ ];
  fileSystems."/" =
    { device = "/dev/disk/by-uuid/5b0e8428-c9ef-41f9-8beb-a8ccb65ab573";
      fsType = "ext4";
    };
  fileSystems."/boot" =
    { device = "/dev/disk/by-uuid/59A7-C2A3";
      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.eno1.useDHCP = lib.mkDefault true;
  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/machines/live-usb/configuration.nix
+++ b/machines/live-usb/configuration.nix
@@ -0,0 +1,89 @@
 # Live USB ISO configuration for recovery and installation
 { pkgs, modulesPath, ... }:
 {
  imports = [
    # Use minimal installation CD as base
    (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
  ];
  # Use roles structure for consistent configuration
  roles = {
    audio.enable = true;
    bluetooth.enable = true;
    desktop = {
      enable = true;
      kde = true;
      x11 = true;
      wayland = true;
      sddm = true;
    };
  };
  # Allow unfree packages for broader hardware support
  nixpkgs.config.allowUnfree = true;
  # Essential packages for system recovery and installation
  environment.systemPackages = with pkgs; [
    # Text editors
    neovim
    nano
    # System tools
    git
    curl
    wget
    htop
    tree
    lsof
    strace
    # Filesystem tools
    btrfs-progs
    e2fsprogs
    xfsprogs
    ntfs3g
    dosfstools
    # Network tools
    networkmanager
    wirelesstools
    # Hardware tools
    pciutils
    usbutils
    smartmontools
    # Archive tools
    unzip
    p7zip
    # Development tools (for quick fixes)
    gcc
    binutils
  ];
  # Enable NetworkManager for easy wifi setup
  networking.networkmanager.enable = true;
  # Enable SSH daemon for remote access
  services.openssh = {
    enable = true;
    settings = {
      PermitRootLogin = "yes";
      PasswordAuthentication = true;
    };
  };
  # ISO customization
  isoImage = {
    volumeID = "NIXOS-LIVE";
  };
  # Enable some useful services
  services.udisks2.enable = true; # For mounting USB drives
  # Hardware support
  hardware.enableAllFirmware = true;
  hardware.enableRedistributableFirmware = true;
 }
--- a/machines/nix-book/configuration.nix
+++ b/machines/nix-book/configuration.nix
@@ -2,43 +2,31 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{ config, pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
  imports =
    [ # Include the results of the hardware scan.
      ./hardware-configuration.nix
    ];
-  nix = {
+  roles = {
-    package = pkgs.nixFlakes;
+    audio.enable = true;
-
+    bluetooth.enable = true;
-    distributedBuilds = true;
+    desktop = {
-    buildMachines = [{
+      enable = true;
-      hostName = "z790prors.oglehome";
+      wayland = true;
-      system = "x86_64-linux";
+      gaming = false;
-      protocol = "ssh-ng";
+      kde = true;
-      sshUser = "johno";
+      sddm = true;
      sshKey = "/root/.ssh/id_ed25519";
      maxJobs = 3;
      speedFactor = 2;
    }];
    settings = {
      experimental-features = [ "nix-command" "flakes" ];
      substituters = [ 
        "https://hyprland.cachix.org"
        #"ssh://johno@z790prors.oglehome"
      ];
      builders-use-substitutes = true;
      trusted-public-keys = [
        "arch-store:lBSsckiRVH+A2ZyZWIzPwpSFstAGXcf/d7H1lSmiFo8="
 	"z790prors:2zFp1rh6cS+2aAHwmcKKkkg13LV+x2YVuAh7TCWSckw="
 	"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
      ];
    };
    nfs-mounts.enable = true;
    printing.enable = true;
    spotifyd.enable = true;
    users = {
      enable = true;
      extraGroups = [ "video" ];
    };
    virtualisation.enable = true;
  };
  # Bootloader.
@@ -51,38 +39,10 @@
  boot.kernelPackages = pkgs.linuxPackages_latest;
  # 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/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";
  };
  # Configure keymap in X11
  services.xserver.xkb = {
    layout = "us";
    variant = "";
    options = "caps:escape";
  };
  hardware.graphics = {
    enable = true;
    extraPackages = with pkgs; [
@@ -92,52 +52,6 @@
    ];
  };
  hardware.pulseaudio.enable = true;
  # Define a user account. Don't forget to set a password with ‘passwd’.
  users.users.johno = {
    isNormalUser = true;
    description = "John Ogle";
    extraGroups = [ "networkmanager" "wheel" "audio" ];
    packages = with pkgs; [];
  };
  inputs.home-manager.users.johno = import ./home/home-nix-book.nix;
  # Enable automatic login for the user.
  services.getty.autologinUser = "johno";
  # 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
  ];
  # 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;
  };
  virtualisation.docker.enable = true;
  users.extraGroups.docker.members = [ "johno" ];
  # 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
@@ -145,21 +59,4 @@
  # 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?
  # Desktop
  programs.steam.enable = true;
  #services.xserver.enable = true;
  services.displayManager = {
    sddm.enable = true;
    sddm.wayland.enable = true;
    #defaultSession = "plasmax11";
  };
  services.desktopManager.plasma6.enable = true;
  programs.hyprland = {
    enable = true;
    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
  };
 }
--- a/machines/nix-book/hardware-configuration.nix
+++ b/machines/nix-book/hardware-configuration.nix
@@ -10,15 +10,27 @@
  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "sdhci_pci" ];
  boot.initrd.kernelModules = [ ];
  boot.initrd.luks.devices."luks-4126fbd4-bd09-4ece-af0d-6fff414c21b3".device = "/dev/disk/by-uuid/4126fbd4-bd09-4ece-af0d-6fff414c21b3";
  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];
-  fileSystems."/" =
+  roles.btrfs = {
-    { device = "/dev/disk/by-uuid/bd396529-e2c4-47cb-b844-8d6ed841f81a";
+    enable = true;
-      fsType = "ext4";
+    filesystems."/dev/disk/by-uuid/223a44e5-91e2-4272-830e-129166042a1d" = {
      mountpoints = {
        "/" = {
          compression = "zstd";
          extraOptions = [ "noatime" ];
        };
      };
      scrub.enable = true;
      deduplication = {
        enable = true;
        hashTableSizeMB = 32;
        verbosity = "err";
      };
    };
  };
  boot.initrd.luks.devices."luks-4126fbd4-bd09-4ece-af0d-6fff414c21b3".device = "/dev/disk/by-uuid/4126fbd4-bd09-4ece-af0d-6fff414c21b3";
  fileSystems."/boot" =
    { device = "/dev/disk/by-uuid/7A0B-CF88";
@@ -29,6 +41,7 @@
  swapDevices =
    [ { device = "/dev/disk/by-uuid/ec1f70ea-27b6-4646-ad3b-eac41bd83e3e"; }
    ];
  zramSwap.enable = true;
  # 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
--- a/machines/nix-book/nixbook-btrfs-migration.md
+++ b/machines/nix-book/nixbook-btrfs-migration.md
@@ -0,0 +1,223 @@
 # NixBook ext4 to btrfs Migration Guide
 ## Overview
 This guide converts your nixbook machine from ext4 to btrfs with zstd compression and beesd deduplication while preserving your LUKS encryption and all data.
 ## Current System Info
 - **Hostname**: nix-book
 - **Root filesystem**: ext4 on `/dev/disk/by-uuid/bd396529-e2c4-47cb-b844-8d6ed841f81a`
 - **Encryption**: LUKS with two devices configured
 - **Current usage**: 138GB used / 225GB total (65% full)
 - **Free space**: 76GB available (sufficient for conversion)
 ## Pre-Migration Checklist
 ### 1. Create Full System Backup (CRITICAL)
 ```bash
 # Boot from NixOS live USB
 # Mount encrypted filesystem
 cryptsetup luksOpen /dev/disk/by-uuid/4126fbd4-bd09-4ece-af0d-6fff414c21b3 luks-nixbook
 mount /dev/mapper/luks-nixbook /mnt
 # Create backup to external drive (adjust target as needed)
 rsync -avxHAX --progress /mnt/ /path/to/backup/nixbook-backup/
 ```
 ### 2. Verify Configuration Changes
 The following files have been updated for btrfs:
 - `machines/nix-book/configuration.nix` - Added beesd service
 - `machines/nix-book/hardware-configuration.nix` - Changed fsType to btrfs with compression
 ## Migration Process
 ### Phase 1: Boot to Live Environment
 1. **Create NixOS live USB**:
   ```bash
   # Download latest NixOS ISO
   # Flash to USB drive
   dd if=nixos-minimal-xx.xx-x86_64-linux.iso of=/dev/sdX bs=4M status=progress
   ```
 2. **Boot from live USB** and ensure you can access the encrypted drives
 ### Phase 2: Filesystem Conversion
 3. **Unlock LUKS volumes**:
   ```bash
   cryptsetup luksOpen /dev/disk/by-uuid/4126fbd4-bd09-4ece-af0d-6fff414c21b3 luks-nixbook
   cryptsetup luksOpen /dev/disk/by-uuid/b614167b-9045-4234-a441-ac6f60a96d81 luks-nixbook2
   ```
 4. **Check filesystem before conversion**:
   ```bash
   fsck.ext4 -f /dev/mapper/luks-nixbook
   ```
 5. **Convert ext4 to btrfs** (this preserves all data):
   ```bash
   # Install btrfs-progs if not available
   nix-shell -p btrfs-progs
   # Convert the filesystem (takes 15-45 minutes depending on data)
   btrfs-convert /dev/mapper/luks-nixbook
   # Verify conversion succeeded
   mount /dev/mapper/luks-nixbook /mnt
   ls -la /mnt  # Should show your normal filesystem
   btrfs filesystem show /mnt
   ```
 6. **Get new filesystem UUID** (may have changed):
   ```bash
   blkid /dev/mapper/luks-nixbook
   # Note the new UUID if it changed
   ```
 ### Phase 3: Configuration Update
 7. **Mount and chroot into system**:
   ```bash
   mount -o compress=zstd,noatime /dev/mapper/luks-nixbook /mnt
   mount /dev/disk/by-uuid/7A0B-CF88 /mnt/boot
   nixos-enter --root /mnt
   ```
 8. **Update hardware-configuration.nix** if UUID changed:
   ```bash
   # Edit /etc/nixos/hardware-configuration.nix if needed
   # Update the UUID in fileSystems."/" section
   ```
 9. **Rebuild system with btrfs configuration**:
   ```bash
   cd /home/johno/nixos-configs
   nixos-rebuild switch --flake .#nix-book
   ```
 ### Phase 4: Enable Compression and Deduplication
 10. **Reboot into new btrfs system**:
    ```bash
    exit  # Exit chroot
    umount -R /mnt
    reboot
    ```
 11. **Verify btrfs is working**:
    ```bash
    mount | grep btrfs
    btrfs filesystem usage /
    ```
 12. **Enable and start beesd**:
    ```bash
    systemctl status beesd-root
    systemctl start beesd-root
    systemctl enable beesd-root
    ```
 13. **Force compression on existing files** (optional but recommended):
    ```bash
    # This will compress existing files with zstd
    btrfs filesystem defragment -r -czstd /
    ```
 ## Post-Migration Verification
 ### Check System Health
 ```bash
 # Verify btrfs health
 btrfs scrub start /
 btrfs scrub status /
 # Check compression effectiveness
 compsize /
 # Monitor beesd deduplication
 journalctl -u beesd-root -f
 # Check filesystem usage
 btrfs filesystem usage /
 df -h /
 ```
 ### Performance Monitoring
 ```bash
 # Monitor beesd hash table
 ls -lh /.beeshash
 # Check compression ratio over time
 compsize /home /nix /var
 ```
 ## Expected Benefits
 ### Space Savings
 - **Compression**: 20-30% reduction in disk usage from zstd
 - **Deduplication**: Additional 10-20% savings on duplicate files
 - **Combined**: Potentially 30-40% total space savings
 ### Performance Impact
 - **Compression**: Minimal CPU overhead, often improves I/O performance
 - **Deduplication**: Background process, minimal impact during normal use
 - **Overall**: Should be neutral to positive performance impact
 ## Rollback Plan (Emergency)
 If something goes wrong:
 1. **Boot from live USB**
 2. **Restore from backup**:
   ```bash
   cryptsetup luksOpen /dev/disk/by-uuid/4126fbd4-bd09-4ece-af0d-6fff414c21b3 luks-nixbook
   mkfs.ext4 /dev/mapper/luks-nixbook
   mount /dev/mapper/luks-nixbook /mnt
   rsync -avxHAX --progress /path/to/backup/nixbook-backup/ /mnt/
   ```
 3. **Restore original hardware-configuration.nix** with ext4 settings
 4. **Rebuild and reboot**
 ## Troubleshooting
 ### Common Issues
 **"Device busy" during conversion**:
 - Ensure no processes are accessing the filesystem
 - Check with `lsof` and `fuser`
 **UUID changed after conversion**:
 - Update hardware-configuration.nix with new UUID
 - Regenerate initrd: `nixos-rebuild switch`
 **Beesd service fails to start**:
 - Check disk space for hash table
 - Verify filesystem is btrfs: `mount | grep btrfs`
 - Check logs: `journalctl -u beesd-root`
 **Boot issues after conversion**:
 - Boot from live USB
 - Check /boot partition is mounted correctly
 - Verify LUKS UUIDs match in configuration
 - Rebuild bootloader: `nixos-rebuild switch --install-bootloader`
 ## Maintenance
 ### Regular Tasks
 ```bash
 # Monthly scrub (checks for corruption)
 btrfs scrub start /
 # Monitor compression effectiveness
 compsize /
 # Check beesd deduplication status
 systemctl status beesd-root
 ```
 ### Space Management
 ```bash
 # Balance filesystem (defragments and optimizes)
 btrfs balance start -dusage=50 /
 # Check for space issues
 btrfs filesystem usage /
 ```
 This migration preserves all your data while gaining the benefits of modern btrfs features including transparent compression and automatic deduplication.
--- a/machines/wixos/configuration.nix
+++ b/machines/wixos/configuration.nix
@@ -0,0 +1,62 @@
 # 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`).
 # NixOS-WSL specific options are documented on the NixOS-WSL repository:
 # https://github.com/nix-community/NixOS-WSL
 { config, lib, pkgs, ... }:
 {
  imports = [
  ];
  roles = {
    audio.enable = true;
    desktop = {
      enable = true;
      wayland = true;
    };
    users.enable = true;
  };
  networking.hostName = "wixos";
  wsl.enable = true;
  wsl.defaultUser = "johno";
  wsl.startMenuLaunchers = true;
  wsl.useWindowsDriver = true;
  wsl.wslConf.network.hostname = "wixos";
  wsl.wslConf.user.default = "johno";
  services.xserver.videoDrivers = [ "nvidia" ];
  hardware.graphics = { 
    enable = true;
    extraPackages = with pkgs; [
      mesa
      libvdpau-va-gl
      vaapiVdpau
    ];
  };
  environment.sessionVariables = {
    LD_LIBRARY_PATH = [
      "/usr/lib/wsl/lib"
      "/run/opengl-driver/lib"
    ];
  };
  hardware.nvidia = {
    modesetting.enable = true;
    nvidiaSettings = true;
    open = true;
    package = config.boot.kernelPackages.nvidiaPackages.latest;
  };
  # 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?
 }
--- a/machines/z790prors/configuration.nix
+++ b/machines/z790prors/configuration.nix
@@ -1,173 +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’).
 { inputs, config, pkgs, ... }:
 let
  kidsPackages = with pkgs; [
    firefox
  ];
 in
 {
  imports =
    [ # Include the results of the hardware scan.
      ./hardware-configuration.nix
      ../../roles/virtualisation/default.nix
      ../../roles/nfs-mounts/default.nix
    ];
  # Use the systemd-boot EFI boot loader.
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;
  boot.loader.grub.useOSProber = true;
  networking.hostName = "z790prors-nix"; # Define your hostname.
  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
  # Set your time zone.
  time.timeZone = "America/Los_Angeles";
  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
  # Per-interface useDHCP will be mandatory in the future, so this generated config
  # replicates the default behaviour.
  networking.useDHCP = false;
  networking.interfaces.enp3s0.useDHCP = true;
  # 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";
  # };
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
  nix.settings.secret-key-files = /root/cache-priv-key.pem;
  nix.settings.max-jobs = "auto";
  nix.settings.trusted-users = [ "johno" ];
  nix.settings.substituters = [
    "https://hyprland.cachix.org"
  ];
  nix.settings.trusted-public-keys = [
    "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
  ];
  nixpkgs.config.allowUnfree = true;
  # Enable the X11 windowing system.
  services.xserver.enable = true;
  hardware.graphics.enable = true;
  services.xserver.videoDrivers = ["nvidia"];
  hardware.nvidia = {
    modesetting.enable = true;
    powerManagement.enable = false;
    powerManagement.finegrained = false;
    open = false;
    nvidiaSettings = true;
    package = config.boot.kernelPackages.nvidiaPackages.production;
  };
  # Configure keymap in X11
  # services.xserver.layout = "us";
  # services.xserver.xkbOptions = "eurosign:e";
  # Enable CUPS to print documents.
  # services.printing.enable = true;
  # Enable sound.
  hardware.pulseaudio.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.johno = {
    isNormalUser = true;
    description = "John Ogle";
    extraGroups = [ "wheel" "networkmanager" "audio" "libvirtd" ]; # Enable ‘sudo’ for the user.
  };
  users.users.eli = {
    isNormalUser = true;
    description = "Eli";
    home = "/arch/@home/eli";
    packages = kidsPackages;
  };
  users.users.andrew = {
    isNormalUser = true;
    description = "Andrew";
    home = "/arch/@home/andrew";
    packages = kidsPackages;
  };
  users.users.jules = {
    isNormalUser = true;
    description = "Jules";
    home = "/arch/@home/jules";
    packages = kidsPackages;
  };
  # 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.
    git
  ];
  # 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;
  services.displayManager = {
    sddm.enable = true;
    sddm.wayland.enable = true;
    #defaultSession = "plasmax11";
  };
  services.desktopManager.plasma6.enable = true;
  programs.hyprland = {
    enable = true;
    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
  };
  programs.java.enable = true;
  programs.steam = {
    enable = true;
    remotePlay.openFirewall = true;
    localNetworkGameTransfers.openFirewall = true;
    #package = pkgs.steam.override {
      #withJava = true;
      #withPrimus = true;
      #extraPkgs = pkgs: [ bumblebee glxinfo ];
    #};
  };
  # 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 = "21.11"; # Did you read the comment?
 }
--- a/machines/z790prors/hardware-configuration.nix
+++ b/machines/z790prors/hardware-configuration.nix
@@ -1,35 +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 = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];
  fileSystems."/" =
    { device = "/dev/disk/by-uuid/8d996d13-6d55-4524-83a2-6f6fb47a09ea";
      fsType = "btrfs";
    };
  fileSystems."/boot" =
    { device = "/dev/disk/by-uuid/7445-C336";
      fsType = "vfat";
    };
  fileSystems."/arch" =
    { device = "/dev/disk/by-label/endeavouros";
      fsType = "btrfs";
    };
  swapDevices = [ ];
  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -0,0 +1,4 @@
 { pkgs, ... }:
 {
  vulkanHDRLayer = pkgs.callPackage ./vulkan-hdr-layer {};
 }
--- a/packages/vulkan-hdr-layer/default.nix
+++ b/packages/vulkan-hdr-layer/default.nix
@@ -0,0 +1,34 @@
 { lib, stdenv, fetchFromGitHub, meson, pkg-config, vulkan-loader, ninja, writeText, vulkan-headers, vulkan-utility-libraries,  jq, libX11, libXrandr, libxcb, wayland, wayland-scanner }:
 stdenv.mkDerivation rec {
  pname = "vulkan-hdr-layer";
  version = "63d2eec";
  src = (fetchFromGitHub {
    owner = "Zamundaaa";
    repo = "VK_hdr_layer";
    rev = "869199cd2746e7f69cf19955153080842b6dacfc";
    fetchSubmodules = true;
    hash = "sha256-xfVYI+Aajmnf3BTaY2Ysg5fyDO6SwDFGyU0L+F+E3is=";
  }).overrideAttrs (_: {
    GIT_CONFIG_COUNT = 1;
    GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
    GIT_CONFIG_VALUE_0 = "git@github.com:";
  });
  nativeBuildInputs = [ vulkan-headers meson ninja pkg-config jq ];
  buildInputs = [ vulkan-headers vulkan-loader vulkan-utility-libraries libX11 libXrandr libxcb wayland wayland-scanner ];
  # Help vulkan-loader find the validation layers
  setupHook = writeText "setup-hook" ''
    addToSearchPath XDG_DATA_DIRS @out@/share
  '';
  meta = with lib; {
    description = "Layers providing Vulkan HDR";
    homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
    platforms = platforms.linux;
    license = licenses.mit;
  };
 }
--- a/roles/audio/default.nix
+++ b/roles/audio/default.nix
@@ -0,0 +1,40 @@
 { lib, config, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.audio;
 in
 {
  options.roles.audio = {
    enable = mkEnableOption "Enable the audio role";
  };
  config = mkIf cfg.enable
    {
      environment.systemPackages = with pkgs; [
        paprefs
        pavucontrol
        pulsemixer
      ];
      services.pipewire = {
        enable = true;
        pulse.enable = true;
      };
      services.pulseaudio = {
        package = pkgs.pulseaudioFull;
        extraConfig = ''
          load-module module-combine-sink
          load-module module-switch-on-connect
        '';
      };
      services.squeezelite = {
        #enable = true;
        pulseAudio = true;
      };
    };
 }
--- a/roles/bluetooth/default.nix
+++ b/roles/bluetooth/default.nix
@@ -0,0 +1,26 @@
 { lib, config, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.bluetooth;
 in
 {
  options.roles.bluetooth = {
    enable = mkEnableOption "Enable the bluetooth role";
  };
  config = mkIf cfg.enable
    {
      hardware.bluetooth.enable = true;
      hardware.bluetooth.powerOnBoot = true;
      hardware.bluetooth.settings = {
        General = {
          Enable = "Source,Sink,Media,Socket";
        };
      };
      services.blueman.enable = true;
    };
 }
--- a/roles/btrfs/default.nix
+++ b/roles/btrfs/default.nix
@@ -0,0 +1,168 @@
 { lib, config, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.btrfs;
 in
 {
  options.roles.btrfs = {
    enable = mkEnableOption "Enable btrfs filesystem management";
    filesystems = mkOption {
      type = types.attrsOf (types.submodule {
        options = {
          # Filesystem-level maintenance options
          scrub = {
            enable = mkOption { 
              type = types.bool; 
              default = true;
              description = "Enable automatic scrubbing for this filesystem";
            };
            interval = mkOption { 
              type = types.str; 
              default = "weekly";
              description = "Scrub interval (systemd timer format)";
            };
          };
          deduplication = {
            enable = mkOption { 
              type = types.bool; 
              default = false;
              description = "Enable beesd deduplication for this filesystem";
            };
            hashTableSizeMB = mkOption { 
              type = types.int; 
              default = 1024;
              description = "Hash table size in MB (should be multiple of 16)";
            };
            verbosity = mkOption { 
              type = types.str; 
              default = "info";
              description = "Logging verbosity level";
            };
          };
          balance = {
            enable = mkOption { 
              type = types.bool; 
              default = false;
              description = "Enable periodic balance operations";
            };
            interval = mkOption { 
              type = types.str; 
              default = "monthly";
              description = "Balance interval (systemd timer format)";
            };
            dataUsage = mkOption { 
              type = types.int; 
              default = 50;
              description = "Data usage threshold for balance";
            };
            metadataUsage = mkOption { 
              type = types.int; 
              default = 50;
              description = "Metadata usage threshold for balance";
            };
          };
          # Mountpoint-based configuration
          mountpoints = mkOption {
            type = types.attrsOf (types.submodule {
              options = {
                subvolume = mkOption { 
                  type = types.nullOr types.str; 
                  default = null;
                  description = "Subvolume name. If null, uses default subvolume.";
                };
                compression = mkOption { 
                  type = types.str; 
                  default = "zstd";
                  description = "Compression algorithm (zstd, lzo, lz4, none)";
                };
                autodefrag = mkOption { 
                  type = types.bool; 
                  default = false;
                  description = "Enable automatic defragmentation";
                };
                extraOptions = mkOption { 
                  type = types.listOf types.str; 
                  default = [];
                  description = "Additional mount options";
                };
              };
            });
            default = {};
            description = "Mountpoint configurations for this filesystem";
          };
        };
      });
      default = {};
      description = "Btrfs filesystems configuration";
    };
  };
  config = mkIf cfg.enable {
    # Generate fileSystems configuration from mountpoints
    fileSystems = mkMerge (flatten (mapAttrsToList (device: fsCfg:
      mapAttrsToList (mountpoint: mountCfg:
        {
          ${mountpoint} = {
            device = device;
            fsType = "btrfs";
            options = 
              (optional (mountCfg.subvolume != null) "subvol=${mountCfg.subvolume}") ++
              [ "compress=${mountCfg.compression}" ] ++
              (optional mountCfg.autodefrag "autodefrag") ++
              mountCfg.extraOptions;
          };
        }
      ) fsCfg.mountpoints
    ) cfg.filesystems));
    # Configure scrub service using NixOS built-in
    services.btrfs.autoScrub = mkIf (any (fs: fs.scrub.enable) (attrValues cfg.filesystems)) {
      enable = true;
      interval = "weekly"; # TODO: Make this configurable per filesystem
      fileSystems = attrNames (filterAttrs (_: fs: fs.scrub.enable) cfg.filesystems);
    };
    # Configure beesd for filesystems with deduplication enabled
    services.beesd.filesystems = mapAttrs' (device: fsCfg: 
      nameValuePair (replaceStrings ["/"] ["_"] (replaceStrings ["-"] ["_"] device)) {
        spec = device;
        hashTableSizeMB = fsCfg.deduplication.hashTableSizeMB;
        verbosity = fsCfg.deduplication.verbosity;
      }
    ) (filterAttrs (_: fs: fs.deduplication.enable) cfg.filesystems);
    # Custom balance services for filesystems with balance enabled
    systemd.services = mkMerge (mapAttrsToList (device: fsCfg: mkIf fsCfg.balance.enable {
      "btrfs-balance-${replaceStrings ["/"] ["-"] (replaceStrings ["-"] ["_"] device)}" = {
        description = "Balance btrfs filesystem ${device}";
        script = ''
          ${pkgs.btrfs-progs}/bin/btrfs balance start \
            -dusage=${toString fsCfg.balance.dataUsage} \
            -musage=${toString fsCfg.balance.metadataUsage} \
            ${device}
        '';
        serviceConfig = {
          Type = "oneshot";
          Nice = 19;
          IOSchedulingClass = "idle";
        };
      };
    }) cfg.filesystems);
    # Balance timers
    systemd.timers = mkMerge (mapAttrsToList (device: fsCfg: mkIf fsCfg.balance.enable {
      "btrfs-balance-${replaceStrings ["/"] ["-"] (replaceStrings ["-"] ["_"] device)}" = {
        description = "Periodic balance for ${device}";
        wantedBy = [ "timers.target" ];
        timerConfig = {
          OnCalendar = fsCfg.balance.interval;
          Persistent = true;
        };
      };
    }) cfg.filesystems);
  };
 }
--- a/roles/default.nix
+++ b/roles/default.nix
@@ -0,0 +1,88 @@
 { lib, pkgs, ... }:
 with lib;
 {
  imports = [
    ./audio
    ./bluetooth
    ./btrfs
    ./desktop
    ./kodi
    ./nfs-mounts
    ./printing
    ./spotifyd
    ./users
    ./virtualisation
  ];
  config = {
    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";
    };
    time.timeZone = "America/Los_Angeles";
    services.xserver.xkb = {
      layout = "us";
      variant = "";
      options = "caps:escape";
    };
    # Don't go to emergency mode if we aren't able to mount filesystems.
    # This is silly if you have multiple hard drives or partitions
    # configured on a machine and then one goes away intentionally or
    # unintentionally. If the system is already booting, let it continue
    # to try and boot.
    systemd.enableEmergencyMode = false;
    # Enable the OpenSSH daemon.
    services.openssh.enable = true;
    environment.systemPackages = with pkgs; [
      git
      glances
      pciutils
      tree
      usbutils
      vim
    ];
    nix = {
      package = pkgs.nix;
      # distributedBuilds = true;
      # buildMachines = [{
      #   hostName = "z790prors.oglehome";
      #   system = "x86_64-linux";
      #   protocol = "ssh-ng";
      #   sshUser = "johno";
      #   sshKey = "/root/.ssh/id_ed25519";
      #   maxJobs = 3;
      #   speedFactor = 2;
      # }];
      settings = {
        experimental-features = [ "nix-command" "flakes" ];
        max-jobs = "auto";
        trusted-users = [ "johno" ];
        substituters = [
        ];
      };
      gc = {
        automatic = true;
        randomizedDelaySec = "14m";
        options = "--delete-older-than 10d";
      };
    };
    nixpkgs.config.allowUnfree = true;
  };
 }
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -0,0 +1,24 @@
 { lib, config, pkgs, ... }:
 with lib;
 {
  options.roles.desktop = {
    enable = mkEnableOption "Enable the desktop role.";
    x11 = mkOption { type = types.bool; default = false; description = "Enable X11 support."; };
    wayland = mkOption { type = types.bool; default = false; description = "Enable Wayland support."; };
    kde = mkOption { type = types.bool; default = false; description = "Enable KDE."; };
    gaming = mkOption { type = types.bool; default = false; description = "Enable gaming support."; };
    sddm = mkOption { type = types.bool; default = false; description = "Enable SDDM greeter."; };
  };
  imports = [
    ./x11.nix
    ./wayland.nix
    ./gaming.nix
    ./kde.nix
    ./programs.nix
    ./sddm.nix
  ];
 }
--- a/roles/desktop/gaming.nix
+++ b/roles/desktop/gaming.nix
@@ -0,0 +1,18 @@
 { lib, config, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.desktop;
 in
 {
  config = mkIf (cfg.enable && cfg.gaming) {
    environment.systemPackages = with pkgs; [
      steam
      lutris
      moonlight
    ];
    # Possibly other gaming specific services or settings
  };
 }
--- a/roles/desktop/kde.nix
+++ b/roles/desktop/kde.nix
@@ -0,0 +1,12 @@
 { config, lib, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.desktop;
 in
 {
  config = mkIf (cfg.enable && cfg.kde) {
    services.desktopManager.plasma6.enable = true;
  };
 }
--- a/roles/desktop/programs.nix
+++ b/roles/desktop/programs.nix
@@ -0,0 +1,20 @@
 { lib, config, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.desktop;
 in
 {
  config = mkIf cfg.enable {
    environment.systemPackages = with pkgs; [
      brightnessctl
      emacs-nox
      moonlight-qt
    ];
    programs.dconf.enable = true;
    services.gnome.gnome-keyring.enable = true;
    programs.kdeconnect.enable = true;
  };
 }
--- a/roles/desktop/sddm.nix
+++ b/roles/desktop/sddm.nix
@@ -0,0 +1,15 @@
 { lib, config, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.desktop;
 in
 {
  config = mkIf (cfg.enable && cfg.sddm) {
    services.displayManager.sddm = {
      enable = true;
      wayland.enable = (!cfg.x11 && cfg.wayland);
    };
  };
 }
--- a/roles/desktop/wayland.nix
+++ b/roles/desktop/wayland.nix
@@ -0,0 +1,23 @@
 { lib, config, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.desktop;
 in
 {
  config = mkIf (cfg.enable && cfg.wayland) {
    programs.sway = {
      enable = true;
      wrapperFeatures.gtk = true;
    };
    programs.light.enable = true;
    environment.systemPackages = with pkgs; [
      grim
      slurp
      wl-clipboard
      mako
    ];
  };
 }
--- a/roles/desktop/x11.nix
+++ b/roles/desktop/x11.nix
@@ -0,0 +1,19 @@
 { lib, config, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.desktop;
 in
 {
  config = mkIf (cfg.enable && cfg.x11) {
    services.xserver = {
      enable = true;
      windowManager.i3 = {
        enable = true;
        extraPackages = with pkgs; [ dmenu i3status i3lock ];
      };
    };
  };
 }
--- a/roles/kodi/default.nix
+++ b/roles/kodi/default.nix
@@ -0,0 +1,56 @@
 { config, lib, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.kodi;
 in
 {
  options.roles.kodi = {
    enable = mkEnableOption "Enable Kodi";
    autologin = mkOption {
      default = false;
    };
    wayland = mkOption {
      default = true;
    };
  };
  config = let
    kodiBasePkg = if cfg.wayland then pkgs.kodi-wayland else pkgs.kodi;
    kodiPkg = kodiBasePkg.withPackages (pkgs: with pkgs; [
      jellyfin
      steam-launcher
      steam-library
      youtube
    ]);
  in mkIf cfg.enable
    {
      users.extraUsers.kodi = {
        isNormalUser = true;
        extraGroups = [ "wheel" "networkmanager" "audio" "video" ];
      };
      networking.firewall = {
        allowedTCPPorts = [ 8080 ];
        allowedUDPPorts = [ 8080 ];
      };
      environment.systemPackages = with pkgs; [
        kodiPkg
        wget
      ];
      programs.kdeconnect.enable = true;
      services = if cfg.autologin then {
          displayManager = {
            autoLogin.enable = true;
            autoLogin.user = "kodi";
            defaultSession = "kodi";
            sessionData.autologinSession = "plasma";
          };
      } else {};
    };
 }
--- a/roles/nfs-mounts/default.nix
+++ b/roles/nfs-mounts/default.nix
@@ -1,8 +1,31 @@
-{ config, ... }:
+{ config, lib, ... }:
 with lib;
 let
  cfg = config.roles.nfs-mounts;
 in
 {
  options.roles.nfs-mounts = {
    enable = mkEnableOption "Enable default NFS mounts";
    # TODO: implement requireMount
    requireMount = mkOption {
      type = types.bool;
      description = "Hard fail if the NFS mounts are not available";
      default = false;
    };
  };
  config = mkIf cfg.enable
    {
      fileSystems."/media" = {
        device = "10.0.0.43:/media";
        fsType = "nfs";
        options = [
          "defaults"
          "nofail"
          "softreval"
        ];
      };
    };
 }
--- a/roles/printing/default.nix
+++ b/roles/printing/default.nix
@@ -0,0 +1,30 @@
 { config, lib, ... }:
 with lib;
 let
  cfg = config.roles.printing;
 in
 {
  options.roles.printing = {
    enable = mkEnableOption "Enable default printing setup";
  };
  config = mkIf cfg.enable
    {
      services.printing.enable = true;
      services.avahi = {
        enable = true;
        nssmdns4 = true;
        openFirewall = true;
      };
      hardware.printers.ensurePrinters = [{
        name = "MFC-L8900CDW_series";
        deviceUri = "dnssd://Brother%20MFC-L8900CDW%20series._ipp._tcp.local/?uuid=e3248000-80ce-11db-8000-b422006699d8";
        model = "everywhere";
      }];
      hardware.printers.ensureDefaultPrinter = "MFC-L8900CDW_series";
    };
 }
--- a/roles/spotifyd/default.nix
+++ b/roles/spotifyd/default.nix
@@ -0,0 +1,40 @@
 { config, lib, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.spotifyd;
 in
 {
  options.roles.spotifyd = {
    enable = mkEnableOption "Enable the spotifyd role";
  };
  config = mkIf cfg.enable
    {
      roles.audio.enable = true;
      services.spotifyd = {
        enable = true;
        settings = {
          global = {
            use_mpris = false;
            backend = "alsa";
            device = "sysdefault";
            bitrate = 320;
            cache_path = "";
            zeroconf_port = 1234;
            autoplay = false;
          };
        };
      };
      networking.firewall.allowedTCPPorts = [
        1234
        57621
      ];
      networking.firewall.allowedUDPPorts = [
        5353
      ];
    };
 }
--- a/roles/users/default.nix
+++ b/roles/users/default.nix
@@ -0,0 +1,52 @@
 { config, lib, pkgs, ... }:
 with lib;
 let
  cfg = config.roles.users;
 in
 {
  options.roles.users = {
    enable = mkEnableOption "Enable default users";
    extraGroups = mkOption {
      default = [];
    };
    kids = mkOption {
      type = types.bool;
      default = false;
    };
  };
  config = let
    kidsPackages = with pkgs; [
      firefox
    ];
  in mkIf cfg.enable {
    users.users.johno = {
      isNormalUser = true;
      description = "John Ogle";
      extraGroups = [ "wheel" "networkmanager" "audio" "video" ] ++ cfg.extraGroups;
    };
    users.users.eli = mkIf cfg.kids {
      isNormalUser = true;
      description = "Eli";
      home = "/home/eli";
      packages = kidsPackages;
    };
    users.users.andrew = mkIf cfg.kids {
      isNormalUser = true;
      description = "Andrew";
      home = "/home/andrew";
      packages = kidsPackages;
    };
    users.users.jules = mkIf cfg.kids {
      isNormalUser = true;
      description = "Jules";
      home = "/home/jules";
      packages = kidsPackages;
    };
  };
 }
--- a/roles/virtualisation/default.nix
+++ b/roles/virtualisation/default.nix
@@ -1,6 +1,20 @@
-{ config, ... }:
+{ config, lib, ... }:
 with lib;
 let
  cfg = config.roles.virtualisation;
 in
 {
  options.roles.virtualisation = {
    enable = mkEnableOption "Enable virtualisation";
  };
  config = mkIf cfg.enable
    {
      virtualisation.libvirtd.enable = true;
      programs.virt-manager.enable = true;
      virtualisation.docker.enable = true;
      users.extraGroups.docker.members = [ "johno" ];
    };
 }
Author	SHA1	Message	Date
John Ogle	a3c8995422	[btrfs] Add role and migrate nix-book	2025-07-29 16:14:29 -07:00
John Ogle	b9bb5d387f	[nix-book] Update drive UUID	2025-07-29 15:48:04 -07:00
John Ogle	e3aff80a97	[nix-book] Add beesd	2025-07-29 15:48:04 -07:00
John Ogle	574c8e6482	[nix-book] Update file system type to btrfs	2025-07-29 15:48:04 -07:00
John Ogle	0f59a558cd	[nix-book] Add btrfs migration plan	2025-07-29 15:48:04 -07:00
John Ogle	14b7de30f6	[live-usb] Clean up config Also switched from trying to override the `nixos` user to instead just installing home-manager _into_ the `nixos` user. It felt a bit like fighting the tide otherwise.	2025-07-29 15:29:48 -07:00
John Ogle	8b676203e7	[live-usb] Add a build script	2025-07-29 12:15:36 -07:00
John Ogle	beeb7acefd	[live-usb] Clean up the configuration	2025-07-29 12:15:25 -07:00
John Ogle	a512d9bc06	[live-usb] Add live-usb machine configuration	2025-07-29 12:01:38 -07:00
John Ogle	cc3d398963	[printing] Ensure Brother printer is found	2025-07-23 19:47:43 -07:00
John Ogle	f757ea7271	[kodi] Add kdeconnect	2025-07-19 14:55:35 -07:00
John Ogle	64149713d2	[home] Add k8s management apps	2025-07-16 22:38:19 -07:00
John Ogle	88b413e0af	[nixbook] disable gaming	2025-07-16 18:52:51 -07:00
John Ogle	c5070eb4bf	[home] Re-enable openscad-unstable	2025-07-13 12:07:01 -07:00
John Ogle	6b4dc1e6b7	Add CLAUDE.md	2025-07-13 12:06:55 -07:00
John Ogle	aadd8c7b6c	[home] Add claude-code	2025-07-13 12:06:46 -07:00
John Ogle	f8d145b495	[secrets] Remove altogether I'm standardizing on bitwarden and rbw for secrets. No need to build out a separate secret management system. The complexity of this was just not worth it for my effectively single-user workflows	2025-07-13 11:08:42 -07:00
John Ogle	9232d46f6a	[wixos] Add users role	2025-07-13 11:06:49 -07:00
John Ogle	b2b34fc05f	[flake] update	2025-07-13 10:44:00 -07:00
John Ogle	aa4dacb3af	Add bootstrap script Adds a very simple bootstrap script for setting up a new host. I'm not exactly sure the best way to use this yet. Though I suppose it could be run with some sort of "curl https://blahblah \| bash" shenanigans. That just seems like it would be about as much effort as just running the nixos-rebuild command itself from a new host. In any case though, this worked well for bootstrapping a new wixos instance. So that was nice.	2025-07-13 10:28:52 -07:00
John Ogle	6dc4d6956a	[doom] defer loading gptel This prevents the rbw auth prompt from appearing until it is actually needed	2025-07-13 10:27:52 -07:00
John Ogle	be83fc566f	[wixos] remove deprecated reference	2025-07-13 10:16:31 -07:00
John Ogle	485df44aea	[home] Add snapcast	2025-06-07 09:41:39 -07:00
John Ogle	4861128de6	[doom] Add gptel	2025-05-28 18:45:20 -07:00
John Ogle	9fe7cfbbfc	[home] Add codex	2025-05-27 19:35:26 -07:00
John Ogle	741e3a67d6	[doom] unset DOOMPROFILE	2025-05-27 19:35:16 -07:00
John Ogle	22254eb1f3	[doom] bump version	2025-05-27 19:02:34 -07:00
John Ogle	79dde1a0fe	[flake] update	2025-05-26 11:28:26 -07:00
John Ogle	f4b3c36a4e	[openscad] Disable for now	2025-05-26 11:27:27 -07:00
John Ogle	1fa7a2689c	[home] Add openscad-unstable	2025-05-26 11:23:56 -07:00
John Ogle	c08c5e2486	[emacs] Remove doom-emacs-unstraightened	2025-05-26 11:23:50 -07:00
John Ogle	ecaa6dcb83	[flake] update	2025-03-16 15:44:01 -07:00
John Ogle	7729ff7434	[desktop] Fix moonlight package	2025-03-16 15:43:54 -07:00
John Ogle	52c110a505	[boxy] Enhance graphics drivers	2025-03-16 15:43:41 -07:00
John Ogle	d5997575df	[boxy] Add sddm config	2025-03-16 14:34:19 -07:00
John Ogle	57bc35101e	[kodi] Setup extra groups	2025-03-16 14:34:12 -07:00
John Ogle	6b09b1b0bc	[desktop] Add moonlight	2025-03-16 14:33:58 -07:00
John Ogle	1851743a21	[desktop] Finish programs refactor	2025-03-16 14:33:44 -07:00
John Ogle	c6d787f9f5	[boxy] Enable bluetooth	2025-03-16 14:33:00 -07:00
John Ogle	f4a8f9d614	[home] Remove nixpkgs config Need to find some better way of doing this so that it works across home-manager-only installations as well as nixos home manager module installations.	2025-03-08 14:46:47 -08:00
John Ogle	1e01d44f2f	wip	2025-03-08 14:46:39 -08:00
John Ogle	39dbe6644c	[kodi] Add moonlight-embedded	2025-03-07 14:51:39 -08:00
John Ogle	870e1073dc	[home] Switch from gpg-agent to gnome-keyring	2025-03-05 13:30:32 -08:00
John Ogle	c1f132026a	[home] Remove some accidental non-working update	2025-03-05 13:25:39 -08:00
John Ogle	5650125d7e	Add .goosehints	2025-03-05 13:25:08 -08:00
John Ogle	6536213bd0	[home] Remove autoUpgrade Flakes make this irrelevant	2025-03-05 13:24:51 -08:00
John Ogle	a0ce3b810e	[home] Fix support for non-NixOS systems	2025-03-05 13:24:38 -08:00
John Ogle	abbcfebc97	[doom] Restore	2025-03-05 12:33:45 -08:00
John Ogle	495aba3fef	[home] Support standalone home manager	2025-03-05 12:33:32 -08:00
John Ogle	f9bcec74d3	Revert "[audio] Setup squeezelite" This reverts commit `1d0b3a0367`.	2025-03-04 12:50:46 -08:00
John Ogle	97c4d7035c	[squeezelite] Disable for now	2025-02-17 12:46:56 -08:00
John Ogle	8abd331619	[home] Add google-cookie-retrieval	2025-02-17 12:44:14 -08:00
John Ogle	aca0afa0dc	[flake] Remove z790prors	2025-02-17 12:35:16 -08:00
John Ogle	1d0b3a0367	[audio] Setup squeezelite	2025-02-16 18:41:50 -08:00
John Ogle	50f9defdd5	[wixos] Add audio role	2025-02-16 18:40:07 -08:00
John Ogle	d71d7a1ffb	Remove more gaming stuff	2025-02-16 11:21:20 -08:00
John Ogle	ee511f6ab8	[wixos] Get nvidia drivers working I think	2025-02-16 11:21:04 -08:00
John Ogle	e3dd0bdb30	[flake] Update	2025-02-16 11:20:12 -08:00
John Ogle	10300ed10b	[desktop] Fix sddm import	2025-02-15 11:54:28 -08:00
John Ogle	8e72ef71d2	[machines] Remove z790prors	2025-02-15 10:24:02 -08:00
John Ogle	d6e031efd0	[desktop] Refactor into multiple components	2025-02-15 10:23:33 -08:00
John Ogle	16fa4a641c	Add goosehints	2025-02-15 09:38:14 -08:00
John Ogle	7a5ec23cc5	[home] Add goose (honk)	2025-02-12 19:32:15 -08:00
John Ogle	ff1124fbe6	[doom] Disable unstraightened for now	2025-02-07 07:19:57 -08:00
John Ogle	53088f9536	[wixos] Add desktop role	2025-02-07 07:19:50 -08:00
John Ogle	68c04b43fd	[default] Add glances	2025-02-07 07:19:42 -08:00
John Ogle	efbfffbb61	[gaming] Abandon for now	2025-02-07 07:18:09 -08:00
John Ogle	0e1a67b980	[flake] update	2025-02-07 07:17:30 -08:00
John Ogle	7d6e294340	[tmux] Change prefix to M-\	2025-02-01 12:09:15 -08:00
John Ogle	8690a0289d	[tmux] Remove shift+arrow window nav This was conflicting with operations like manipulating dates in org-mode	2025-02-01 11:29:56 -08:00
John Ogle	e95f56e240	[z790prors] Remove kids accounts	2025-02-01 10:58:49 -08:00
John Ogle	2dffbb0a98	[packages] Use nixpkgs for nextcloud-talk-desktop	2025-02-01 10:58:25 -08:00
John Ogle	2ceaf78825	[default] Disable distributed builds (for now)	2025-01-30 20:37:32 -08:00
John Ogle	e164097f36	Add wixos	2025-01-30 14:17:43 -08:00
John Ogle	d1605e386d	[tmux] Update default terminal and keyMode	2025-01-30 14:17:14 -08:00
John Ogle	4a41533ba8	[z790prors] Use local time for hardware clock	2025-01-03 13:50:51 -08:00
John Ogle	9d45449fce	[desktop] Add ghostty	2025-01-03 13:40:09 -08:00
John Ogle	877bc2c739	[flake] update	2025-01-03 13:39:29 -08:00
John Ogle	cd6e028142	[z790prors] Support evil partition and OS	2025-01-03 12:24:18 -08:00
John Ogle	421b27f76f	[modrinth] Remove modrinth	2025-01-03 12:18:51 -08:00
John Ogle	1f4a72d28c	[tmux] Add tmux	2025-01-03 12:13:17 -08:00
John Ogle	a8f19af989	[nix-book] Compress swap	2025-01-03 10:44:51 -08:00
John Ogle	d4b0fe5b9e	[emacs] Add org/projects agenda directory	2025-01-01 15:27:35 -08:00
John Ogle	09cff42222	[desktop] Add blender	2024-12-24 12:39:05 -08:00
John Ogle	0183e7c823	[default] Add tree	2024-12-22 08:40:01 -08:00
John Ogle	29cdd1e239	[desktop] Add bambu-studio	2024-12-22 08:39:06 -08:00
John Ogle	7ced8f11ba	[hyprland] Remove completely	2024-12-16 12:15:32 -08:00
John Ogle	244b7c0888	[flake] Remove references to chaotic	2024-12-16 11:52:56 -08:00
John Ogle	80744bcbf1	[flake] update	2024-12-16 11:51:54 -08:00
John Ogle	56d03f4228	[desktop] Fix formatting	2024-12-16 11:51:54 -08:00
John Ogle	32d0c7fa5a	[home] Set ENABLE_GAMESCOPE_WSI	2024-12-16 11:51:54 -08:00
John Ogle	1c2aae93b7	[desktop] Don't autostart sunshine	2024-12-16 11:51:54 -08:00
John Ogle	0ab6562694	[desktop] Add vulkan HDR layer, disabled	2024-12-16 11:51:49 -08:00
John Ogle	986ee06a46	[z790prors] Use latest kernel and nvidia driver	2024-12-16 11:51:05 -08:00
John Ogle	34abaeeec9	[users] Add video group	2024-12-16 11:51:05 -08:00
John Ogle	11638cfa1b	[modrinth-nvidia] Install java versions	2024-12-16 11:51:05 -08:00
John Ogle	1ce431b0e5	[emacs] Use external module for doom config	2024-12-16 11:51:05 -08:00
John Ogle	98ef9b1443	[modrinth-nvidia] Fix build from update	2024-12-16 11:51:05 -08:00
John Ogle	4c779663df	[nextcloud-talk-desktop] Update to 0.39.0	2024-12-16 11:51:05 -08:00
John Ogle	e2bb87fcf1	[emacs] Update nerd-fonts usage This was changed in a new version of nix	2024-12-16 11:51:05 -08:00
John Ogle	ef47c5dc9a	[flake] update	2024-12-16 11:51:05 -08:00
John Ogle	7da089daa3	[desktop] Add a waylandOnly option	2024-12-14 15:38:46 -08:00
John Ogle	8134d7cb33	[desktop] modrinth-nvidia for x11 only	2024-12-14 15:29:35 -08:00
John Ogle	24f1a64f3c	[desktop] Add custom package modrinth-nvidia	2024-12-05 21:00:42 -08:00
John Ogle	19531074ca	[desktop] Add modrinth-app	2024-12-05 19:59:46 -08:00
John Ogle	a30c130f21	[flake] update	2024-11-28 12:04:44 -08:00
John Ogle	e088ee2dc8	[desktop] Add protonup	2024-11-28 12:02:56 -08:00
John Ogle	366a7e2ea3	[plasma-manager] Dark theme	2024-11-28 12:02:37 -08:00
John Ogle	9116e44dfe	[plasma-manager] Enable mouse acceleration	2024-11-14 14:43:16 -08:00
John Ogle	e3ef710bdb	[default] Add some common utils	2024-11-12 08:01:49 -08:00
John Ogle	e1a804cfed	[plasma-manager] Update comments	2024-11-10 10:29:17 -08:00
John Ogle	ec59936012	[defaults] Disable systemd emergency mode	2024-11-09 15:11:45 -08:00
John Ogle	844d17a855	[z790prors] Remove arch mount point I had to boot into emergency mode and use systemd runtime masking: ``` systemd mask --runtime arch.mount ``` This allowed the system to boot so that I could remove this entry and run nixos-rebuild	2024-11-09 15:09:04 -08:00
John Ogle	b19dc65c6d	[emacs] Upgrade doom	2024-11-09 13:51:25 -08:00
John Ogle	6db2c78e0b	[emacs] Disable auto nix lsp Especially on underpowered devices, my monolithic nixos config grinds everything to a halt. I'll just manually enable this when the context makes sense.	2024-11-03 11:11:23 -08:00
John Ogle	475aafa33e	[kde] Remove polonium Polonium has been frustrating to use. I'm unsure how much of this I can blame polonium vs kde vs plasma-manager vs nix, but 1. keyboard shortcuts aren't working 2. tiling keeps going in and out for various windows 3. seemingly kde startup time takes forever with it installed The more I'm starting to understand KDE's native window management functions, the more I'm thinking that's the right way to go. I'm going to abandom polonium for now, perhaps with some future return.	2024-11-03 11:08:03 -08:00
John Ogle	09562f0af9	[flake] update	2024-11-03 11:01:07 -08:00
John Ogle	ae543d9628	Revert "[spotifyd] Update to lean in on pulseaudio" This reverts commit `b9097e91d5`.	2024-11-03 09:50:08 -08:00
John Ogle	c7716d2bca	Revert "[audio] Switch to pulseaudio" This reverts commit `abf8fe9ad2`.	2024-11-03 09:49:09 -08:00
John Ogle	54cf339d52	[plasma-manager] Update desktop switching shortcuts	2024-11-03 09:41:04 -08:00
John Ogle	b9097e91d5	[spotifyd] Update to lean in on pulseaudio	2024-10-21 12:31:36 -07:00
John Ogle	abf8fe9ad2	[audio] Switch to pulseaudio This is an attempt to get spotifyd running as a system user working	2024-10-21 12:31:36 -07:00
John Ogle	926b47f07f	[flake] update	2024-10-21 08:43:05 -07:00
John Ogle	749ef988f1	[z790prors] Enable HDR in plasma 6.2	2024-10-21 08:42:46 -07:00
John Ogle	dfa91d327f	[nix] Enable automatic gc	2024-10-21 08:42:26 -07:00
John Ogle	37c455d75e	[plasma-manager] Some shortcut improvements	2024-10-21 08:42:02 -07:00
John Ogle	c0d7d934f3	[plasma-manager] Merge config from z790prors	2024-10-15 18:34:04 -07:00
John Ogle	cb91f69c49	[desktop] Add polonium	2024-10-15 18:25:12 -07:00
John Ogle	bc6378cb22	Setup kde wayland gamescope + nvidia settings	2024-10-15 18:25:12 -07:00
John Ogle	a13676311a	[plasma-manager] Initial setup	2024-10-15 08:32:20 -07:00
John Ogle	ec57592715	[nixbook] Enable spotifyd	2024-10-15 08:17:07 -07:00
John Ogle	051c223eb7	[i3+sway] Add touchpad config	2024-10-10 17:15:26 -07:00
John Ogle	6030f6ea42	[z790prors] Enable BEES	2024-10-08 08:37:53 -07:00
John Ogle	df77fd5c74	[i3+sway] Fix terminal reference	2024-10-05 19:49:17 -07:00
John Ogle	458bcb4cdf	[roles] Remove unused trusted public key	2024-10-05 19:12:49 -07:00
John Ogle	40e10bab34	[roles] Remove unused config option	2024-10-05 19:12:38 -07:00
John Ogle	3477a3480f	[boxy] Fix wayland and user setup	2024-10-05 19:10:15 -07:00
John Ogle	d2ae7f8e11	[roles] Also make desktop opt-in	2024-10-05 19:09:58 -07:00
John Ogle	ff3a0a4738	[roles] No config change unless enabled	2024-10-05 18:17:42 -07:00
John Ogle	1a857399a6	[spotifyd] Setup system-wide spotifyd	2024-10-05 17:21:08 -07:00
John Ogle	4620288747	[z790prors] Update default refresh rate	2024-10-05 08:37:33 -07:00
John Ogle	b5f2e1738f	[secrets] Setup initial example secrets	2024-10-05 08:21:28 -07:00
John Ogle	8e27017aa4	[boxy] Force things to work, but on X11 for now	2024-10-04 17:16:30 -07:00
John Ogle	4ca9804db8	[i3+sway] Fix resize and exit bindings	2024-09-21 08:21:31 -07:00
John Ogle	6417540b51	[desktop] Setup brightness controls	2024-09-20 21:08:30 -07:00
John Ogle	3f1bdc7af0	[audio] Add an audio role	2024-09-19 20:47:19 -07:00
John Ogle	4d39f8a635	[bluetooth] Add bluetooth role	2024-09-19 20:26:10 -07:00
John Ogle	736194b8b4	[printing] Setup dynamic printer config	2024-09-18 21:14:00 -07:00
John Ogle	4096dc75b9	Bump doom emacs	2024-09-11 07:34:47 -07:00
John Ogle	18afc61e33	[emacs] Modularize more and better pkg Attempts to select the right emacs package based on whether the machine is x11 only or not.	2024-09-10 17:03:04 -07:00
John Ogle	9ba6006fca	[i3] Use home row navigation	2024-09-10 11:26:01 -07:00
John Ogle	000db04502	[i3+sway] Set default extra config options	2024-09-10 11:25:35 -07:00
John Ogle	42a34a6c40	[nix-book] Update sway scale factor	2024-09-10 11:09:44 -07:00
John Ogle	5e029720ef	[i3+sway] Add optionality to configs	2024-09-10 11:09:37 -07:00
John Ogle	5289d8847b	[sway] Fix/add caps:escape option	2024-09-10 10:50:31 -07:00
John Ogle	d9e5fdb0df	Merge i3+sway configs	2024-09-10 10:50:31 -07:00
John Ogle	fb8431da2d	Flatten home modules	2024-09-10 10:50:31 -07:00
John Ogle	e9d14167aa	[z790prors] Add back kids accounts	2024-09-08 14:22:07 -07:00
John Ogle	3a9348730b	Update all machines to use new roles format	2024-09-08 14:16:17 -07:00
John Ogle	1da9e92a24	Switch back to sddm	2024-09-08 14:13:13 -07:00
John Ogle	75baf55d5b	Setup sway config	2024-09-08 14:06:07 -07:00
John Ogle	692cebc839	Setup roles as modules and switch to sway	2024-09-08 13:49:28 -07:00
John Ogle	f22ff0e286	[kodi] Add wayland option	2024-09-08 12:22:22 -07:00
John Ogle	811b61e9e2	Update to current graphics acceleration setting	2024-09-07 20:06:05 -07:00
John Ogle	2390d55782	[boxy] Enable hardware graphics acceleration	2024-09-07 20:00:26 -07:00
John Ogle	609e5f4548	Remove boxy boilerplate comments	2024-09-07 18:37:49 -07:00
John Ogle	bc5d69e4cf	Specify autologinSession	2024-09-07 18:36:05 -07:00
John Ogle	637c0cca2b	Fix another typo	2024-09-07 18:29:59 -07:00
John Ogle	c82a85a630	Fix typo	2024-09-07 18:29:11 -07:00
John Ogle	3b40ecbad1	Add roles to boxy	2024-09-07 18:28:03 -07:00
John Ogle	8b311d4ed0	Explicitly setup pipewire	2024-09-07 18:27:52 -07:00
John Ogle	23639bee01	Initial boxy config	2024-09-08 01:22:54 +00:00
John Ogle	5d101928f6	Remove reference to missing file	2024-09-07 17:18:13 -07:00
John Ogle	4ba82961cd	Add a kodi role	2024-09-07 17:12:22 -07:00
John Ogle	c61ee69500	Modularize machines>roles	2024-09-07 16:12:08 -07:00
John Ogle	5571ac8657	Update doomemacs	2024-09-07 14:57:16 -07:00
John Ogle	a753164efc	Disable fluffychat	2024-09-07 14:57:11 -07:00
John Ogle	645e34320c	Ok now actually use home manager	2024-09-07 14:57:01 -07:00
John Ogle	48add8c1f3	Actually add home manager config	2024-09-07 14:43:31 -07:00
John Ogle	27c10f9a20	Whoops remove submodule	2024-09-07 14:42:13 -07:00
John Ogle	ecde6caa38	[z790prors] Disable sddm wayland	2024-09-07 14:39:26 -07:00
John Ogle	d134adb40f	Import home-manager config	2024-09-07 14:33:47 -07:00
John Ogle	d330faf646	[nfs-mounts] Update media options for faster boot time	2024-09-02 09:23:52 -07:00
John Ogle	67ed1a44b1	[z790prors] Add i3wm and kdeconnect	2024-09-02 09:09:52 -07:00
John Ogle	65bc26c017	[z790prors] Add johno to input group	2024-09-02 09:09:20 -07:00
John Ogle	b176707b41	[z790prors] nvidia driver tweaks	2024-09-02 09:08:48 -07:00
John Ogle	b851c0fed3	[z790prors] Use static networking This should significantly speeds up boot time in userspace	2024-09-02 09:07:39 -07:00
John Ogle	6ea46d6e9c	Add z790prors top level home manager config	2024-08-24 12:20:12 -07:00
John Ogle	368b3040c3	Add sunshine to z790prors	2024-08-24 12:19:51 -07:00
John Ogle	c4be32f75b	Update to beta nvidia driver	2024-08-24 12:19:22 -07:00