Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 aaron
|
95fe2dbc97
|
Generated
+15
-16
@@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1785627969,
|
||||
"narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
|
||||
"lastModified": 1782949081,
|
||||
"narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
|
||||
"rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -28,11 +28,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787176219,
|
||||
"narHash": "sha256-djoRr6jBpe35q/0JwAvXpFXg1Ktf+X54NU2RLR7wnHw=",
|
||||
"lastModified": 1783823409,
|
||||
"narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c53d643b3737e2fcd04e6cb3b3580ef50b2087a0",
|
||||
"rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -43,11 +43,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1787135253,
|
||||
"narHash": "sha256-RD2kNWCG+Bjo6h+JVjWVNntZs2GtRoeY2xHjts/FNkA=",
|
||||
"lastModified": 1783776592,
|
||||
"narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ffb3c9b700e759be2ef13237c9d8f953b32a1e46",
|
||||
"rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -66,11 +66,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787151631,
|
||||
"narHash": "sha256-EblMdrDFBFNNlUPm5zUQdh0j6gDx+OFQPv7LFE4B5AA=",
|
||||
"lastModified": 1783647864,
|
||||
"narHash": "sha256-gtVkWD4SbsvQQ8aSFEsrUTxxyuim4/ZC6lBJmA+sE/k=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "d0d62a2b5027da689b4e8d5ee43f1cf83f2e975d",
|
||||
"rev": "ebffdb62cd1604537ee51d4d23258c002f1c90f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -86,11 +86,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787234716,
|
||||
"narHash": "sha256-O07tHqxugZ/XE/90kx/UCZ0YCbHSI88v2ct2ezuCKi4=",
|
||||
"lastModified": 1783830881,
|
||||
"narHash": "sha256-V75/tqvYElVWyXnFf+0jh89wMh5a/cbV5YYe/P7RFDM=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "a064c063f204518619b8c032c944138a0349966b",
|
||||
"rev": "ed3cb98536eaec92c2b523ddf703e1dc6728f535",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -108,7 +108,6 @@
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1774449309,
|
||||
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/nixos/appimage.nix
|
||||
../../modules/nixos/astro.nix
|
||||
../../modules/nixos/audio.nix
|
||||
../../modules/nixos/bootloader.nix
|
||||
@@ -26,7 +25,6 @@
|
||||
../../modules/nixos/steam.nix
|
||||
../../modules/nixos/thunar.nix
|
||||
../../modules/nixos/users.nix
|
||||
../../modules/nixos/vial.nix
|
||||
];
|
||||
|
||||
# set hostname
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/nixos/appimage.nix
|
||||
../../modules/nixos/astro.nix
|
||||
../../modules/nixos/audio.nix
|
||||
../../modules/nixos/bootloader.nix
|
||||
@@ -22,7 +21,6 @@
|
||||
../../modules/nixos/settings.nix
|
||||
../../modules/nixos/steam.nix
|
||||
../../modules/nixos/users.nix
|
||||
../../modules/nixos/vial.nix
|
||||
];
|
||||
|
||||
# set hostname
|
||||
|
||||
@@ -1,123 +1,60 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
let
|
||||
# Powerline separators, U+E0B0..U+E0B3.
|
||||
#
|
||||
# Written as escapes rather than literal glyphs. These are Private Use Area
|
||||
# codepoints: they render only with a patched font, they survive copy/paste
|
||||
# badly, and when they get stripped the loss is invisible, the config still
|
||||
# parses, the status bar just quietly loses its separators. Nix has no \u
|
||||
# escape of its own, but fromJSON does.
|
||||
sep = builtins.fromJSON ''
|
||||
{
|
||||
"right": "\ue0b0",
|
||||
"rightThin": "\ue0b1",
|
||||
"left": "\ue0b2",
|
||||
"leftThin": "\ue0b3"
|
||||
}
|
||||
'';
|
||||
in
|
||||
{
|
||||
programs.tmux = {
|
||||
# defaults
|
||||
enable = true;
|
||||
prefix = "C-a";
|
||||
keyMode = "vi";
|
||||
mouse = true;
|
||||
|
||||
# tmux-256color gives truecolor, italics and undercurl in nvim.
|
||||
terminal = "tmux-256color";
|
||||
|
||||
# Default is 500ms. Causes lag you feel when leaving insert mode in nvim,
|
||||
# because tmux is waiting to see whether Esc starts an escape sequence.
|
||||
escapeTime = 10;
|
||||
|
||||
# nvim autoread / :checktime react to focus.
|
||||
focusEvents = true;
|
||||
|
||||
# History limit.
|
||||
historyLimit = 50000;
|
||||
|
||||
# Window numbers matching the number row.
|
||||
baseIndex = 1;
|
||||
|
||||
terminal = "screen-256color";
|
||||
extraConfig = ''
|
||||
# Status keys
|
||||
set -g status-keys vi
|
||||
|
||||
# Tell tmux the outer terminal can do 24-bit colour (tmux >= 3.2).
|
||||
set -sa terminal-features ",*:RGB"
|
||||
|
||||
# Shift+Enter / extended keys
|
||||
# These make tmux forward CSI-u sequences unconditionally.
|
||||
# Needs tmux >= 3.5 for the format option,
|
||||
set -s extended-keys always
|
||||
set -s extended-keys-format csi-u
|
||||
set -as terminal-features '*:extkeys'
|
||||
|
||||
# Status bar options
|
||||
set -g status-interval 5
|
||||
set -g status-interval 1
|
||||
set -g status on
|
||||
set -g status-justify left
|
||||
|
||||
# Clock mode
|
||||
setw -g clock-mode-colour cyan
|
||||
|
||||
# Colors
|
||||
set -g status-bg black
|
||||
set -g status-fg white
|
||||
|
||||
# Key bindings
|
||||
bind r source-file ~/.config/tmux/tmux.conf \; display-message "tmux.conf reloaded"
|
||||
|
||||
# Panel split and selection, new panes/windows inherit the cwd
|
||||
# Reload configuration
|
||||
bind r source-file ~/.config/tmux/tmux.conf
|
||||
# Panel split and selection
|
||||
unbind %
|
||||
unbind '"'
|
||||
bind v split-window -v -c "#{pane_current_path}"
|
||||
bind c split-window -h -c "#{pane_current_path}"
|
||||
bind i new-window -c "#{pane_current_path}"
|
||||
bind -r b previous-window
|
||||
bind -r n next-window
|
||||
|
||||
bind v split-window -v
|
||||
bind c split-window -h
|
||||
bind i new-window
|
||||
bind b previous-window
|
||||
bind n next-window
|
||||
# Move around panes with hjkl
|
||||
bind h select-pane -L
|
||||
bind j select-pane -D
|
||||
bind k select-pane -U
|
||||
bind l select-pane -R
|
||||
|
||||
# Resize panes
|
||||
bind -r H resize-pane -L 5
|
||||
bind -r J resize-pane -D 5
|
||||
bind -r K resize-pane -U 5
|
||||
bind -r L resize-pane -R 5
|
||||
|
||||
bind H resize-pane -L 5
|
||||
bind J resize-pane -D 5
|
||||
bind K resize-pane -U 5
|
||||
bind L resize-pane -R 5
|
||||
# Wayland clipboard integration
|
||||
# Copy selection to both clipboard (Ctrl+V / Shift+Insert) and primary (middle-click)
|
||||
bind -T copy-mode-vi v send-keys -X begin-selection
|
||||
bind -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
||||
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
||||
bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
||||
bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
||||
# Uncomment if you want yanks to also travel over SSH via OSC52.
|
||||
# Locally redundant with wl-copy above.
|
||||
#set -g set-clipboard on
|
||||
|
||||
# Kill commands
|
||||
bind q confirm-before -p "kill window #W? (y/n)" kill-window
|
||||
bind Q confirm-before -p "kill session #S? (y/n)" kill-session
|
||||
|
||||
bind q kill-window
|
||||
bind Q kill-session
|
||||
# Bars
|
||||
# This is the nord-tmux status line. #{prefix_highlight} came from that
|
||||
# theme's tmux-prefix-highlight integration -- a plugin you never loaded,
|
||||
# so the token expanded to nothing. tmux can do it natively. Commas inside
|
||||
# #{?...} are argument separators and have to be escaped as #, hence the
|
||||
# look of the style spec.
|
||||
set -g status-left-length 24
|
||||
set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]${sep.right}"
|
||||
set -g status-right "#{?client_prefix,#[fg=black#,bg=yellow#,bold] ^A ,}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]${sep.left}#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${sep.leftThin}#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]${sep.left}#[fg=black,bg=cyan,bold] #H "
|
||||
|
||||
set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]"
|
||||
set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H "
|
||||
# Windows
|
||||
set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore]${sep.right} #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${sep.rightThin} #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]${sep.right}"
|
||||
set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore]${sep.right} #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore]${sep.rightThin} #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]${sep.right}"
|
||||
set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]"
|
||||
set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]"
|
||||
set -g window-status-separator ""
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# AppImages ship a squashfs payload that the bundled runtime mounts through
|
||||
# libfuse.so.2 at startup. nix-ld resolves the ELF interpreter but not that
|
||||
# dlopen, so running one directly dies with "dlopen(): error loading
|
||||
# libfuse.so.2". appimage-run sidesteps the mount entirely: it unpacks the
|
||||
# image and runs the payload inside an FHS sandbox, which the bundled Qt and
|
||||
# electron style binaries need anyway.
|
||||
#
|
||||
# Used for the BitBox02 wallet AppImage, downloaded fresh from
|
||||
# https://bitbox.swiss/download/ rather than installed from nixpkgs.
|
||||
programs.appimage = {
|
||||
enable = true;
|
||||
# register AppImages with binfmt_misc so ./Something.AppImage runs as-is,
|
||||
# no appimage-run prefix to remember.
|
||||
binfmt = true;
|
||||
};
|
||||
}
|
||||
@@ -35,7 +35,6 @@
|
||||
tree
|
||||
unzip
|
||||
usbutils
|
||||
vial
|
||||
vim
|
||||
wget
|
||||
which
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Vial-capable keyboards (lily58 pro r2g) expose a second, non-keyboard raw
|
||||
# HID interface that vial.rocks drives over WebHID. Its /dev/hidraw* node is
|
||||
# root-only by default, so neither chromium nor the native app can open it.
|
||||
#
|
||||
# This has to ship as a numbered rules file rather than via
|
||||
# services.udev.extraRules: extraRules lands in 99-local.rules, but the
|
||||
# builtin that turns TAG+="uaccess" into an actual ACL is invoked from
|
||||
# systemd's 73-seat-late.rules. A tag set at 99 is set too late to be seen,
|
||||
# so the device ends up correctly tagged and still unreadable. 60- sorts
|
||||
# safely ahead of 73.
|
||||
services.udev.packages = [
|
||||
(pkgs.writeTextFile {
|
||||
name = "vial-udev-rules";
|
||||
destination = "/lib/udev/rules.d/60-vial.rules";
|
||||
# Vial firmware advertises itself through a magic USB serial, so this
|
||||
# matches any vial board rather than just the lily58. uaccess hands the
|
||||
# device to whoever owns the active seat, no group membership needed.
|
||||
text = ''
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", TAG+="uaccess"
|
||||
'';
|
||||
})
|
||||
];
|
||||
}
|
||||
Reference in New Issue
Block a user