diff --git a/flake.lock b/flake.lock index c80a827..118482e 100755 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1714614481, - "narHash": "sha256-vykQwGwiu178RHmmRRTzId3qpc9YQtY29Jie7E2GFMg=", + "lastModified": 1722909529, + "narHash": "sha256-GNSbAD9a4zzd7Ir9qgeY9wbeqywh4vvqQz6iFw2/4HU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cccda8508481ea8c8ff4e50a297900ed54b26dc3", + "rev": "c051c42e3325ac62e9bf83e72e3868db1e5f2e64", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1722462338, - "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", + "lastModified": 1722936497, + "narHash": "sha256-UBst8PkhY0kqTgdKiR8MtTBt4c1XmjJoOV11efjsC/o=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", + "rev": "a6c743980e23f4cef6c2a377f9ffab506568413a", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "master": { "locked": { - "lastModified": 1722623640, - "narHash": "sha256-F4hS1GKEHSpDw94MzX5msjd/T0UId42/fuz3W4xBY/A=", + "lastModified": 1722943531, + "narHash": "sha256-ux/I+ZwVu5b2/nAkNyqY4OfJj8xsoVEBCDCv+P9UpB0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6d75cee17e9536d8dabca1c65948474aa42600c4", + "rev": "4549654dc1cf9f1f76ebbad5a69da2382c0c99a8", "type": "github" }, "original": { @@ -270,14 +270,15 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_2", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1722574804, - "narHash": "sha256-+spPoNKEYVtiGwC2OS3MwDmz87RLZ/yOKFgF/g4C3CI=", + "lastModified": 1722913682, + "narHash": "sha256-7KX4YDBpWJFtoWGA/rSRGoc7PfOyshrmyxlhSM2ApAw=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "072706c6a3aa9a6538007854781a7f22fbf217bc", + "rev": "b32bb5899e83d45a8f518cc6b8c8fb28ed104f8b", "type": "github" }, "original": { @@ -288,11 +289,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -312,11 +313,11 @@ ] }, "locked": { - "lastModified": 1710146057, - "narHash": "sha256-GLZNcoQT3AWGg1ZINKOgHcD1/LgDStI6hZbfsisjOgM=", + "lastModified": 1721822211, + "narHash": "sha256-zacOgNv3qM3AbSG3p5PT/Bfc4c7NoIqoLII8/jIUsOQ=", "owner": "nix-community", "repo": "nixpkgs-fmt", - "rev": "f048515c9a98d7e2e4b034ec77641acc8a58098d", + "rev": "bdb15b4c7e0cb49ae091dd43113d0a938afae02c", "type": "github" }, "original": { @@ -327,45 +328,39 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", - "type": "github" + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1714531828, - "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", + "lastModified": 1722791413, + "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", + "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1722372011, - "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", + "lastModified": 1722791413, + "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf05eeada35e122770c5c14add958790fcfcbef5", + "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", "type": "github" }, "original": { @@ -409,11 +404,11 @@ }, "nur": { "locked": { - "lastModified": 1722617047, - "narHash": "sha256-pR27oxlnzGffQH5+djQFmY8JcgRNSOa+J1BajtipABU=", + "lastModified": 1722941135, + "narHash": "sha256-GNL8ajczLqTDdhaXT1ms9FYaQnDWdWuhuJfBNV6Z1pg=", "owner": "nix-community", "repo": "NUR", - "rev": "c84d6fd7b6d560e6bf1f52cc70ae2861a8633a83", + "rev": "addaf31cf82a1c17f71918f7f4b668d34ccbfee0", "type": "github" }, "original": { @@ -427,11 +422,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1714606777, - "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -450,11 +445,11 @@ ] }, "locked": { - "lastModified": 1722535539, - "narHash": "sha256-MHQ6xEWnm5NacAziHpHIvS/32iCQKrAOXw5ng5F9j9U=", + "lastModified": 1722804745, + "narHash": "sha256-l6N3QaiDqN2QmHDAxjczQPLPCTv+Kp7PsrtJBltmhTo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "8def0842f289af5d323d14219f1edccd388b195a", + "rev": "61d9342fb471cd3c45a047406428fba7b6fb49ad", "type": "github" }, "original": { @@ -499,6 +494,27 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722824458, + "narHash": "sha256-2k3/geD5Yh8JT1nrGaRycje5kB0DkvQA/OUZoel1bIU=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a8a937c304e62a5098c6276c9cdf65c19a43b1a5", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stable": { "locked": { "lastModified": 1704290814, @@ -577,11 +593,11 @@ }, "unstable": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -616,11 +632,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1722562293, - "narHash": "sha256-JLhM5xSbx5Isjyfz8+WhCfJ9hgEJ4VYRivTOANYZVWM=", + "lastModified": 1722907736, + "narHash": "sha256-drU5kbx9EtTqg7rXc6ni0LZuZQy7l/wVgsQ8PSYl5Qw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2056dac5adce82433b1dae711868b1c22e5ed07e", + "rev": "b3c49142939ba6072cb8bdd6109e36d1b70a055a", "type": "github" }, "original": { diff --git a/hosts/shared/configuration.nix b/hosts/shared/configuration.nix index e8d48dc..c403d31 100755 --- a/hosts/shared/configuration.nix +++ b/hosts/shared/configuration.nix @@ -2,8 +2,16 @@ nix.settings = { experimental-features = [ "nix-command" "flakes" ]; - substituters = [ "https://cosmic.cachix.org/" ]; - trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + substituters = [ + "https://cache.nixos.org?priority=10" + "https://fortuneteller2k.cachix.org" + "https://cosmic.cachix.org/" + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "fortuneteller2k.cachix.org-1:kXXNkMV5yheEQwT0I4XYh1MaCSz+qg72k8XAi2PthJI=" + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + ]; }; boot = {