From 93bde6becaa9290c0a0b39773fe6b5060cc4a5ea Mon Sep 17 00:00:00 2001 From: Kabbone Date: Sat, 9 Dec 2023 10:23:27 +0100 Subject: [PATCH] flake update and move to stable --- flake.lock | 88 +++++++++++++++++++++++++++++++++++++++--------------- flake.nix | 18 ++++++----- 2 files changed, 74 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 144068d..7125643 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1701433070, - "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", + "lastModified": 1702110869, + "narHash": "sha256-hgbzPjIMLYJf3Ekq9qZCpDcIZn1BZmOp7d6PMkIWknU=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", + "rev": "7db6291d95693374d408f4877c265ec7481f222b", "type": "github" }, "original": { @@ -104,18 +104,20 @@ } }, "jovian-nixos": { - "flake": false, + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1701524494, - "narHash": "sha256-dXNCIUWm8Z74PijQ/THFb3HXQtRc2VA6LJvT+VrjZoY=", + "lastModified": 1701953467, + "narHash": "sha256-dpx/o701Jj7YGN+8D2ccY6gloGZ10hMSQs+ddhD+7v4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "365027ec7dc32018b20d3fbe3abf645406651e4c", + "rev": "fb984b33b033e8ed625a11c95b313eefc3ebb99e", "type": "github" }, "original": { "owner": "Jovian-Experiments", - "ref": "development", "repo": "Jovian-NixOS", "type": "github" } @@ -141,13 +143,35 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "jovian-nixos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1701250978, - "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=", + "lastModified": 1701656485, + "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8772491ed75f150f02552c60694e1beff9f46013", + "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", "type": "github" }, "original": { @@ -159,11 +183,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1701718080, + "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "type": "github" }, "original": { @@ -173,29 +213,29 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs_2": { "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "lastModified": 1701952659, + "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", "owner": "NixOS", "repo": "nIxpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nIxpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1701546128, - "narHash": "sha256-EgKJ0kQ/VFbDFhBeiRtuxQOtdY+p+8/3u/uNrEeQvV8=", + "lastModified": 1702111593, + "narHash": "sha256-BVeIkq0K8QvvNwO3BhLmbHRJPcWCiOCATdGdIhwryhw=", "owner": "nix-community", "repo": "NUR", - "rev": "ce93686dc874ac9e17c94d3332ddd8d95bd19b6e", + "rev": "276e9a8b905a3b21195f2adbbf631cd5084036d8", "type": "github" }, "original": { @@ -211,8 +251,8 @@ "jovian-nixos": "jovian-nixos", "microvm": "microvm", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": "nixpkgs_2", + "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur" } }, diff --git a/flake.nix b/flake.nix index 0219785..a587c15 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,14 @@ inputs = # All flake references used to build my NixOS setup. These are dependencies. { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Nix Packages - nixpkgs-stable.url = "github:NixOS/nIxpkgs/nixos-23.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Nix Packages + nixpkgs.url = "github:NixOS/nIxpkgs/nixos-23.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - microvm.url = "github:astro/microvm.nix"; - microvm.inputs.nixpkgs.follows = "nixpkgs"; + + microvm = { + url = "github:astro/microvm.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { # User Package Management url = "github:nix-community/home-manager"; @@ -32,12 +35,11 @@ }; jovian-nixos = { - url = "github:Jovian-Experiments/Jovian-NixOS/development"; - flake = false; + url = "github:Jovian-Experiments/Jovian-NixOS"; }; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-stable, nixos-hardware, home-manager, nur, agenix, jovian-nixos, microvm, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, nur, agenix, jovian-nixos, microvm, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. let # Variables that can be used in the config files user = "kabbone"; userdmz = "diablo"; @@ -48,7 +50,7 @@ nixosConfigurations = ( # NixOS configurations import ./hosts { # Imports ./hosts/default.nix inherit (nixpkgs) lib; - inherit inputs nixpkgs nixpkgs-stable nixos-hardware home-manager nur user userdmz userserver location agenix jovian-nixos microvm; # Also inherit home-manager so it does not need to be defined here. + inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager nur user userdmz userserver location agenix jovian-nixos microvm; # Also inherit home-manager so it does not need to be defined here. nix.allowedUsers = [ "@wheel" ]; security.sudo.execWheelOnly = true; }