feat(waybar): add more train portals to the on-board info widget

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1747575206,
+        "lastModified": 1750173260,
-        "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
+        "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
+        "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
         "type": "github"
       },
       "original": {
@@ -32,11 +32,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1749289693,
+        "lastModified": 1752094135,
-        "narHash": "sha256-fSMlofc9z/G/bfwgtDD+zy9RBqKR71FsLNU8mfLwPq0=",
+        "narHash": "sha256-kd5/x5SshFVFHWUf/7rRqXQ06aUaD6VJdUYRCDUHHo0=",
         "owner": "oddlama",
         "repo": "agenix-rekey",
-        "rev": "57cb67bc61f8421c576085d595d902f02828d953",
+        "rev": "395cdb1631e9715e37d0e859a2b1da63f0ae333b",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1749289693,
+        "lastModified": 1752094135,
-        "narHash": "sha256-fSMlofc9z/G/bfwgtDD+zy9RBqKR71FsLNU8mfLwPq0=",
+        "narHash": "sha256-kd5/x5SshFVFHWUf/7rRqXQ06aUaD6VJdUYRCDUHHo0=",
         "owner": "oddlama",
         "repo": "agenix-rekey",
-        "rev": "57cb67bc61f8421c576085d595d902f02828d953",
+        "rev": "395cdb1631e9715e37d0e859a2b1da63f0ae333b",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1747575206,
+        "lastModified": 1750173260,
-        "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
+        "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
+        "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
         "type": "github"
       },
       "original": {
@@ -96,11 +96,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1750153510,
+        "lastModified": 1752828704,
-        "narHash": "sha256-NYHXXJZ9m4fJpKk9tKn/EExX87SqcBcRINOGF7hKRLI=",
+        "narHash": "sha256-I8cCVFZIFcIy+7KBnjCuS/ISTJYeR8mkah1oxA6qBVk=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "4e95eaf8a351956d75cc400318579967ca2b6d0f",
+        "rev": "f5d22072074b0bc3c47a3a96a00e4fad263014ff",
         "type": "github"
       },
       "original": {
@@ -414,11 +414,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750127463,
+        "lastModified": 1752814804,
-        "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=",
+        "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402",
+        "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
         "type": "github"
       },
       "original": {
@@ -491,11 +491,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749960154,
+        "lastModified": 1752985182,
-        "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=",
+        "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "424a40050cdc5f494ec45e46462d288f08c64475",
+        "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c",
         "type": "github"
       },
       "original": {
@@ -506,11 +506,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1750083401,
+        "lastModified": 1752666637,
-        "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
+        "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
+        "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153",
         "type": "github"
       },
       "original": {
@@ -538,11 +538,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1744463964,
+        "lastModified": 1752480373,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
         "type": "github"
       },
       "original": {
@@ -554,11 +554,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1749794982,
+        "lastModified": 1752950548,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
         "type": "github"
       },
       "original": {
@@ -586,11 +586,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1749794982,
+        "lastModified": 1752950548,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
         "type": "github"
       },
       "original": {
@@ -691,11 +691,11 @@
         "systems": "systems_6"
       },
       "locked": {
-        "lastModified": 1749961984,
+        "lastModified": 1752986956,
-        "narHash": "sha256-1Nmycj9cVUIkoDsVEn9k8SGMS9V+BcBUL+rDXNapslw=",
+        "narHash": "sha256-1AK8+W7d5eNyGRkcWHa+9oIChLJbY6jt7ujSJo+ft4M=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "c9f12a733e8edcf8d408ccd178c1a11e753ffa08",
+        "rev": "51ac0aee7e7ee21ca0874b913f07f9004bc9311f",
         "type": "github"
       },
       "original": {

home/essentials/keyring.nix

@@ -2,6 +2,10 @@
   services.gnome-keyring = {
     enable = true;
 
-    components = [ "secrets" "pkcs11" "ssh" ];
+    components = [
+      "secrets"
+      "pkcs11"
+      "ssh"
+    ];
   };
 }

home/misc_pkgs/packages.nix

@@ -32,6 +32,7 @@
     # Desktop Media things
     mpv-unwrapped
     libsForQt5.gwenview
+    davinci-resolve
 
     # Desktop game things
     openttd-jgrpp

home/wm/default.nix

@@ -5,7 +5,8 @@
     ./dunst.nix
     ./gtk.nix
     ./hyprland.nix
-    ./hyprpaper
+    ./hyprpaper.nix
+    ./niriconf.nix
     ./rofi
     ./swaylock.nix
     ./waybar

home/wm/hyprpaper.nix

@@ -3,11 +3,11 @@
     enable = true;
     settings = {
       preload = [
-        (builtins.toString wallpapers/gadse.png)
+        (builtins.toString ./src/wallpapers/gadse.png)
       ];
 
       wallpaper = [
-        ",${builtins.toString wallpapers/gadse.png}"
+        ",${builtins.toString ./src/wallpapers/gadse.png}"
       ];
     };
   };

home/wm/niriconf.nix

@@ -0,0 +1,3 @@
+{
+  home.file.".config/niri/config.kdl".text = builtins.readFile ./src/niriconf.kdl;
+}

home/wm/src/niriconf.kdl

@@ -0,0 +1,624 @@
+// 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://github.com/YaLTeR/niri/wiki/Configuration:-Introduction
+
+// Input device configuration.
+// Find the full list of options on the wiki:
+// https://github.com/YaLTeR/niri/wiki/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"
+            layout "de"
+            variant "neo_qwertz"
+        }
+
+        // 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 true
+        // drag-lock
+        natural-scroll
+        accel-speed 0.3
+        scroll-factor 0.8
+        // accel-profile "flat"
+        // scroll-method "two-finger"
+        // disabled-on-external-mouse
+    }
+
+    mouse {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        accel-speed 0.3
+        // 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://github.com/YaLTeR/niri/wiki/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 "<width>x<height>" or "<width>x<height>@<refresh rate>".
+    // 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://github.com/YaLTeR/niri/wiki/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 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 "waybar"
+spawn-at-startup "nm-applet &"
+spawn-at-startup "wl-paste --watch cliphist -max-items 50 store"
+
+// 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/%Y-%m-%d %H-%M-%S_niri.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://github.com/YaLTeR/niri/wiki/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://github.com/YaLTeR/niri/wiki/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
+}
+
+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
+}
+
+
+window-rule {
+    match title="flameshot"
+    open-floating true
+}
+
+window-rule {
+    match title="Welcome to ((IntelliJ IDEA)|PyCharm|RustRover|GoLand|DataGrip|(Android Studio))"
+    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+Q hotkey-overlay-title="Open a Terminal: alacritty" { spawn "alacritty"; }
+    Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
+    Mod+R hotkey-overlay-title="Run an application: rofi drun" { spawn "rofi" "-drun"; }
+    Mod+Perid hotkey-overlay-title="Run an application: rofimoji" { spawn "rofimoji" "-a" "copy" "-s" "neutral"; }
+    Mod+X hotkey-overlay-title="Run an application: clipboard history" { spawn "cliphist list | rofi -dmenu | cliphist decode | wl-copy"; }
+    Mod+Shift+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
+
+    // You can also use a shell. Do this if you need pipes, multiple commands, etc.
+    // Note: the entire command goes as a single argument in the end.
+    // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
+
+    // Example volume keys mappings for PipeWire & WirePlumber.
+    // The allow-when-locked=true property makes them work even when the session is locked.
+    XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; }
+    XF86AudioMute        allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
+    XF86AudioMicMute     allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
+
+    // Example brightness key mappings for brightnessctl.
+    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+W 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+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 "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }
+    // Mod+TouchpadScrollUp   { spawn "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; }
+    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; }
+}

home/wm/waybar/default.nix

@@ -29,6 +29,8 @@
           "network"
           "battery"
           "custom/icestats"
+          "custom/thalysstats"
+          "custom/oebbstats"
           "clock"
           "tray"
         ];
@@ -40,8 +42,24 @@
         };
 
         "custom/icestats" = {
-          exec = ./src/ice_fetch.sh;
+          exec = ./src/icestats/ice_fetch.sh;
-          exec-if = ./src/ice_presence.sh;
+          exec-if = ./src/icestats/ice_presence.sh;
+          interval = 1;
+          tooltip = true;
+          return-type = "json";
+        };
+
+        "custom/thalysstats" = {
+          exec = ./src/thalysstats/thalys_fetch.sh;
+          exec-if = ./src/thalysstats/thalys_presence.sh;
+          interval = 1;
+          tooltip = true;
+          return-type = "json";
+        };
+
+        "custom/oebbstats" = {
+          exec = ./src/oebbstats/oebb_fetch.sh;
+          exec-if = ./src/oebbstats/oebb_presence.sh;
           interval = 1;
           tooltip = true;
           return-type = "json";

home/wm/waybar/src/oebbstats/oebb_fetch.sh

@@ -0,0 +1,87 @@
+# Fetch the JSON data from the ÖBB API
+decoded_data=$(curl -s https://railnet.oebb.at/assets/media/fis/combined.json)
+
+# Check if the decoded data is valid JSON
+if ! echo "$decoded_data" | jq empty 2>/dev/null; then
+    echo "{\"text\": \"N/A\", \"alt\": \"Speed data not available\", \"tooltip\": \"\", \"class\": \"unavailable\", \"percentage\": 0}"
+    exit 1
+fi
+
+# Extract the speed value from latestStatus
+speed=$(echo "$decoded_data" | jq -r '.latestStatus.speed // empty')
+
+# Check if the speed value is empty or null
+if [ -z "$speed" ] || [ "$speed" = "null" ]; then
+    echo "{\"text\": \"N/A\", \"alt\": \"Speed data not available\", \"tooltip\": \"\", \"class\": \"unavailable\", \"percentage\": 0}"
+    exit 1
+fi
+
+# Extract train information
+train_type=$(echo "$decoded_data" | jq -r '.trainType')
+line_number=$(echo "$decoded_data" | jq -r '.lineNumber')
+trip_number=$(echo "$decoded_data" | jq -r '.tripNumber')
+
+# Get next stop information
+next_stop_name=$(echo "$decoded_data" | jq -r '.nextStation.name.de')
+next_stop_arrival_scheduled=$(echo "$decoded_data" | jq -r '.nextStation.arrival.scheduled')
+next_stop_arrival_forecast=$(echo "$decoded_data" | jq -r '.nextStation.arrival.forecast')
+
+# Calculate delay if forecast exists
+delay_minutes=""
+if [ "$next_stop_arrival_forecast" != "null" ] && [ "$next_stop_arrival_forecast" != "" ]; then
+    # Convert times to minutes for calculation
+    scheduled_minutes=$(echo "$next_stop_arrival_scheduled" | awk -F: '{print ($1 * 60) + $2}')
+    forecast_minutes=$(echo "$next_stop_arrival_forecast" | awk -F: '{print ($1 * 60) + $2}')
+    delay=$((forecast_minutes - scheduled_minutes))
+    
+    if [ $delay -gt 0 ]; then
+        delay_minutes="+${delay}"
+    elif [ $delay -lt 0 ]; then
+        delay_minutes="${delay}"
+    fi
+fi
+
+# Get distance information
+distance_from_current=$(echo "$decoded_data" | jq -r '.latestStatus.distance.meters // 0')
+next_station_distance=$(echo "$decoded_data" | jq -r '.nextStation.distanceFromPrevious // 0')
+remaining_distance=$((next_station_distance - distance_from_current))
+distance_km=$(echo "scale=2; $remaining_distance/1000" | bc)
+
+# Use forecast time if available, otherwise scheduled time
+display_time="$next_stop_arrival_scheduled"
+if [ "$next_stop_arrival_forecast" != "null" ] && [ "$next_stop_arrival_forecast" != "" ]; then
+    display_time="$next_stop_arrival_forecast"
+fi
+
+# Get current and destination stations
+current_station=$(echo "$decoded_data" | jq -r '.currentStation.name.de // "Unknown"')
+destination=$(echo "$decoded_data" | jq -r '.destination.de // .destination.all // "Unknown"')
+
+# Create the tooltip text
+tooltip="${train_type} ${line_number} (${trip_number})\n"
+tooltip+="From: ${current_station}\n"
+tooltip+="To: ${destination}\n\n"
+tooltip+="Next stop: ${next_stop_name}\n"
+
+if [ -n "$delay_minutes" ]; then
+    tooltip+="${display_time} (${delay_minutes} min) - ${distance_km} km"
+else
+    tooltip+="${display_time} - ${distance_km} km"
+fi
+
+# Create the display text
+if [ -n "$delay_minutes" ]; then
+    text="${speed} km/h - ${display_time} (${delay_minutes})"
+else
+    text="${speed} km/h - ${display_time}"
+fi
+
+alt="Current speed"
+class="oebbstats"
+percentage=0
+
+# Create the JSON object
+json_output="{\"text\": \"${text}\", \"alt\": \"${alt}\", \"tooltip\": \"${tooltip}\", \"class\": \"${class}\", \"percentage\": ${percentage}}"
+
+# Print the JSON object
+echo "$json_output"

home/wm/waybar/src/oebbstats/oebb_presence.sh

@@ -0,0 +1,6 @@
+SSID=$(iwconfig wlp1s0 | grep ESSID | sed -e 's/.*ESSID:"\(.*\)"/\1/' | xargs)
+if [[ $SSID == "OEBB" ]]; then
+	exit 0
+else
+	exit 1
+fi

home/wm/waybar/src/sncffetch/sncf_fetch.sh

@@ -0,0 +1,100 @@
+# TODO: Get speed from somewhere!!!
+
+# Fetch the JSON data from the API
+# The URL is hardcoded, but could be passed as an argument
+trip_data=$(curl -s "https://wifi.sncf/router/api/train/details")
+
+# Check if trip_data is empty or does not contain valid JSON
+if [ -z "$trip_data" ] || ! echo "$trip_data" | jq -e . > /dev/null 2>&1; then
+  # Output a standard error message in JSON format if data is unavailable
+  echo "{\"text\": \"N/A\", \"alt\": \"Train data not available\", \"tooltip\": \"Could not retrieve train information.\", \"class\": \"unavailable\", \"percentage\": 0}"
+  exit 1
+fi
+
+# Extract general trip information
+train_number=$(echo "$trip_data" | jq -r '.number')
+# The train type (e.g., TGV) is not explicitly in the JSON, so we'll use a generic title or assume TGV
+train_type="TGV"
+
+# Find the next stop
+# We iterate through the stops and find the first one with an arrival time in the future.
+next_stop_info=""
+current_time_epoch=$(date +%s)
+
+# The `jq` command below processes the 'stops' array.
+# - `to_entries` converts the array to key-value pairs.
+# - `map(...)` processes each stop.
+# - `select(...)` filters for the stops that are in the future.
+# - `sort_by(.value.realDate)` sorts them by arrival time.
+# - `first` gets the very next stop.
+# - `// empty` handles the case where no future stops are found.
+next_stop_info=$(echo "$trip_data" | jq -r '
+  .stops | to_entries | map(
+    select(
+      (.value.realDate | fromdateiso8601) > now
+    )
+  ) | sort_by(.value.realDate) | first | .value // empty
+')
+
+
+# Check if a next stop was found
+if [ -z "$next_stop_info" ]; then
+    # If no next stop is found, it might be the last stop. Let's get the last stop from the list.
+    last_stop_info=$(echo "$trip_data" | jq -r '.stops[-1]')
+    stop_label=$(echo "$last_stop_info" | jq -r '.label')
+    
+    echo "{\"text\": \"Approaching ${stop_label}\", \"alt\": \"Final destination\", \"tooltip\": \"Train is approaching its final destination: ${stop_label}\", \"class\": \"final-stop\", \"percentage\": 100}"
+    exit 0
+fi
+
+# Extract details for the next stop
+next_stop_name=$(echo "$next_stop_info" | jq -r '.label')
+next_stop_arrival_iso=$(echo "$next_stop_info" | jq -r '.realDate')
+next_stop_delay=$(echo "$next_stop_info" | jq -r '.delay') # in minutes
+delay_reason=$(echo "$next_stop_info" | jq -r '.delayReason')
+
+# Format the arrival time to HH:MM
+next_stop_arrival_time=$(date -d "$next_stop_arrival_iso" +"%H:%M")
+
+# Extract progress information from the first stop in the array
+progress_info=$(echo "$trip_data" | jq -r '.stops[0].progress')
+percentage=$(echo "$progress_info" | jq -r '.progressPercentage')
+# Round the percentage to an integer
+percentage_int=$(printf "%.0f" "$percentage")
+
+
+# --- Construct the output strings ---
+
+# Build the main text string
+text="Progress: ${percentage_int}% - Next: ${next_stop_name} ${next_stop_arrival_time}"
+if [ "$next_stop_delay" -gt 0 ]; then
+  text+=" (+${next_stop_delay}')"
+fi
+
+# Build the tooltip string
+tooltip="${train_type} ${train_number}\n\n"
+tooltip+="Next stop: ${next_stop_name}\n"
+tooltip+="Arrival: ${next_stop_arrival_time}"
+
+if [ "$next_stop_delay" -gt 0 ]; then
+  tooltip+=" (+${next_stop_delay}')"
+fi
+if [ -n "$delay_reason" ] && [ "$delay_reason" != "null" ]; then
+    tooltip+="\nReason: ${delay_reason}"
+fi
+
+# Set alt text and class
+alt="Train ${train_number} progress"
+class="sncfstats"
+
+# --- Create and print the final JSON object ---
+
+# Using jq to safely construct the JSON output
+jq -n \
+  --arg text "$text" \
+  --arg alt "$alt" \
+  --arg tooltip "$tooltip" \
+  --arg class "$class" \
+  --argjson percentage "$percentage_int" \
+  '{text: $text, alt: $alt, tooltip: $tooltip, class: $class, percentage: $percentage}'
+

home/wm/waybar/src/thalysstats/thalys_fetch.sh

@@ -0,0 +1,45 @@
+
+api_response=$(curl -s "https://www.ombord.info/api/jsonp/position/?_=$(date +%s%3N)")
+
+# Check if the API call returned any data. If not, exit gracefully.
+if [ -z "$api_response" ]; then
+  echo '{"text": "", "tooltip": "Failed to fetch Thalys data", "class": "unavailable"}'
+  exit 1
+fi
+
+speed_ms=$(echo "$api_response" | tr -d '();' | jq -r '.speed // "null"')
+
+# Check if the extracted speed value is null or empty.
+if [ "$speed_ms" == "null" ] || [ -z "$speed_ms" ]; then
+  echo '{"text": "N/A", "tooltip": "Speed data not available", "class": "unavailable"}'
+  exit 1
+fi
+
+# Bash does not handle floating-point arithmetic, so we use `bc` (Basic Calculator).
+# 1. Convert speed from meters per second (m/s) to kilometers per hour (km/h) by multiplying by 3.6.
+# 2. `scale=0` tells bc to output with zero decimal places (i.e., as an integer).
+# 3. The `/ 1` at the end ensures that the rounding is applied correctly.
+speed_kmh=$(echo "scale=0; $speed_ms * 3.6 / 1" | bc)
+
+# --- Waybar JSON Output ---
+
+# The main text displayed on the bar.
+text="${speed_kmh} km/h"
+
+# A more descriptive text that appears on hover.
+tooltip="Current speed: ${speed_kmh} km/h"
+
+# A CSS class for custom styling in your Waybar `style.css`.
+class="thalysstats"
+
+# The percentage value, often used for progress bars or circular indicators.
+# We'll set it to 0 as it's not applicable here, but it's good practice to include it.
+percentage=0
+
+# Print the final JSON object.
+# Using `printf` is a safer way to format strings containing variables than `echo`.
+printf '{"text": "%s", "tooltip": "%s", "class": "%s", "percentage": %d}\n' \
+  "$text" \
+  "$tooltip" \
+  "$class" \
+  "$percentage"

home/wm/waybar/src/thalysstats/thalys_presence.sh

@@ -0,0 +1,6 @@
+SSID=$(iwconfig wlp1s0 | grep ESSID | sed -e 's/.*ESSID:"\(.*\)"/\1/' | xargs)
+if [[ $SSID == "EurostarTrainsWiFi" ]]; then
+	exit 0
+else
+	exit 1
+fi

home/wm/waybar/waybar.css

@@ -66,6 +66,8 @@
 #pulseaudio,
 #temperature,
 #icestats,
+#thalysstats,
+#oebbstats,
 #tray {
     padding-left: 10px;
     padding-right: 10px;

home/wm/xdg.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs }:
+{ lib, pkgs, ... }:
 {
   xdg = {
     userDirs = {

modules/essentials/environment.nix

@@ -12,6 +12,9 @@
     systemPackages = with pkgs; [
       fprintd
       polkit_gnome
+      libsecret
+      swayidle
+      swaylock
     ];
 
     etc."xdg/gtk-2.0/gtkrc".text = ''

modules/utils/default.nix

@@ -1,7 +1,9 @@
 {
   imports = [
+    ./agenix
     ./auth.nix
     ./gnome.nix
+    ./niri.nix
     ./printing.nix
   ];
 }

modules/utils/niri.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  programs.niri.enable = true;
+
+  # Install xwayland-satellite for xwayland support
+  environment.systemPackages = with pkgs; [
+    xwayland-satellite
+    fuzzel
+  ];
+}