diff --git a/flake.lock b/flake.lock index 98d32ad..5ea7bcd 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1779969295, - "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=", + "lastModified": 1780408569, + "narHash": "sha256-s7Tv6FUQThRAvW8En8XVC6HMb0uiikzVccCcCo9u/Bg=", "owner": "nix-community", "repo": "home-manager", - "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6", + "rev": "f384af1bec6423a0d4ba1855917ab948f64e5808", "type": "github" }, "original": { @@ -56,26 +56,6 @@ "type": "github" } }, - "insomnia": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1780015149, - "narHash": "sha256-sEpglWrsVDNHys56LNLY8mvak2A3OkRE865ZYTc9i/w=", - "ref": "develop", - "rev": "b0c3b79e114502acd375afe78cac34ef2aeef05c", - "revCount": 610, - "type": "git", - "url": "ssh://git@gitea.hareworks.net/Hare/insomnia.git" - }, - "original": { - "ref": "develop", - "type": "git", - "url": "ssh://git@gitea.hareworks.net/Hare/insomnia.git" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -83,11 +63,11 @@ ] }, "locked": { - "lastModified": 1779604987, - "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=", + "lastModified": 1780210899, + "narHash": "sha256-4axz3OBPTKa6LIkXV8n0lc63MQU+et2CB5DGobEAi6k=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd", + "rev": "97df9dc0b7c924344b793a15c1e8e4522ebb854e", "type": "github" }, "original": { @@ -97,12 +77,15 @@ } }, "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1779826373, - "narHash": "sha256-3sRzgLX86qV5NlhWUAufLmHwkyP03tmL3VdZIM13dEo=", + "lastModified": 1780310866, + "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ef4efb84766a166c906bd55759574676bf91267c", + "rev": "4ed851c979641e28597a05086332d75cdc9e395f", "type": "github" }, "original": { @@ -113,27 +96,24 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", - "type": "github" + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -144,6 +124,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -163,10 +159,10 @@ "inputs": { "flake-utils": "flake-utils", "home-manager": "home-manager", - "insomnia": "insomnia", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", + "yoi": "yoi", "zen-browser": "zen-browser" } }, @@ -200,9 +196,29 @@ "type": "github" } }, + "yoi": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1780446170, + "narHash": "sha256-Jfmsj1boCZ1xIZw+7rUN/cib61KKX37lZ0I4T+Ds6SA=", + "ref": "develop", + "rev": "cc98c0eb28376adef8722ec96b8e2ffba05e4f8f", + "revCount": 950, + "type": "git", + "url": "ssh://git@gitea.hareworks.net/Hare/yoi.git" + }, + "original": { + "ref": "develop", + "type": "git", + "url": "ssh://git@gitea.hareworks.net/Hare/yoi.git" + } + }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1761859251, diff --git a/flake.nix b/flake.nix index 1696c68..a241e92 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ flake-utils.url = "github:numtide/flake-utils"; nixos-hardware.url = "github:NixOS/nixos-hardware"; zen-browser.url = "github:xaragon/zen-browser-flake"; - insomnia.url = "git+ssh://git@gitea.hareworks.net/Hare/insomnia.git?ref=develop"; + yoi.url = "git+ssh://git@gitea.hareworks.net/Hare/yoi.git?ref=develop"; nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/arcadia/hare/home-manager.nix b/hosts/arcadia/hare/home-manager.nix index f34886b..ec7c994 100644 --- a/hosts/arcadia/hare/home-manager.nix +++ b/hosts/arcadia/hare/home-manager.nix @@ -78,7 +78,7 @@ orca-slicer davinci-resolve inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default - inputs.insomnia.packages.${stdenv.hostPlatform.system}.default + inputs.yoi.packages.${stdenv.hostPlatform.system}.default ]; services.easyeffects = { enable = true; diff --git a/programs/utility.nix b/programs/utility.nix index 0fe76b5..e26bee1 100644 --- a/programs/utility.nix +++ b/programs/utility.nix @@ -11,5 +11,6 @@ wezterm libsixel nixfmt + nil ]; }