diff --git a/bin/skyg b/bin/skyg index a3f0f52..73252a3 100755 --- a/bin/skyg +++ b/bin/skyg @@ -5,14 +5,14 @@ const current_folder = path self | path dirname cd $current_folder def valid_profiles [] { - nix flake show --json err> /dev/null | from json | - select nixosConfigurations | - flatten | transpose | + nix flake show --json err> /dev/null | from json | + select nixosConfigurations | + flatten | transpose | select column0 | rename name } def is-valid-profile [name: string] { - (valid_profiles | where name == $name | length) == 1 + (valid_profiles | where name == $name | length) == 1 } def main [] { diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index edb690f..b6be9d7 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -38,6 +38,7 @@ window-rule { } spawn-at-startup "waypaper" "--restore" +spawn-at-startup "flameshot" // ========================= // Outputs @@ -238,9 +239,11 @@ binds { Mod+Shift+Equal { set-window-height "+10%"; } Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - Print { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; } Mod+P { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; } + + //Print { spawn "sh" "-c" "flameshot gui"; } + //Mod+P { spawn "sh" "-c" "flameshot gui"; } Mod+R { spawn "/home/ari/.config/niri/screen-record.sh"; } Ctrl+Alt+Delete { quit; } diff --git a/flake.lock b/flake.lock index ef3334f..ebd91c4 100644 --- a/flake.lock +++ b/flake.lock @@ -13,12 +13,12 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1757699119, - "narHash": "sha256-iOOoVdrkcyk95Xg68TuPeAwpz+v80mgZCqil0jpPZuY=", - "rev": "1e16c8f8a44573bb0648c76b6c98352436f5171e", - "revCount": 304, + "lastModified": 1761251546, + "narHash": "sha256-I/TDYHCKui0K62f2cEk2UJf6N9rO/hdsa65kpEJMhSo=", + "rev": "70beec406153496943274f59cb2ded76be49fcd7", + "revCount": 306, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.11.2/01993f0b-1215-7072-ac1a-f2b27b566115/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.12.0/019a12c8-c95c-7c68-8da4-d8cc92608fbf/source.tar.gz" }, "original": { "type": "tarball", @@ -28,37 +28,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-q1tqDvmfjDgLk/wbYf4pRhyHDS94iY85Q79FPBtcv7g=", + "narHash": "sha256-TORlljq+wwn8XWLoN0giLY15pNiIAXuU0igpIXjLhMY=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-E1vGfcQ5dqtRG9EDP6eOQWCnCIRB2XFkFBp2C4FgQ8c=", + "narHash": "sha256-1HEvUQcG0mVdEQrEqcLEdB9nHpMNbb39bdNxdvyizqk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-GtxtkI0cOC2A30Xw6gCDTN7JxN1zJGh7/eIXr6AlTSA=", + "narHash": "sha256-WrXQbrXVisAdZl/hh49PsErSPHwzks1Vw+O3jarVjDo=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/x86_64-linux" } }, "flake-compat": { @@ -154,12 +154,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1757694985, - "narHash": "sha256-3Ia+y7Hbwnzcuf1hyuVnFtbnSR6ErQeFjemHdVxjCNE=", - "rev": "766f43aa6acb1b3578db488c19fbbedf04ed9f24", - "revCount": 22340, + "lastModified": 1761238235, + "narHash": "sha256-BvEZ31+FQKJz2XH8PTXpJqGZ1eT9bhMQ2wBj2ehBYvM=", + "rev": "9512828397f684d0f732ea76b7631f69a0db34f7", + "revCount": 23138, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.2/01993ee9-f8e7-7b80-80df-ec0a20a32514/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.12.0/019a1277-d4c6-7dca-9d55-ee5165fd0bf6/source.tar.gz" }, "original": { "type": "tarball", @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1761339987, + "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1761933221, + "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "7467f155fcba189eb088a7601f44fbef7688669b", "type": "github" }, "original": { @@ -266,12 +266,12 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", - "revCount": 866707, + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "revCount": 886100, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.866707%2Brev-e643668fd71b949c53f8626614b21ff71a07379d/0199817d-7e74-7254-9801-5432e45096c7/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.886100%2Brev-08dacfca559e1d7da38f3cf05f1f45ee9bfd213c/019a329e-32b1-7e68-9599-4784bdd5f623/source.tar.gz" }, "original": { "type": "tarball", @@ -280,12 +280,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757034884, - "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", - "revCount": 856744, + "lastModified": 1760965567, + "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=", + "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93", + "revCount": 880602, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.856744%2Brev-ca77296380960cd497a765102eeb1356eb80fed0/01992cf9-9347-761a-8963-9cbe43abe2fa/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.880602%2Brev-cb82756ecc37fa623f8cf3e88854f9bf7f64af93/019a0545-358b-78f4-97fe-88a7820eac2f/source.tar.gz" }, "original": { "type": "tarball", @@ -294,12 +294,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", - "revCount": 810395, + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "revCount": 811874, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.810395%2Brev-25e53aa156d47bad5082ff7618f5feb1f5e02d01/01998694-ad17-7fa8-8c3a-c8bc31d19657/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" }, "original": { "type": "tarball", diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 91599bf..db3d9b6 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -104,6 +104,9 @@ in boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; + nixpkgs.config.permittedInsecurePackages = [ + "python3.12-ecdsa-0.19.1" + ]; # Packages environment.systemPackages = let @@ -151,8 +154,8 @@ in signal-desktop # Languages - python312 python313 + python314 uv cargo rustc diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index da957e0..f14577d 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -67,7 +67,6 @@ in environment.systemPackages = (with pkgs; [ # languages - python312 python313 cargo rustc diff --git a/modules/nixos/desktop/tiler/default.nix b/modules/nixos/desktop/tiler/default.nix index f1365f2..7978929 100644 --- a/modules/nixos/desktop/tiler/default.nix +++ b/modules/nixos/desktop/tiler/default.nix @@ -43,6 +43,7 @@ in waybar nwg-bar # Screen capture and recording tools + (flameshot.override { enableWlrSupport = true; }) grim slurp satty