aboutsummaryrefslogtreecommitdiffstats
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--home/nipsy/arrakis/mutt/muttrc2
-rw-r--r--home/nipsy/caladan.nix5
-rw-r--r--home/nipsy/caladan/sway/config246
-rw-r--r--home/nipsy/common/core/default.nix1
-rw-r--r--home/nipsy/common/core/git.nix10
-rw-r--r--home/nipsy/common/core/ssh.nix5
-rw-r--r--home/nipsy/common/core/zsh/zshrc6
-rw-r--r--home/nipsy/common/optional/desktops/gtk.nix5
-rw-r--r--home/nipsy/common/optional/desktops/i3/default.nix4
-rw-r--r--home/nipsy/ginaz.nix5
-rw-r--r--home/nipsy/kaitain.nix36
-rw-r--r--home/nipsy/richese.nix28
-rw-r--r--home/root/caladan.nix6
-rw-r--r--home/root/common/core/default.nix1
-rw-r--r--home/root/common/core/git.nix2
-rw-r--r--home/root/common/core/ssh.nix5
-rw-r--r--home/root/kaitain.nix4
-rw-r--r--home/root/richese.nix4
18 files changed, 323 insertions, 52 deletions
diff --git a/home/nipsy/arrakis/mutt/muttrc b/home/nipsy/arrakis/mutt/muttrc
index 1293092..eec5b99 100644
--- a/home/nipsy/arrakis/mutt/muttrc
+++ b/home/nipsy/arrakis/mutt/muttrc
@@ -53,7 +53,7 @@ set confirmcreate=no # prompt when creating new files
set copy=yes # always save a copy of outgoing messages
set delete=yes # purge deleted messages without asking
set edit_headers # let me edit the message header when composing
-set editor="vim -c 'set textwidth=65' -c 'set noautoindent' -c 'set formatoptions+=a'" # editor to use when composing messages
+set editor="vim -c 'set textwidth=65' -c 'set noautoindent'" # editor to use when composing messages
#set editor="/usr/bin/nvi" # editor to use when composing messages
#set editor="/usr/bin/vi" # editor to use when composing messages
set fast_reply # skip initial prompts when replying
diff --git a/home/nipsy/caladan.nix b/home/nipsy/caladan.nix
index 45ca9a2..a79bbe7 100644
--- a/home/nipsy/caladan.nix
+++ b/home/nipsy/caladan.nix
@@ -10,6 +10,7 @@
];
home.file = {
+ ".config/sway/config".source = ./caladan/sway/config;
".mailcap".text = ''
#application/msword; antiword -rs '%s'; copiousoutput; description=Microsoft Word Document
application/pdf; pdftotext '%s' -; copiousoutput; description=Adobe Portable Document Format
@@ -31,7 +32,7 @@
programs.zsh = {
shellAliases = {
- manage = "tmux new-window ssh root@darkstar\\; split-window -d ssh root@king\\; new-window ssh root@black-sheep\\; split-window -d ssh root@fangorn\\; split-window -d ssh root@treebeard\\; new-window ssh root@casey\\; split-window -d ssh root@homer\\; new-window ssh root@lilnasx\\; split-window -d ssh root@trent";
+ manage = "tmux new-window ssh -A root@arrakis\\; split-window -d ssh -A root@darkstar\\; split-window -d ssh root@king\\; new-window ssh root@black-sheep\\; split-window -d ssh root@fangorn\\; split-window -d ssh root@treebeard\\; new-window ssh root@casey\\; split-window -d ssh root@homer\\; new-window ssh root@lilnasx\\; split-window -d ssh root@trent";
};
};
@@ -51,7 +52,7 @@
xsession = {
initExtra = ''
- xrandr --output DisplayPort-0 --primary --mode 2560x1440 --rate 165
+ xrandr --output DisplayPort-0 --primary --mode 2560x1440 --rate 170
# disable VRR because it causes the display to go to sleep on my GeForce 1080 (now 3070 Ti) sometimes; maybe monitor related?
#nvidia-settings -a AllowVRR=0
diff --git a/home/nipsy/caladan/sway/config b/home/nipsy/caladan/sway/config
new file mode 100644
index 0000000..dcedd45
--- /dev/null
+++ b/home/nipsy/caladan/sway/config
@@ -0,0 +1,246 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+# Your preferred terminal emulator
+set $term ghostty
+# Your preferred application launcher
+set $menu wmenu-run
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)
+output * mode 2560x1440@143.972Hz adaptive_sync on allow_tearing yes bg ~/bg/StarWarsRetro-BrentCheshire.jpg center
+#
+# Example configuration:
+#
+# output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: swaymsg -t get_outputs
+
+### Idle configuration
+#
+# Example configuration:
+#
+#exec swayidle -w \
+# timeout 600 'swaylock -f -c 000000' \
+# timeout 900 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+# before-sleep 'swaylock -f -c 000000'
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+exec swayidle -w \
+ timeout 900 'swaymsg "output * power off"' resume 'swaymsg "output * power on"'
+
+### Default options
+default_border none
+default_floating_border none
+titlebar_padding 1
+titlebar_border_thickness 0
+
+### Input configuration
+#
+# Example configuration:
+#
+# input type:touchpad {
+# dwt enabled
+# tap enabled
+# natural_scroll enabled
+# middle_emulation enabled
+# }
+#
+input type:keyboard {
+ xkb_layout "us"
+ xkb_options "caps:super,compose:ralt"
+}
+#
+# You can also configure each device individually.
+# Read `man 5 sway-input` for more information about this section.
+
+### Key bindings
+#
+# Basics:
+#
+ # Start a terminal
+ bindsym $mod+Return exec $term
+
+ # Kill focused window
+ bindsym $mod+Shift+q kill
+
+ # Start your launcher
+ bindsym $mod+d exec $menu
+
+ # Drag floating windows by holding down $mod and left mouse button.
+ # Resize them with right mouse button + $mod.
+ # Despite the name, also works for non-floating windows.
+ # Change normal to inverse to use left mouse button for resizing and right
+ # mouse button for dragging.
+ floating_modifier $mod normal
+
+ # Reload the configuration file
+ bindsym $mod+Shift+c reload
+
+ # Exit sway (logs you out of your Wayland session)
+ bindsym $mod+Shift+e exit
+#
+# Moving around:
+#
+ # Move your focus around
+ bindsym $mod+$left focus left
+ bindsym $mod+$down focus down
+ bindsym $mod+$up focus up
+ bindsym $mod+$right focus right
+ # Or use $mod+[up|down|left|right]
+ bindsym $mod+Left focus left
+ bindsym $mod+Down focus down
+ bindsym $mod+Up focus up
+ bindsym $mod+Right focus right
+
+ # Move the focused window with the same, but add Shift
+ bindsym $mod+Shift+$left move left
+ bindsym $mod+Shift+$down move down
+ bindsym $mod+Shift+$up move up
+ bindsym $mod+Shift+$right move right
+ # Ditto, with arrow keys
+ bindsym $mod+Shift+Left move left
+ bindsym $mod+Shift+Down move down
+ bindsym $mod+Shift+Up move up
+ bindsym $mod+Shift+Right move right
+#
+# Workspaces:
+#
+ # Switch to workspace
+ bindsym $mod+1 workspace number 1
+ bindsym $mod+2 workspace number 2
+ bindsym $mod+3 workspace number 3
+ bindsym $mod+4 workspace number 4
+ bindsym $mod+5 workspace number 5
+ bindsym $mod+6 workspace number 6
+ bindsym $mod+7 workspace number 7
+ bindsym $mod+8 workspace number 8
+ bindsym $mod+9 workspace number 9
+ bindsym $mod+0 workspace number 10
+ # Move focused container to workspace
+ bindsym $mod+Shift+1 move container to workspace number 1
+ bindsym $mod+Shift+2 move container to workspace number 2
+ bindsym $mod+Shift+3 move container to workspace number 3
+ bindsym $mod+Shift+4 move container to workspace number 4
+ bindsym $mod+Shift+5 move container to workspace number 5
+ bindsym $mod+Shift+6 move container to workspace number 6
+ bindsym $mod+Shift+7 move container to workspace number 7
+ bindsym $mod+Shift+8 move container to workspace number 8
+ bindsym $mod+Shift+9 move container to workspace number 9
+ bindsym $mod+Shift+0 move container to workspace number 10
+ # Note: workspaces can have any name you want, not just numbers.
+ # We just use 1-10 as the default.
+#
+# Layout stuff:
+#
+ # You can "split" the current object of your focus with
+ # $mod+b or $mod+v, for horizontal and vertical splits
+ # respectively.
+ bindsym $mod+b splith
+ bindsym $mod+v splitv
+
+ # Switch the current container between different layout styles
+ bindsym $mod+s layout stacking
+ bindsym $mod+w layout tabbed
+ bindsym $mod+e layout toggle split
+
+ # Make the current focus fullscreen
+ bindsym $mod+f fullscreen
+
+ # Toggle the current focus between tiling and floating mode
+ bindsym $mod+Shift+space floating toggle
+
+ # Swap focus between the tiling area and the floating area
+ bindsym $mod+space focus mode_toggle
+
+ # Move focus to the parent container
+ bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+ # Sway has a "scratchpad", which is a bag of holding for windows.
+ # You can send windows there and get them back later.
+
+ # Move the currently focused window to the scratchpad
+ bindsym $mod+Shift+minus move scratchpad
+
+ # Show the next scratchpad window or hide the focused scratchpad window.
+ # If there are multiple scratchpad windows, this command cycles through them.
+ bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+ # left will shrink the containers width
+ # right will grow the containers width
+ # up will shrink the containers height
+ # down will grow the containers height
+ bindsym $left resize shrink width 10px
+ bindsym $down resize grow height 10px
+ bindsym $up resize shrink height 10px
+ bindsym $right resize grow width 10px
+
+ # Ditto, with arrow keys
+ bindsym Left resize shrink width 10px
+ bindsym Down resize grow height 10px
+ bindsym Up resize shrink height 10px
+ bindsym Right resize grow width 10px
+
+ # Return to default mode
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+#
+# Utilities:
+#
+ # Special keys to adjust volume via PulseAudio
+ bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+ bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+ bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+ bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+ # Special keys to adjust brightness via brightnessctl
+ bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+ bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
+ # Special key to take a screenshot with grim
+ bindsym Print exec grim
+
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+bar {
+ position bottom
+
+ # When the status_command prints a new line to stdout, swaybar updates.
+ # The default just shows the current date and time.
+ status_command while date -R; do sleep 1; done
+
+ colors {
+ statusline #ffffff
+ background #323232
+ inactive_workspace #32323200 #32323200 #5c5c5c
+ }
+}
+
+# Criteria based behavior
+for_window [class=".*"] inhibit_idle fullscreen
+for_window [app_id=".*"] inhibit_idle fullscreen
+
+include /etc/sway/config.d/*
diff --git a/home/nipsy/common/core/default.nix b/home/nipsy/common/core/default.nix
index a78dbe8..23d7ce8 100644
--- a/home/nipsy/common/core/default.nix
+++ b/home/nipsy/common/core/default.nix
@@ -3,7 +3,6 @@
imports = [
./bash.nix
./git.nix
- #./ssh.nix
./tmux
./vim
./zsh
diff --git a/home/nipsy/common/core/git.nix b/home/nipsy/common/core/git.nix
index d8bc6cf..5ff118e 100644
--- a/home/nipsy/common/core/git.nix
+++ b/home/nipsy/common/core/git.nix
@@ -1,8 +1,12 @@
{
programs.git = {
enable = true;
- userEmail = "nipsy@bitgnome.net";
- userName = "Mark Nipper";
- extraConfig.pull.rebase = true;
+ settings = {
+ pull.rebase = true;
+ user = {
+ email = "nipsy@bitgnome.net";
+ name = "Mark Nipper";
+ };
+ };
};
}
diff --git a/home/nipsy/common/core/ssh.nix b/home/nipsy/common/core/ssh.nix
deleted file mode 100644
index 929cc51..0000000
--- a/home/nipsy/common/core/ssh.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- programs.ssh = {
- enable = true;
- };
-}
diff --git a/home/nipsy/common/core/zsh/zshrc b/home/nipsy/common/core/zsh/zshrc
index cca7d6f..08d4025 100644
--- a/home/nipsy/common/core/zsh/zshrc
+++ b/home/nipsy/common/core/zsh/zshrc
@@ -20,6 +20,7 @@ if [[ -z "${DISPLAY}" ]] && [[ $(tty) == "/dev/tty1" ]]; then
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
# set some Wayland specific variables
+ export ELECTRON_OZONE_PLATFORM_HINT=auto
export MOZ_ENABLE_WAYLAND=1
export GDK_BACKEND=wayland
export QT_QPA_PLATFORM=wayland
@@ -30,11 +31,6 @@ if [[ -z "${DISPLAY}" ]] && [[ $(tty) == "/dev/tty1" ]]; then
fi
-# if already in Wayland, update the GPG TTY so ssh-askpass will work correctly
-if [[ -n "${WAYLAND_DISPLAY}" ]]; then
- gpg-connect-agent updatestartuptty /bye >/dev/null
-fi
-
# completion options
setopt LIST_PACKED MENU_COMPLETE
# expansion and globbing options
diff --git a/home/nipsy/common/optional/desktops/gtk.nix b/home/nipsy/common/optional/desktops/gtk.nix
index bac2060..e252b3a 100644
--- a/home/nipsy/common/optional/desktops/gtk.nix
+++ b/home/nipsy/common/optional/desktops/gtk.nix
@@ -1,4 +1,9 @@
{
+ dconf.settings."org/gnome/desktop/interface" = {
+ color-scheme = "prefer-dark";
+ gtk-theme = "Adwaita-dark";
+ };
+
home.sessionVariables = {
GTK_THEME = "Adwaita:dark";
};
diff --git a/home/nipsy/common/optional/desktops/i3/default.nix b/home/nipsy/common/optional/desktops/i3/default.nix
index 0086aa8..10451fa 100644
--- a/home/nipsy/common/optional/desktops/i3/default.nix
+++ b/home/nipsy/common/optional/desktops/i3/default.nix
@@ -3,6 +3,7 @@
home = {
file = {
".config/ghostty/config".text = ''
+ #async-backend = epoll
background-opacity = 0.8
cursor-color = #ffffff
font-family = "DejaVu Sans Mono"
@@ -82,7 +83,7 @@
defaultWorkspace = "workspace number 1";
modifier = "Mod4";
keybindings = lib.mkOptionDefault {
- "${modifier}+Return" = "exec ghostty";
+ "${modifier}+Scroll_Lock" = "exec --no-startup-id ${pkgs.xscreensaver}/bin/xscreensaver-command -lock";
"${modifier}+Shift+e" = "exec ${pkgs.i3}/bin/i3-msg exit";
"${modifier}+Shift+v" = ''mode "VNC"'';
};
@@ -98,6 +99,7 @@
notification = false;
}
];
+ terminal = "ghostty";
window.border = 0;
window.commands = [
{
diff --git a/home/nipsy/ginaz.nix b/home/nipsy/ginaz.nix
index fb3ac3b..918a988 100644
--- a/home/nipsy/ginaz.nix
+++ b/home/nipsy/ginaz.nix
@@ -34,5 +34,10 @@
xrandr --output eDP --primary --scale 0.5
xinput set-prop "ELAN06FA:00 04F3:3202 Touchpad" "libinput Middle Emulation Enabled" 0
'';
+ windowManager.i3.config.keybindings = let
+ modifier = config.xsession.windowManager.i3.config.modifier;
+ in lib.mkOptionDefault {
+ "${modifier}+Return" = "exec ghostty";
+ };
};
}
diff --git a/home/nipsy/kaitain.nix b/home/nipsy/kaitain.nix
index 11813e7..cffa32f 100644
--- a/home/nipsy/kaitain.nix
+++ b/home/nipsy/kaitain.nix
@@ -6,20 +6,28 @@
common/optional/secrets.nix
];
- home.file.".ansible.cfg".text = ''
- [defaults]
- forks=5
- timeout=600
+ home.file = {
+ ".ansible.cfg".text = ''
+ [defaults]
+ forks=5
+ timeout=600
+
+ [ssh_connection]
+ ssh_args=-o BatchMode=yes -o ControlMaster=auto -o ControlPersist=8h -o Compression=yes
+ control_path=/dev/shm/%%C
+ control_path_dir=/dev/shm
+ pipelining=True
+ '';
- [ssh_connection]
- ssh_args=-o BatchMode=yes -o ControlMaster=auto -o ControlPersist=8h -o Compression=yes
- control_path=/dev/shm/%%C
- control_path_dir=/dev/shm
- pipelining=True
- '';
+ ".mailcap".text = ''
+ text/html; elinks -dump %s; copiousoutput
+ application/pdf; pdftotext '%s' -; copiousoutput; description=Adobe Portable Document Format
+ '';
+ };
- home.file.".mailcap".text = ''
- text/html; elinks -dump %s; copiousoutput
- application/pdf; pdftotext '%s' -; copiousoutput; description=Adobe Portable Document Format
- '';
+ xsession.windowManager.i3.config.keybindings = let
+ modifier = config.xsession.windowManager.i3.config.modifier;
+ in lib.mkOptionDefault {
+ "${modifier}+Return" = "exec st";
+ };
}
diff --git a/home/nipsy/richese.nix b/home/nipsy/richese.nix
index 7f698d1..7f73858 100644
--- a/home/nipsy/richese.nix
+++ b/home/nipsy/richese.nix
@@ -6,15 +6,23 @@
common/optional/secrets.nix
];
- home.file.".ansible.cfg".text = ''
- [defaults]
- forks=5
- timeout=600
+ home.file = {
+ ".ansible.cfg".text = ''
+ [defaults]
+ forks=5
+ timeout=600
+
+ [ssh_connection]
+ ssh_args=-o BatchMode=yes -o ControlMaster=auto -o ControlPersist=8h -o Compression=yes -o StrictHostKeyChecking=no
+ control_path=/dev/shm/%%C
+ control_path_dir=/dev/shm
+ pipelining=True
+ '';
+ };
- [ssh_connection]
- ssh_args=-o BatchMode=yes -o ControlMaster=auto -o ControlPersist=8h -o Compression=yes -o StrictHostKeyChecking=no
- control_path=/dev/shm/%%C
- control_path_dir=/dev/shm
- pipelining=True
- '';
+ xsession.windowManager.i3.config.keybindings = let
+ modifier = config.xsession.windowManager.i3.config.modifier;
+ in lib.mkOptionDefault {
+ "${modifier}+Return" = "exec st";
+ };
}
diff --git a/home/root/caladan.nix b/home/root/caladan.nix
index 287f220..228bb90 100644
--- a/home/root/caladan.nix
+++ b/home/root/caladan.nix
@@ -8,7 +8,7 @@
"bin/knock".source = ../common/scripts/knock;
};
- #nix.extraOptions = ''
- # !include /run/secrets/nix-access-token-github
- #'';
+ nix.extraOptions = ''
+ !include /run/secrets/nix-access-token-github
+ '';
}
diff --git a/home/root/common/core/default.nix b/home/root/common/core/default.nix
index e2ca7c5..3043d2c 100644
--- a/home/root/common/core/default.nix
+++ b/home/root/common/core/default.nix
@@ -3,7 +3,6 @@
imports = [
./bash.nix
./git.nix
- #./ssh.nix
./tmux
./vim
./zsh
diff --git a/home/root/common/core/git.nix b/home/root/common/core/git.nix
index 49e10df..e1cb96b 100644
--- a/home/root/common/core/git.nix
+++ b/home/root/common/core/git.nix
@@ -1,6 +1,6 @@
{
programs.git = {
enable = true;
- extraConfig.pull.rebase = true;
+ settings.pull.rebase = true;
};
}
diff --git a/home/root/common/core/ssh.nix b/home/root/common/core/ssh.nix
deleted file mode 100644
index 929cc51..0000000
--- a/home/root/common/core/ssh.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- programs.ssh = {
- enable = true;
- };
-}
diff --git a/home/root/kaitain.nix b/home/root/kaitain.nix
index 72dbda0..cb4ed48 100644
--- a/home/root/kaitain.nix
+++ b/home/root/kaitain.nix
@@ -4,6 +4,10 @@
common/core
];
+ home.file = {
+ "bin/knock".source = ../common/scripts/knock;
+ };
+
nix.extraOptions = ''
!include /run/secrets/nix-access-token-github
'';
diff --git a/home/root/richese.nix b/home/root/richese.nix
index 72dbda0..cb4ed48 100644
--- a/home/root/richese.nix
+++ b/home/root/richese.nix
@@ -4,6 +4,10 @@
common/core
];
+ home.file = {
+ "bin/knock".source = ../common/scripts/knock;
+ };
+
nix.extraOptions = ''
!include /run/secrets/nix-access-token-github
'';
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 21:35:02 +0000