diff --git a/.gitignore b/nixos/.gitignore similarity index 100% rename from .gitignore rename to nixos/.gitignore diff --git a/assets/openssh-authorized-keys b/nixos/assets/openssh-authorized-keys similarity index 100% rename from assets/openssh-authorized-keys rename to nixos/assets/openssh-authorized-keys diff --git a/assets/wallpaper-macos-swirlies b/nixos/assets/wallpaper-macos-swirlies similarity index 100% rename from assets/wallpaper-macos-swirlies rename to nixos/assets/wallpaper-macos-swirlies diff --git a/common.nix b/nixos/common.nix similarity index 100% rename from common.nix rename to nixos/common.nix diff --git a/flake.lock b/nixos/flake.lock similarity index 78% rename from flake.lock rename to nixos/flake.lock index b020800..37c3841 100644 --- a/flake.lock +++ b/nixos/flake.lock @@ -27,11 +27,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769548169, - "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", + "lastModified": 1792739756, + "narHash": "sha256-s0TeXWG5Ci75Y/Hzon0Z7NrN/fG773Rc54/z6oPFszQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", + "rev": "fa627f4c8b8e92f58f58a73d99ee4e1304e64eb2", "type": "github" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1791711434, - "narHash": "sha256-LpIhxnuO0tYeZ4k7BbNMxsPs2zJpB4hWXO1jdhUuE7Q=", + "lastModified": 1792915725, + "narHash": "sha256-v75hPw5NJ+mRRcwUzKi2OQtVSVv1hgq6ceAlPQB2kEE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9a2dd40780eeab8543aa97c59c26f11267025616", + "rev": "93696586f3463024cceb089353539be95a38ae2b", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1791662279, - "narHash": "sha256-xI8L+UwJLIg75yVJwLPsY+AUEP1teCT3FyuvodyJu2Y=", + "lastModified": 1793015021, + "narHash": "sha256-Ee5BWo8sh3pGt70QUdRajnaginqFmWvrtdBc4gJzhks=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6fcc160353f63555b560f25588925133c8f61f2a", + "rev": "718f670e845328e9c2cecdd832835712b2cbd065", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1791734076, - "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", + "lastModified": 1792773339, + "narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", + "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504", "type": "github" }, "original": { diff --git a/flake.nix b/nixos/flake.nix similarity index 100% rename from flake.nix rename to nixos/flake.nix diff --git a/graphical.nix b/nixos/graphical.nix similarity index 97% rename from graphical.nix rename to nixos/graphical.nix index ec46369..432e664 100644 --- a/graphical.nix +++ b/nixos/graphical.nix @@ -17,21 +17,31 @@ }; environment.systemPackages = with pkgs; [ - adw-gtk3 - adwaita-icon-theme - blanket + # CLI programs. + # TODO: Consider replacing with ddcutil-service. ddcutil + wl-clipboard + + # Graphical programs. + + blanket + celluloid gnome-calculator loupe # 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. networkmanagerapplet - pwvucontrol spotify sublime-merge - wl-clipboard pkgs-unstable.overskride + pkgs-unstable.pwvucontrol + pkgs-unstable.yt-dlp + + # Icon themes. + + adw-gtk3 + adwaita-icon-theme ]; programs = { diff --git a/readme.md b/nixos/readme.md similarity index 100% rename from readme.md rename to nixos/readme.md diff --git a/ruysch-graphical.nix b/nixos/ruysch-graphical.nix similarity index 98% rename from ruysch-graphical.nix rename to nixos/ruysch-graphical.nix index 167790d..f1a6a38 100644 --- a/ruysch-graphical.nix +++ b/nixos/ruysch-graphical.nix @@ -70,19 +70,18 @@ "/home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies" spawn-at-startup "${ironbar}" spawn-at-startup "${wl-gammarelay-rs}" - spawn-at-startup "${swayidle}" "timeout" "600" "${hyprlock}" spawn-at-startup "${mako}" - - - + + + prefer-no-csd screenshot-path "~/screenshots/niri-%Y-%m-%d-%H:%M:%S.png" - + hotkey-overlay { skip-at-startup; } - + input { disable-power-key-handling - + keyboard { xkb { layout "us,bg(phonetic),gr" @@ -98,13 +97,13 @@ } cursor { xcursor-theme "Adwaita"; } - + layout { gaps 60 center-focused-column "on-overflow" always-center-single-column empty-workspace-above-first - + // struts { top -60; } focus-ring { off; } preset-column-widths { @@ -113,14 +112,14 @@ } insert-hint { color "#9141AC88"; } } - + overview { backdrop-color "#181821"; } recent-windows { off; } animations { slowdown 0.5; } gestures { hot-corners { off; }; } - + // Internal laptop screen. output "BOE 0x0BCA Unknown" { scale 1.125; } @@ -128,6 +127,7 @@ // TandemDrive office monitors. 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 "LG Electronics LG HDR 4K 0x0005C746" { scale 1.25; } output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; } @@ -139,22 +139,22 @@ scale 1.5 mode custom=true "2560x1440@60" } - - - + + + binds { Super+Q { close-window; } Super+W { spawn "${rofi}" "-show" "drun"; } Super+E { spawn "${gnome-terminal}"; } Super+R { spawn "${nautilus}"; } - + Super+T { spawn "${firefox}"; } Super+Shift+T { spawn "${firefox}" "--private-window"; } - + Super+A { center-column; } Super+S { switch-preset-column-width; } Super+D { toggle-window-floating; } - + Super+U allow-when-locked=true { spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%" } @@ -167,12 +167,12 @@ Super+O allow-when-locked=true { spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle" } - + Super+P allow-when-locked=true { spawn "${wlr-randr}" "--output" "eDP-1" "--toggle"; } - + Super+H { spawn "${nmcli}" "connection" "up" "airvpn"; } Super+Shift+H { spawn "${nmcli}" "connection" "down" "airvpn"; } - + Super+J { spawn "${emote}"; } // TODO: Put this in linux-utils as Nix package. // Super+K allow-when-locked=true { spawn "wl-gammarelay-toggle-temperature"; } @@ -187,11 +187,11 @@ // TODO: Set up session-based locking like on Arch. // Super+L { spawn "${loginctl}" "lock-session"; } Super+L { spawn "${hyprlock}"; } - + // I.e. the Non-Screeching Earwarmers. Super+B { spawn "${bluetoothctl}" "connect" "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+Comma { spawn "${playerctl}" "previous"; } Super+Period { spawn "${playerctl}" "next"; } @@ -200,46 +200,46 @@ // Super+BracketLeft allow-when-locked=true { spawn "ddc-brightness" "down"; } // Super+BracketRight allow-when-locked=true { spawn "ddc-brightness" "up"; } // Super+Shift+BracketRight allow-when-locked=true { spawn "ddc-brightness" "max"; } - + Super+Tab { toggle-overview; } Super+Space { switch-layout "next"; } Super+Escape { spawn "${nwg-bar}"; } Super+F11 { fullscreen-window; } - + Super+Left { focus-column-left; } Super+Right { focus-column-right; } Super+Up { focus-workspace-up; } Super+Down { focus-workspace-down; } Super+Home { focus-column-first; } Super+End { focus-column-last; } - + Super+Shift+Left { move-column-left; } Super+Shift+Right { move-column-right; } Super+Shift+Up { move-column-to-workspace-up; } Super+Shift+Down { move-column-to-workspace-down; } Super+Shift+Home { move-column-to-first; } Super+Shift+End { move-column-to-last; } - + Super+Control+Shift+Left { move-column-to-monitor-left; } Super+Control+Shift+Right { move-column-to-monitor-right; } Super+Control+Shift+Up { move-column-to-monitor-up; } Super+Control+Shift+Down { move-column-to-monitor-down; } - + Super+1 { set-column-width "40%"; } Super+2 { set-column-width "50%"; } Super+3 { set-column-width "66.667%"; } Super+4 { set-column-width "75%"; } Super+5 { set-column-width "100%"; } - + // TODO: Add back rectangle screenshot selection. Print { screenshot; } Super+Print { screenshot-window; } // Special function keys. - + XF86MonBrightnessDown allow-when-locked=true { spawn "${brightnessctl}" "set" "10%-"; } XF86MonBrightnessUp allow-when-locked=true { spawn "${brightnessctl}" "set" "+10%"; } - + XF86AudioLowerVolume allow-when-locked=true { spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%" } @@ -249,7 +249,7 @@ XF86AudioMute allow-when-locked=true { spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle" } - + XF86AudioPlay 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 // is a pain in the arse. exclude app-id="jetbrains-rustrover" - + shadow { on color "#0004" @@ -343,20 +343,20 @@ ''; "nwg-bar/style.css".text = '' window { background-color: black; } - + #outer-box { margin: 30px; } - + label { margin-top: 8px; color: white; } - + button { margin: 10px; padding: 14px; background-color: #333; } - + button:hover { background-color: #444; } ''; }; diff --git a/ruysch.nix b/nixos/ruysch.nix similarity index 97% rename from ruysch.nix rename to nixos/ruysch.nix index b0d96b6..7714672 100644 --- a/ruysch.nix +++ b/nixos/ruysch.nix @@ -108,6 +108,11 @@ networking = { hostName = "ruysch"; networkmanager.enable = true; + + hosts = { + "fdef:4d4b:17b2::1" = [ "travel-router-vivian" ]; + "10.0.0.1" = [ "travel-router-vivian" ]; + }; }; environment = { @@ -151,11 +156,11 @@ # Personal config. - disableAutoMode = "disable"; env = { CLAUDE_CODE_ENABLE_AWAY_SUMMARY = 0; CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION = "false"; }; + feedbackSurveyRate = 0; modelSettings.claude-opus-5-5.effortLevel = "high"; # Default is dark. theme = "auto";