diff --git a/flake.lock b/flake.lock index 1490f7e..8e6cfc9 100644 --- a/flake.lock +++ b/flake.lock @@ -83,24 +83,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -142,59 +124,7 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1728135019, - "narHash": "sha256-OCUyEfD9g5232OILgW+BpjFVPM8AHl2WM59yRabJvSE=", - "owner": "hyprwm", - "repo": "hyprlock", - "rev": "eb63207ef051c62fa2ab010b3f89da263a397329", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlock", - "type": "github" - } - }, "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { "inputs": { "hyprutils": [ "hyprlock", @@ -225,12 +155,12 @@ }, "hyprlock": { "inputs": { - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1728135019, @@ -247,31 +177,6 @@ } }, "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { "inputs": { "nixpkgs": [ "hyprlock", @@ -298,7 +203,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1721727458, @@ -363,22 +268,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1718428119, - "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 0, "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", @@ -432,61 +321,19 @@ "url": "https://git.outfoxxed.me/outfoxxed/quickshell" } }, - "rofi-obsidian": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1720405179, - "narHash": "sha256-GccZ3CxmS3MDzkCfFNWb/F3eGoVxaoAiHcmWzbq5Z1o=", - "owner": "nydragon", - "repo": "rofi-obsidian", - "rev": "898cb1cb5b52e9b6ab13650ef48b873eebc9581f", - "type": "github" - }, - "original": { - "owner": "nydragon", - "repo": "rofi-obsidian", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "disko": "disko", "flake-parts": "flake-parts", "home-manager": "home-manager_2", - "hyprland": "hyprland", "hyprlock": "hyprlock", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nysh": "nysh", - "rofi-obsidian": "rofi-obsidian", "rustypaste": "rustypaste" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1720318855, - "narHash": "sha256-w3CCVK9LJ5aznXGkO1IyAlbvMNJfyA+dBF7Z1Zwx1LA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "3eed08a074cd2000884a69d448d70da2843f7103", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "rustypaste": { "inputs": { "naersk": "naersk", @@ -554,36 +401,6 @@ "repo": "default-linux", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8a8671a..0dd9692 100644 --- a/flake.nix +++ b/flake.nix @@ -23,21 +23,11 @@ agenix.url = "github:ryantm/agenix"; - rofi-obsidian = { - url = "github:nydragon/rofi-obsidian"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nysh = { url = "git+https://codeberg.org/nydragon/nysh"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/hyprlock"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprlock = { url = "github:hyprwm/hyprlock"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/rofi/default.nix b/home/rofi/default.nix index d45298e..1ed208e 100644 --- a/home/rofi/default.nix +++ b/home/rofi/default.nix @@ -24,7 +24,6 @@ lib.mkIf config.programs.rofi.enable { # WARNING: ABI version mismatch # "calc" "clipboard:${lib.my.checkPath pkgs.cliphist "cliphist-rofi-img"}" - "obsidian:${lib.my.checkPath pkgs.rofi-obsidian "rofi-obsidian"}" ]; matching = "fuzzy"; sort = true; diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix index c0f4de9..0858431 100644 --- a/modules/nix/overlays.nix +++ b/modules/nix/overlays.nix @@ -28,14 +28,8 @@ pkgs = prev.pkgs; }; - rofi-obsidian = inputs'.rofi-obsidian.packages.rofi-obsidian; - nysh = inputs'.nysh.packages.nysh; - #hyprland = inputs'.hyprland.packages.hyprland; - - #xdg-desktop-portal-hyprland = inputs'.hyprland.packages.xdg-desktop-portal-hyprland; - hyprlock = inputs'.hyprlock.packages.hyprlock; }) inputs.rustypaste.overlays.default