clhickey-nixos/configuration.nix

@@ -9,11 +9,6 @@
   cos.username = "clhickey";
   cos.hostName = "clhickey-nixos";
 
-  cos.winboat.enable = true;
-  cos.docker.enable = true;
-
-  cos.remoteBuild.enable = false;
-
   boot = {
     loader = {
       systemd-boot.enable = true;
@@ -62,7 +57,7 @@
 
   cos.hyprland = {
     enable = true;
-    wallpaper = builtins.toString ../TranscodedWallpaper.jpeg;
+    wallpaper = builtins.toString ./TranscodedWallpaper.jpeg;
   };
 
   # auto-mount USB drives
@@ -101,6 +96,8 @@
       enable = true;
       qemu = {
         swtpm.enable = true;
+        ovmf.enable = true;
+        ovmf.packages = [ pkgs.OVMFFull.fd ];
       };
     };
     virtualbox.host = {
@@ -200,9 +197,6 @@
       discord
       aseprite
       pixelorama
-      dig
-      ncdu
-      servo
     ];
     sessionVariables = {
       EDITOR = "${inputs.cnvim.packages.x86_64-linux.default}/bin/nvim";
@@ -213,7 +207,7 @@
     packages = with pkgs; [
       noto-fonts
       noto-fonts-cjk-sans
-      noto-fonts-color-emoji
+      noto-fonts-emoji
       liberation_ttf
       fira-code
       fira-code-symbols
@@ -223,7 +217,7 @@
       font-awesome
       libre-baskerville
       corefonts
-      vista-fonts
+      vistafonts
     ];
   };
 

cos.nix

@@ -4,9 +4,6 @@
     ./hyprland.nix
     ./wireguard.nix
     ./winboat.nix
-    ./docker.nix
-    ./remoteBuild.nix
-    ./gnupg.nix
     "${inputs.home-manager}/nixos"
   ];
 

docker.nix

@@ -1,15 +0,0 @@
-{ lib, config, ... }:
-let cfg = config.cos.docker; in
-{
-  options.cos.docker = {
-    enable = lib.mkEnableOption "Enable Docker";
-  };
-
-  config = lib.mkIf cfg.enable {
-    virtualisation.docker.enable = true;
-
-    users.users.${config.cos.username}.extraGroups = [
-      "docker"
-    ];
-  };
-}

flake.lock

@@ -2,9 +2,7 @@
   "nodes": {
     "cnvim": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "nixpkgs"
-        ],
         "nixvimFlake": "nixvimFlake"
       },
       "locked": {
@@ -86,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763228015,
+        "lastModified": 1759761710,
-        "narHash": "sha256-1rYieMVUyZ3kK/cBIr8mOusxrOEJ1/+2MsOg0oJ7b3A=",
+        "narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "96156a9e86281c4bfc451236bc2ddfe4317e6f39",
+        "rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c",
         "type": "github"
       },
       "original": {
@@ -149,11 +147,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762977756,
+        "lastModified": 1759632233,
-        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1759381078,
+        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
         "type": "github"
       },
       "original": {
@@ -163,7 +177,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1742422364,
         "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
@@ -262,7 +276,7 @@
     "penn-nix": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1742609439,
@@ -283,9 +297,10 @@
         "cnvim": "cnvim",
         "home-manager": "home-manager",
         "mapnix": "mapnix",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "osm-bikeability": "osm-bikeability",
-        "penn-nix": "penn-nix"
+        "penn-nix": "penn-nix",
+        "winboat": "winboat"
       }
     },
     "systems": {
@@ -332,6 +347,26 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "winboat": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760459934,
+        "narHash": "sha256-OQn5UqCOXsvaAwOG0p3ZiXmR+WfN3wf7H3zlc+uiByM=",
+        "owner": "TibixDev",
+        "repo": "winboat",
+        "rev": "eac9a7f48ce9bf9c60b9e7743aaf53d5a0f6351e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "TibixDev",
+        "repo": "winboat",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -8,7 +8,7 @@
     penn-nix.url = "github:clay53/penn-nix";
     cnvim = {
       url = "github:clay53/cnvim";
-      inputs.nixpkgs.follows = "nixpkgs";
+      #inputs.nixpkgs.follows = "nixpkgs";
     };
     mapnix = {
       url = "github:clay53/mapnix";
@@ -17,6 +17,10 @@
       url = "github:clay53/osm-bikeability";
       flake = false;
     };
+    winboat = {
+      url = "github:TibixDev/winboat";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs = { self, nixpkgs, ... }@inputs: {
     nixosConfigurations.clhickey-nixos = nixpkgs.lib.nixosSystem {

gnupg.nix

@@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  programs.gnupg.agent.enable = true;
-  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-curses;
-}

hyprland.nix

@@ -37,7 +37,7 @@ let cfg = config.cos.hyprland; in
         waylandFrontend = true;
 	    addons = with pkgs; [
           fcitx5-gtk
-          qt6Packages.fcitx5-configtool
+          fcitx5-configtool
           fcitx5-mozc
         ];
       };
@@ -55,7 +55,6 @@ let cfg = config.cos.hyprland; in
       kdePackages.ark
       kdePackages.gwenview
       yaru-theme
-      hyprpaper
     ];
 
     services.hypridle.enable = true;
@@ -148,7 +147,6 @@ let cfg = config.cos.hyprland; in
             gaps_out = 0;
           };
           input = {
-            kb_layout = "jp";
             accel_profile = "flat";
             sensitivity = 1.0;
             touchpad = {
@@ -158,9 +156,6 @@ let cfg = config.cos.hyprland; in
           xwayland = {
             force_zero_scaling = true;
           };
-          misc = {
-            disable_hyprland_logo = true;
-          };
         };
       };
 

remoteBuild.nix

@@ -1,30 +0,0 @@
-{ lib, config, ... }:
-let cfg = config.cos.remoteBuild; in
-{
-  options.cos.remoteBuild = {
-    enable = lib.mkEnableOption "Turn on remote builders";
-  };
-
-  config = lib.mkIf cfg.enable {
-    cos.wireguard.enable = true;
-
-    nix.buildMachines = [{
-      sshUser = "clhickey";
-      hostName = config.cos.wireguard.clientPubOptionsMap.nixnas.ip;
-      system = "x86_64-linux";
-      protocol = "ssh-ng";
-      maxJobs = 4;
-      speedFactor = 1;
-      supportedFeatures = [ "kvm" "nixos-tests" "big-parallel" ];
-      mandatoryFeatures = [];
-    }];
-    nix.distributedBuilds = true;
-    nix.settings.builders-use-substitutes = false;
-    nix.settings.trusted-public-keys = [
-      "${config.cos.wireguard.clientPubOptionsMap.nixnas.ip}:iD0dK5e3PmeldRKuQcFPfrwsMsILNvvE/joqGRluu4c="
-    ];
-    nix.settings.substituters = [
-      "ssh-ng://clhickey@${config.cos.wireguard.clientPubOptionsMap.nixnas.ip}"
-    ];
-  };
-}

winboat.nix

@@ -8,10 +8,14 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    cos.docker.enable = true;
+    virtualisation.docker.enable = true;
+
+    users.users.${config.cos.username}.extraGroups = [
+      "docker"
+    ];
 
     environment.systemPackages = [
-      pkgs.winboat
+      inputs.winboat.packages.x86_64-linux.winboat
       pkgs.freerdp
     ];
   };

wireguard.nix

@@ -65,11 +65,6 @@ in
       wireguard-tools
     ];
 
-    environment.etc."resolv.conf".text = ''
-      nameserver 10.100.0.1
-      nameserver 1.1.1.1
-    '';
-
     networking.wireguard = {
       enable = true;
       interfaces = {