Compare commits
16
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aca9e5d7cc
|
||
|
|
2c8fbf008d | ||
|
|
c4f1be8a38
|
||
|
|
6df7fcacbb | ||
|
|
bc11b464a8
|
||
|
|
0ac9b45286 | ||
|
|
55e12b2226 | ||
|
|
eab8f4974e
|
||
|
|
0b1190a257
|
||
|
|
62954a67b5
|
||
|
|
37d44b64c1 | ||
|
|
cb5dd91550
|
||
|
|
fb04de1d23 | ||
|
|
f41387e451
|
||
|
|
2ae9d451f5 | ||
|
|
3feb6d2367
|
Generated
+16
-15
@@ -8,11 +8,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1782949081,
|
"lastModified": 1787559586,
|
||||||
"narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
|
"narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
|
"rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -28,11 +28,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1784546264,
|
"lastModified": 1787797243,
|
||||||
"narHash": "sha256-jxVr5EHMYAOkFvS2k0abIvt6NqyshyWmiHHzV17sT2g=",
|
"narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e3dea8e4792b09a6c0eb5836b0284ad05b1acba0",
|
"rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -43,11 +43,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1784497964,
|
"lastModified": 1787900134,
|
||||||
"narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=",
|
"narHash": "sha256-VYXO0XZlgj06dxJZRhrD3WoSsvq/c7+/Akyoa22pefw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163",
|
"rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1784057377,
|
"lastModified": 1787862710,
|
||||||
"narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=",
|
"narHash": "sha256-dL1Tv7LekaTWUJxHRckjbupWczDdc3QOgRuVCM+WAvQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "07180a087e4a00720dc0731cbcd8dec796974381",
|
"rev": "8c096abcf376137527c134da4ee210332b08ccc0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -86,11 +86,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1784556533,
|
"lastModified": 1788099672,
|
||||||
"narHash": "sha256-tlcP2x7d+ldS3BypTcInqrsOhi6BPuSSTeubfBMmm8Y=",
|
"narHash": "sha256-t4Rw5OeULK/WA2Jh9ja615sCs2AmvahkAUx/ymdf2YQ=",
|
||||||
"owner": "noctalia-dev",
|
"owner": "noctalia-dev",
|
||||||
"repo": "noctalia-shell",
|
"repo": "noctalia-shell",
|
||||||
"rev": "815635cf7dc810616c9e6ecf4b9b4f4c54e69905",
|
"rev": "d891007c022a3a1d4484495fe8b350a00deafae9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -108,6 +108,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774449309,
|
"lastModified": 1774449309,
|
||||||
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
|
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
../../modules/nixos/appimage.nix
|
||||||
../../modules/nixos/astro.nix
|
../../modules/nixos/astro.nix
|
||||||
../../modules/nixos/audio.nix
|
../../modules/nixos/audio.nix
|
||||||
../../modules/nixos/bootloader.nix
|
../../modules/nixos/bootloader.nix
|
||||||
@@ -25,6 +26,7 @@
|
|||||||
../../modules/nixos/steam.nix
|
../../modules/nixos/steam.nix
|
||||||
../../modules/nixos/thunar.nix
|
../../modules/nixos/thunar.nix
|
||||||
../../modules/nixos/users.nix
|
../../modules/nixos/users.nix
|
||||||
|
../../modules/nixos/vial.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# set hostname
|
# set hostname
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
../../modules/nixos/appimage.nix
|
||||||
../../modules/nixos/astro.nix
|
../../modules/nixos/astro.nix
|
||||||
../../modules/nixos/audio.nix
|
../../modules/nixos/audio.nix
|
||||||
../../modules/nixos/bootloader.nix
|
../../modules/nixos/bootloader.nix
|
||||||
@@ -21,6 +22,7 @@
|
|||||||
../../modules/nixos/settings.nix
|
../../modules/nixos/settings.nix
|
||||||
../../modules/nixos/steam.nix
|
../../modules/nixos/steam.nix
|
||||||
../../modules/nixos/users.nix
|
../../modules/nixos/users.nix
|
||||||
|
../../modules/nixos/vial.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# set hostname
|
# set hostname
|
||||||
|
|||||||
@@ -1,60 +1,123 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
{ 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 = {
|
programs.tmux = {
|
||||||
|
# defaults
|
||||||
enable = true;
|
enable = true;
|
||||||
prefix = "C-a";
|
prefix = "C-a";
|
||||||
keyMode = "vi";
|
keyMode = "vi";
|
||||||
mouse = true;
|
mouse = true;
|
||||||
terminal = "screen-256color";
|
|
||||||
|
# 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;
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
# Status keys
|
# Status keys
|
||||||
set -g status-keys vi
|
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
|
# Status bar options
|
||||||
set -g status-interval 1
|
set -g status-interval 5
|
||||||
set -g status on
|
|
||||||
set -g status-justify left
|
set -g status-justify left
|
||||||
|
|
||||||
# Clock mode
|
# Clock mode
|
||||||
setw -g clock-mode-colour cyan
|
setw -g clock-mode-colour cyan
|
||||||
|
|
||||||
# Colors
|
# Colors
|
||||||
set -g status-bg black
|
set -g status-bg black
|
||||||
set -g status-fg white
|
set -g status-fg white
|
||||||
|
|
||||||
# Key bindings
|
# Key bindings
|
||||||
# Reload configuration
|
bind r source-file ~/.config/tmux/tmux.conf \; display-message "tmux.conf reloaded"
|
||||||
bind r source-file ~/.config/tmux/tmux.conf
|
|
||||||
# Panel split and selection
|
# Panel split and selection, new panes/windows inherit the cwd
|
||||||
unbind %
|
unbind %
|
||||||
unbind '"'
|
unbind '"'
|
||||||
bind v split-window -v
|
bind v split-window -v -c "#{pane_current_path}"
|
||||||
bind c split-window -h
|
bind c split-window -h -c "#{pane_current_path}"
|
||||||
bind i new-window
|
bind i new-window -c "#{pane_current_path}"
|
||||||
bind b previous-window
|
bind -r b previous-window
|
||||||
bind n next-window
|
bind -r n next-window
|
||||||
|
|
||||||
# Move around panes with hjkl
|
# Move around panes with hjkl
|
||||||
bind h select-pane -L
|
bind h select-pane -L
|
||||||
bind j select-pane -D
|
bind j select-pane -D
|
||||||
bind k select-pane -U
|
bind k select-pane -U
|
||||||
bind l select-pane -R
|
bind l select-pane -R
|
||||||
|
|
||||||
# Resize panes
|
# Resize panes
|
||||||
bind H resize-pane -L 5
|
bind -r H resize-pane -L 5
|
||||||
bind J resize-pane -D 5
|
bind -r J resize-pane -D 5
|
||||||
bind K resize-pane -U 5
|
bind -r K resize-pane -U 5
|
||||||
bind L resize-pane -R 5
|
bind -r L resize-pane -R 5
|
||||||
|
|
||||||
# Wayland clipboard integration
|
# Wayland clipboard integration
|
||||||
# Copy selection to both clipboard (Ctrl+V / Shift+Insert) and primary (middle-click)
|
# 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 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 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"
|
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
|
# Kill commands
|
||||||
bind q kill-window
|
bind q confirm-before -p "kill window #W? (y/n)" kill-window
|
||||||
bind Q kill-session
|
bind Q confirm-before -p "kill session #S? (y/n)" kill-session
|
||||||
|
|
||||||
# Bars
|
# 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-length 24
|
||||||
set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]"
|
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 "#{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 "
|
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 "
|
||||||
|
|
||||||
# Windows
|
# Windows
|
||||||
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-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] #[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-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-separator ""
|
set -g window-status-separator ""
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
{ 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,6 +35,7 @@
|
|||||||
tree
|
tree
|
||||||
unzip
|
unzip
|
||||||
usbutils
|
usbutils
|
||||||
|
vial
|
||||||
vim
|
vim
|
||||||
wget
|
wget
|
||||||
which
|
which
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{ 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