stopping here for a while

might move into one of the existing modules

defaults/sway/config

@@ -7,41 +7,34 @@ set $down j
 set $up k
 set $right l
 # Alacritty
-set $term foot
+set $term alacritty
 
 # Menu (rofi)
-set $menu wofi --show
+set $rofi_cmd rofi -terminal '$term'
+set $menu $rofi_cmd -show combi -combi-modes drun#run -modes combi
 
-# ### Output configuration
-# output DP-3 pos 3840 0 res 1920x1080@59Hz
-# output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
-# output DP-2 pos 1920 0 res 1920x1080@60Hz
+### Output configuration
+output DP-3 pos 3840 0 res 1920x1080@59Hz
+output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
+output DP-2 pos 1920 0 res 1920x1080@60Hz
 
 ### Wallpaper
-output * bg ~/.wallpaper/.wallpaper.png fill
-# output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
-# output DP-2  bg ~/.wallpaper/.wallpaper.png fill
-# output DP-3 bg ~/.wallpaper/.wallpaper.png fill
+output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
+output DP-2  bg ~/.wallpaper/.wallpaper.png fill
+output DP-3 bg ~/.wallpaper/.wallpaper.png fill
 
 ### Workspace binding
 
 ## DP-3 bindings
-# workspace 1 output DP-2
-# workspace 2 output DP-2
-# workspace 4 output DP-2
-# workspace 5 output DP-2
-#
-# ## HDMI-A-1 bindings
-# workspace 3 output HDMI-A-1
-# workspace 9 output HDMI-A-1
-#
-# ## DP-2 bindings
-# workspace 6 output DP-3
-# workspace 7 output DP-3
-# workspace 8 output DP-3
+workspace 1 output DP-2
+workspace 2 output DP-2
 
-## eDP-1 bindings scale
-output eDP-1 scale 1.25
+## HDMI-A-1 bindings
+workspace 3 output HDMI-A-1 
+
+## DP-2 bindings
+workspace 6 output DP-3
+workspace 7 output DP-3
 
 ### Colour options
 set $bg 	#24283b
@@ -94,9 +87,8 @@ floating_modifier $mod normal
     # Reload the configuration file
     bindsym $mod+Shift+c reload
 
-    # Shutdown and reboot hotkeys
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the shutdown shortcut. Do you really want to shutdown your computer?' -b 'Yes, shutdown' 'systemctl poweroff'
-    bindsym $mod+Shift+r exec swaynag -t warning -m 'You pressed the reboot shortcut. Do you really want to reboot your computer?' -b 'Yes, reboot' 'systemctl reboot'
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $mod+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'
 
 ### Navigation
     # Move your focus around
@@ -190,10 +182,9 @@ mode "resize" {
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
-
-### resize
 bindsym $mod+r mode "resize"
 
+
 ### Audio and brightness keybinds
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
@@ -205,14 +196,16 @@ bindsym XF86AudioPrev exec playerctl previous
 bindsym XF86MonBrightnessUp exec light -A 5
 bindsym XF86MonBrightnessDown exec light -U 5
 
-### Lock the screen
-bindsym $mod+Ctrl+q 'swaylock -f -i /home/wyatt/.wallpaper/.wallpaper_lock.png'
+### Lock the screen so my brother 
+### won't dick with my computer
+bindsym $mod+Ctrl+l 'swaylock -f -i /home/wyatt/.wallpaper_lock.jpeg'
 
 ### Status Bar:
 bar {
     swaybar_command waybar
 }
 
+
 ### Font settings:
 font pango:FiraCode: 14px
 
@@ -232,4 +225,10 @@ set $opacity 1.00
 for_window [class=".*"] opacity $opacity
 for_window [app_id=".*"] opacity $opacity
 
+# Disable locking when conditions are met
+for_window [class="streaming_client"] inhibit_idle fullscreen
+for_window [app_id="firefox"] inhibit_idle fullscreen
+for_window [app_id="neovide"] inhibit_idle fullscreen
+
+for_window [title="Beyond All Reason"] inhibit_idle fullscreen
 include /etc/sway/config.d/*

defaults/zellij/config.kdl

@@ -1,254 +0,0 @@
-keybinds clear-defaults=true {
-    locked {
-        bind "Ctrl g" { SwitchToMode "normal"; }
-    }
-    pane {
-        bind "left" { MoveFocus "left"; }
-        bind "down" { MoveFocus "down"; }
-        bind "up" { MoveFocus "up"; }
-        bind "right" { MoveFocus "right"; }
-        bind "c" { SwitchToMode "renamepane"; PaneNameInput 0; }
-        bind "d" { NewPane "down"; SwitchToMode "normal"; }
-        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "normal"; }
-        bind "f" { ToggleFocusFullscreen; SwitchToMode "normal"; }
-        bind "h" { MoveFocus "left"; }
-        bind "j" { MoveFocus "down"; }
-        bind "k" { MoveFocus "up"; }
-        bind "l" { MoveFocus "right"; }
-        bind "n" { NewPane; SwitchToMode "normal"; }
-        bind "p" { SwitchFocus; }
-        bind "Ctrl p" { SwitchToMode "normal"; }
-        bind "r" { NewPane "right"; SwitchToMode "normal"; }
-        bind "w" { ToggleFloatingPanes; SwitchToMode "normal"; }
-        bind "z" { TogglePaneFrames; SwitchToMode "normal"; }
-    }
-    tab {
-        bind "left" { GoToPreviousTab; }
-        bind "down" { GoToNextTab; }
-        bind "up" { GoToPreviousTab; }
-        bind "right" { GoToNextTab; }
-        bind "1" { GoToTab 1; SwitchToMode "normal"; }
-        bind "2" { GoToTab 2; SwitchToMode "normal"; }
-        bind "3" { GoToTab 3; SwitchToMode "normal"; }
-        bind "4" { GoToTab 4; SwitchToMode "normal"; }
-        bind "5" { GoToTab 5; SwitchToMode "normal"; }
-        bind "6" { GoToTab 6; SwitchToMode "normal"; }
-        bind "7" { GoToTab 7; SwitchToMode "normal"; }
-        bind "8" { GoToTab 8; SwitchToMode "normal"; }
-        bind "9" { GoToTab 9; SwitchToMode "normal"; }
-        bind "[" { BreakPaneLeft; SwitchToMode "normal"; }
-        bind "]" { BreakPaneRight; SwitchToMode "normal"; }
-        bind "b" { BreakPane; SwitchToMode "normal"; }
-        bind "h" { GoToPreviousTab; }
-        bind "j" { GoToNextTab; }
-        bind "k" { GoToPreviousTab; }
-        bind "l" { GoToNextTab; }
-        bind "n" { NewTab; SwitchToMode "normal"; }
-        bind "r" { SwitchToMode "renametab"; TabNameInput 0; }
-        bind "s" { ToggleActiveSyncTab; SwitchToMode "normal"; }
-        bind "Ctrl t" { SwitchToMode "normal"; }
-        bind "x" { CloseTab; SwitchToMode "normal"; }
-        bind "tab" { ToggleTab; }
-    }
-    resize {
-        bind "left" { Resize "Increase left"; }
-        bind "down" { Resize "Increase down"; }
-        bind "up" { Resize "Increase up"; }
-        bind "right" { Resize "Increase right"; }
-        bind "+" { Resize "Increase"; }
-        bind "-" { Resize "Decrease"; }
-        bind "=" { Resize "Increase"; }
-        bind "H" { Resize "Decrease left"; }
-        bind "J" { Resize "Decrease down"; }
-        bind "K" { Resize "Decrease up"; }
-        bind "L" { Resize "Decrease right"; }
-        bind "h" { Resize "Increase left"; }
-        bind "j" { Resize "Increase down"; }
-        bind "k" { Resize "Increase up"; }
-        bind "l" { Resize "Increase right"; }
-        bind "Ctrl n" { SwitchToMode "normal"; }
-    }
-    move {
-        bind "left" { MovePane "left"; }
-        bind "down" { MovePane "down"; }
-        bind "up" { MovePane "up"; }
-        bind "right" { MovePane "right"; }
-        bind "h" { MovePane "left"; }
-        bind "Ctrl h" { SwitchToMode "normal"; }
-        bind "j" { MovePane "down"; }
-        bind "k" { MovePane "up"; }
-        bind "l" { MovePane "right"; }
-        bind "n" { MovePane; }
-        bind "p" { MovePaneBackwards; }
-        bind "tab" { MovePane; }
-    }
-    scroll {
-        bind "Alt left" { MoveFocusOrTab "left"; SwitchToMode "normal"; }
-        bind "Alt down" { MoveFocus "down"; SwitchToMode "normal"; }
-        bind "Alt up" { MoveFocus "up"; SwitchToMode "normal"; }
-        bind "Alt right" { MoveFocusOrTab "right"; SwitchToMode "normal"; }
-        bind "e" { EditScrollback; SwitchToMode "normal"; }
-        bind "Alt h" { MoveFocusOrTab "left"; SwitchToMode "normal"; }
-        bind "Alt j" { MoveFocus "down"; SwitchToMode "normal"; }
-        bind "Alt k" { MoveFocus "up"; SwitchToMode "normal"; }
-        bind "Alt l" { MoveFocusOrTab "right"; SwitchToMode "normal"; }
-        bind "s" { SwitchToMode "entersearch"; SearchInput 0; }
-    }
-    search {
-        bind "c" { SearchToggleOption "CaseSensitivity"; }
-        bind "n" { Search "down"; }
-        bind "o" { SearchToggleOption "WholeWord"; }
-        bind "p" { Search "up"; }
-        bind "w" { SearchToggleOption "Wrap"; }
-    }
-    session {
-        bind "c" {
-            LaunchOrFocusPlugin "configuration" {
-                floating true
-                move_to_focused_tab true
-            }
-            SwitchToMode "normal"
-        }
-        bind "Ctrl o" { SwitchToMode "normal"; }
-        bind "p" {
-            LaunchOrFocusPlugin "plugin-manager" {
-                floating true
-                move_to_focused_tab true
-            }
-            SwitchToMode "normal"
-        }
-        bind "w" {
-            LaunchOrFocusPlugin "session-manager" {
-                floating true
-                move_to_focused_tab true
-            }
-            SwitchToMode "normal"
-        }
-    }
-    shared_except "locked" {
-        bind "Alt +" { Resize "Increase"; }
-        bind "Alt -" { Resize "Decrease"; }
-        bind "Alt =" { Resize "Increase"; }
-        bind "Alt [" { PreviousSwapLayout; }
-        bind "Alt ]" { NextSwapLayout; }
-        bind "Alt f" { ToggleFloatingPanes; }
-        bind "Ctrl g" { SwitchToMode "locked"; }
-        bind "Alt i" { MoveTab "left"; }
-        bind "Alt n" { NewPane; }
-        bind "Alt o" { MoveTab "right"; }
-        bind "Ctrl q" { Quit; }
-    }
-    shared_except "locked" "move" {
-        bind "Ctrl h" { SwitchToMode "move"; }
-    }
-    shared_except "locked" "session" {
-        bind "Ctrl o" { SwitchToMode "session"; }
-    }
-    shared_except "locked" "scroll" {
-        bind "Alt left" { MoveFocusOrTab "left"; }
-        bind "Alt down" { MoveFocus "down"; }
-        bind "Alt up" { MoveFocus "up"; }
-        bind "Alt right" { MoveFocusOrTab "right"; }
-        bind "Alt h" { MoveFocusOrTab "left"; }
-        bind "Alt j" { MoveFocus "down"; }
-        bind "Alt k" { MoveFocus "up"; }
-        bind "Alt l" { MoveFocusOrTab "right"; }
-    }
-    shared_except "locked" "scroll" "search" "tmux" {
-        bind "Ctrl b" { SwitchToMode "tmux"; }
-    }
-    shared_except "locked" "tab" {
-        bind "Ctrl t" { SwitchToMode "tab"; }
-    }
-    shared_except "locked" "pane" {
-        bind "Ctrl p" { SwitchToMode "pane"; }
-    }
-    shared_except "locked" "resize" {
-        bind "Ctrl n" { SwitchToMode "resize"; }
-    }
-    shared_except "normal" "locked" "entersearch" {
-        bind "enter" { SwitchToMode "normal"; }
-    }
-    shared_except "normal" "locked" "entersearch" "renametab" "renamepane" {
-        bind "esc" { SwitchToMode "normal"; }
-    }
-    shared_among "pane" "tmux" {
-        bind "x" { CloseFocus; SwitchToMode "normal"; }
-    }
-    shared_among "scroll" "search" {
-        bind "PageDown" { PageScrollDown; }
-        bind "PageUp" { PageScrollUp; }
-        bind "left" { PageScrollUp; }
-        bind "down" { ScrollDown; }
-        bind "up" { ScrollUp; }
-        bind "right" { PageScrollDown; }
-        bind "Ctrl b" { PageScrollUp; }
-        bind "Ctrl c" { ScrollToBottom; SwitchToMode "normal"; }
-        bind "d" { HalfPageScrollDown; }
-        bind "Ctrl f" { PageScrollDown; }
-        bind "h" { PageScrollUp; }
-        bind "j" { ScrollDown; }
-        bind "k" { ScrollUp; }
-        bind "l" { PageScrollDown; }
-        bind "u" { HalfPageScrollUp; }
-    }
-    entersearch {
-        bind "Ctrl c" { SwitchToMode "scroll"; }
-        bind "esc" { SwitchToMode "scroll"; }
-        bind "enter" { SwitchToMode "search"; }
-    }
-    renametab {
-        bind "esc" { UndoRenameTab; SwitchToMode "tab"; }
-    }
-    shared_among "renametab" "renamepane" {
-        bind "Ctrl c" { SwitchToMode "normal"; }
-    }
-    renamepane {
-        bind "esc" { UndoRenamePane; SwitchToMode "pane"; }
-    }
-    shared_among "session" "tmux" {
-        bind "d" { Detach; }
-    }
-    tmux {
-        bind "left" { MoveFocus "left"; SwitchToMode "normal"; }
-        bind "down" { MoveFocus "down"; SwitchToMode "normal"; }
-        bind "up" { MoveFocus "up"; SwitchToMode "normal"; }
-        bind "right" { MoveFocus "right"; SwitchToMode "normal"; }
-        bind "space" { NextSwapLayout; }
-        bind "\"" { NewPane "down"; SwitchToMode "normal"; }
-        bind "%" { NewPane "right"; SwitchToMode "normal"; }
-        bind "," { SwitchToMode "renametab"; }
-        bind "[" { SwitchToMode "scroll"; }
-        bind "Ctrl b" { Write 2; SwitchToMode "normal"; }
-        bind "c" { NewTab; SwitchToMode "normal"; }
-        bind "h" { MoveFocus "left"; SwitchToMode "normal"; }
-        bind "j" { MoveFocus "down"; SwitchToMode "normal"; }
-        bind "k" { MoveFocus "up"; SwitchToMode "normal"; }
-        bind "l" { MoveFocus "right"; SwitchToMode "normal"; }
-        bind "n" { GoToNextTab; SwitchToMode "normal"; }
-        bind "o" { FocusNextPane; }
-        bind "p" { GoToPreviousTab; SwitchToMode "normal"; }
-        bind "z" { ToggleFocusFullscreen; SwitchToMode "normal"; }
-    }
-}
-
-plugins {
-    compact-bar location="zellij:compact-bar"
-    configuration location="zellij:configuration"
-    filepicker location="zellij:strider" {
-        cwd "/"
-    }
-    plugin-manager location="zellij:plugin-manager"
-    session-manager location="zellij:session-manager"
-    status-bar location="zellij:status-bar"
-    strider location="zellij:strider"
-    tab-bar location="zellij:tab-bar"
-}
-
-load_plugins {
-}
- 
-theme "catppuccin-mocha"
-show_startup_tips false
-show_release_notes false
-default_mode "normal"

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757432263,
-        "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
+        "lastModified": 1748044287,
+        "narHash": "sha256-9bJzyUX5+HXYmI60WMGYXXDdhGbSh1Le6yBM4og3K7E=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
+        "rev": "2456ff5c95edfc3b197cb012b947012faed77591",
         "type": "github"
       },
       "original": {
@@ -24,11 +24,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -55,38 +55,21 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "ghostty": {
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "zig": "zig",
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1759330332,
-        "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
+        "lastModified": 1748207486,
+        "narHash": "sha256-4kR7VyauWpNMrBePHMM8yzQvUzHHGRVkQpJ3DyoKcH0=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
+        "rev": "3f6c02b49e08aed51e4be85d87b79b9dbea34a85",
         "type": "github"
       },
       "original": {
@@ -102,11 +85,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1747556831,
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
         "type": "github"
       },
       "original": {
@@ -132,73 +115,13 @@
         "type": "github"
       }
     },
-    "nixgl": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1752054764,
-        "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
-        "owner": "guibou",
-        "repo": "nixGL",
-        "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "guibou",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748189127,
-        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
-        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1758360447,
-        "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
-        "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1746378225,
-        "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=",
+        "lastModified": 1747953325,
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "93e8cdce7afc64297cfec447c311470788131cd9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1759281824,
-        "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5b5be50345d4113d04ba58c444348849f5585b4a",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
         "type": "github"
       },
       "original": {
@@ -208,14 +131,45 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1741992157,
+        "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "da4b122f63095ca1199bd4d526f9e26426697689",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "release-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1741865919,
+        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
@@ -233,26 +187,10 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "zig": {
       "inputs": {
         "flake-compat": [
-          "ghostty",
-          "flake-compat"
+          "ghostty"
         ],
         "flake-utils": [
           "ghostty",
@@ -260,15 +198,15 @@
         ],
         "nixpkgs": [
           "ghostty",
-          "nixpkgs"
+          "nixpkgs-stable"
         ]
       },
       "locked": {
-        "lastModified": 1748261582,
-        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
+        "lastModified": 1741825901,
+        "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
+        "rev": "0b14285e283f5a747f372fb2931835dd937c4383",
         "type": "github"
       },
       "original": {
@@ -279,20 +217,27 @@
     },
     "zon2nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": [
+          "ghostty",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ghostty",
+          "nixpkgs-unstable"
+        ]
       },
       "locked": {
-        "lastModified": 1758405547,
-        "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
+        "lastModified": 1742104771,
+        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
         "owner": "jcollie",
         "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       },
       "original": {
         "owner": "jcollie",
+        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
         "type": "github"
       }
     }

flake.nix

@@ -12,7 +12,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    nixgl.url = "github:guibou/nixGL";
   };
 
   outputs = inputs @ {
@@ -22,7 +21,6 @@
     darwin,
     home-manager,
     ghostty,
-    nixgl,
     ...
   }: let
     userName = "wyatt";
@@ -49,7 +47,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -72,7 +70,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -96,7 +94,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "server"; };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -131,17 +129,5 @@
       #   }
       # ];
     };
-
-    # For anyone running home-manager standalone
-    homeConfigurations.${userName} = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
-      modules = [
-        ./home
-      ];
-      # Optionally, pass specialArgs if needed
-      extraSpecialArgs = extraSpecialArgs // { 
-        inherit nixgl;
-      };
-    };
   };
 }

home/bat.nix

@@ -1,17 +0,0 @@
-{ pkgs, ... }: {
-  programs.bat = {
-    enable = true;
-    config.theme = "catppuccin";
-
-    themes.catppuccin = {
-      src = pkgs.fetchFromGitHub {
-        owner = "catppuccin";
-        repo = "bat";
-        rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-        hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-      };
-
-      file = "/Catppuccin-mocha.tmTheme";
-    };
-  };
-}

home/browser.nix

@@ -1,4 +1,5 @@
 {
+  role,
   pkgs,
   lib,
   ...
@@ -9,7 +10,7 @@
   };
 
   programs.chromium = {
-    enable = pkgs.stdenv.isLinux;
+    enable = pkgs.stdenv.isLinux && role == "devel";
     package = pkgs.ungoogled-chromium.override {
       enableWideVine = true;
       commandLineArgs = [
@@ -38,14 +39,14 @@
       (createChromiumExtension {
         # ublock origin
         id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
-        sha256 = "sha256:054kqrai2kd89bzc5c3x17rjfdil2zzxrxrg65vaywmvm77y7kmn";
+        sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
         # sha256 = lib.fakeSha256;
         version = "1.64.0";
       })
       (createChromiumExtension {
         # bitwarden
         id = "nngceckbapebfimnlniiiahkandclblb";
-        sha256 = "sha256:02cscadjqbfx3a5bky1zc38pxymzgndb9h3wing3pb0fwm30yrzd";
+        sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
         # sha256 = lib.fakeSha256;
         version = "2025.5.0";
       })

home/default.nix

@@ -4,6 +4,7 @@
   userName,
   userEmail,
   ghostty,
+  role,
   ...
 }: let
   # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -13,7 +14,7 @@
   };
 in {
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty role;}) [
     ./atuin.nix
     ./shell.nix
     ./packages
@@ -25,9 +26,6 @@ in {
     ./sway.nix
     ./terminal.nix
     ./browser.nix
-    ./zellij.nix
-    ./bat.nix
-    ./fonts.nix
   ];
 
   # Home Manager needs a bit of information about you and the
@@ -40,9 +38,8 @@ in {
       else "/home/${userName}";
 
     sessionVariables = {
-      XDG_CURRENT_DESKTOP = "gnome";
+      XDG_CURRENT_DESKTOP = "sway";
       XDG_SESSION_TYPE = "wayland";
-      XDG_SESSION_DESKTOP="gnome";
       XDG_CONFIG_HOME = "$HOME/.config";
       XDG_CACHE_HOME = "$HOME/.cache";
       XDG_DATA_HOME = "$HOME/.local/share";

home/fonts.nix

@@ -1,16 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  fonts.fontconfig.enable = true;
-  home.packages = with pkgs;
-    [
-      noto-fonts
-      noto-fonts-emoji
-      liberation_ttf
-      noto-fonts-cjk-sans
-      monaspace
-    ]
-    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-}

home/git.nix

@@ -15,7 +15,7 @@
     extraConfig = {
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      pull.rebase = false;
+      pull.merge = true;
       merge.tool = "nvimdiff";
       mergetool.keepBackup = false;
     };

home/packages/common.nix

@@ -4,7 +4,7 @@
   ...
 }: {
   home.packages = with pkgs; [
-    yazi # terminal file manager
+    nnn # terminal file manager
 
     # archives
     zip
@@ -13,7 +13,9 @@
     p7zip
 
     # utils
+    zellij
     tmux
+    bat
     lazygit
     bottom
     ripgrep
@@ -39,13 +41,9 @@
     babelfish
 
     # language-specific package managers
-    # nodejs
-    fnm
+    nodejs
     cargo
     python3
-    python312Packages.gyp
-    node-gyp
-    node-pre-gyp
 
     # nix specific stuff
     nixd

home/packages/linux.nix

@@ -5,19 +5,12 @@
 }: {
   home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
     imv
-    # betterdiscordctl
-    # vesktop
+    betterdiscordctl
+    vesktop
     xdg-utils
+    mcrcon
     xfce.thunar
     pavucontrol
-    # godot
-    # aseprite
-    gpu-screen-recorder
-    gpu-screen-recorder-gtk
     # ungoogled-chromium
-    playerctl
-    light
-    brightnessctl
-    wttrbar
   ]);
 }

home/shell.nix

@@ -1,9 +1,9 @@
-{pkgs, lib, ...}: {
+{pkgs, ...}: {
   programs.fish = {
     enable = true;
-    shellInit = ''
-      fnm env --use-on-cd --shell fish | source
-    '';
+    # initExtra = ''
+    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
+    # '';
 
     shellAliases = {
       # ls aliases
@@ -52,27 +52,6 @@
         '';
         onEvent = "fish_greeting";
       };
-    } // lib.optionalAttrs pkgs.stdenv.isLinux {
-      block = {
-        body = ''
-          systemd-inhibit --what=sleep --who="$USER" --why="manual invocation" --mode=block sleep infinity &
-          set -g INHIBIT_PID $last_pid
-          echo "Sleep inhibited. PID: $INHIBIT_PID"
-        '';
-      };
-
-      unblock = {
-        body = ''
-          if set -q INHIBIT_PID
-            kill $INHIBIT_PID 2>/dev/null
-            and echo "Sleep inhibitor removed. PID: $INHIBIT_PID"
-            or echo "Failed to kill process or already terminated."
-            set -e INHIBIT_PID
-          else
-            echo "No active sleep inhibitor found."
-          end
-        '';
-      };
     };
   };
 

home/sway.nix

@@ -1,8 +1,10 @@
 {
   lib,
   pkgs,
+  role,
   ...
 }: let
+  isDevel = pkgs.stdenv.isLinux && role == "devel";
   dirs = {
     defaults = ../defaults;
   };
@@ -16,7 +18,7 @@
   };
 in {
   wayland.windowManager.sway = {
-    enable = pkgs.stdenv.isLinux;
+    enable = isDevel;
     extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
     xwayland = true;
     systemd.enable = true;
@@ -29,123 +31,26 @@ in {
   xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
   xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
   xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
-
-  programs.wofi = { 
-    enable = pkgs.stdenv.isLinux;
-    settings = {
-      width=600;
-      height=350;
-      location="center";
-      show="drun";
-      prompt="Search...";
-      filter_rate=100;
-      allow_markup=true;
-      no_actions=true;
-      halign="fill";
-      orientation="vertical";
-      content_halign="fill";
-      insensitive=true;
-      allow_images=true;
-      image_size=40;
-      gtk_dark=true;
-    };
-    style = ''
-      @define-color	selected-text  #8caaee;
-      @define-color	text  #c6d0f5;
-      @define-color	base  #24273a;
-
-      * {
-        font-family: 'Monaspace Krypton 9', monospace;
-        font-size: 18px;
-      }
-
-      window {
-        margin: 0px;
-        padding: 20px;
-        background-color: @base;
-        opacity: 0.95;
-      }
-
-      #inner-box {
-        margin: 0;
-        padding: 0;
-        border: none;
-        background-color: @base;
-      }
-
-      #outer-box {
-        margin: 0;
-        padding: 20px;
-        border: none;
-        background-color: @base;
-      }
-
-      #scroll {
-        margin: 0;
-        padding: 0;
-        border: none;
-        background-color: @base;
-      }
-
-      #input {
-        margin: 0;
-        padding: 10px;
-        border: none;
-        background-color: @base;
-        color: @text;
-      }
-
-      #input:focus {
-        outline: none;
-        box-shadow: none;
-        border: none;
-      }
-
-      #text {
-        margin: 5px;
-        border: none;
-        color: @text;
-      }
-
-      #entry {
-        background-color: @base;
-      }
-
-      #entry:selected {
-        outline: none;
-        border: none;
-      }
-
-      #entry:selected #text {
-        color: @selected-text;
-      }
-
-      #entry image {
-        -gtk-icon-transform: scale(0.7);
-      }
-    '';
-  };
-  programs.swaylock.enable = pkgs.stdenv.isLinux;
-  
-  services.mako = {
-    enable = pkgs.stdenv.isLinux;
-    settings = {
-      text-color="#cad3f5";
-      border-color="#c6d0f5";
-      background-color="#24273a";
-      width=420;
-      height=110;
-      padding=10;
-      border-size=2;
-      font="Monaspace Krypton 9";
-      anchor="top-right";
-      default-timeout=5000;
-      max-icon-size=32;
-    };
-  };
+  programs.rofi.enable = isDevel;
+  services.mako.enable = isDevel;
 
   programs.waybar = {
-    enable = pkgs.stdenv.isLinux;
+    enable = isDevel;
     systemd.enable = true;
+
+    package = pkgs.waybar.overrideAttrs (old: {
+      version = "0.11.0";
+
+      src = pkgs.fetchFromGitHub {
+        owner = "Alexays";
+        repo = "Waybar";
+        rev = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47";
+        sha256 = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
+        fetchSubmodules = true;
+      };
+
+      buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ];
+      # mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
+    });
   };
 }

home/terminal.nix

@@ -100,51 +100,8 @@
     };
   };
 
-
-    programs.foot = {
-      enable = true;
-      settings = {
-        main = {
-          font = "Monaspace Argon:size=11";
-        };
-        colors = {
-          alpha = 0.9;
-
-          cursor = "11111b f5e0dc";
-          foreground = "cdd6f4";
-          background = "1e1e2e";
-
-          regular0 = "45475a";
-          regular1 = "f38ba8";
-          regular2 = "a6e3a1";
-          regular3 = "f9e2af";
-          regular4 = "89b4fa";
-          regular5 = "f5c2e7";
-          regular6 = "94e2d5";
-          regular7 = "bac2de";
-
-          bright0 = "585b70";
-          bright1 = "f38ba8";
-          bright2 = "a6e3a1";
-          bright3 = "f9e2af";
-          bright4 = "89b4fa";
-          bright5 = "f5c2e7";
-          bright6 = "94e2d5";
-          bright7 = "a6adc8";
-
-          "16" = "fab387";
-          "17" = "f5e0dc";
-
-          selection-foreground = "cdd6f4";
-          selection-background = "414356";
-
-          search-box-no-match = "11111b f38ba8";
-          search-box-match = "cdd6f4 313244";
-
-          jump-labels = "11111b fab387";
-          urls = "89b4fa";
-        };
-      };
+  programs.kitty = {
+    enable = false; # TODO: to enable later
   };
 
   home.packages = if pkgs.stdenv.isLinux then

home/zellij.nix

@@ -1,14 +0,0 @@
-{ 
-  lib, 
-  ... 
-}: let
-  dirs = {
-    defaults = ../defaults;
-  };
-in {
-  programs.zellij = {
-    enable = true;
-  };
-
-  xdg.configFile."zellij/config.kdl".source = lib.mkForce (dirs.defaults + /zellij/config.kdl);
-}

modules/apps/appimage.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.appimage;
-in {
-  options.appimage = {
-    enable = mkEnableOption "AppImage support";
-  };
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      appimageupdate
-      appimage-run
-    ];
-  };
-}

modules/common/default.nix

@@ -5,7 +5,6 @@
 }: {
   imports = [
     ./core.nix
-    ./environment.nix
     ./fonts.nix
     ./users.nix
   ];

modules/common/environment.nix

@@ -1,23 +0,0 @@
-{ lib, pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    git
-    vim
-    neovim
-    usbutils
-    coreutils
-    pciutils
-    patchelf
-    htop
-  ] ++ 
-  lib.optionals pkgs.stdenv.isLinux (with pkgs; [
-    systemd
-    lshw
-    dmidecode
-    nix-ld
-  ]) ++
-  lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
-      # nothing here, yet ;)
-  ]);
-
-  environment.variables.EDITOR = "nvim";
-}

modules/common/users.nix

@@ -1,38 +1,35 @@
-{ lib, pkgs, userName, hostname, ... }:
-
 {
+  lib,
+  pkgs,
+  userName,
+  hostname,
+  ...
+} @ args: {
+  imports = [
+    ../security/sudo.nix
+  ];
+
   networking.hostName = hostname;
 
-  users.users."${userName}" = {
-    home = if pkgs.stdenv.isDarwin 
+  # Don't forget to set a password with ‘passwd’!
+  users.users."${userName}" = lib.mkMerge [
+    {
+      home =
+        if pkgs.stdenv.isDarwin
         then "/Users/${userName}"
         else "/home/${userName}";
       description = userName;
-  } // lib.optionalAttrs pkgs.stdenv.isLinux {
+    }
+
+    (lib.mkIf (pkgs.stdenv.isLinux) {
       group = "${userName}";
       isNormalUser = true;
-  };
+    })
+  ];
+
+  security.sudo.needsPassword = false;
 
   users.groups.wyatt = {};
+
   nix.settings.trusted-users = [userName];
-
-  security = lib.optionalAttrs pkgs.stdenv.isLinux {
-    sudo.extraRules = [
-      {
-        groups = [ "wheel" ];
-        commands = [
-          {
-            command = "ALL";
-            options = [ "NOPASSWD" "SETENV" ];
-          }
-        ];
-      }
-    ];
-  };
-
-  environment = lib.optionalAttrs pkgs.stdenv.isDarwin {
-    etc."sudoers.d/wheel-nopasswd".text = ''
-      %wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL
-    '';
-  };
 }

modules/machine/cloud/configuration.nix

@@ -21,13 +21,11 @@ in {
       inherit lib pkgs flatpakPackages;
     })
     ../../apps/gaming.nix
-    ../../apps/appimage.nix
     ../../graphics
     ../../pwrMgmt
     ../../networking/core.nix
     ../../sound/pipewire.nix
     ../../sound/shairport.nix
-    ../../sound/focusrite.nix
     ../../virtualization/podman.nix
     ../../virtualization/hardware.nix
   ];
@@ -36,13 +34,9 @@ in {
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
   # Custom kernel/boot stuff
-  boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   # Enable Bluetooth if present
   hardware.bluetooth.enable = true;
@@ -52,23 +46,40 @@ in {
 
   # Install packages to be installed system-wide
   environment.systemPackages = with pkgs; [
+    vim
+    neovim
+    git
     wireguard-tools
     grim
     slurp
     playerctl
     light
     brightnessctl
+    firefox
     wttrbar
     cliphist
-    xdg-desktop-portal-gtk
-    xdg-utils
-    flatpak-xdg-utils
-    desktop-file-utils
-    shared-mime-info
-    wl-clipboard
-    wl-clip-persist
+    patchelf
+    nix-ld
   ];
 
+  # Set the EDITOR global environment variable to neovim
+  environment.variables.EDITOR = "nvim";
+
+  # Enable OpenSSH
+  services.openssh.enable = true;
+
+  # Enable keyring
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable GnuPG
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable SUID wrappers (some programs need them)
+  programs.mtr.enable = true;
+
   # Enable Polkit
   security.polkit.enable = true;
 
@@ -136,54 +147,28 @@ in {
     networkManager.enable = true;
   };
 
-  programs = {
-    # Enable GnuPG
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
-    # Enable SUID wrappers (some programs need them)
-    mtr.enable = true;
-
   # Enable dconf
-    dconf.enable = true;
-  };
+  programs.dconf.enable = true;
 
   # Add username to groups "wheel" and "video" - more may be added here later
   users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
 
-  services = {
-    # Enable OpenSSH
-    openssh.enable = true;
-
-    # Enable keyring
-    gnome.gnome-keyring.enable = true;
-
   # Flatpak packages (see ../../apps/flatpak.nix)
-    flatpak.packages = flatpakPackages;
-  };
-
-  # Focusrite Scarlett audio interface support (see ../../sound/focusrite.nix)
-  sound.hardware.focusrite.enable = true;
-
-  # AppImage support
-  appimage.enable = true;
+  services.flatpak.packages = flatpakPackages;
 
   # XDG stuff
   xdg = {
     portal = {
       enable = true;
+      wlr.enable = true;
       config = {
-        sway = {
-          default = ["wlr" "gtk"];
-          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
-        };
         common = {
-          default = ["gtk"];
-          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+          default = [
+            "wlr"
+          ];
         };
       };
+      xdgOpenUsePortal = true;
       extraPortals = with pkgs; [
         xdg-desktop-portal-wlr
         xdg-desktop-portal-gtk

modules/machine/valefor/README.md

@@ -6,4 +6,4 @@ Licensed by the Mozilla Public License v2
 
 ## Synopsis
 
-This is where the machine-specific configuration files for hostname `valefor` live, my apartment appliance server. These files get called by the root `flake.nix` file.
+This directory is currently empty so, currently, there's nothing to see! However, this is where the machine-specific configuration files for hostname `valefor` live, my apartment appliance server. These files get called by the root `flake.nix` file.

modules/machine/valefor/configuration.nix

@@ -27,6 +27,18 @@
   # Set your timezone
   time.timeZone = "America/Detroit";
 
+  # Install packages to be installed system-wide
+  environment.systemPackages = with pkgs; [
+    vim
+    neovim
+    git
+    patchelf
+    nix-ld
+  ];
+
+  # Set the EDITOR global environment variable to neovim
+  environment.variables.EDITOR = "nvim";
+
   # Enable OpenSSH
   services.openssh.enable = true;
 
@@ -75,7 +87,12 @@
 
   # Core networking module (see ../../networking/core.nix)
   network = {
-    firewall.enable = true;
+    firewall = {
+      enable = true;
+      tcpPorts = {
+        allowedPorts = [8123];
+      };
+    };
     networkManager.enable = true;
   };
 
@@ -85,7 +102,37 @@
   };
 
   # Add username to groups "wheel" and "video" - more may be added here later
-  users.users.${userName}.extraGroups = ["wheel" "podman" "network"];
+  users.users.${userName} = { 
+    extraGroups = ["wheel" "podman" "network"]; 
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+    ];
+  };
+
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+  ];
+
+  # Add Home Assistant service
+  services.home-assistant = {
+    enable = true;
+    extraComponents = [
+      "esphome"
+      "met"
+      "radio_browser"
+      "homeassistant_hardware"
+      "zha"
+      "group"
+      "mikrotik"
+    ];
+    config = {
+      # Includes dependencies for a basic setup
+      # https://www.home-assistant.io/integrations/default_config/
+      default_config = {};
+    };
+  };
+
+  security.sudo.wheelNeedsPassword = false;
 
   system.stateVersion = "24.11";
 }

modules/security/sudo.nix

@@ -5,7 +5,7 @@
 }:
 with lib; {
   options = {
-    security.sudoers = {
+    security.sudo = {
       needsPassword = mkOption {
         type = types.bool;
         default = true;

modules/sound/focusrite.nix

@@ -1,33 +0,0 @@
-# Must be paired with the pipewire Nix module, this does nothing but install packages
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.sound.hardware.focusrite;
-in {
-  options.sound.hardware.focusrite = {
-    enable = mkEnableOption "Focusrite audio interface support";
-    guiSupport = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable GUI support for Focusrite Scarlett audio interface (installs alsa-scarlett-gui)";
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      environment.systemPackages = with pkgs;
-        [
-          scarlett2
-          alsa-scarlett-gui
-        ]
-        ++ (
-          if cfg.guiSupport
-          then [pkgs.alsa-scarlett-gui]
-          else []
-        );
-    }
-  ]);
-}