From 0f6d10ffeb0914c2befa9acee84f7973449e432c Mon Sep 17 00:00:00 2001 From: cashmere Date: Fri, 8 Aug 2025 16:30:35 +0200 Subject: [PATCH] fix set keybind error. --- flake.lock | 137 +++++++++++++++++++++++++++++++++++++++++++++++------ flake.nix | 5 +- 2 files changed, 127 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e38c44e5..6f8c813d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,68 @@ { "nodes": { - "home-manager": { + "niri": { "inputs": { - "nixpkgs": "nixpkgs" + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1754444017, - "narHash": "sha256-PyxmeamNheSNZICr8vvanf0F3YQf9DPCu2qErVC2A7k=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a3790776751d1a6365aa0717f509d05adee90734", + "lastModified": 1754647495, + "narHash": "sha256-cHzUe/X4LQjlVWZ+k7OFuPZIe2S+0dDNEOIRXORK0ZA=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "f4739f416bd1e092207825f3c9cd400fc306d6d9", "type": "github" }, "original": { - "id": "home-manager", - "type": "indirect" + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1748151941, + "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.05.1", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1754589971, + "narHash": "sha256-gu0lWJbDkHs6+V9KHXwQHtZ2Hp72FxOjy3YisJ3qj9k=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "f74d83dccaa6e8fffb38c304dd5d1eae07b87d24", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -33,6 +72,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1754563854, + "narHash": "sha256-YzNTExe3kMY9lYs23mZR7jsVHe5TWnpwNrsPOpFs/b8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e728d7ae4bb6394bbd19eec52b7358526a44c414", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1754214453, @@ -49,10 +104,64 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1753595452, + "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", + "ref": "refs/heads/master", + "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", + "revCount": 665, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + } + }, "root": { "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "niri": "niri", + "nixpkgs": "nixpkgs_2", + "quickshell": "quickshell" + } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1748488455, + "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.6", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1754533920, + "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index edc02cb0..88cac74f 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,11 @@ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; quickshell.url = "git+https://git.outfoxxed.me/quickshell/quickshell"; quickshell.inputs.nixpkgs.follows = "nixpkgs"; + niri.url = "github:sodiboo/niri-flake"; # home-manager.url = "github:nix-community/home-manager"; }; - outputs = { self, nixpkgs, ... }: + outputs = { self, nixpkgs, niri, ... }: let pkgs = nixpkgs.legacyPackages.x86_64-linux; in { @@ -39,6 +40,8 @@ homeModules.dankMaterialShell = { config, options, pkgs, outputs, ... }: let cfg = config.programs.dankMaterialShell; in { + imports = [ niri.homeModules.niri ]; + options.programs.dankMaterialShell = { enable = pkgs.lib.mkEnableOption "DankMaterialShell"; enableKeybinds =