Compare commits

..
10 changed files with 54 additions and 69 deletions

View file

View file

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

Before After
Before After

View file

@ -27,11 +27,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1792739756, "lastModified": 1769548169,
"narHash": "sha256-s0TeXWG5Ci75Y/Hzon0Z7NrN/fG773Rc54/z6oPFszQ=", "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "fa627f4c8b8e92f58f58a73d99ee4e1304e64eb2", "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -47,11 +47,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1792915725, "lastModified": 1791711434,
"narHash": "sha256-v75hPw5NJ+mRRcwUzKi2OQtVSVv1hgq6ceAlPQB2kEE=", "narHash": "sha256-LpIhxnuO0tYeZ4k7BbNMxsPs2zJpB4hWXO1jdhUuE7Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "93696586f3463024cceb089353539be95a38ae2b", "rev": "9a2dd40780eeab8543aa97c59c26f11267025616",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -78,11 +78,11 @@
}, },
"nixpkgs-26-05": { "nixpkgs-26-05": {
"locked": { "locked": {
"lastModified": 1793015021, "lastModified": 1791662279,
"narHash": "sha256-Ee5BWo8sh3pGt70QUdRajnaginqFmWvrtdBc4gJzhks=", "narHash": "sha256-xI8L+UwJLIg75yVJwLPsY+AUEP1teCT3FyuvodyJu2Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "718f670e845328e9c2cecdd832835712b2cbd065", "rev": "6fcc160353f63555b560f25588925133c8f61f2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +94,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1792773339, "lastModified": 1791734076,
"narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=", "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504", "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -17,31 +17,21 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# CLI programs. adw-gtk3
adwaita-icon-theme
blanket
# TODO: Consider replacing with ddcutil-service. # TODO: Consider replacing with ddcutil-service.
ddcutil ddcutil
wl-clipboard
# Graphical programs.
blanket
celluloid
gnome-calculator gnome-calculator
loupe loupe
# We don't use programs.nm-applet.enable because that also creates an enabled systemd unit for # We don't use programs.nm-applet.enable because that also creates an enabled systemd unit for
# the applet. We just want nm-connection-editor. # the applet. We just want nm-connection-editor.
networkmanagerapplet networkmanagerapplet
pwvucontrol
spotify spotify
sublime-merge sublime-merge
wl-clipboard
pkgs-unstable.overskride pkgs-unstable.overskride
pkgs-unstable.pwvucontrol
pkgs-unstable.yt-dlp
# Icon themes.
adw-gtk3
adwaita-icon-theme
]; ];
programs = { programs = {

View file

@ -70,18 +70,19 @@
"/home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies" "/home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies"
spawn-at-startup "${ironbar}" spawn-at-startup "${ironbar}"
spawn-at-startup "${wl-gammarelay-rs}" spawn-at-startup "${wl-gammarelay-rs}"
spawn-at-startup "${swayidle}" "timeout" "600" "${hyprlock}"
spawn-at-startup "${mako}" spawn-at-startup "${mako}"
prefer-no-csd prefer-no-csd
screenshot-path "~/screenshots/niri-%Y-%m-%d-%H:%M:%S.png" screenshot-path "~/screenshots/niri-%Y-%m-%d-%H:%M:%S.png"
hotkey-overlay { skip-at-startup; } hotkey-overlay { skip-at-startup; }
input { input {
disable-power-key-handling disable-power-key-handling
keyboard { keyboard {
xkb { xkb {
layout "us,bg(phonetic),gr" layout "us,bg(phonetic),gr"
@ -97,13 +98,13 @@
} }
cursor { xcursor-theme "Adwaita"; } cursor { xcursor-theme "Adwaita"; }
layout { layout {
gaps 60 gaps 60
center-focused-column "on-overflow" center-focused-column "on-overflow"
always-center-single-column always-center-single-column
empty-workspace-above-first empty-workspace-above-first
// struts { top -60; } // struts { top -60; }
focus-ring { off; } focus-ring { off; }
preset-column-widths { preset-column-widths {
@ -112,14 +113,14 @@
} }
insert-hint { color "#9141AC88"; } insert-hint { color "#9141AC88"; }
} }
overview { backdrop-color "#181821"; } overview { backdrop-color "#181821"; }
recent-windows { off; } recent-windows { off; }
animations { slowdown 0.5; } animations { slowdown 0.5; }
gestures { hot-corners { off; }; } gestures { hot-corners { off; }; }
// Internal laptop screen. // Internal laptop screen.
output "BOE 0x0BCA Unknown" { scale 1.125; } output "BOE 0x0BCA Unknown" { scale 1.125; }
@ -127,7 +128,6 @@
// TandemDrive office monitors. // TandemDrive office monitors.
output "Dell Inc. DELL P2715Q V48W26AB160L" { scale 1.25; } output "Dell Inc. DELL P2715Q V48W26AB160L" { scale 1.25; }
output "Dell Inc. DELL P2715Q V48W263V308S" { scale 1.25; }
output "Dell Inc. DELL U3225QE GTC9C84" { mode "3840x2160@120"; } output "Dell Inc. DELL U3225QE GTC9C84" { mode "3840x2160@120"; }
output "LG Electronics LG HDR 4K 0x0005C746" { scale 1.25; } output "LG Electronics LG HDR 4K 0x0005C746" { scale 1.25; }
output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; } output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; }
@ -139,22 +139,22 @@
scale 1.5 scale 1.5
mode custom=true "2560x1440@60" mode custom=true "2560x1440@60"
} }
binds { binds {
Super+Q { close-window; } Super+Q { close-window; }
Super+W { spawn "${rofi}" "-show" "drun"; } Super+W { spawn "${rofi}" "-show" "drun"; }
Super+E { spawn "${gnome-terminal}"; } Super+E { spawn "${gnome-terminal}"; }
Super+R { spawn "${nautilus}"; } Super+R { spawn "${nautilus}"; }
Super+T { spawn "${firefox}"; } Super+T { spawn "${firefox}"; }
Super+Shift+T { spawn "${firefox}" "--private-window"; } Super+Shift+T { spawn "${firefox}" "--private-window"; }
Super+A { center-column; } Super+A { center-column; }
Super+S { switch-preset-column-width; } Super+S { switch-preset-column-width; }
Super+D { toggle-window-floating; } Super+D { toggle-window-floating; }
Super+U allow-when-locked=true { Super+U allow-when-locked=true {
spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%" spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%"
} }
@ -167,12 +167,12 @@
Super+O allow-when-locked=true { Super+O allow-when-locked=true {
spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle" spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle"
} }
Super+P allow-when-locked=true { spawn "${wlr-randr}" "--output" "eDP-1" "--toggle"; } Super+P allow-when-locked=true { spawn "${wlr-randr}" "--output" "eDP-1" "--toggle"; }
Super+H { spawn "${nmcli}" "connection" "up" "airvpn"; } Super+H { spawn "${nmcli}" "connection" "up" "airvpn"; }
Super+Shift+H { spawn "${nmcli}" "connection" "down" "airvpn"; } Super+Shift+H { spawn "${nmcli}" "connection" "down" "airvpn"; }
Super+J { spawn "${emote}"; } Super+J { spawn "${emote}"; }
// TODO: Put this in linux-utils as Nix package. // TODO: Put this in linux-utils as Nix package.
// Super+K allow-when-locked=true { spawn "wl-gammarelay-toggle-temperature"; } // Super+K allow-when-locked=true { spawn "wl-gammarelay-toggle-temperature"; }
@ -187,11 +187,11 @@
// TODO: Set up session-based locking like on Arch. // TODO: Set up session-based locking like on Arch.
// Super+L { spawn "${loginctl}" "lock-session"; } // Super+L { spawn "${loginctl}" "lock-session"; }
Super+L { spawn "${hyprlock}"; } Super+L { spawn "${hyprlock}"; }
// I.e. the Non-Screeching Earwarmers. // I.e. the Non-Screeching Earwarmers.
Super+B { spawn "${bluetoothctl}" "connect" "58:18:62:1F:E3:33"; } Super+B { spawn "${bluetoothctl}" "connect" "58:18:62:1F:E3:33"; }
Super+Shift+B { spawn "${bluetoothctl}" "disconnect" "58:18:62:1F:E3:33"; } Super+Shift+B { spawn "${bluetoothctl}" "disconnect" "58:18:62:1F:E3:33"; }
Super+M { spawn "${playerctl}" "play-pause"; } Super+M { spawn "${playerctl}" "play-pause"; }
Super+Comma { spawn "${playerctl}" "previous"; } Super+Comma { spawn "${playerctl}" "previous"; }
Super+Period { spawn "${playerctl}" "next"; } Super+Period { spawn "${playerctl}" "next"; }
@ -200,46 +200,46 @@
// Super+BracketLeft allow-when-locked=true { spawn "ddc-brightness" "down"; } // Super+BracketLeft allow-when-locked=true { spawn "ddc-brightness" "down"; }
// Super+BracketRight allow-when-locked=true { spawn "ddc-brightness" "up"; } // Super+BracketRight allow-when-locked=true { spawn "ddc-brightness" "up"; }
// Super+Shift+BracketRight allow-when-locked=true { spawn "ddc-brightness" "max"; } // Super+Shift+BracketRight allow-when-locked=true { spawn "ddc-brightness" "max"; }
Super+Tab { toggle-overview; } Super+Tab { toggle-overview; }
Super+Space { switch-layout "next"; } Super+Space { switch-layout "next"; }
Super+Escape { spawn "${nwg-bar}"; } Super+Escape { spawn "${nwg-bar}"; }
Super+F11 { fullscreen-window; } Super+F11 { fullscreen-window; }
Super+Left { focus-column-left; } Super+Left { focus-column-left; }
Super+Right { focus-column-right; } Super+Right { focus-column-right; }
Super+Up { focus-workspace-up; } Super+Up { focus-workspace-up; }
Super+Down { focus-workspace-down; } Super+Down { focus-workspace-down; }
Super+Home { focus-column-first; } Super+Home { focus-column-first; }
Super+End { focus-column-last; } Super+End { focus-column-last; }
Super+Shift+Left { move-column-left; } Super+Shift+Left { move-column-left; }
Super+Shift+Right { move-column-right; } Super+Shift+Right { move-column-right; }
Super+Shift+Up { move-column-to-workspace-up; } Super+Shift+Up { move-column-to-workspace-up; }
Super+Shift+Down { move-column-to-workspace-down; } Super+Shift+Down { move-column-to-workspace-down; }
Super+Shift+Home { move-column-to-first; } Super+Shift+Home { move-column-to-first; }
Super+Shift+End { move-column-to-last; } Super+Shift+End { move-column-to-last; }
Super+Control+Shift+Left { move-column-to-monitor-left; } Super+Control+Shift+Left { move-column-to-monitor-left; }
Super+Control+Shift+Right { move-column-to-monitor-right; } Super+Control+Shift+Right { move-column-to-monitor-right; }
Super+Control+Shift+Up { move-column-to-monitor-up; } Super+Control+Shift+Up { move-column-to-monitor-up; }
Super+Control+Shift+Down { move-column-to-monitor-down; } Super+Control+Shift+Down { move-column-to-monitor-down; }
Super+1 { set-column-width "40%"; } Super+1 { set-column-width "40%"; }
Super+2 { set-column-width "50%"; } Super+2 { set-column-width "50%"; }
Super+3 { set-column-width "66.667%"; } Super+3 { set-column-width "66.667%"; }
Super+4 { set-column-width "75%"; } Super+4 { set-column-width "75%"; }
Super+5 { set-column-width "100%"; } Super+5 { set-column-width "100%"; }
// TODO: Add back rectangle screenshot selection. // TODO: Add back rectangle screenshot selection.
Print { screenshot; } Print { screenshot; }
Super+Print { screenshot-window; } Super+Print { screenshot-window; }
// Special function keys. // Special function keys.
XF86MonBrightnessDown allow-when-locked=true { spawn "${brightnessctl}" "set" "10%-"; } XF86MonBrightnessDown allow-when-locked=true { spawn "${brightnessctl}" "set" "10%-"; }
XF86MonBrightnessUp allow-when-locked=true { spawn "${brightnessctl}" "set" "+10%"; } XF86MonBrightnessUp allow-when-locked=true { spawn "${brightnessctl}" "set" "+10%"; }
XF86AudioLowerVolume allow-when-locked=true { XF86AudioLowerVolume allow-when-locked=true {
spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%" spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%"
} }
@ -249,7 +249,7 @@
XF86AudioMute allow-when-locked=true { XF86AudioMute allow-when-locked=true {
spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle" spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle"
} }
XF86AudioPlay allow-when-locked=true { spawn "${playerctl}" "play-pause"; } XF86AudioPlay allow-when-locked=true { spawn "${playerctl}" "play-pause"; }
XF86AudioPause allow-when-locked=true { spawn "${playerctl}" "play-pause"; } XF86AudioPause allow-when-locked=true { spawn "${playerctl}" "play-pause"; }
} }
@ -302,7 +302,7 @@
// These already have shadows, and aren't rectangular so clipping the existing ones off // These already have shadows, and aren't rectangular so clipping the existing ones off
// is a pain in the arse. // is a pain in the arse.
exclude app-id="jetbrains-rustrover" exclude app-id="jetbrains-rustrover"
shadow { shadow {
on on
color "#0004" color "#0004"
@ -343,20 +343,20 @@
''; '';
"nwg-bar/style.css".text = '' "nwg-bar/style.css".text = ''
window { background-color: black; } window { background-color: black; }
#outer-box { margin: 30px; } #outer-box { margin: 30px; }
label { label {
margin-top: 8px; margin-top: 8px;
color: white; color: white;
} }
button { button {
margin: 10px; margin: 10px;
padding: 14px; padding: 14px;
background-color: #333; background-color: #333;
} }
button:hover { background-color: #444; } button:hover { background-color: #444; }
''; '';
}; };

View file

@ -108,11 +108,6 @@
networking = { networking = {
hostName = "ruysch"; hostName = "ruysch";
networkmanager.enable = true; networkmanager.enable = true;
hosts = {
"fdef:4d4b:17b2::1" = [ "travel-router-vivian" ];
"10.0.0.1" = [ "travel-router-vivian" ];
};
}; };
environment = { environment = {
@ -156,11 +151,11 @@
# Personal config. # Personal config.
disableAutoMode = "disable";
env = { env = {
CLAUDE_CODE_ENABLE_AWAY_SUMMARY = 0; CLAUDE_CODE_ENABLE_AWAY_SUMMARY = 0;
CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION = "false"; CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION = "false";
}; };
feedbackSurveyRate = 0;
modelSettings.claude-opus-5-5.effortLevel = "high"; modelSettings.claude-opus-5-5.effortLevel = "high";
# Default is dark. # Default is dark.
theme = "auto"; theme = "auto";