latest niri
This commit is contained in:
1 parent
3be8e198df
commit
57d6c968d9
5 files changed
+74
-62
No files matched your search
@@ -136,6 +136,15 @@ screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
|
||||
// Window Rules
|
||||
// =========================
|
||||
// Open the Firefox picture-in-picture player as floating by default.
|
||||
window-rule {
|
||||
match app-id="org.pipewire.Helvum"
|
||||
|
||||
open-focused true
|
||||
open-floating true
|
||||
default-floating-position x=0 y=25 relative-to="top"
|
||||
default-window-height { proportion 0.8; }
|
||||
default-column-width { proportion 0.75; }
|
||||
}
|
||||
window-rule {
|
||||
match app-id=r#"firefox$"# title="^Picture-in-Picture$"
|
||||
match app-id="org.pulseaudio.pavucontrol"
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
"group/sound",
|
||||
"group/backlight",
|
||||
"tray",
|
||||
"mpd",
|
||||
// "jack",
|
||||
// "wireplumber",
|
||||
"custom/logout"
|
||||
],
|
||||
// Modules configuration
|
||||
@@ -49,7 +52,7 @@
|
||||
"pulseaudio/slider": {
|
||||
"min": 0,
|
||||
"max": 100,
|
||||
"orientation": "horizontal"
|
||||
"orientation": "horizontal",
|
||||
},
|
||||
"custom/logout": {
|
||||
"format": "⏻",
|
||||
@@ -181,6 +184,7 @@
|
||||
""
|
||||
]
|
||||
},
|
||||
"on-click": "pavucontrol"
|
||||
"on-click": "/run/current-system/sw/bin/flatpak run org.pipewire.Helvum"
|
||||
// "on-click": "/run/current-system/sw/bin/pavucontrol"
|
||||
}
|
||||
}
|
||||
Generated
+38
-38
@@ -13,12 +13,12 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1757033802,
|
||||
"narHash": "sha256-BLUHtWWoHFR6UJJJwkmivSv7RTjo92wlT0Y7kbCd2MY=",
|
||||
"rev": "e154f8433851f8f2509490f33680e3285d553df4",
|
||||
"revCount": 301,
|
||||
"lastModified": 1757699119,
|
||||
"narHash": "sha256-iOOoVdrkcyk95Xg68TuPeAwpz+v80mgZCqil0jpPZuY=",
|
||||
"rev": "1e16c8f8a44573bb0648c76b6c98352436f5171e",
|
||||
"revCount": 304,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.11.1/01991762-b4e5-7a3b-8bfc-5d0f1ed4965e/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.11.2/01993f0b-1215-7072-ac1a-f2b27b566115/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -28,37 +28,37 @@
|
||||
"determinate-nixd-aarch64-darwin": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-Dym4kTLMTxAxNyZcrHRKRVMBINQPA7qgr+7dHozNrps=",
|
||||
"narHash": "sha256-q1tqDvmfjDgLk/wbYf4pRhyHDS94iY85Q79FPBtcv7g=",
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/macOS"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/macOS"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS"
|
||||
}
|
||||
},
|
||||
"determinate-nixd-aarch64-linux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-eYVSpk+ly2YRSYvgT47ABmFRwG0DliNO/8ntBkoRmjI=",
|
||||
"narHash": "sha256-E1vGfcQ5dqtRG9EDP6eOQWCnCIRB2XFkFBp2C4FgQ8c=",
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/aarch64-linux"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/aarch64-linux"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux"
|
||||
}
|
||||
},
|
||||
"determinate-nixd-x86_64-linux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-ZvRoKG/v0WS2XrDgkV+/hq3ARGokGisyelncKwlefvk=",
|
||||
"narHash": "sha256-GtxtkI0cOC2A30Xw6gCDTN7JxN1zJGh7/eIXr6AlTSA=",
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/x86_64-linux"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/x86_64-linux"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
@@ -131,11 +131,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756679287,
|
||||
"narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
|
||||
"lastModified": 1757808926,
|
||||
"narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
|
||||
"rev": "f21d9167782c086a33ad53e2311854a8f13c281e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -154,12 +154,12 @@
|
||||
"nixpkgs-regression": "nixpkgs-regression"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1757029043,
|
||||
"narHash": "sha256-/XtKs/hpYXJPeT3WppFVFZH1WvPDmeTt11hMWt/Bwas=",
|
||||
"rev": "7143558a0989008c8e08cc27c3cb6a031f30b356",
|
||||
"revCount": 22309,
|
||||
"lastModified": 1757694985,
|
||||
"narHash": "sha256-3Ia+y7Hbwnzcuf1hyuVnFtbnSR6ErQeFjemHdVxjCNE=",
|
||||
"rev": "766f43aa6acb1b3578db488c19fbbedf04ed9f24",
|
||||
"revCount": 22340,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.1/01991737-661d-7932-b7c9-d3a0499b4c3f/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.2/01993ee9-f8e7-7b80-80df-ec0a20a32514/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -173,11 +173,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1757130842,
|
||||
"narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=",
|
||||
"lastModified": 1757430124,
|
||||
"narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5",
|
||||
"rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -204,11 +204,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1757103352,
|
||||
"narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=",
|
||||
"lastModified": 1757891025,
|
||||
"narHash": "sha256-NfiTk59huy/YK9H4W4wVwRYyiP2u86QqROM5KK4f5F4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "11b2a10c7be726321bb854403fdeec391e798bf0",
|
||||
"rev": "4c38a024fa32e61db2be8573e5282b15d9733a79",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -266,12 +266,12 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1756696532,
|
||||
"narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=",
|
||||
"rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f",
|
||||
"revCount": 854745,
|
||||
"lastModified": 1757034884,
|
||||
"narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=",
|
||||
"rev": "ca77296380960cd497a765102eeb1356eb80fed0",
|
||||
"revCount": 856744,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.854745%2Brev-58dcbf1ec551914c3756c267b8b9c8c86baa1b2f/019908ed-e731-796e-b7c5-ea173f5d3b8d/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.856744%2Brev-ca77296380960cd497a765102eeb1356eb80fed0/01992cf9-9347-761a-8963-9cbe43abe2fa/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -280,12 +280,12 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1757244434,
|
||||
"narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=",
|
||||
"rev": "092c565d333be1e17b4779ac22104338941d913f",
|
||||
"revCount": 809550,
|
||||
"lastModified": 1757810152,
|
||||
"narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=",
|
||||
"rev": "9a094440e02a699be5c57453a092a8baf569bdad",
|
||||
"revCount": 809873,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.809550%2Brev-092c565d333be1e17b4779ac22104338941d913f/01992879-0346-7c7e-8e0b-99e6d3f6c244/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.809873%2Brev-9a094440e02a699be5c57453a092a8baf569bdad/019948d8-e1ce-71d3-a6ab-b8e7de3004e2/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
||||
@@ -152,6 +152,7 @@ in
|
||||
vscode
|
||||
devenv
|
||||
just
|
||||
uv
|
||||
rpi-imager
|
||||
rpiboot
|
||||
code-cursor-fhs
|
||||
@@ -184,11 +185,13 @@ in
|
||||
]);
|
||||
services.usbmuxd.enable = true;
|
||||
services.flatpak.packages = [
|
||||
"io.github.kolunmi.Bazaar"
|
||||
"com.spotify.Client"
|
||||
"com.cassidyjames.butler"
|
||||
"io.dbeaver.DBeaverCommunity"
|
||||
"com.google.Chrome"
|
||||
"dev.deedles.Trayscale"
|
||||
"org.pipewire.Helvum"
|
||||
];
|
||||
# Gaming
|
||||
programs.steam = {
|
||||
|
||||
@@ -2,27 +2,23 @@
|
||||
let
|
||||
cfg = config.skyg.nixos.desktop.tiler.niri;
|
||||
makeNiriSystemdService = { description, script, path ? [ ] }: {
|
||||
inherit description script path;
|
||||
enable = true;
|
||||
requires = [ "niri.service" ];
|
||||
restartTriggers = [
|
||||
script
|
||||
path
|
||||
];
|
||||
reloadTriggers = [
|
||||
script
|
||||
path
|
||||
];
|
||||
after = [ "niri.service" "xdg-desktop-portal.service" ];
|
||||
partOf = [ "niri.service" "tray.target" ];
|
||||
bindsTo = [ "niri.service" ];
|
||||
wants = [ "niri.service" "xdg-desktop-portal.service" ];
|
||||
wantedBy = [ "graphical-session.target" "tray.target" ];
|
||||
serviceConfig = {
|
||||
Unit = {
|
||||
Description = description;
|
||||
After = [ "niri.service" "xdg-desktop-portal.service" ];
|
||||
PartOf = [ "niri.service" "tray.target" ];
|
||||
BindsTo = [ "niri.service" ];
|
||||
Wants = [ "niri.service" "xdg-desktop-portal.service" ];
|
||||
WantedBy = [
|
||||
"graphical-session.target"
|
||||
# "tray.target"
|
||||
];
|
||||
Requires = [ "niri.service" ];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
KillMode = "mixed";
|
||||
Restart = "on-failure";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID";
|
||||
KillMode = "mixed";
|
||||
ConditionEnvironment = "WAYLAND_DISPLAY";
|
||||
};
|
||||
};
|
||||
@@ -50,7 +46,7 @@ in
|
||||
filePath = "niri";
|
||||
configSource = "/home/${config.skyg.user.name}/nixos-setup/configs";
|
||||
};
|
||||
systemd.user.services.niri-waybar = makeNiriSystemdService {
|
||||
users.users.${config.skyg.user.name}.systemd.user.services.niri-waybar = makeNiriSystemdService {
|
||||
description = "Niri's Top Waybar";
|
||||
path = [ pkgs.nwg-bar pkgs.niri ];
|
||||
script = ''
|
||||
@@ -62,19 +58,19 @@ in
|
||||
--style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.css
|
||||
'';
|
||||
};
|
||||
systemd.user.services.niri-xwayland = makeNiriSystemdService {
|
||||
users.users.${config.skyg.user.name}.systemd.user.services.niri-xwayland = makeNiriSystemdService {
|
||||
description = "Niri's xwayland-satellite";
|
||||
script = ''
|
||||
${pkgs.xwayland-satellite}/bin/xwayland-satellite
|
||||
'';
|
||||
};
|
||||
systemd.user.services.niri-hypridle = makeNiriSystemdService {
|
||||
users.users.${config.skyg.user.name}.systemd.user.services.niri-hypridle = makeNiriSystemdService {
|
||||
description = "Niri's hypridle";
|
||||
script = ''
|
||||
${pkgs.hypridle}/bin/hypridle
|
||||
'';
|
||||
};
|
||||
systemd.user.services.niri-swayosd = makeNiriSystemdService {
|
||||
users.users.${config.skyg.user.name}.systemd.user.services.niri-swayosd = makeNiriSystemdService {
|
||||
description = "Niri's swayosd";
|
||||
script = ''
|
||||
${pkgs.swayosd}/bin/swayosd-server
|
||||
|
||||
Reference in new issue
Block a user