diff --git a/Makefile b/Makefile index 52e7fd8..19bb993 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,7 @@ NIX_LOCK := nix flake lock DEPS_MY := \ myneovim \ - vnetod \ - yagpt_tg_bot + vnetod DEPS_NIXOS := \ nixpkgs \ @@ -15,8 +14,7 @@ DEPS_NIXOS := \ DEPS_MISC := \ wired \ - nil \ - mailserver + nil MACHINES := \ home \ diff --git a/flake.lock b/flake.lock index 2c2fa6c..db79adf 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -45,22 +45,6 @@ "type": "github" } }, - "blobs": { - "flake": false, - "locked": { - "lastModified": 1604995301, - "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "type": "gitlab" - } - }, "cmp-luasnip": { "flake": false, "locked": { @@ -125,22 +109,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -190,11 +158,11 @@ }, "hardware": { "locked": { - "lastModified": 1704266875, - "narHash": "sha256-luA5SGmeIRZlgLfSLUuR3eacS63q2bJ0Yywqak5lj3E=", + "lastModified": 1711352745, + "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8e34f33464d77bea2d5cf7dc1066647b1ad2b324", + "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", "type": "github" }, "original": { @@ -232,11 +200,11 @@ ] }, "locked": { - "lastModified": 1704099619, - "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=", + "lastModified": 1710888565, + "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851", + "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", "type": "github" }, "original": { @@ -327,32 +295,6 @@ "type": "github" } }, - "mailserver": { - "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-22_11": "nixpkgs-22_11", - "utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1671738303, - "narHash": "sha256-PRgqtaWf2kMSYqVmcnmhTh+UsC0RmvXRTr+EOw5VZUA=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "6d0d9fb966cc565a3df74d3b686f924c7615118c", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, "myneovim": { "inputs": { "cmp-luasnip": "cmp-luasnip", @@ -388,11 +330,11 @@ "theme": "theme" }, "locked": { - "lastModified": 1709128630, - "narHash": "sha256-Lfgfy/EWEmO9X1nkR8gG51FmLVTPh9M9IDCpviyINQY=", + "lastModified": 1711622575, + "narHash": "sha256-jr/ixBdhOiw6+yGdP+kvEaZmmD28k6FSXii2a4l7Xxk=", "ref": "refs/heads/main", - "rev": "d280679b1498f9082ba12b2c65adbf16ea23c557", - "revCount": 114, + "rev": "40bc84d1f8d5964ecf2e308360421b30d7a966f6", + "revCount": 115, "type": "git", "url": "https://git.pleshevski.ru/mynix/neovim" }, @@ -458,11 +400,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704145853, - "narHash": "sha256-G/1AMt9ibpeMlcxvD1vNaC8imGaK+g7zZ99e29BLgWw=", + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2ea8eab9e400618748ab1a6a108255233b602c", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "type": "github" }, "original": { @@ -472,28 +414,13 @@ "type": "github" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1711593151, + "narHash": "sha256-/9NCoPI7fqJIN8viONsY9X0fAeq8jc3GslFCO0ky6TQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "bb2b73df7bcfbd2dd55ff39b944d70547d53c267", "type": "github" }, "original": { @@ -654,14 +581,12 @@ "flake-utils": "flake-utils", "hardware": "hardware", "home-manager": "home-manager_2", - "mailserver": "mailserver", "myneovim": "myneovim", "nil": "nil", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "vnetod": "vnetod", - "wired": "wired", - "yagpt_tg_bot": "yagpt_tg_bot" + "wired": "wired" } }, "rust-overlay": { @@ -827,29 +752,6 @@ "repo": "wired-notify", "type": "github" } - }, - "yagpt_tg_bot": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695800785, - "narHash": "sha256-8S6J7jz+CeHQxRUVp2L2ru2OtSG88iMqNBhpavVWjzM=", - "ref": "refs/heads/main", - "rev": "12ca31135f67b35c52f86b714d361f9e9eff0d47", - "revCount": 10, - "type": "git", - "url": "https://git.pleshevski.ru/pleshevskiy/yandexgpt_tg_bot" - }, - "original": { - "type": "git", - "url": "https://git.pleshevski.ru/pleshevskiy/yandexgpt_tg_bot" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 686e30b..d14269c 100644 --- a/flake.nix +++ b/flake.nix @@ -41,18 +41,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; - - yagpt_tg_bot = { - url = "git+https://git.pleshevski.ru/pleshevskiy/yandexgpt_tg_bot"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - - mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.utils.follows = "flake-utils"; - }; }; outputs = inputs @ { self, flake-utils, nixpkgs, ... }: diff --git a/nixos/hosts/default.nix b/nixos/hosts/default.nix index 12ff5f7..342ef3b 100644 --- a/nixos/hosts/default.nix +++ b/nixos/hosts/default.nix @@ -2,7 +2,6 @@ let hardware = inputs.hardware.nixosModules; - yagpt_tg_bot = inputs.yagpt_tg_bot.nixosModules; in { home = { @@ -10,7 +9,6 @@ in extraModules = [ hardware.common-gpu-amd - yagpt_tg_bot.default ../modules/nix.nix ../modules/wireguard-client.nix ../modules/octoprint.nix