From cb08358a0a70bb953856a7da19a5866550e4538e Mon Sep 17 00:00:00 2001 From: Fredrik Robertsen Date: Wed, 25 Mar 2026 13:33:42 +0100 Subject: [PATCH] init: migrate minipc config to monorepo --- dotfiles/alacritty/alacritty.toml | 8 + dotfiles/git/ignore | 4 + dotfiles/jj/config.toml | 6 + dotfiles/kanshi/config | 28 + dotfiles/niri/config.kdl | 649 ++++++++++++++++++++++++ dotfiles/nushell/config.nu | 37 ++ dotfiles/nushell/env.nu | 6 + flake.lock | 27 + flake.nix | 21 + hosts/minipc/default.nix | 21 + hosts/minipc/hardware-configuration.nix | 33 ++ install-dotfiles.nu | 28 + modules/base.nix | 52 ++ modules/dev/default.nix | 27 + modules/dev/direnv.nix | 6 + modules/gc.nix | 20 + modules/japanese.nix | 15 + modules/niri.nix | 19 + modules/steam.nix | 6 + 19 files changed, 1013 insertions(+) create mode 100644 dotfiles/alacritty/alacritty.toml create mode 100644 dotfiles/git/ignore create mode 100644 dotfiles/jj/config.toml create mode 100644 dotfiles/kanshi/config create mode 100644 dotfiles/niri/config.kdl create mode 100644 dotfiles/nushell/config.nu create mode 100644 dotfiles/nushell/env.nu create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 hosts/minipc/default.nix create mode 100644 hosts/minipc/hardware-configuration.nix create mode 100755 install-dotfiles.nu create mode 100644 modules/base.nix create mode 100644 modules/dev/default.nix create mode 100644 modules/dev/direnv.nix create mode 100644 modules/gc.nix create mode 100644 modules/japanese.nix create mode 100644 modules/niri.nix create mode 100644 modules/steam.nix diff --git a/dotfiles/alacritty/alacritty.toml b/dotfiles/alacritty/alacritty.toml new file mode 100644 index 0000000..371d234 --- /dev/null +++ b/dotfiles/alacritty/alacritty.toml @@ -0,0 +1,8 @@ +[window] +opacity = 0.95 + [window.padding] + x = 10 + y = 10 + +[font] +size = 16 diff --git a/dotfiles/git/ignore b/dotfiles/git/ignore new file mode 100644 index 0000000..bb5d5e9 --- /dev/null +++ b/dotfiles/git/ignore @@ -0,0 +1,4 @@ +.direnv/ +.zed/ +.cache/ +.envrc diff --git a/dotfiles/jj/config.toml b/dotfiles/jj/config.toml new file mode 100644 index 0000000..4bb3eed --- /dev/null +++ b/dotfiles/jj/config.toml @@ -0,0 +1,6 @@ +[ui] +default-command = "log" + +[user] +email = "fredrikr79@pm.me" +name = "Fredrik Robertsen" diff --git a/dotfiles/kanshi/config b/dotfiles/kanshi/config new file mode 100644 index 0000000..3c68a7c --- /dev/null +++ b/dotfiles/kanshi/config @@ -0,0 +1,28 @@ +output "Hewlett Packard HP ZR24w CNT01710L4" mode 1920x1200@59.950 scale 1.000000 alias $eirin_l +output "Hewlett Packard HP ZR24w CNT0181039" mode 1920x1200@59.950 scale 1.000000 alias $eirin_r +output "Invalid Vendor Codename - RTK 0x0101 0x01010101" mode 2560x1600@120.008 scale 1.500000 alias $portable +output "Ancor Communications Inc MG248 G7LMQS010063" mode 1920x1080@60.000 scale 1.000000 alias $urgen_l +output "ASUSTek COMPUTER INC MG248 K2LMQS048969" mode 1920x1080@60.000 scale 1.000000 alias $urgen_r +output "Hewlett Packard HP ZR24w CNT01711G6" mode 1920x1200@59.950 scale 1.000000 alias $arbeidsrommet_w +output "Hewlett Packard HP ZR24w CNT018103H" mode 1920x1200@59.950 scale 1.000000 alias $arbeidsrommet_b +profile arbeidsrommet_2 { + output "Hewlett Packard HP ZR24w CNT018103H" position 0,0 + output "Invalid Vendor Codename - RTK 0x0101 0x01010101" position 0,1200 +} + +profile demiurgen { + output "Ancor Communications Inc MG248 G7LMQS010063" position 0,0 + output "ASUSTek COMPUTER INC MG248 K2LMQS048969" position 1920,0 +} + +profile gnomevirksomhet { + output "Hewlett Packard HP ZR24w CNT01710L4" position 0,0 + output "Hewlett Packard HP ZR24w CNT0181039" position 1920,0 + output "Invalid Vendor Codename - RTK 0x0101 0x01010101" position 720,1200 +} + +profile arbeidsrommet { + output "Hewlett Packard HP ZR24w CNT01711G6" position 0,0 + output "Invalid Vendor Codename - RTK 0x0101 0x01010101" position 0,1200 +} + diff --git a/dotfiles/niri/config.kdl b/dotfiles/niri/config.kdl new file mode 100644 index 0000000..307029e --- /dev/null +++ b/dotfiles/niri/config.kdl @@ -0,0 +1,649 @@ + +// This config is in the KDL format: https://kdl.dev +// "/-" comments out the following node. +// Check the wiki for a full description of the configuration: +// https://yalter.github.io/niri/Configuration:-Introduction + +// Input device configuration. +// Find the full list of options on the wiki: +// https://yalter.github.io/niri/Configuration:-Input +input { + keyboard { + xkb { + // You can set rules, model, layout, variant and options. + // For more information, see xkeyboard-config(7). + + // For example: + // layout "us,ru" + options "compose:menu" + + // If this section is empty, niri will fetch xkb settings + // from org.freedesktop.locale1. You can control these using + // localectl set-x11-keymap. + } + + // Enable numlock on startup, omitting this setting disables it. + numlock + + repeat-delay 165 + repeat-rate 40 + } + + // Next sections include libinput settings. + // Omitting settings disables them, or leaves them at their default values. + // All commented-out settings here are examples, not defaults. + touchpad { + // off + tap + // dwt + // dwtp + // drag false + // drag-lock + natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "two-finger" + // disabled-on-external-mouse + } + + mouse { + // off + // natural-scroll + accel-speed 0.2 + accel-profile "flat" + // scroll-method "no-scroll" + middle-emulation + } + + trackpoint { + // off + // natural-scroll + // accel-speed 1 + // accel-profile "adaptive" + // scroll-method "on-button-down" + // scroll-button 273 + // scroll-button-lock + // middle-emulation + } + + // Uncomment this to make the mouse warp to the center of newly focused windows. + // warp-mouse-to-focus + + // Focus windows and outputs automatically when moving the mouse into them. + // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. + focus-follows-mouse max-scroll-amount="0%" +} + +// You can configure outputs by their name, which you can find +// by running `niri msg outputs` while inside a niri instance. +// The built-in laptop monitor is usually called "eDP-1". +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Outputs +// Remember to uncomment the node by removing "/-"! +/-output "eDP-1" { + // Uncomment this line to disable this output. + // off + + // Resolution and, optionally, refresh rate of the output. + // The format is "x" or "x@". + // If the refresh rate is omitted, niri will pick the highest refresh rate + // for the resolution. + // If the mode is omitted altogether or is invalid, niri will pick one automatically. + // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. + mode "1920x1080@120.030" + + // You can use integer or fractional scale, for example use 1.5 for 150% scale. + scale 2 + + // Transform allows to rotate the output counter-clockwise, valid values are: + // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. + transform "normal" + + // Position of the output in the global coordinate space. + // This affects directional monitor actions like "focus-monitor-left", and cursor movement. + // The cursor can only move between directly adjacent outputs. + // Output scale and rotation has to be taken into account for positioning: + // outputs are sized in logical, or scaled, pixels. + // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080, + // so to put another output directly adjacent to it on the right, set its x to 1920. + // If the position is unset or results in an overlap, the output is instead placed + // automatically. + position x=1280 y=0 +} + +// home gaming monitor +output "Microstep MSI MAG 27C6F CE1M225300689" { + mode "1920x1080@179.998" +} + +// uperfect portable monitor +output "DP-2" { + mode "2560x1600@120.008" + scale 1.5 +} + +// Settings that influence how windows are positioned and sized. +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Layout +layout { + // Set gaps around windows in logical pixels. + gaps 16 + + // When to center a column when changing focus, options are: + // - "never", default behavior, focusing an off-screen column will keep at the left + // or right edge of the screen. + // - "always", the focused column will always be centered. + // - "on-overflow", focusing a column will center it if it doesn't fit + // together with the previously focused column. + center-focused-column "never" + + // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. + preset-column-widths { + // Proportion sets the width as a fraction of the output width, taking gaps into account. + // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. + // The default preset widths are 1/3, 1/2 and 2/3 of the output. + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + + // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. + // preset-window-heights { } + + // You can change the default width of the new windows. + default-column-width { proportion 0.5; } + // If you leave the brackets empty, the windows themselves will decide their initial width. + // default-column-width {} + + // By default focus ring and border are rendered as a solid background rectangle + // behind windows. That is, they will show up through semitransparent windows. + // This is because windows using client-side decorations can have an arbitrary shape. + // + // If you don't like that, you should uncomment `prefer-no-csd` below. + // Niri will draw focus ring and border *around* windows that agree to omit their + // client-side decorations. + // + // Alternatively, you can override it with a window rule called + // `draw-border-with-background`. + + // You can change how the focus ring looks. + focus-ring { + // Uncomment this line to disable the focus ring. + // off + + // How many logical pixels the ring extends out from the windows. + width 4 + + // Colors can be set in a variety of ways: + // - CSS named colors: "red" + // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" + // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. + + // Color of the ring on the active monitor. + active-color "#7fc8ff" + + // Color of the ring on inactive monitors. + // + // The focus ring only draws around the active window, so the only place + // where you can see its inactive-color is on other monitors. + inactive-color "#505050" + + // You can also use gradients. They take precedence over solid colors. + // Gradients are rendered the same as CSS linear-gradient(angle, from, to). + // The angle is the same as in linear-gradient, and is optional, + // defaulting to 180 (top-to-bottom gradient). + // You can use any CSS linear-gradient tool on the web to set these up. + // Changing the color space is also supported, check the wiki for more info. + // + // active-gradient from="#80c8ff" to="#c7ff7f" angle=45 + + // You can also color the gradient relative to the entire view + // of the workspace, rather than relative to just the window itself. + // To do that, set relative-to="workspace-view". + // + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can also add a border. It's similar to the focus ring, but always visible. + border { + // The settings are the same as for the focus ring. + // If you enable the border, you probably want to disable the focus ring. + off + + width 4 + active-color "#ffc87f" + inactive-color "#505050" + + // Color of the border around windows that request your attention. + urgent-color "#9b0000" + + // Gradients can use a few different interpolation color spaces. + // For example, this is a pastel rainbow gradient via in="oklch longer hue". + // + // active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue" + + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can enable drop shadows for windows. + shadow { + // Uncomment the next line to enable shadows. + on + + // By default, the shadow draws only around its window, and not behind it. + // Uncomment this setting to make the shadow draw behind its window. + // + // Note that niri has no way of knowing about the CSD window corner + // radius. It has to assume that windows have square corners, leading to + // shadow artifacts inside the CSD rounded corners. This setting fixes + // those artifacts. + // + // However, instead you may want to set prefer-no-csd and/or + // geometry-corner-radius. Then, niri will know the corner radius and + // draw the shadow correctly, without having to draw it behind the + // window. These will also remove client-side shadows if the window + // draws any. + // + // draw-behind-window true + + // You can change how shadows look. The values below are in logical + // pixels and match the CSS box-shadow properties. + + // Softness controls the shadow blur radius. + softness 30 + + // Spread expands the shadow. + spread 5 + + // Offset moves the shadow relative to the window. + offset x=0 y=5 + + // You can also change the shadow color and opacity. + color "#0007" + } + + // Struts shrink the area occupied by windows, similarly to layer-shell panels. + // You can think of them as a kind of outer gaps. They are set in logical pixels. + // Left and right struts will cause the next window to the side to always be visible. + // Top and bottom struts will simply add outer gaps in addition to the area occupied by + // layer-shell panels and regular gaps. + struts { + left 32 + right 32 + // top 64 + // bottom 64 + } +} + +// Add lines like this to spawn processes at startup. +// Note that running niri as a session supports xdg-desktop-autostart, +// which may be more convenient to use. +// See the binds section below for more spawn examples. + +// This line starts waybar, a commonly used bar for Wayland compositors. +spawn-at-startup "waybar" + +spawn-at-startup "kanshi" + +// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: +// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" + +hotkey-overlay { + // Uncomment this line to disable the "Important Hotkeys" pop-up at startup. + skip-at-startup +} + +// Uncomment this line to ask the clients to omit their client-side decorations if possible. +// If the client will specifically ask for CSD, the request will be honored. +// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. +// This option will also fix border/focus ring drawing behind some semitransparent windows. +// After enabling or disabling this, you need to restart the apps for this to take effect. +prefer-no-csd + +// You can change the path where screenshots are saved. +// A ~ at the front will be expanded to the home directory. +// The path is formatted with strftime(3) to give you the screenshot date and time. +screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + +// You can also set this to null to disable saving screenshots to disk. +// screenshot-path null + +// Animation settings. +// The wiki explains how to configure individual animations: +// https://yalter.github.io/niri/Configuration:-Animations +animations { + // Uncomment to turn off all animations. + // off + + // Slow down all animations by this factor. Values below 1 speed them up instead. + // slowdown 3.0 +} + +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Window-Rules + +// Work around WezTerm's initial configure bug +// by setting an empty default-column-width. +window-rule { + // This regular expression is intentionally made as specific as possible, + // since this is the default config, and we want no false positives. + // You can get away with just app-id="wezterm" if you want. + match app-id=r#"^org\.wezfurlong\.wezterm$"# + default-column-width {} +} + +// Open the Firefox picture-in-picture player as floating by default. +window-rule { + // This app-id regular expression will work for both: + // - host Firefox (app-id is "firefox") + // - Flatpak Firefox (app-id is "org.mozilla.firefox") + match app-id=r#"firefox$"# title="^Picture-in-Picture$" + open-floating true +} + +// Example: block out two password managers from screen capture. +// (This example rule is commented out with a "/-" in front.) +/-window-rule { + match app-id=r#"^org\.keepassxc\.KeePassXC$"# + match app-id=r#"^org\.gnome\.World\.Secrets$"# + + block-out-from "screen-capture" + + // Use this instead if you want them visible on third-party screenshot tools. + // block-out-from "screencast" +} + +// Example: enable rounded corners for all windows. +// (This example rule is commented out with a "/-" in front.) +window-rule { + geometry-corner-radius 12 + clip-to-geometry true +} + +binds { + // Keys consist of modifiers separated by + signs, followed by an XKB key name + // in the end. To find an XKB name for a particular key, you may use a program + // like wev. + // + // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt + // when running as a winit window. + // + // Most actions that you can bind here can also be invoked programmatically with + // `niri msg action do-something`. + + // Mod-Shift-/, which is usually the same as Mod-?, + // shows a list of important hotkeys. + Mod+Shift+Slash { show-hotkey-overlay; } + + // Suggested binds for running programs: terminal, app launcher, screen locker. + Mod+T hotkey-overlay-title="Open a Terminal: alacritty" { spawn "alacritty"; } + Super+Alt+L hotkey-overlay-title="Lock the Screen" { spawn "dms" "ipc" "call" "lock" "lock"; } + Mod+B hotkey-overlay-title="Open a browser: firefox" { spawn "firefox"; } + Mod+Z hotkey-overlay-title="Open an IDE: zed" { spawn "zeditor"; } + Mod+E hotkey-overlay-title="Open a file browser" { spawn "nautilus"; } + + // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc. + // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`. + // For example, this is a standard bind to toggle the screen reader (orca). + Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { spawn-sh "pkill orca || exec orca"; } + + // Example volume keys mappings for PipeWire & WirePlumber. + // The allow-when-locked=true property makes them work even when the session is locked. + // Using spawn-sh allows to pass multiple arguments together with the command. + // "-l 1.0" limits the volume to 100%. + XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0"; } + XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; } + XF86AudioMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; } + + // Example media keys mapping using playerctl. + // This will work with any MPRIS-enabled media player. + XF86AudioPlay allow-when-locked=true { spawn-sh "playerctl play-pause"; } + XF86AudioStop allow-when-locked=true { spawn-sh "playerctl stop"; } + XF86AudioPrev allow-when-locked=true { spawn-sh "playerctl previous"; } + XF86AudioNext allow-when-locked=true { spawn-sh "playerctl next"; } + + // Example brightness key mappings for brightnessctl. + // You can use regular spawn with multiple arguments too (to avoid going through "sh"), + // but you need to manually put each argument in separate "" quotes. + XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; } + + // Open/close the Overview: a zoomed-out view of workspaces and windows. + // You can also move the mouse into the top-left hot corner, + // or do a four-finger swipe up on a touchpad. + Mod+O repeat=false { toggle-overview; } + + Mod+Q repeat=false { close-window; } + + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + Mod+Ctrl+Left { move-column-left; } + Mod+Ctrl+Down { move-window-down; } + Mod+Ctrl+Up { move-window-up; } + Mod+Ctrl+Right { move-column-right; } + Mod+Ctrl+H { move-column-left; } + Mod+Ctrl+J { move-window-down; } + Mod+Ctrl+K { move-window-up; } + Mod+Ctrl+L { move-column-right; } + + // Alternative commands that move across workspaces when reaching + // the first or last window in a column. + // Mod+J { focus-window-or-workspace-down; } + // Mod+K { focus-window-or-workspace-up; } + // Mod+Ctrl+J { move-window-down-or-to-workspace-down; } + // Mod+Ctrl+K { move-window-up-or-to-workspace-up; } + + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + + Mod+Shift+Left { focus-monitor-left; } + Mod+Shift+Down { focus-monitor-down; } + Mod+Shift+Up { focus-monitor-up; } + Mod+Shift+Right { focus-monitor-right; } + Mod+Shift+H { focus-monitor-left; } + Mod+Shift+J { focus-monitor-down; } + Mod+Shift+K { focus-monitor-up; } + Mod+Shift+L { focus-monitor-right; } + + Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + + // Alternatively, there are commands to move just a single window: + // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } + // ... + + // And you can also move a whole workspace to another monitor: + // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } + // ... + + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Page_Down { move-column-to-workspace-down; } + Mod+Ctrl+Page_Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } + // ... + + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + + // You can bind mouse wheel scroll ticks using the following syntax. + // These binds will change direction based on the natural-scroll setting. + // + // To avoid scrolling through workspaces really fast, you can use + // the cooldown-ms property. The bind will be rate-limited to this value. + // You can set a cooldown on any bind, but it's most useful for the wheel. + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + // Usually scrolling up and down with Shift in applications results in + // horizontal scrolling; these binds replicate that. + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + + // Similarly, you can bind touchpad scroll "ticks". + // Touchpad scrolling is continuous, so for these binds it is split into + // discrete intervals. + // These binds are also affected by touchpad's natural-scroll, so these + // example binds are "inverted", since we have natural-scroll enabled for + // touchpads by default. + // Mod+TouchpadScrollDown { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+"; } + // Mod+TouchpadScrollUp { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02-"; } + + // You can refer to workspaces by index. However, keep in mind that + // niri is a dynamic workspace system, so these commands are kind of + // "best effort". Trying to refer to a workspace index bigger than + // the current workspace count will instead refer to the bottommost + // (empty) workspace. + // + // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on + // will all refer to the 3rd workspace. + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+Ctrl+1 { move-column-to-workspace 1; } + Mod+Ctrl+2 { move-column-to-workspace 2; } + Mod+Ctrl+3 { move-column-to-workspace 3; } + Mod+Ctrl+4 { move-column-to-workspace 4; } + Mod+Ctrl+5 { move-column-to-workspace 5; } + Mod+Ctrl+6 { move-column-to-workspace 6; } + Mod+Ctrl+7 { move-column-to-workspace 7; } + Mod+Ctrl+8 { move-column-to-workspace 8; } + Mod+Ctrl+9 { move-column-to-workspace 9; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+1 { move-window-to-workspace 1; } + + // Switches focus between the current and the previous workspace. + // Mod+Tab { focus-workspace-previous; } + + // The following binds move the focused window in and out of a column. + // If the window is alone, they will consume it into the nearby column to the side. + // If the window is already in a column, they will expel it out. + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + // Consume one window from the right to the bottom of the focused column. + Mod+Comma { consume-window-into-column; } + // Expel the bottom window from the focused column to the right. + Mod+Period { expel-window-from-column; } + + Mod+R { switch-preset-column-width; } + // Cycling through the presets in reverse order is also possible. + // Mod+R { switch-preset-column-width-back; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + + // Expand the focused column to space not taken up by other fully visible columns. + // Makes the column "fill the rest of the space". + Mod+Ctrl+F { expand-column-to-available-width; } + + Mod+C { center-column; } + + // Center all fully visible columns on screen. + Mod+Ctrl+C { center-visible-columns; } + + // Finer width adjustments. + // This command can also: + // * set width in pixels: "1000" + // * adjust width in pixels: "-5" or "+5" + // * set width as a percentage of screen width: "25%" + // * adjust width as a percentage of screen width: "-10%" or "+10%" + // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, + // set-column-width "100" will make the column occupy 200 physical screen pixels. + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + + // Finer height adjustments when in column with other windows. + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + // Move the focused window between the floating and the tiling layout. + Mod+V { toggle-window-floating; } + Mod+Shift+V { switch-focus-between-floating-and-tiling; } + + // Toggle tabbed column display mode. + // Windows in this column will appear as vertical tabs, + // rather than stacked on top of each other. + Mod+W { toggle-column-tabbed-display; } + + // Actions to switch layouts. + // Note: if you uncomment these, make sure you do NOT have + // a matching layout switch hotkey configured in xkb options above. + // Having both at once on the same hotkey will break the switching, + // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). + // Mod+Space { switch-layout "next"; } + // Mod+Shift+Space { switch-layout "prev"; } + + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + + // Applications such as remote-desktop clients and software KVM switches may + // request that niri stops processing the keyboard shortcuts defined here + // so they may, for example, forward the key presses as-is to a remote machine. + // It's a good idea to bind an escape hatch to toggle the inhibitor, + // so a buggy application can't hold your session hostage. + // + // The allow-inhibiting=false property can be applied to other binds as well, + // which ensures niri always processes them, even when an inhibitor is active. + Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + + // The quit action will show a confirmation dialog to avoid accidental exits. + Mod+Shift+E { quit; } + Ctrl+Alt+Delete { quit; } + + // Powers off the monitors. To turn them back on, do any input like + // moving the mouse or pressing any other key. + Mod+Shift+P { power-off-monitors; } +} + +include "dms/cursor.kdl" + +include "dms/outputs.kdl" + +include "dms/windowrules.kdl" diff --git a/dotfiles/nushell/config.nu b/dotfiles/nushell/config.nu new file mode 100644 index 0000000..b1b65ef --- /dev/null +++ b/dotfiles/nushell/config.nu @@ -0,0 +1,37 @@ +$env.config.show_banner = false +$env.config.completions.case_sensitive = false +$env.config.completions.algorithm = "fuzzy" +$env.config.completions.quick = false +$env.config.completions.partial = true + +source $"($nu.cache-dir)/carapace.nu" +use $"($nu.cache-dir)/starship.nu" + +# direnv hook +$env.config = ($env.config? | default {}) +$env.config.hooks = ($env.config.hooks? | default {}) +$env.config.hooks.pre_prompt = ( + $env.config.hooks.pre_prompt? + | default [] + | append {|| + direnv export json + | from json --strict + | default {} + | items {|key, value| + let value = do ( + { + "PATH": { + from_string: {|s| $s | split row (char esep) | path expand --no-symlink } + to_string: {|v| $v | path expand --no-symlink | str join (char esep) } + } + } + | merge ($env.ENV_CONVERSIONS? | default {}) + | get ([[value, optional, insensitive]; [$key, true, true] [from_string, true, false]] | into cell-path) + | if ($in | is-empty) { {|x| $x} } else { $in } + ) $value + return [ $key $value ] + } + | into record + | load-env + } +) diff --git a/dotfiles/nushell/env.nu b/dotfiles/nushell/env.nu new file mode 100644 index 0000000..5837681 --- /dev/null +++ b/dotfiles/nushell/env.nu @@ -0,0 +1,6 @@ +# generate carapace completions before config.nu is parsed +$env.CARAPACE_BRIDGES = 'zsh,fish,bash,inshellisense' +$env.CARAPACE_MATCH = 1 +mkdir ($nu.cache-dir) +carapace _carapace nushell | save --force $"($nu.cache-dir)/carapace.nu" +starship init nu | save --force $"($nu.cache-dir)/starship.nu" diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..786f446 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..813928a --- /dev/null +++ b/flake.nix @@ -0,0 +1,21 @@ +{ + description = "multi-machine nixos config"; + + inputs.nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + + outputs = { self, nixpkgs, ... }@inputs: + let + mkHost = hostname: nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ ./hosts/${hostname} ]; + }; + in { + nixosConfigurations = { + minipc = mkHost "minipc"; + # laptop = mkHost "laptop"; + # gaming = mkHost "gaming"; + }; + }; +} + diff --git a/hosts/minipc/default.nix b/hosts/minipc/default.nix new file mode 100644 index 0000000..fb1289d --- /dev/null +++ b/hosts/minipc/default.nix @@ -0,0 +1,21 @@ +{ config, pkgs, inputs, ... }: +{ + imports = [ + ./hardware-configuration.nix + ../../modules/base.nix + ../../modules/dev + ../../modules/niri.nix + ../../modules/gc.nix + ../../modules/japanese.nix + ../../modules/steam.nix + ]; + + networking.hostName = "minipc"; + boot.resumeDevice = "/dev/disk/by-uuid/1d373996-e20a-4770-b711-325a9cbb2362"; + + boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen; + + environment.systemPackages = with pkgs; [ + webcord + ]; +} diff --git a/hosts/minipc/hardware-configuration.nix b/hosts/minipc/hardware-configuration.nix new file mode 100644 index 0000000..0465357 --- /dev/null +++ b/hosts/minipc/hardware-configuration.nix @@ -0,0 +1,33 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "ahci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/ca379753-4dce-47f0-a9a6-097584193160"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1104-EECD"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/1d373996-e20a-4770-b711-325a9cbb2362"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/install-dotfiles.nu b/install-dotfiles.nu new file mode 100755 index 0000000..dcdac9c --- /dev/null +++ b/install-dotfiles.nu @@ -0,0 +1,28 @@ +#!/usr/bin/env nu + +let dotfiles = ($env.HOME | path join "nixos-config/dotfiles") +let config = ($env.HOME | path join ".config") + +# iterate over all files in dotfiles/ +glob $"($dotfiles)/**/*" | where ($it | path type) == "file" | each {|file| + let rel = ($file | str replace $"($dotfiles)/" "") + let target = ($config | path join $rel) + let target_dir = ($target | path dirname) + + # ensure parent dir exists + mkdir $target_dir + + # skip if already correctly symlinked + if ($target | path type) == "symlink" { + return + } + + # back up existing file + if ($target | path exists) { + print $"backing up ($target) → ($target).bak" + mv $target $"($target).bak" + } + + print $"linking ($target) → ($file)" + ln -s $file $target +} diff --git a/modules/base.nix b/modules/base.nix new file mode 100644 index 0000000..590e2ce --- /dev/null +++ b/modules/base.nix @@ -0,0 +1,52 @@ +{ config, pkgs, inputs, ... }: +{ + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + # boot.kernelPackages = pkgs.linuxPackages_latest; + + networking.networkmanager.enable = true; + time.timeZone = "Europe/Oslo"; + i18n.defaultLocale = "en_US.UTF-8"; + services.xserver.xkb = { layout = "us"; variant = ""; }; + + users.users.fredrikr = { + isNormalUser = true; + description = "Fredrik Robertsen"; + extraGroups = [ "networkmanager" "wheel" ]; + shell = pkgs.nushell; + }; + + nixpkgs.config.allowUnfree = true; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + environment = { + systemPackages = with pkgs; [ vim ripgrep xdg-utils ]; + shells = with pkgs; [ nushell bash ]; + }; + + programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; + programs.bash.interactiveShellInit = '' + if [ "$TERM" = "dumb" ]; then exec ${pkgs.bash}; fi + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "nu" && -z ''${BASH_EXECUTION_STRING} ]]; then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.nushell}/bin/nu $LOGIN_OPTION + fi + ''; + + services.openssh.enable = true; + services.gnome.gnome-keyring.enable = true; + hardware.bluetooth.enable = true; + programs.nix-ld.enable = true; + + system.stateVersion = "25.11"; # set per machine + + nix.settings.substituters = [ + "https://cache.nixos.org" + "https://nix-community.cachix.org" + ]; + nix.settings.trusted-public-keys = [ + "cache.nixos.org-1:6nchdd59x431o0gwypbmraurkbj16zpmqfgspcdshjy=" + "nix-community.cachix.org-1:mb9fsh9qf2dcimdsuo8zy7bkq5cx+/rkcwyvrcyg3fs=" + ]; +} + diff --git a/modules/dev/default.nix b/modules/dev/default.nix new file mode 100644 index 0000000..87eef82 --- /dev/null +++ b/modules/dev/default.nix @@ -0,0 +1,27 @@ +{ pkgs, ... }: +{ + imports = [ + ./direnv.nix + ]; + + environment.systemPackages = with pkgs; [ + pandoc + typst + zathura + helix + odin + ols + uiua-unstable + uiua386 + nushell + carapace + starship + kanshi + jujutsu + ]; + + programs.git.enable = true; + + environment.sessionVariables.EDITOR = "hx"; +} + diff --git a/modules/dev/direnv.nix b/modules/dev/direnv.nix new file mode 100644 index 0000000..2b51c9d --- /dev/null +++ b/modules/dev/direnv.nix @@ -0,0 +1,6 @@ +{ + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; +} diff --git a/modules/gc.nix b/modules/gc.nix new file mode 100644 index 0000000..957aeed --- /dev/null +++ b/modules/gc.nix @@ -0,0 +1,20 @@ +{ config, inputs, ... }: +{ + system.autoUpgrade = { + enable = true; + flake = inputs.self.outPath; + flags = [ + "--print-build-logs" + ]; + dates = "02:00"; + randomizedDelaySec = "45min"; + }; + + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + + nix.optimise.automatic = true; +} diff --git a/modules/japanese.nix b/modules/japanese.nix new file mode 100644 index 0000000..e8df730 --- /dev/null +++ b/modules/japanese.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: { + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + fcitx5.addons = with pkgs; [ + # fcitx5-mozc + fcitx5-mozc-ut + fcitx5-gtk + ]; + }; + + fonts.packages = with pkgs; [ + migmix # migu japanese font mix + ]; +} diff --git a/modules/niri.nix b/modules/niri.nix new file mode 100644 index 0000000..c549438 --- /dev/null +++ b/modules/niri.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: +{ + programs.niri.enable = true; + + environment.systemPackages = with pkgs; [ + alacritty + mako + firefox + nautilus + playerctl + brightnessctl + xwayland-satellite + ]; + + programs.dms-shell.enable = true; + + services.displayManager.dms-greeter.enable = true; + services.displayManager.dms-greeter.compositor.name = "niri"; +} diff --git a/modules/steam.nix b/modules/steam.nix new file mode 100644 index 0000000..12dcfdf --- /dev/null +++ b/modules/steam.nix @@ -0,0 +1,6 @@ +{ + programs.steam = { + enable = true; + }; + programs.gamemode.enable = true; +}