Skip to content

Commit

Permalink
feat: bump to 23.11 and rename nixpkgs-unstable -> unstable
Browse files Browse the repository at this point in the history
  • Loading branch information
jnsgruk committed Nov 27, 2023
1 parent 3795aab commit 9c055b2
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 51 deletions.
58 changes: 29 additions & 29 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
description = "jnsgruk's nixos configuration";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";

agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs-unstable";
agenix.inputs.nixpkgs.follows = "unstable";

nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
nix-formatter-pack.inputs.nixpkgs.follows = "nixpkgs-unstable";
nix-formatter-pack.inputs.nixpkgs.follows = "unstable";

hyprland.url = "github:hyprwm/Hyprland";
hyprland-contrib.url = "github:hyprwm/contrib";
Expand All @@ -18,33 +18,33 @@
sf-pro-fonts-src.flake = false;

disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs-unstable";
disko.inputs.nixpkgs.follows = "unstable";

lanzaboote.url = "github:nix-community/lanzaboote";
lanzaboote.inputs.nixpkgs.follows = "nixpkgs-unstable";
lanzaboote.inputs.nixpkgs.follows = "unstable";

vscode-server.url = "github:nix-community/nixos-vscode-server";
vscode-server.inputs.nixpkgs.follows = "nixpkgs-unstable";
vscode-server.inputs.nixpkgs.follows = "unstable";

home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable";
home-manager.inputs.nixpkgs.follows = "unstable";

crafts.url = "github:jnsgruk/crafts-flake"; # url = "path:/home/jon/crafts-flake";
crafts.inputs.nixpkgs.follows = "nixpkgs-unstable";
crafts.inputs.nixpkgs.follows = "unstable";
embr.url = "github:jnsgruk/firecracker-ubuntu";
embr.inputs.nixpkgs.follows = "nixpkgs-unstable";
embr.inputs.nixpkgs.follows = "unstable";
};

outputs =
{ self
, nixpkgs
, nixpkgs-unstable
, unstable
, nix-formatter-pack
, ...
} @ inputs:
let
inherit (self) outputs;
stateVersion = "23.05";
stateVersion = "23.11";
username = "jon";

libx = import ./lib { inherit inputs outputs stateVersion username; };
Expand Down Expand Up @@ -73,7 +73,7 @@

# Custom packages; acessible via 'nix build', 'nix shell', etc
packages = libx.forAllSystems (system:
let pkgs = nixpkgs-unstable.legacyPackages.${system};
let pkgs = unstable.legacyPackages.${system};
in import ./pkgs { inherit pkgs; }
);

Expand All @@ -83,13 +83,13 @@
# Devshell for bootstrapping
# Accessible via 'nix develop' or 'nix-shell' (legacy)
devShells = libx.forAllSystems (system:
let pkgs = nixpkgs-unstable.legacyPackages.${system};
let pkgs = unstable.legacyPackages.${system};
in import ./shell.nix { inherit pkgs; }
);

formatter = libx.forAllSystems (system:
nix-formatter-pack.lib.mkFormatter {
pkgs = nixpkgs-unstable.legacyPackages.${system};
pkgs = unstable.legacyPackages.${system};
config.tools = {
deadnix.enable = true;
nixpkgs-fmt.enable = true;
Expand Down
2 changes: 1 addition & 1 deletion host/common/services/homepage.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ inputs, pkgs, ... }: {
imports = [ "${inputs.nixpkgs-unstable}/nixos/modules/services/misc/homepage-dashboard.nix" ];
imports = [ "${inputs.unstable}/nixos/modules/services/misc/homepage-dashboard.nix" ];

services.homepage-dashboard = {
enable = true;
Expand Down
2 changes: 1 addition & 1 deletion host/common/services/servarr.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ in
{
# Always use the prowlarr module from nixos-unstable
disabledModules = [ "${inputs.nixpkgs}/${prowlarrModule}" ];
imports = [ "${inputs.nixpkgs-unstable}/${prowlarrModule}" ];
imports = [ "${inputs.unstable}/${prowlarrModule}" ];

services = {
jellyfin = {
Expand Down
2 changes: 1 addition & 1 deletion host/common/virt/lxd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ in
{
# Always use the lxd module from nixos-unstable
disabledModules = [ "${inputs.nixpkgs}/${lxdModule}" ];
imports = [ "${inputs.nixpkgs-unstable}/${lxdModule}" ];
imports = [ "${inputs.unstable}/${lxdModule}" ];
virtualisation = {
lxd = {
enable = true;
Expand Down
4 changes: 2 additions & 2 deletions lib/helpers.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ inputs, outputs, stateVersion, theme, username, ... }: {
# Helper function for generating home-manager configs
mkHome = { hostname, user ? username, desktop ? null }: inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux;
pkgs = inputs.unstable.legacyPackages.x86_64-linux;
extraSpecialArgs = {
inherit inputs outputs stateVersion theme hostname desktop;
username = user;
Expand All @@ -10,7 +10,7 @@
};

# Helper function for generating host configs
mkHost = { hostname, desktop ? null, pkgsInput ? inputs.nixpkgs-unstable }: pkgsInput.lib.nixosSystem {
mkHost = { hostname, desktop ? null, pkgsInput ? inputs.unstable }: pkgsInput.lib.nixosSystem {
specialArgs = {
inherit inputs outputs stateVersion theme username hostname desktop;
};
Expand Down
2 changes: 1 addition & 1 deletion lib/theme/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ let
inherit ((import ./colours.nix)) colours;
libx = import ./lib.nix { inherit lib; };

pkgs = import inputs.nixpkgs-unstable {
pkgs = import inputs.unstable {
system = "x86_64-linux";
overlays = [ outputs.overlays.fonts ];
config = { allowUnfree = true; joypixels.acceptLicense = true; };
Expand Down
2 changes: 1 addition & 1 deletion overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# When applied, the unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable'
unstable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable {
unstable = import inputs.unstable {
inherit (final) system;
config.allowUnfree = true;
};
Expand Down

0 comments on commit 9c055b2

Please sign in to comment.