From 8c98bdc15f993309afda12ba0592105eddee9524 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 6 Oct 2023 20:36:31 -0500 Subject: [PATCH 1/2] Add todo for remote LUKS unlocking --- nixos/dragon/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/dragon/default.nix b/nixos/dragon/default.nix index ac54b74..bb8fdfb 100644 --- a/nixos/dragon/default.nix +++ b/nixos/dragon/default.nix @@ -35,6 +35,8 @@ # ./users.nix ]; + # TODO: https://nixos.wiki/wiki/Remote_LUKS_Unlocking + nixpkgs = { # You can add overlays here overlays = [ From 4fe7ad524d452b38205864b56b3e3f109c1649bc Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 6 Oct 2023 23:56:28 -0500 Subject: [PATCH 2/2] Fix unusual windows not floating by default and other stuff --- flake.nix | 1 - modules/home-manager/common.nix | 12 +++++++----- modules/home-manager/scripts/common/bin/archupdate | 6 ------ .../scripts/common/bin/work-journal-entry | 4 ---- modules/home-manager/sway.nix | 4 ++++ readme.md | 12 +++++------- 6 files changed, 16 insertions(+), 23 deletions(-) delete mode 100755 modules/home-manager/scripts/common/bin/archupdate delete mode 100755 modules/home-manager/scripts/common/bin/work-journal-entry diff --git a/flake.nix b/flake.nix index 68da6a8..95b4dd7 100644 --- a/flake.nix +++ b/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}); diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index 9cb460f..e3d4c93 100644 --- a/modules/home-manager/common.nix +++ b/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? diff --git a/modules/home-manager/scripts/common/bin/archupdate b/modules/home-manager/scripts/common/bin/archupdate deleted file mode 100755 index ec3c4b5..0000000 --- a/modules/home-manager/scripts/common/bin/archupdate +++ /dev/null @@ -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 diff --git a/modules/home-manager/scripts/common/bin/work-journal-entry b/modules/home-manager/scripts/common/bin/work-journal-entry deleted file mode 100755 index 77414f1..0000000 --- a/modules/home-manager/scripts/common/bin/work-journal-entry +++ /dev/null @@ -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 diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix index d49ab1f..1f53d56 100644 --- a/modules/home-manager/sway.nix +++ b/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"; diff --git a/readme.md b/readme.md index ad5720d..9c73e95 100644 --- a/readme.md +++ b/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"?