diff --git a/README.md b/README.md index 9a4229f..06047d4 100644 --- a/README.md +++ b/README.md @@ -1,102 +1,179 @@ # nixos-config -Personal NixOS configuration using flakes and home-manager. +Personal NixOS configuration using flakes + home-manager. ## Structure ``` nixos-config/ -├── flake.nix # Entry point — inputs and outputs +├── flake.nix # Inputs and outputs +├── flake.lock # Pinned input versions ├── hosts/ │ └── nixos/ -│ ├── configuration.nix # System configuration -│ └── hardware-configuration.nix # Auto-generated, machine-specific +│ ├── configuration.nix # System-level config (kernel, services, users) +│ └── hardware-configuration.nix # Auto-generated, machine-specific (not in git) └── home/ - └── duynguyen/ - └── default.nix # Home-manager config (user packages, dotfiles) + ├── hosts/ + │ └── nixos.nix # Home-manager entry point for this machine + └── modules/ # Reusable modules, imported by hosts/nixos.nix + ├── niri/ + │ ├── default.nix # Niri module (loads config.kdl + sub-modules) + │ ├── config.kdl # Niri compositor config (edit this directly) + │ ├── noctalia/ + │ │ ├── default.nix # Noctalia shell settings + │ │ └── wallpapers/ # Wallpaper images (add your own here) + │ └── polkit/ + │ └── default.nix # Polkit authentication agent (systemd service) + ├── kitty/ + │ └── default.nix # Kitty terminal settings + ├── cli/ + │ └── default.nix # Shell, git, starship, zoxide, fish + └── applications/ + └── default.nix # All user packages, KDE/Plasma settings ``` +> `home/hosts/` and `hosts/` are two different layers: +> - `hosts/` = NixOS system config (runs as root) +> - `home/hosts/` = home-manager user config (runs as your user) +> +> When adding a second machine, add one file to each. + ## What's configured -- **KDE Plasma 6** on Wayland via SDDM, Breeze Dark theme -- **Niri** scrollable-tiling compositor (available as a separate session at SDDM) -- **Vietnamese input** via fcitx5 + unikey (Telex/VNI) - - Open `fcitx5-configtool` → Input Method tab → add **Unikey** -- **Touchpad**: natural scroll, acceleration 0.4, scroll factor 0.75 -- **Shell**: zsh (default) with autosuggestions, syntax highlighting, starship prompt, zoxide -- **Locale**: English UI, Vietnamese formats (currency, time, etc.), Asia/Ho_Chi_Minh timezone -- **Pipewire** for audio -- **Packages**: - - Browsers: firefox, zen-browser, claude-desktop - - Terminals: kitty, foot - - Editor: vscodium - - Niri tools: fuzzel, waybar, mako, wl-clipboard - - Daily apps: mpv, imv, grim + slurp, libreoffice, telegram-desktop - - CLI: btop, ripgrep, fzf, eza, bat, gh - - System: claude-code, git, kate +### Desktop +- **Niri** scrollable-tiling Wayland compositor +- **Noctalia shell** — bar, launcher, lock screen, wallpaper, idle, notifications (replaces waybar / walker / swaylock / swaybg / mako) +- **KDE Plasma 6** via SDDM — available as a secondary session, Breeze Dark theme +- **XWayland satellite** for X11 app compatibility under Niri +- **Polkit** via `polkit-kde-agent-1` + +### System +- **Locale**: English UI (`en_US.UTF-8`) everywhere, timezone `Asia/Ho_Chi_Minh` +- **Vietnamese input**: fcitx5 + unikey (Telex/VNI), toggle with `Super+Space` +- **Audio**: Pipewire (ALSA + PulseAudio compat) +- **Bluetooth**: enabled + Blueman applet +- **Power**: TLP (automatic power management), UPower (battery status) +- **Display**: DDC/CI support for external monitor brightness (`ddcutil`) +- **Fonts**: JetBrainsMono Nerd Font, Noto Color Emoji, Font Awesome + +### Shell +- **zsh** (default login shell) — autosuggestions, syntax highlighting, starship prompt, zoxide +- **fish** — available as secondary shell (`fish` to launch) + +### Packages (selection) +| Category | Packages | +|---|---| +| Browsers | firefox, zen-browser | +| AI | claude-desktop, claude-code | +| Terminals | kitty, ghostty, foot | +| Editor | vscodium | +| File manager | thunar + archive plugin + tumbler thumbnails | +| Media | mpv, imv, obs-studio, gimp, kdenlive | +| Office | libreoffice, zathura | +| Chat | telegram-desktop | +| CLI tools | tree, btop, htop, ripgrep, fd, fzf, eza, bat, dust, ncdu, lazygit, delta, yazi, tldr, tokei, jq, yq | +| System | brightnessctl, playerctl, ddcutil, grim, slurp, swappy, pavucontrol, blueman | + +## Niri keybindings + +| Key | Action | +|---|---| +| `Mod+T` | Open kitty terminal | +| `Mod+Space` | Noctalia launcher | +| `Mod+S` | Noctalia control center | +| `Super+Alt+L` | Lock screen | +| `Mod+Shift+Q` | Close window | +| `Mod+H/L` or `←/→` | Focus column left/right | +| `Mod+J/K` or `↓/↑` | Focus window down/up | +| `Mod+Shift+H/L` or `Shift+←/→` | Move column left/right | +| `Mod+Shift+J/K` or `Shift+↓/↑` | Move window down/up | +| `Mod+1-9` | Switch to workspace | +| `Mod+Shift+1-9` | Move window to workspace | +| `Mod+Shift+E` | Quit niri | + +> Edit keybindings directly in `home/modules/niri/config.kdl`. ## Reproducing on a fresh machine ### 1. Install NixOS -Boot the NixOS ISO, partition, and install as normal. During install, choose KDE Plasma if prompted. +Boot the NixOS ISO and install as usual. During partitioning, set up your disks. Choose any desktop — it will be replaced. -### 2. Enable flakes temporarily - -```bash -nix-shell -p git --command "bash" -# or just proceed if git is already available -``` - -### 3. Clone this repo +### 2. Clone this repo ```bash +nix-shell -p git git clone ~/nixos-config cd ~/nixos-config ``` -### 4. Provide the hardware config +### 3. Copy your hardware config -`hardware-configuration.nix` is machine-specific and not tracked in git. Copy the one generated by the NixOS installer: +`hardware-configuration.nix` is machine-specific and not tracked in git. Copy the one the installer generated: ```bash cp /etc/nixos/hardware-configuration.nix ~/nixos-config/hosts/nixos/hardware-configuration.nix ``` +### 4. Review `hosts/nixos/configuration.nix` + +Check these fields match your machine: +- `networking.hostName` — change if you want a different hostname +- `users.users.duynguyen` — change username if needed (update `home/hosts/nixos.nix` to match) +- `time.timeZone` — currently `Asia/Ho_Chi_Minh` + ### 5. Apply the configuration ```bash sudo nixos-rebuild switch --flake ~/nixos-config#nixos ``` -### 6. Lock the flake inputs +This builds and activates the full system + home-manager config in one step. -```bash -nix flake update -``` +### 6. Log out and back in -Commit the resulting `flake.lock` so future rebuilds use the exact same package versions. +Required so that: +- New locale settings (`LC_*`) take effect +- Niri session appears in SDDM +- Home-manager environment variables are loaded + +At the SDDM login screen, select **Niri** from the session menu. + +### 7. Vietnamese input (first time only) + +After logging in: +1. Open `fcitx5-configtool` +2. **Input Method** tab → add **Unikey** +3. Toggle EN/VI with `Super+Space` + +--- ## Daily usage | Task | Command | -|------|---------| -| Apply system + home changes | `sudo nixos-rebuild switch --flake ~/nixos-config#nixos` | -| Update all inputs | `nix flake update` | +|---|---| +| Apply changes | `sudo nixos-rebuild switch --flake ~/nixos-config#nixos` | +| Update all flake inputs | `nix flake update` | +| Update one input | `nix flake update noctalia` | | Roll back last switch | `sudo nixos-rebuild switch --rollback` | | Search packages | `nix search nixpkgs ` | +| Check what changed | `git diff` | -## Adding packages +## How to modify things -- **System-wide** (available to all users): `hosts/nixos/configuration.nix` → `environment.systemPackages` -- **User-level** (home-manager managed): `home/duynguyen/default.nix` → `home.packages` -- **Per-user via NixOS**: `hosts/nixos/configuration.nix` → `users.users.duynguyen.packages` +### Add a package +Open `home/modules/applications/default.nix` and add to `home.packages`. -## Vietnamese input setup (fcitx5) +### Change niri settings +Edit `home/modules/niri/config.kdl` directly. Niri reloads the config automatically when the file changes after a rebuild. -After first build: -1. Open **fcitx5-configtool** -2. Go to the **Input Method** tab → add **Unikey** -3. Switch between English/Vietnamese with **Super+Space** +### Change noctalia bar / theme / idle +Edit `home/modules/niri/noctalia/default.nix`. -Unikey supports both **Telex** (default) and **VNI** — configure in the Unikey settings. +### Add a wallpaper +Drop an image into `home/modules/niri/noctalia/wallpapers/` and commit it. + +### Add a new machine +1. `hosts//configuration.nix` + `hardware-configuration.nix` +2. `home/hosts/.nix` — import the modules you want +3. Add a new `nixosConfigurations.` entry in `flake.nix` diff --git a/flake.lock b/flake.lock index b8f9ed0..9f4af35 100644 --- a/flake.lock +++ b/flake.lock @@ -90,6 +90,37 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1786106723, + "narHash": "sha256-CgKDSHL6rqAAQkkvg1xaZDQXb77+4XW73iGcUMJ+2w0=", + "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1049422.f13ff45afd1b/nixexprs.tar.zst" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" + } + }, + "noctalia": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1786633340, + "narHash": "sha256-Kc3xbv2+z0+aV+t4IL1BfoTtB9MS0zHyI38oiv7zHxc=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "4dd6f29dbaafde7b11d61ce12685d01441d4a483", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -118,6 +149,7 @@ "claude-desktop": "claude-desktop", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", + "noctalia": "noctalia", "plasma-manager": "plasma-manager", "zen-browser": "zen-browser" } diff --git a/home/modules/applications/default.nix b/home/modules/applications/default.nix index a0e05ef..67e5b0f 100644 --- a/home/modules/applications/default.nix +++ b/home/modules/applications/default.nix @@ -47,6 +47,7 @@ wl-clipboard # CLI tools + tree vim neovim tmux @@ -70,12 +71,13 @@ # System control brightnessctl playerctl + ddcutil # Dev tools gh ]; - # KDE Plasma session: dark theme + touchpad preferences + # KDE Plasma session: dark theme + touchpad preferences + English locale programs.plasma = { enable = true; workspace.lookAndFeel = "org.kde.breezedark.desktop"; @@ -89,5 +91,19 @@ scrollSpeed = 0.75; } ]; + # Force all KDE format/calendar locale to English so the clock widget, + # calendar, and date/number formatting don't fall back to vi_VN. + configFile."plasma-localerc"."Formats" = { + LANG = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_COLLATE = "en_US.UTF-8"; + LC_ADDRESS = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + }; }; } diff --git a/home/modules/cli/default.nix b/home/modules/cli/default.nix index 61c573f..0dd48a1 100644 --- a/home/modules/cli/default.nix +++ b/home/modules/cli/default.nix @@ -6,9 +6,12 @@ syntaxHighlighting.enable = true; }; + programs.fish.enable = true; + programs.zoxide = { - enable = true; + enable = true; enableZshIntegration = true; + enableFishIntegration = true; }; programs.starship.enable = true; diff --git a/home/modules/niri/config.kdl b/home/modules/niri/config.kdl new file mode 100644 index 0000000..c681578 --- /dev/null +++ b/home/modules/niri/config.kdl @@ -0,0 +1,685 @@ +// 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://niri-wm.github.io/niri/Configuration:-Introduction + +// Input device configuration. +// Find the full list of options on the wiki: +// https://niri-wm.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 "grp:win_space_toggle,compose:ralt,ctrl:nocaps" + + // 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 + } + + // 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-factor 1.0 + // scroll-method "two-finger" + // disabled-on-external-mouse + } + + mouse { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "no-scroll" + } + + trackpoint { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // 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://niri-wm.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 +} + +// Settings that influence how windows are positioned and sized. +// Find more information on the wiki: +// https://niri-wm.github.io/niri/Configuration:-Layout +layout { + // Set gaps around windows in logical pixels. + gaps 8 + + // 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+Ctrl+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 64 + // right 64 + // 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 "noctalia" +spawn-at-startup "xwayland-satellite" + +// 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://niri-wm.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 0.5 +} + +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://niri-wm.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: kitty" { spawn "kitty"; } + Mod+Space hotkey-overlay-title="Noctalia: Launcher" { spawn "noctalia-ipc" "panel-toggle" "launcher"; } + Mod+S hotkey-overlay-title="Noctalia: Control Center" { spawn "noctalia-ipc" "panel-toggle" "control-center"; } + Super+Alt+L hotkey-overlay-title="Noctalia: Lock" { spawn "noctalia-ipc" "session" "lock"; } + + // 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+Shift+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+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; } + + // Cycle through widths set in preset-column-widths. + Mod+R { switch-preset-column-width; } + // Cycling through the presets in reverse order is also possible. + Mod+Shift+R { switch-preset-column-width-back; } + + Mod+Ctrl+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + + // While maximize-column leaves gaps and borders around the window, + // maximize-window-to-edges doesn't: the window expands to the edges of the screen. + // This bind corresponds to normal window maximizing, + // e.g. by double-clicking on the titlebar. + Mod+M { maximize-window-to-edges; } + + // 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; } + + // ── Move window: Mod+Shift+HJKL / Arrow ────────────────────────────── + Mod+Shift+H { move-column-left; } + Mod+Shift+L { move-column-right; } + Mod+Shift+K { move-window-up; } + Mod+Shift+J { move-window-down; } + Mod+Shift+Left { move-column-left; } + Mod+Shift+Right { move-column-right; } + Mod+Shift+Up { move-window-up; } + Mod+Shift+Down { move-window-down; } + + // ── Move window to workspace: Mod+Shift+1-9 ────────────────────────── + Mod+Shift+1 { move-column-to-workspace 1; } + Mod+Shift+2 { move-column-to-workspace 2; } + Mod+Shift+3 { move-column-to-workspace 3; } + Mod+Shift+4 { move-column-to-workspace 4; } + Mod+Shift+5 { move-column-to-workspace 5; } + Mod+Shift+6 { move-column-to-workspace 6; } + Mod+Shift+7 { move-column-to-workspace 7; } + Mod+Shift+8 { move-column-to-workspace 8; } + Mod+Shift+9 { move-column-to-workspace 9; } +} + +// ── Prefer no client-side decorations ──────────────────────────────────── +prefer-no-csd + +// ── Gestures ───────────────────────────────────────────────────────────── +gestures { + hot-corners { + off + } +} + +// ── Rounded corners ────────────────────────────────────────────────────── +window-rule { + geometry-corner-radius 12 + clip-to-geometry true +} + +// ── Noctalia: disable background-blur on bar layer to prevent seam ────── +layer-rule { + match namespace="noctalia" + background-effect { + blur false + } +} + +// ── Floating windows ───────────────────────────────────────────────────── +window-rule { + match app-id=r#"^Tk$"# + match app-id=r#"^gimp$"# title=r#"Preferences"# + match app-id=r#"^mpv$"# + match app-id=r#"^soffice$"# title=r#"^Text Import"# + match app-id=r#"^thunar$"# title=r#"^Rename "# + match app-id=r#"^xarchiver$"# + match app-id=r#"firefox$"# title=r#"^Picture-in-Picture$"# + + open-floating true +} diff --git a/home/modules/niri/default.nix b/home/modules/niri/default.nix index d1c5253..16d4d09 100644 --- a/home/modules/niri/default.nix +++ b/home/modules/niri/default.nix @@ -1,98 +1,7 @@ -{ pkgs, lib, ... }: -let - # Start from niri's own default config so we inherit every new default - # automatically on updates. We patch only what we need to change. - base = builtins.readFile "${pkgs.niri.doc}/share/doc/niri/default-config.kdl"; - - # waybar → noctalia + add xwayland-satellite - r1 = builtins.replaceStrings - [ "spawn-at-startup \"waybar\"\n" ] - [ "spawn-at-startup \"noctalia\"\nspawn-at-startup \"xwayland-satellite\"\n" ] - base; - - # terminal: alacritty → kitty - r2 = builtins.replaceStrings - [ " Mod+T hotkey-overlay-title=\"Open a Terminal: alacritty\" { spawn \"alacritty\"; }\n" ] - [ " Mod+T hotkey-overlay-title=\"Open a Terminal: kitty\" { spawn \"kitty\"; }\n" ] - r1; - - # launcher: fuzzel → noctalia launcher + control-center - r3 = builtins.replaceStrings - [ " Mod+D hotkey-overlay-title=\"Run an Application: fuzzel\" { spawn \"fuzzel\"; }\n" ] - [ " Mod+Space hotkey-overlay-title=\"Noctalia: Launcher\" { spawn \"noctalia-ipc\" \"panel-toggle\" \"launcher\"; }\n Mod+S hotkey-overlay-title=\"Noctalia: Control Center\" { spawn \"noctalia-ipc\" \"panel-toggle\" \"control-center\"; }\n" ] - r2; - - # lock: swaylock → noctalia - r4 = builtins.replaceStrings - [ " Super+Alt+L hotkey-overlay-title=\"Lock the Screen: swaylock\" { spawn \"swaylock\"; }\n" ] - [ " Super+Alt+L hotkey-overlay-title=\"Noctalia: Lock\" { spawn \"noctalia-ipc\" \"session\" \"lock\"; }\n" ] - r3; - - # skip the hotkey overlay pop-up at startup - r5 = builtins.replaceStrings - [ " // skip-at-startup\n" ] - [ " skip-at-startup\n" ] - r4; - - # tighter gaps - r6 = builtins.replaceStrings - [ " gaps 16\n" ] - [ " gaps 8\n" ] - r5; - - # enable animations slowdown - r7 = builtins.replaceStrings - [ " // slowdown 3.0\n" ] - [ " slowdown 0.5\n" ] - r6; - - # Our additions appended after the patched default config. - # A second `input { touchpad { } }` block overrides earlier touchpad settings. - customConfig = '' - - // ── Touchpad ───────────────────────────────────────────────────────────── - input { - touchpad { - tap - natural-scroll - accel-profile "flat" - scroll-factor 1.0 - } - } - - // ── Prefer no client-side decorations ──────────────────────────────────── - prefer-no-csd - - // ── Gestures ───────────────────────────────────────────────────────────── - gestures { - hot-corners { - off - } - } - - // ── Rounded corners ────────────────────────────────────────────────────── - window-rule { - geometry-corner-radius 12 - clip-to-geometry true - } - - // ── Floating windows ───────────────────────────────────────────────────── - window-rule { - match app-id=r#"^Tk$"# - match app-id=r#"^gimp$"# title=r#"Preferences"# - match app-id=r#"^mpv$"# - match app-id=r#"^soffice$"# title=r#"^Text Import"# - match app-id=r#"^thunar$"# title=r#"^Rename "# - match app-id=r#"^xarchiver$"# - match app-id=r#"firefox$"# title=r#"^Picture-in-Picture$"# - - open-floating true - } - ''; -in +{ ... }: { imports = [ ./noctalia ./polkit ]; # .text writes a real file (not a nix-store symlink) so niri auto-reloads on rebuild - xdg.configFile."niri/config.kdl".text = r7 + customConfig; + xdg.configFile."niri/config.kdl".text = builtins.readFile ./config.kdl; } diff --git a/home/modules/niri/noctalia/default.nix b/home/modules/niri/noctalia/default.nix index f54d005..dac4431 100644 --- a/home/modules/niri/noctalia/default.nix +++ b/home/modules/niri/noctalia/default.nix @@ -20,7 +20,8 @@ in enable = true; settings = { bar.default = { - start = [ "launcher" "clipboard" "cpu" "network" "ram" ]; + # "group:sysmon" renders as one capsule containing cpu + ram + start = [ "launcher" "clipboard" "group:sysmon" "network" ]; center = [ "clock" ]; end = [ "notifications" "volume" "brightness" "battery" "control-center" "session" ]; thickness = 40; @@ -29,6 +30,16 @@ in margin_edge = 0; margin_ends = 0; widget_spacing = 8; + + capsule_group = [ + { + id = "sysmon"; + members = [ "cpu" "ram" ]; + fill = "surface_variant"; + opacity = 1.0; + padding = 6.0; + } + ]; }; idle = { @@ -56,12 +67,14 @@ in shell = { font_family = "JetBrainsMono Nerd Font"; polkit_agent = true; - corner_radius_scale = 0.0; + corner_radius_scale = 1.0; animation.speed = 1.5; panel = { clipboard_placement = "attached"; launcher_placement = "attached"; launcher_session_search = true; + panel_overlap = 1; # pull panel flush against bar to hide seam + contact_shadow = true; # gradient at meeting point masks any residual gap }; shadow.alpha = 0.5; }; diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index e8b198a..d3decde 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -74,6 +74,17 @@ programs.firefox.enable = true; programs.niri.enable = true; programs.zsh.enable = true; + programs.fish.enable = true; + + # Power management (TLP conflicts with power-profiles-daemon which Plasma enables + # by default, so explicitly disable it) + services.power-profiles-daemon.enable = false; + services.tlp.enable = true; + services.upower.enable = true; + + # ddcutil: control external monitor brightness/contrast over DDC/CI + boot.kernelModules = [ "i2c-dev" ]; + hardware.i2c.enable = true; security.polkit.enable = true;