diff --git a/Makefile b/Makefile index ac6aea6..bdc9675 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ DEPS_MY := \ DEPS_NIXOS := \ nixpkgs \ + nixpkgs_unstable \ hardware \ home-manager \ agenix diff --git a/flake.lock b/flake.lock index 18d3ec2..da1b599 100644 --- a/flake.lock +++ b/flake.lock @@ -129,6 +129,22 @@ "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, @@ -178,11 +194,11 @@ }, "hardware": { "locked": { - "lastModified": 1679224149, - "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=", + "lastModified": 1679765008, + "narHash": "sha256-VCkg/wC2e882suYDS5PDAemaMLYSOdFm4fsx2gowMR0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59", + "rev": "f38f9a4c9b2b6f89a5778465e0afd166a8300680", "type": "github" }, "original": { @@ -200,11 +216,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1679265143, - "narHash": "sha256-5RDMW+O4owjdPz7t4K4YxH2fOHCNOcyVmSiKRUikiv0=", + "lastModified": 1679786039, + "narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1b8bf5c3270386a1b6850bd77d79dbdbaf0d7a7c", + "rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727", "type": "github" }, "original": { @@ -297,20 +313,21 @@ "mailserver": { "inputs": { "blobs": "blobs", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05", + "nixpkgs-22_11": "nixpkgs-22_11", "utils": [ "flake-utils" ] }, "locked": { - "lastModified": 1669807829, - "narHash": "sha256-rgQ8MYV1UD4Ynw0wzfl9hatgsV5GV7X6eM6ioSPKzls=", + "lastModified": 1671738303, + "narHash": "sha256-PRgqtaWf2kMSYqVmcnmhTh+UsC0RmvXRTr+EOw5VZUA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "694e7d34f60028f4877517e1c7c73c9527fad400", + "rev": "6d0d9fb966cc565a3df74d3b686f924c7615118c", "type": "gitlab" }, "original": { @@ -370,14 +387,15 @@ ], "nixpkgs": [ "nixpkgs" - ] + ], + "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1678960093, - "narHash": "sha256-7wZx73wgMhceeHO85zcu/NGi/GDeZXDH/jBBKHhQiW0=", + "lastModified": 1679901802, + "narHash": "sha256-BT/2TqtolnSYqi1vpx0nBo5idlPLwl+5ZY+e/T+dm6o=", "ref": "refs/heads/main", - "rev": "c856ff0959b2053f5a6824d591a7f3ab2973a7fb", - "revCount": 28, + "rev": "b5afe25a79bfefe1da34d70779658ea7f313938b", + "revCount": 32, "type": "git", "url": "https://git.pleshevski.ru/mynix/tools" }, @@ -413,11 +431,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1669857315, - "narHash": "sha256-E/QGmoL7Q3GDR2/I5o2CAMHMcmPQEJAySke1s+nOaho=", + "lastModified": 1679847043, + "narHash": "sha256-Md5zV84PkRz/4X8pVlvuBfJymRhq9z2g5mv8Ine+hQc=", "owner": "oxalica", "repo": "nil", - "rev": "c549d6fbb2befa4afa12911413d7f494c278555c", + "rev": "775ba9e6ac31a3b20ecec7ae3c29ca1a7baee3b1", "type": "github" }, "original": { @@ -457,28 +475,28 @@ "type": "github" } }, - "nixpkgs-22_05": { + "nixpkgs-22_11": { "locked": { - "lastModified": 1654936503, - "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=", + "lastModified": 1669558522, + "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dab6df51387c3878cdea09f43589a15729cae9f4", + "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "type": "indirect" } }, "nixpkgs_2": { "locked": { - "lastModified": 1679172431, - "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", + "lastModified": 1679797994, + "narHash": "sha256-Kr/O/UlfqAtoFmkZeAaphsxogeaN8a/IugBApFzPfpk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", + "rev": "5f9d1bb572e08ec432ae46c78581919d837a90f6", "type": "github" }, "original": { @@ -490,11 +508,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1677262115, - "narHash": "sha256-DPkHiJw2QnKYAzQXBlwelwghxbcD5oigK2kLPHMpMQ8=", + "lastModified": 1679281263, + "narHash": "sha256-neMref1GTruSLt1jBgAw+lvGsZj8arQYfdxvSi5yp4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "806075be2bdde71895359ed18cb530c4d323e6f6", + "rev": "8276a165b9fa3db1a7a4f29ee29b680e0799b9dc", "type": "github" }, "original": { @@ -504,11 +522,11 @@ }, "nixpkgs_unstable": { "locked": { - "lastModified": 1679338402, - "narHash": "sha256-w0YDouArgrXg8aaX1cslEgzIWuwhB+0ai7xb/UuDwZo=", + "lastModified": 1679900446, + "narHash": "sha256-RWtJbUqeSLKn8FLSt0b6pLSC4fWrPdv4WHTDOaO/0hU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3ad3f8193f79ba34e8412dfae3781580262beec", + "rev": "56206539ba1de71fb0be7e4f23551e05fdeb29de", "type": "github" }, "original": { @@ -647,6 +665,31 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "mytools", + "flake-utils" + ], + "nixpkgs": [ + "mytools", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1679445660, + "narHash": "sha256-yhO+5d5Ilxybmt3/oGI7KJ/kjnDq50MLrPIvjc40qeg=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "50ec694c27a12bc178fff961c4dd927fa6a47f18", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -676,11 +719,11 @@ ] }, "locked": { - "lastModified": 1669775522, - "narHash": "sha256-6xxGArBqssX38DdHpDoPcPvB/e79uXyQBwpBcaO/BwY=", + "lastModified": 1678415622, + "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3158e47f6b85a288d12948aeb9a048e0ed4434d6", + "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7", "type": "github" }, "original": { @@ -817,11 +860,11 @@ ] }, "locked": { - "lastModified": 1678956361, - "narHash": "sha256-0TQOhjPoydoyEnVwIlgV7xm6VOkXkgvHWvq5NFgc8OY=", + "lastModified": 1679321145, + "narHash": "sha256-XxNcy0ldrUKDZhaGaORtkAcnoZmnpc32KJVyeIGV2BY=", "ref": "refs/heads/main", - "rev": "720c00628610b33fb143a78b2b7908a42fc40902", - "revCount": 16, + "rev": "82d99a485c47870a92fb889af58908a41e695092", + "revCount": 18, "type": "git", "url": "https://git.pleshevski.ru/pleshevskiy/wd2" }, @@ -839,11 +882,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1665825115, - "narHash": "sha256-KZ4mLzR6lqYGFEiwMF0KmYIKEN7isY9nOG10jRbcXBM=", + "lastModified": 1671338321, + "narHash": "sha256-Nm/DarDGFYP+ocPcoEYh4guKXH+jndREtMl0VKMSYF8=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "9bd2ca3625091ed2b0e35321ee41a5d5e1327a4b", + "rev": "f4300acba8180f8fc6babc1a118f9b3753a2b052", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9e30c8e..0108d11 100644 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ (hostname: machine: pkgs.writeShellScript "deploy-${hostname}" '' ${nixos-rebuild}/bin/nixos-rebuild switch \ --flake .#${hostname} \ - --target-host ${machine.config.deployment.targetHost} + --target-host ${machine.config.deployment.targetHost} \ $@ '') vpsMachines); diff --git a/home/modules/dev_tools.nix b/home/modules/dev_tools.nix index 9a67e43..cde62e3 100644 --- a/home/modules/dev_tools.nix +++ b/home/modules/dev_tools.nix @@ -40,7 +40,8 @@ in wd2 # my wrapper for d2 gnumake libnotify # tool to send notifications via cli - fawltydeps # Python dependency checker + # TODO: Uncomment when https://github.com/tweag/FawltyDeps/pull/272 is merged + # fawltydeps # Python dependency checker deno nickel