Merge remote-tracking branch 'origin/main'

flake.nix

@@ -49,7 +49,6 @@
     colors = colors;
     font = font;
 
-    # TODO: nix-color integration?
     # Your custom packages
     # Acessible through 'nix build', 'nix shell', etc
     packages = forAllSystems (system: import ./pkgs nixpkgs-unstable.legacyPackages.${system});

modules/home-manager/common.nix

@@ -9,12 +9,14 @@
   # TODO: fonts? right now they are only handled at the nixos-level (desktop-usage module)
   # TODO: wallpaper?
 
-  imports = [
+  imports = with outputs.homeManagerModules; [
     # nix-colors.homeManagerModules.default
-    outputs.homeManagerModules.fish
-    outputs.homeManagerModules.helix
-    outputs.homeManagerModules.git
-    outputs.homeManagerModules.iex
+    fish
+    helix
+    git
+    iex
+    zellij
+    broot
   ];
 
   # TODO: specify an email?

modules/home-manager/scripts/common/bin/archupdate

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-yay -Syu --nodiffmenu --nocleanmenu --noeditmenu
-
-# TODO: update kernel with a flag?
-# yes | pacman -Syu && kexec -l --initrd=/boot/initramfs-linux.img /boot/vmlinuz-linux && kexec -e

modules/home-manager/scripts/common/bin/work-journal-entry

@@ -1,4 +0,0 @@
-#!/usr/bin/env fish
-N work/divvy/(date +%Y-%m-%d) && \
-	pushd $NOTES_PATH && git add -A && \
-	git commit -m "Edit work journal entry for "(date +%Y-%m-%d) && nsync

modules/home-manager/sway.nix

@@ -55,6 +55,10 @@
       exec --no-startup-id {
         swaymsg "workspace 1"
       }
+
+      set $tilers "(wezterm.*|kitty.*|firefox.*|slack.*|Slack.*|thunar.*|Alacritty.*|alacritty.*|Discord.*|discord.*)"
+      for_window [title=".*"] floating enable
+      for_window [app_id=$tilers] floating disable
     '';
     config = {
       defaultWorkspace = "1";

nixos/dragon/default.nix

@@ -36,6 +36,8 @@
       # ./users.nix
     ];
 
+  # TODO: https://nixos.wiki/wiki/Remote_LUKS_Unlocking
+
   nixpkgs = {
     # You can add overlays here
     overlays = [

readme.md

@@ -121,16 +121,14 @@ nix-shell --packages git \
 
 ## Short Term
 
-- Modularize the home manager stuff into modules
-- Remove all work-specific config and stick that in its own flake that uses my main flake as input
+- a.lyte.dev for web analytics
+- grafana and stuff for monitoring
+- alerts?
 - Fonts installed by home manager instead of nixos module
-- Zellij config
-- Broot theme
+- Zellij config?
+- Broot config?
 
 ## Long Term
 
 - nix-darwin for work profile(s)
   - https://medium.com/@zmre/nix-darwin-quick-tip-activate-your-preferences-f69942a93236
-- I don't understand Nix well enough to know why stuff is being compiled even when I have a binary cache
-  - Maybe it detects different CPUs and will recompile certain packages for per-CPU optimizations?
-    - How does this factor in with "pureness"?