diff --git a/agenix/hosts/tanker/weewx/config.age b/agenix/hosts/tanker/weewx/config.age index 0411c65..6bf2ebe 100644 Binary files a/agenix/hosts/tanker/weewx/config.age and b/agenix/hosts/tanker/weewx/config.age differ diff --git a/flake.lock b/flake.lock index 94bcc21..ac35e50 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1690278259, - "narHash": "sha256-0Ujy0ZD1Yg5+QDaEnk4TeYhIZ6AckRORrXLGsAEhFKE=", + "lastModified": 1690473955, + "narHash": "sha256-fQDi3egnML8kFrJjmmjIZsAuQQzRv0RgEKpd1XnZ2UY=", "owner": "nix-community", "repo": "disko", - "rev": "5b19fb2e74df312751cecbf0f668217eb59d9170", + "rev": "4aa3641e277794fc40bf64688c533c68a77b9a96", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1690303752, - "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=", + "lastModified": 1690476848, + "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=", "owner": "nix-community", "repo": "home-manager", - "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8", + "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da", "type": "github" }, "original": { @@ -463,13 +463,29 @@ "type": "github" } }, - "nixpkgs": { + "nixos-stable": { "locked": { - "lastModified": 1690327932, - "narHash": "sha256-Fv7PYZxN4eo0K6zXhHG/vOc+e2iuqQ5ywDrh0yeRjP0=", + "lastModified": 1690370995, + "narHash": "sha256-9z//23jGegLJrf3ITStLwVf715O39dq5u48Kr/XW14U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9b47d85504bdd199e90846622c76aa0bfeabfac", + "rev": "f3fbbc36b4e179a5985b9ab12624e9dfe7989341", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1690441914, + "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", "type": "github" }, "original": { @@ -558,11 +574,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1689668210, - "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=", + "lastModified": 1690464206, + "narHash": "sha256-38V4kmOh6ikpfGiAS+Kt2H/TA2DubSqE66veP/jmB4Q=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "eb433bff05b285258be76513add6f6c57b441775", + "rev": "9289996dcac62fd45836db7c07b87d2521eb526d", "type": "github" }, "original": { @@ -583,6 +599,7 @@ "nifoc-overlay": "nifoc-overlay", "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", + "nixos-stable": "nixos-stable", "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix" diff --git a/flake.nix b/flake.nix index a741224..2572ba9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - + nixos-stable.url = "github:nixos/nixpkgs/nixos-23.05"; # nixpkgs-master.url = "github:nixos/nixpkgs/master"; # Tools @@ -71,7 +71,7 @@ }; tanker = import ./system/flakes/tanker.nix { - inherit (inputs) nixpkgs disko deploy-rs home-manager agenix attic; + inherit (inputs) nixpkgs nixos-stable disko deploy-rs home-manager agenix attic; inherit inputs; }; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index caac383..5965cf8 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -118,12 +118,12 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-07-27"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "11610e0631cdaaffd8eb6774bd5275465a4eb314"; - sha256 = "0fph4dxa6160nvm0y0ind5cvvxz52vj895gk32yiy8vasllh29k2"; + rev = "5e27645a2b7ecce1f8e0971d78f55de0f392ba23"; + sha256 = "1mrvqdn713hl1y4ai7ywgifrvw13x3nbk354l98557ay2icax89y"; fetchSubmodules = false; }; }; @@ -440,12 +440,12 @@ in }; format-nvim = buildVimPluginFrom2Nix { pname = "format.nvim"; - version = "2023-07-24"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "niuiic"; repo = "format.nvim"; - rev = "2959389fc6a621001af3d3e42562e323ac61e8f3"; - sha256 = "0qsk6zbyr7gsfmb3nvfn5i6ygnr7madhyqjs1wj1vfzk521glbl7"; + rev = "b97190790a8644296cc10745a90147f148b2a5b3"; + sha256 = "1qxwhkw00lf51zgkkx402vh73g09fbq7kz9scvmf3gzx9ybvzw7a"; fetchSubmodules = false; }; }; @@ -473,12 +473,12 @@ in }; vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-07-20"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "ca8971739e3908973c5912cb3a0ffb6cf7bd83e7"; - sha256 = "1b9jqympkq0aw9mjpl5gny2xal0cmg3kxwxafpd3i4l8hw5qrwzh"; + rev = "0646093e07b1f89b16536cfb3dc4993e3f0ac653"; + sha256 = "117zdg6ibnnnpl03r6dhb71hm3dw6h0y2lxbkj8kl5b0gk8lapph"; fetchSubmodules = false; }; }; @@ -561,12 +561,12 @@ in }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-07-25"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "11b80e7eea249affc8776483272bcfc627b5552a"; - sha256 = "0mwmyci65w4rzrvlcws7s6yw4m801vdcqr585harccifyrvpslls"; + rev = "5d73da785a3c05fd63ac31769079db05169a6ec7"; + sha256 = "16xdc4nf9i39bi9diin5v3782gnlp0ln95aphydv2s7rcg88mdlj"; fetchSubmodules = false; }; }; diff --git a/home/programs/scripts/attic-nedeco-devshells-cache b/home/programs/scripts/attic-nedeco-devshells-cache new file mode 100755 index 0000000..ca8a8a7 --- /dev/null +++ b/home/programs/scripts/attic-nedeco-devshells-cache @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p fd jq +# shellcheck disable=SC1008 + +jq -cr ".variables.pkgsBuildHost.value[]" "$(fd '^flake-profile-[a-z0-9]+$' ./.direnv/)" | while read -r dir; do + echo "Uploading $dir ..." + + if attic push nedeco:devshells "$dir"; then + continue + else + echo "Ignoring error ..." + fi +done diff --git a/home/programs/scripts/attic-system-cache b/home/programs/scripts/attic-system-cache index d4a4405..66077ad 100755 --- a/home/programs/scripts/attic-system-cache +++ b/home/programs/scripts/attic-system-cache @@ -12,4 +12,3 @@ else echo "Ignoring error ..." exit 0 fi - diff --git a/secret/shared/nix-netrc b/secret/shared/nix-netrc index fd3936e..cbeeb19 100644 Binary files a/secret/shared/nix-netrc and b/secret/shared/nix-netrc differ diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix index 8a9099d..98bc45e 100644 --- a/system/flakes/tanker.nix +++ b/system/flakes/tanker.nix @@ -1,14 +1,16 @@ -{ nixpkgs, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }: +{ nixpkgs, nixos-stable, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }: let default-system = "x86_64-linux"; + overlay-stable = _: _: { pkgs-stable = import nixos-stable { system = default-system; }; }; # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; }; overlay-deploy-rs = _: _: { inherit (deploy-rs.packages.${default-system}) deploy-rs; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ + overlay-stable # overlay-master overlay-deploy-rs overlay-nifoc diff --git a/system/hosts/tanker.nix b/system/hosts/tanker.nix index 7f09a36..b066905 100644 --- a/system/hosts/tanker.nix +++ b/system/hosts/tanker.nix @@ -53,8 +53,6 @@ in ../nixos/tailscale.nix - ../nixos/voyager.nix - ../nixos/websites-tanker.nix ../../container/matrix diff --git a/system/nixos/container.nix b/system/nixos/container.nix index fa907d4..0f7a2b3 100644 --- a/system/nixos/container.nix +++ b/system/nixos/container.nix @@ -43,6 +43,8 @@ # It looks like there is no way to activate the "built-in" service and timer ... systemd.services.podman-auto-update-custom = { + enable = false; + description = "Run podman auto-update daily"; wants = [ "network-online.target" ]; after = [ "network-online.target" ];