diff --git a/.gitmodules b/.gitmodules index d795b97..2de3680 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "custom/overlays"] path = custom/overlays - url = ssh://forgejo@10.0.0.64/thek0tyara/nixpkgs-extension.git + url = https://git.sys-con.ru/thek0tyara/nixpkgs-extension.git diff --git a/devenv.nix b/devenv.nix index 110f646..c6349b0 100644 --- a/devenv.nix +++ b/devenv.nix @@ -10,6 +10,7 @@ # https://devenv.sh/scripts/ scripts = { update.exec = '' + git submodule update --init --recursive nix flake update ''; build.exec = '' diff --git a/flake.lock b/flake.lock index 7e8b344..96e3548 100644 --- a/flake.lock +++ b/flake.lock @@ -341,11 +341,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1771885510, - "narHash": "sha256-noHcKsh3hr4sTtCQn0L9cLcRnANTgRU/X0LuRpK4+q0=", + "lastModified": 1771930713, + "narHash": "sha256-NPOmouXCaizb9Xv0l4xus8/MLOvs+7TktkaElr7Gqoo=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "b2a7f71b586b83d3b2bb6a17b8c2d79b123dc33f", + "rev": "d0e308f32b0024d2203232626e605b2fd4417d21", "type": "github" }, "original": { @@ -584,6 +584,26 @@ "type": "github" } }, + "mypkgs": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771891176, + "narHash": "sha256-NLaeP3MPAr/UEe48KWIbom8kdyFukADjKbNGYso55vE=", + "ref": "refs/heads/nixos-unstable", + "rev": "214f035438b22ce935cd5a547ed368da613bd985", + "revCount": 1, + "type": "git", + "url": "https://git.sys-con.ru/thek0tyara/nixpkgs-extension.git" + }, + "original": { + "type": "git", + "url": "https://git.sys-con.ru/thek0tyara/nixpkgs-extension.git" + } + }, "niri": { "inputs": { "nixpkgs": "nixpkgs_5", @@ -695,11 +715,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -824,6 +844,7 @@ "ghostty": "ghostty", "home-manager": "home-manager_2", "intel-hw": "intel-hw", + "mypkgs": "mypkgs", "niri": "niri", "nixpkgs": "nixpkgs_6", "ragenix": "ragenix" diff --git a/flake.nix b/flake.nix index 3a43e93..5658ad8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; mypkgs = { - url = "ssh://forgejo@10.0.0.64/thek0tyara/nixpkgs-extension.git"; + url = "git+https://git.sys-con.ru/thek0tyara/nixpkgs-extension.git"; inputs.nixpkgs.follows = "nixpkgs"; }; ragenix.url = "github:yaxitech/ragenix/2025.03.09";