nix: rework dotfiles to be spec'd in nixos/dotfiles

flake.nix

@@ -117,10 +117,11 @@
       commonModuleSet = [
         ./nixos/packages
 
+        ./nixos/dotfiles
+
         ./nixos/configs/stylix
         ./nixos/configs/lix.nix
         ./nixos/configs/nix.nix
-        ./nixos/configs/dotfiles
         ./nixos/configs/calendar.nix
         ./nixos/configs/syncthing.nix
         ./nixos/configs/include-conf.nix
@@ -154,6 +155,8 @@
         waveforms.nixosModule
         nix-flatpak.nixosModules.nix-flatpak
 
+        ./nixos/dotfiles/vscode.nix
+
         ./nixos/packages/gui.nix
         ./nixos/packages/wine.nix
         ./nixos/packages/flatpak.nix
@@ -163,7 +166,6 @@
         ./nixos/configs/flatpak.nix
         ./nixos/configs/fonts-linux.nix
         ./nixos/configs/music-server.nix
-        ./nixos/configs/dotfiles/vscode.nix
 
         #./nixos/overlays/fixup-signal
         ./nixos/overlays/fixup-imhex.nix
@@ -409,9 +411,10 @@
           ./nixos/hosts/design.nix
           ./nixos/configuration.droid.nix
 
+          ./nixos/dotfiles/droid.nix
+
           ./nixos/configs/nix.droid.nix
           ./nixos/configs/droid-gui.nix
-          ./nixos/configs/dotfiles/droid.nix
           ./nixos/configs/flake-registry.nix
 
           ./nixos/packages/droid.nix

nixos/configs/dotfiles/hm.nix

@@ -1,48 +0,0 @@
-{ ... }:
-{
-  home.username = "deprekated";
-  home.homeDirectory = "/home/deprekated";
-
-  # Tie our configruation to the version it was written for.
-  home.stateVersion = "24.05";
-
-  #
-  # "Raw file" dotfiles.
-  # These aren't generated by Nix, specifically so we can use them on Windows as well.
-  #
-
-  # xonsh
-  xdg.configFile.xonsh.source = ../../../xonsh;
-
-  # wezterm
-  xdg.configFile.wezterm.source = ../../../wezterm;
-
-  # calendar / contact sync
-  xdg.configFile.khal.source = ../../../khal;
-  xdg.configFile.vdirsyncer.source = ../../../vdirsyncer;
-
-  # looking-glass
-  xdg.configFile.looking-glass.source = ../../../looking-glass;
-
-  # neovim
-  xdg.configFile.nvim.source = ../../../nvim;
-
-  # tmux
-  xdg.configFile.tmux.source = ../../../tmux;
-
-  # espanso
-  xdg.configFile.espanso.source = ../../../espanso;
-
-  # kakoune
-  #xdg.configFile."kak/autoload".source = ../../../kak/autoload;
-  xdg.configFile."kak/wezterm-tab.kak".source = ../../../kak/wezterm-tab.kak;
-  xdg.configFile."kak/sudo-write.kak".source = ../../../kak/sudo-write.kak;
-
-  # taskwarrior
-  xdg.configFile."task/taskrc".source = ../../../taskwarrior/taskrc;
-  xdg.dataFile."task/hooks".source = ../../../taskwarrior/hooks;
-
-  # talon
-  home.file.".talon/user".source = ../../../talon;
-
-}

nixos/configs/gui/default.nix

@@ -49,7 +49,6 @@
     wtype
     wl-clipboard
     brightnessctl
-    sddm-chili-theme
     nirilock-fancy
 
     xdg-desktop-portal-gtk
@@ -136,7 +135,7 @@
       enable = true;
       autoNumlock = true;
       #wayland.enable = true;
-      theme = "chili";
+      #theme = "chili";
     };
   };
 

nixos/configs/syncthing.nix

@@ -10,6 +10,7 @@ let
     "trailblazer" = { id = "JASHWW7-AYYTQLN-QZ6OEOX-EZK4GPA-OYW5IZS-5KAIIVR-MMXMCHL-OERDBQ2"; };
     "aigis"       = { id = "VKRQ6Q4-CCLJR2I-ECOWXRE-TANA2QZ-BJIAPCN-FFVJSB4-GYJNS4R-Z3LLHQ5"; };
     "hinata"      = { id = "2SFRG2A-AZ3XPMN-H3RK2Z6-UXPBPIN-DJN7AMN-JBOY23D-EZGFYNR-HRBI2AY"; };
+    "miko"        = { id = "BTJ3C7W-DBPNTTV-NBKNLNM-SYSGFRZ-VG7ODVU-66RQTO7-XXHYXEY-HX323A6"; };
   };
 in
 {

nixos/configs/virt-host.nix

@@ -10,11 +10,6 @@
   # Enable USB passthrough.
   virtualisation.spiceUSBRedirection.enable = true;
 
-  # Set our system to use libvirt, too.
-  boot.kernelModules = [
-    "kvm-amd"
-    "kvm-intel"
-  ];
   environment.systemPackages = with pkgs; [
     libvirt
     virtiofsd

nixos/dotfiles/hm.nix

@@ -0,0 +1,47 @@
+{ config, lib, ... }:
+{
+  home.username = "deprekated";
+  home.homeDirectory = "/home/deprekated";
+
+  # Tie our configruation to the version it was written for.
+  home.stateVersion = "24.05";
+
+  #
+  # "Raw file" dotfiles.
+  # These aren't generated by Nix, specifically so we can use them on Windows as well.
+  #
+
+  # xonsh
+  xdg.configFile.xonsh.source = ../../xonsh;
+
+  # wezterm
+  xdg.configFile.wezterm.source = ../../wezterm;
+
+  # calendar / contact sync
+  xdg.configFile.khal.source = ../../khal;
+  xdg.configFile.vdirsyncer.source = ../../vdirsyncer;
+
+  # looking-glass
+  xdg.configFile.looking-glass.source = ../../looking-glass;
+
+  # neovim
+  xdg.configFile.nvim.source = ../../nvim;
+
+  # tmux
+  xdg.configFile.tmux.source = ../../tmux;
+
+  # espanso
+  xdg.configFile.espanso.source = ../../espanso;
+
+  # kakoune
+  #xdg.configFile."kak/autoload".source = ../../../kak/autoload;
+  xdg.configFile."kak/wezterm-tab.kak".source = ../../kak/wezterm-tab.kak;
+  xdg.configFile."kak/sudo-write.kak".source = ../../kak/sudo-write.kak;
+
+  # taskwarrior
+  xdg.configFile."task/taskrc".source = ../../taskwarrior/taskrc;
+  xdg.dataFile."task/hooks".source = ../../taskwarrior/hooks;
+
+	# place our gtk2-rc in a place where it won't conflict
+  gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+}

nixos/dotfiles/kakoune-lsp.hm.nix

@@ -4,9 +4,9 @@
 { ... }:
 {
   # General LSP configuration.
-  xdg.configFile."kak-lsp/kak-lsp.toml".source = ../../../kak/kak-lsp.toml;
-  xdg.configFile."kak-tree-sitter/config.toml".source = ../../../kak/kak-tree-sitter.toml;
-  xdg.configFile."kak/colors".source = ../../../kak/colors;
+  xdg.configFile."kak-lsp/kak-lsp.toml".source = ../../kak/kak-lsp.toml;
+  xdg.configFile."kak-tree-sitter/config.toml".source = ../../kak/kak-tree-sitter.toml;
+  xdg.configFile."kak/colors".source = ../../kak/colors;
 
   programs.kakoune.config = {
 

nixos/dotfiles/kakoune.hm.nix

@@ -134,7 +134,7 @@
       colorscheme solarized-darker
 
       # Use wezterm when possible, and tmux otherwise.
-      source ${../../../kak/wezterm-tab.kak}
+      source ${../../kak/wezterm-tab.kak}
       set global windowing_modules 'wezterm-tab' 'tmux'
 
       # Enable auotmatic hovering.
@@ -161,7 +161,7 @@
       }
 
       # Misc plugins.
-      source ${../../../kak/sudo-write.kak}
+      source ${../../kak/sudo-write.kak}
     '';
 
     plugins = with pkgs.kakounePlugins; [

nixos/dotfiles/talon.hm.nix

@@ -2,7 +2,7 @@
 {
   # talon configuration
   home.file.".talon/user" = {
-    source = ../../../talon;
+    source = ../../talon;
     recursive = true;
   };
 

nixos/hosts/miko.nix

@@ -36,7 +36,7 @@
   #
   # Hardware configuration.
   #
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "apple-bce" "appletbdrm" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];