Update repo-managed configs

flake.lock

@@ -0,0 +1,48 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770491427,
+        "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -2,9 +2,9 @@
   description = "sam-4screen-desktop NixOS + Home Manager flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

home/sam/config/atuin/atuin-receipt.json

@@ -1 +0,0 @@
-{"binaries":["atuin"],"binary_aliases":{},"cdylibs":[],"cstaticlibs":[],"install_layout":"flat","install_prefix":"/home/sam/.atuin/bin","modify_path":true,"provider":{"source":"cargo-dist","version":"0.28.3"},"source":{"app_name":"atuin","name":"atuin","owner":"atuinsh","release_type":"github"},"version":"18.6.1"}

home/sam/config/atuin/config.toml

@@ -41,7 +41,7 @@
 # search_mode = "fuzzy"
 
 ## which filter mode to use by default
-## possible values: "global", "host", "session", "directory", "workspace"
+## possible values: "global", "host", "session", "session-preload", "directory", "workspace"
 ## consider using search.filters to customize the enablement and order of filter modes
 # filter_mode = "global"
 
@@ -49,7 +49,7 @@
 ## in any directory within a git repository tree (default: false).
 ##
 ## To use workspace mode by default when available, set this to true and
-## set filter_mode to "workspace" or leave it unspecified and 
+## set filter_mode to "workspace" or leave it unspecified and
 ## set search.filters to include "workspace" before other filter modes.
 # workspaces = false
 
@@ -71,6 +71,11 @@
 ## set it to 0 to always go full screen
 # inline_height = 0
 
+## the maximum number of lines the interface should take up
+## when atuin is invoked from a shell up-key binding
+## the accepted values are identical to those of "inline_height"
+# inline_height_shell_up_key_binding = 0
+
 ## Invert the UI - put the search bar at the top , Default to `false`
 # invert = false
 
@@ -95,6 +100,10 @@
 ## alt-0 .. alt-9
 # ctrl_n_shortcuts = false
 
+## Show numeric shortcuts (1..9) beside list items in the TUI
+## set to false to hide the moving numbers if you find them distracting
+# show_numeric_shortcuts = true
+
 ## default history list format - can also be specified with the --format arg
 # history_format = "{time}\t{command}\t{duration}"
 
@@ -145,10 +154,15 @@
 ## 5. Stripe live/test keys
 # secrets_filter = true
 
-## Defaults to true. If enabled, upon hitting enter Atuin will immediately execute the command. Press tab to return to the shell and edit.
-# This applies for new installs. Old installs will keep the old behaviour unless configured otherwise.
+## Defaults to true. If enabled, upon hitting enter Atuin will immediately execute the command,
+## whereas tab will put the command in the prompt for editing.
+## If set to false, both enter and tab will place the command in the prompt for editing.
+## This applies for new installs. Old installs will keep the old behaviour unless configured otherwise.
 enter_accept = true
 
+## Defaults to false. If enabled, when triggered after &&, || or |, Atuin will complete commands to chain rather than replace the current line.
+# command_chaining = false
+
 ## Defaults to "emacs".  This specifies the keymap on the startup of `atuin
 ## search`.  If this is set to "auto", the startup keymap mode in the Atuin
 ## search is automatically selected based on the shell's keymap where the
@@ -180,6 +194,7 @@ enter_accept = true
 #   "composer",
 #   "dnf",
 #   "docker",
+#   "dotnet",
 #   "git",
 #   "go",
 #   "ip",
@@ -214,6 +229,10 @@ enter_accept = true
 # exit_past_line_start = true
 # Defaults to true. The right arrow key performs the same functionality as Tab and copies the selected line to the command line to be modified.
 # accept_past_line_end = true
+# Defaults to false. The left arrow key performs the same functionality as Tab and copies the selected line to the command line to be modified.
+# accept_past_line_start = false
+# Defaults to false. The backspace key performs the same functionality as Tab and copies the selected line to the command line to be modified when at the start of the line.
+# accept_with_backspace = false
 
 [sync]
 # Enable sync v2 by default
@@ -269,4 +288,4 @@ records = true
 ## The list of enabled filter modes, in order of priority.
 ## The "workspace" mode is skipped when not in a workspace or workspaces = false.
 ## Default filter mode can be overridden with the filter_mode setting.
-# filters = [ "global", "host", "session", "workspace", "directory" ]
+# filters = [ "global", "host", "session", "session-preload", "workspace", "directory" ]

home/sam/config/kitty/current-theme.conf

@@ -1,29 +0,0 @@
-background            #0a1e24
-foreground            #ecefc1
-cursor                #708183
-selection_background  #0a385c
-color0                #6e5246
-color8                #674c31
-color1                #e35a00
-color9                #ff8a39
-color2                #5cab96
-color10               #adcab8
-color3                #e3cd7b
-color11               #ffc777
-color4                #0e548b
-color12               #67a0cd
-color5                #e35a00
-color13               #ff8a39
-color6                #06afc7
-color14               #83a6b3
-color7                #f0f1ce
-color15               #fefff0
-selection_foreground #0a1e24
-
-# START_AUTOGENERATED_TAB_STYLE
-# Feel free to update these colors manually and remove these comments.
-active_tab_foreground   #eeeeee
-active_tab_background   #0a385c
-inactive_tab_foreground #ecefc1
-inactive_tab_background #08181d
-# END_AUTOGENERATED_TAB_STYLE

home/sam/config/kitty/kitty.conf

@@ -1,4 +0,0 @@
-# BEGIN_KITTY_THEME
-# Spacedust
-include current-theme.conf
-# END_KITTY_THEME

home/sam/config/kitty/kitty.conf

@@ -0,0 +1 @@
+/nix/store/gc99q91ai15df90fy326gh4ddjhfbbc5-home-manager-files/.config/kitty/kitty.conf

home/sam/config/waybar/config.jsonc

@@ -1,5 +1,4 @@
 ─────┬──────────────────────────────────────────────────────────────────────────
      │ STDIN
 ─────┼──────────────────────────────────────────────────────────────────────────
-   1 │ 
-   2 │ git add home/sam/config/waybar
+   1 │ sam4jo

home/sam/config/zellij/config.kdl

@@ -1,7 +1,3 @@
-//
-// THIS FILE WAS AUTOGENERATED BY ZELLIJ, THE PREVIOUS FILE AT THIS LOCATION WAS COPIED TO: /home/sam/.config/zellij/config.kdl.bak
-//
-
 keybinds clear-defaults=true {
     locked {
         bind "Ctrl g" { SwitchToMode "normal"; }
@@ -275,12 +271,6 @@ load_plugins {
 web_client {
     font "monospace"
 }
-
-
-options {
-    theme "catppuccin-macchiato"
-  }
-
  
 // Use a simplified UI without special fonts (arrow glyphs)
 // Options:
@@ -302,8 +292,7 @@ options {
 // Choose the path to the default shell that zellij will use for opening new panes
 // Default: $SHELL
 // 
-default_shell "/snap/bin/nu"
-
+// default_shell "fish"
  
 // Choose the path to override cwd that zellij will use for opening new panes
 // 
@@ -514,7 +503,7 @@ default_shell "/snap/bin/nu"
 // Whether to show tips on startup
 // Default: true
 // 
-show_startup_tips false
+// show_startup_tips false
  
 // Whether to show release notes on first version run
 // Default: true

home/sam/config/zellij/config.kdl.bak

@@ -1,532 +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 "i" { TogglePanePinned; SwitchToMode "normal"; }
-        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 "s" { NewPane "stacked"; 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 "e" { EditScrollback; 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 "a" {
-            LaunchOrFocusPlugin "zellij:about" {
-                floating true
-                move_to_focused_tab true
-            }
-            SwitchToMode "normal"
-        }
-        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 "s" {
-            LaunchOrFocusPlugin "zellij:share" {
-                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 left" { MoveFocusOrTab "left"; }
-        bind "Alt down" { MoveFocus "down"; }
-        bind "Alt up" { MoveFocus "up"; }
-        bind "Alt right" { MoveFocusOrTab "right"; }
-        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 h" { MoveFocusOrTab "left"; }
-        bind "Alt i" { MoveTab "left"; }
-        bind "Alt j" { MoveFocus "down"; }
-        bind "Alt k" { MoveFocus "up"; }
-        bind "Alt l" { MoveFocusOrTab "right"; }
-        bind "Alt n" { NewPane; }
-        bind "Alt o" { MoveTab "right"; }
-        bind "Alt p" { TogglePaneInGroup; }
-        bind "Alt Shift p" { ToggleGroupMarking; }
-        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" "search" "tmux" {
-        bind "Ctrl b" { SwitchToMode "tmux"; }
-    }
-    shared_except "locked" "scroll" "search" {
-        bind "Ctrl s" { SwitchToMode "scroll"; }
-    }
-    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 "Ctrl s" { SwitchToMode "normal"; }
-        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"; }
-    }
-}
-
-// Plugin aliases - can be used to change the implementation of Zellij
-// changing these requires a restart to take effect
-plugins {
-    about location="zellij:about"
-    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"
-    welcome-screen location="zellij:session-manager" {
-        welcome_screen true
-    }
-}
-
-// Plugins to load in the background when a new session starts
-// eg. "file:/path/to/my-plugin.wasm"
-// eg. "https://example.com/my-plugin.wasm"
-load_plugins {
-}
-web_client {
-    font "monospace"
-}
- 
-// Use a simplified UI without special fonts (arrow glyphs)
-// Options:
-//   - true
-//   - false (Default)
-// 
-// simplified_ui true
- 
-// Choose the theme that is specified in the themes section.
-// Default: default
-// 
-// theme "dracula"
- 
-// Choose the base input mode of zellij.
-// Default: normal
-// 
-// default_mode "locked"
- 
-// Choose the path to the default shell that zellij will use for opening new panes
-// Default: $SHELL
-// 
-// default_shell "fish"
- 
-// Choose the path to override cwd that zellij will use for opening new panes
-// 
-// default_cwd "/tmp"
- 
-// The name of the default layout to load on startup
-// Default: "default"
-// 
-// default_layout "compact"
- 
-// The folder in which Zellij will look for layouts
-// (Requires restart)
-// 
-// layout_dir "/tmp"
- 
-// The folder in which Zellij will look for themes
-// (Requires restart)
-// 
-// theme_dir "/tmp"
- 
-// Toggle enabling the mouse mode.
-// On certain configurations, or terminals this could
-// potentially interfere with copying text.
-// Options:
-//   - true (default)
-//   - false
-// 
-// mouse_mode false
- 
-// Toggle having pane frames around the panes
-// Options:
-//   - true (default, enabled)
-//   - false
-// 
-// pane_frames false
- 
-// When attaching to an existing session with other users,
-// should the session be mirrored (true)
-// or should each user have their own cursor (false)
-// (Requires restart)
-// Default: false
-// 
-// mirror_session true
- 
-// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
-// eg. when terminal window with an active zellij session is closed
-// (Requires restart)
-// Options:
-//   - detach (Default)
-//   - quit
-// 
-// on_force_close "quit"
- 
-// Configure the scroll back buffer size
-// This is the number of lines zellij stores for each pane in the scroll back
-// buffer. Excess number of lines are discarded in a FIFO fashion.
-// (Requires restart)
-// Valid values: positive integers
-// Default value: 10000
-// 
-// scroll_buffer_size 10000
- 
-// Provide a command to execute when copying text. The text will be piped to
-// the stdin of the program to perform the copy. This can be used with
-// terminal emulators which do not support the OSC 52 ANSI control sequence
-// that will be used by default if this option is not set.
-// Examples:
-//
-// copy_command "xclip -selection clipboard" // x11
-// copy_command "wl-copy"                    // wayland
-// copy_command "pbcopy"                     // osx
-// 
-// copy_command "pbcopy"
- 
-// Choose the destination for copied text
-// Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
-// Does not apply when using copy_command.
-// Options:
-//   - system (default)
-//   - primary
-// 
-// copy_clipboard "primary"
- 
-// Enable automatic copying (and clearing) of selection when releasing mouse
-// Default: true
-// 
-// copy_on_select true
- 
-// Path to the default editor to use to edit pane scrollbuffer
-// Default: $EDITOR or $VISUAL
-// scrollback_editor "/usr/bin/vim"
- 
-// A fixed name to always give the Zellij session.
-// Consider also setting `attach_to_session true,`
-// otherwise this will error if such a session exists.
-// Default: <RANDOM>
-// 
-// session_name "My singleton session"
- 
-// When `session_name` is provided, attaches to that session
-// if it is already running or creates it otherwise.
-// Default: false
-// 
-// attach_to_session true
- 
-// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible
-// Options:
-//   - true (default)
-//   - false
-// 
-// auto_layout false
- 
-// Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected
-// Options:
-//   - true (default)
-//   - false
-// 
-// session_serialization false
- 
-// Whether pane viewports are serialized along with the session, default is false
-// Options:
-//   - true
-//   - false (default)
-// 
-// serialize_pane_viewport false
- 
-// Scrollback lines to serialize along with the pane viewport when serializing sessions, 0
-// defaults to the scrollback size. If this number is higher than the scrollback size, it will
-// also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true.
-// 
-// scrollback_lines_to_serialize 10000
- 
-// Enable or disable the rendering of styled and colored underlines (undercurl).
-// May need to be disabled for certain unsupported terminals
-// (Requires restart)
-// Default: true
-// 
-// styled_underlines false
- 
-// How often in seconds sessions are serialized
-// 
-// serialization_interval 10000
- 
-// Enable or disable writing of session metadata to disk (if disabled, other sessions might not know
-// metadata info on this session)
-// (Requires restart)
-// Default: false
-// 
-// disable_session_metadata false
- 
-// Enable or disable support for the enhanced Kitty Keyboard Protocol (the host terminal must also support it)
-// (Requires restart)
-// Default: true (if the host terminal supports it)
-// 
-// support_kitty_keyboard_protocol false
-// Whether to make sure a local web server is running when a new Zellij session starts.
-// This web server will allow creating new sessions and attaching to existing ones that have
-// opted in to being shared in the browser.
-// When enabled, navigate to http://127.0.0.1:8082
-// (Requires restart)
-// 
-// Note: a local web server can still be manually started from within a Zellij session or from the CLI.
-// If this is not desired, one can use a version of Zellij compiled without
-// `web_server_capability`
-// 
-// Possible values:
-// - true
-// - false
-// Default: false
-// 
-// web_server false
-// Whether to allow sessions started in the terminal to be shared through a local web server, assuming one is
-// running (see the `web_server` option for more details).
-// (Requires restart)
-// 
-// Note: This is an administrative separation and not intended as a security measure.
-// 
-// Possible values:
-// - "on" (allow web sharing through the local web server if it
-// is online)
-// - "off" (do not allow web sharing unless sessions explicitly opt-in to it)
-// - "disabled" (do not allow web sharing and do not permit sessions started in the terminal to opt-in to it)
-// Default: "off"
-// 
-// web_sharing "off"
-// A path to a certificate file to be used when setting up the web client to serve the
-// connection over HTTPs
-// 
-// web_server_cert "/path/to/cert.pem"
-// A path to a key file to be used when setting up the web client to serve the
-// connection over HTTPs
-// 
-// web_server_key "/path/to/key.pem"
-/// Whether to enforce https connections to the web server when it is bound to localhost
-/// (127.0.0.0/8)
-///
-/// Note: https is ALWAYS enforced when bound to non-local interfaces
-///
-/// Default: false
-// 
-// enforce_https_for_localhost false
- 
-// Whether to stack panes when resizing beyond a certain size
-// Default: true
-// 
-// stacked_resize false
- 
-// Whether to show tips on startup
-// Default: true
-// 
-// show_startup_tips false
- 
-// Whether to show release notes on first version run
-// Default: true
-// 
-// show_release_notes false
- 
-// Whether to enable mouse hover effects and pane grouping functionality
-// default is true
-// advanced_mouse_actions false
- 
-// The ip address the web server should listen on when it starts
-// Default: "127.0.0.1"
-// (Requires restart)
-// web_server_ip "127.0.0.1"
- 
-// The port the web server should listen on when it starts
-// Default: 8082
-// (Requires restart)
-// web_server_port 8082
- 
-// A command to run (will be wrapped with sh -c and provided the RESURRECT_COMMAND env variable) 
-// after Zellij attempts to discover a command inside a pane when resurrecting sessions, the STDOUT
-// of this command will be used instead of the discovered RESURRECT_COMMAND
-// can be useful for removing wrappers around commands
-// Note: be sure to escape backslashes and similar characters properly
-// post_command_discovery_hook "echo $RESURRECT_COMMAND | sed <your_regex_here>"

home/sam/config/zshrc

@@ -1,95 +0,0 @@
-export PATH="$HOME/.cargo/bin:$HOME/.atuin/bin:$HOME/.local/bin:$HOME/.fzf/bin:$PATH"
-
-export OPENAI_API_KEY="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"
-
-export TAVILY_API_KEY="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"
-
-#export GEMINI_API_KEY="AIzaSyAoCOjfPH3HigI6aFFAmg9eVhaHMimM7ak"
-export DEEPSEEK_API_KEY="sk-26c66e4dd5b34017bd66f7aef748c625"
-
-
-
-export EDITOR="nvim"
-export VISUAL="nvim"
-
-
-# This must be at the top for Powerlevel10k Instant Prompt to work.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-# === Oh My Zsh Configuration ===
-# Path to your Oh My Zsh installation.
-export ZSH="$HOME/.oh-my-zsh"
-
-# Set the Powerlevel10k theme.
-ZSH_THEME="powerlevel10k/powerlevel10k"
-
-# Which plugins would you like to load?
-plugins=(git zsh-autosuggestions zsh-syntax-highlighting)
-
-
-# === Custom PATH Configuration ===
-# This is the most critical fix. We set the PATH *before* sourcing Oh My Zsh.
-# This ensures all custom commands are available to the shell and plugins.
-export PATH="$HOME/.local/bin:$HOME/.fzf/bin:$PATH"
-
-
-# === Source Oh My Zsh ===
-# This line loads the Oh My Zsh framework. All customisations must come after this.
-source $ZSH/oh-my-zsh.sh
-
-
-# === Custom Tool Configuration ===
-# All your custom tools are configured here, after OMZ has loaded.
-
-# 1. Bat (Better Cat)
-# On Debian/Ubuntu, the binary is often 'batcat'. If 'bat' is not found,
-# change this alias to 'batcat'.
-alias cat='bat --color=always --paging=never'
-
-# 2. Eza Aliases (Modern replacement for 'ls')
-alias ls='eza --icons --git'
-alias ll='eza -l --icons --git'
-alias la='eza -la --icons --git'
-alias tree='eza --tree'
-
-# 3. Zoxide (Smarter cd)
-eval "$(zoxide init zsh)"
-
-# 4. Atuin (Shell History)
-# Your existing Atuin config.
-eval "$(atuin init zsh)"
-bindkey '^[[A' atuin-up-search   # Up arrow
-bindkey '^[[B' atuin-down-search # Down arrow
-
-# 5. FZF (Fuzzy Finder)
-# The official script handles keybindings (Ctrl+T) and completions.
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-
-# 6. Carapace (Completion Engine)
-# This will now work because the PATH is set correctly above.
-source <(carapace-bin _carapace zsh)
-
-
-# === Load Powerlevel10k Theme ===
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-# This must be the very last thing in your .zshrc
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-
-alias cat='batcat --color=always --paging=never'
-
-export ANDROID_HOME=$HOME/android-sdk
-export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools
-# Source ESP-IDF environment
-# IMPORTANT: Adjust path if your ESP-IDF installation moves
-if [ -d "/home/sam/esp/esp-idf" ]; then
-    . "/home/sam/esp/esp-idf/export.sh"
-fi
-
-# opencode
-export PATH=/home/sam/.opencode/bin:$PATH
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion

home/sam/home.nix

@@ -13,7 +13,7 @@ xdg.configFile."starship.toml".source = ./config/starship.toml;
 
 xdg.configFile."niri" = { source = ./config/niri; recursive = true; };
 xdg.configFile."waybar" = { source = ./config/waybar; recursive = true; };
-
+xdg.configFile."zsh/local.zsh".source = ./config/zsh/local.zsh;
 
 home.username = "sam";
 home.homeDirectory = "/home/sam";
@@ -46,6 +46,9 @@ home.stateVersion = "25.11";
 
    
     initExtra = ''
+      if [ -f "$HOME/.config/zsh/local.zsh" ]; then
+    source "$HOME/.config/zsh/local.zsh"
+  fi
     '';
   };
 
@@ -71,7 +74,7 @@ home.stateVersion = "25.11";
   # ---
   # Terminal / editor
   # ---
-  programs.kitty.enable = true;
+#  programs.kitty.enable = true;
 
   programs.neovim = {
     enable = true;

hosts/sam-4screen-desktop/configuration.nix

@@ -1,6 +1,18 @@
 { config, pkgs, lib, ... }:
 
 {
+
+
+# Stop nouveau from binding the NVIDIA GPU
+  boot.blacklistedKernelModules = [ "nouveau" ];
+  boot.kernelParams = [
+  "intel_iommu=off"
+  "dev_mem_signed_off=1"
+  "modprobe.blacklist=nouveau"
+  "nouveau.modeset=0"
+];
+
+
   imports = [
     ./hardware-configuration.nix
   ];
@@ -17,7 +29,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   # Known-good baseline from niri-4screen.md
-  boot.kernelParams = [ "intel_iommu=off" "dev_mem_signed_off=1" ];
+  
 
   # ---
   # Identity
@@ -121,11 +133,23 @@
   # ---
   # SSH
   # ---
-  services.openssh.enable = true;
-  services.openssh.openFirewall = true;
+  
+services.openssh = {
+enable = true;
+openFirewall = true;
+settings = {
+PasswordAuthentication = true;
+KbdInteractiveAuthentication = true;
+PermitRootLogin = "no";
+};
+};
+
+
+#services.openssh.enable = true;
+ # services.openssh.openFirewall = true;
   # Defaulting to keys-only for safety. If you explicitly want password auth for the migration,
   # flip this to true.
-  services.openssh.settings.PasswordAuthentication = false;
+  #services.openssh.settings.PasswordAuthentication = false;
 
   # Explicitly enable firewall (keep SSH as the only opened port via openFirewall above).
   networking.firewall.enable = true;
@@ -148,11 +172,10 @@
   # ---
   # OpenGL (important for NVIDIA Wayland apps)
   # ---
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
+ hardware.graphics = {
+  enable = true;
+  enable32Bit = true;
+};
 
   # ---
   # Audio (PipeWire)
@@ -193,10 +216,11 @@
     settings = {
       default_session = {
         user = "greeter";
-        command =
-          "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd ${
-            lib.escapeShellArg "${pkgs.niri}/bin/niri --session"
-          }";
+         command =
+  "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd ${
+    lib.escapeShellArg
+      "${pkgs.bash}/bin/bash -lc 'mkdir -p ~/.local/state; exec ${pkgs.niri}/bin/niri --session 2>~/.local/state/niri.log'"
+  }";
       };
     };
   };
@@ -212,6 +236,11 @@
 
   # Minimal system packages needed for the session and core usability
   environment.systemPackages = with pkgs; [
+    waybar
+    firefox
+    google-chrome
+    kitty
+    fuzzel
     niri
     greetd.tuigreet
     xwayland
@@ -227,7 +256,7 @@
   hardware.nvidia.modesetting.enable = true;
   hardware.nvidia.nvidiaSettings = true;
   hardware.nvidia.nvidiaPersistenced = true;
-
+hardware.nvidia.open = false;
   # ---
   # NixOS release compatibility
   # ---

hosts/sam-4screen-desktop/hardware-configuration.nix

@@ -1,18 +1,33 @@
-# -----------------------------------------------------------------------------
-# PLACEHOLDER hardware-configuration.nix
-#
-# Replace this file with the REAL generated hardware configuration from the
-# NixOS installer before installing / switching to this host configuration.
-#
-# How:
-# 1) Boot the NixOS installer ISO
-# 2) Partition/mount target as planned
-# 3) Run: nixos-generate-config --root /mnt
-# 4) Copy the generated /mnt/etc/nixos/hardware-configuration.nix into:
-#    hosts/sam-4screen-desktop/hardware-configuration.nix
-# -----------------------------------------------------------------------------
-
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "ums_cypress" "usbhid" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/fb26cb12-6cbf-4dd9-a53d-5fed72351334";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/4A17-D854";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/7ec41b93-8977-4a56-a6be-5eff57b823b0"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }