aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devShells/default.nix2
-rw-r--r--flake.lock26
-rw-r--r--flake.nix11
-rw-r--r--nixos/machine/errol.nix5
-rw-r--r--nixos/modules/generic.nix1
5 files changed, 25 insertions, 20 deletions
diff --git a/devShells/default.nix b/devShells/default.nix
index dd41d2a..c87522f 100644
--- a/devShells/default.nix
+++ b/devShells/default.nix
@@ -22,7 +22,7 @@
espc = callDevelop ./nuttx.nix {arch = "rv32imc";};
c = callDevelop ./c.nix {};
qt = callDevelop ./qt.nix {};
- apo = callDevelop ./apo.nix { };
+ apo = callDevelop ./apo.nix {};
};
in
shells
diff --git a/flake.lock b/flake.lock
index 21cf04f..dacf583 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
- "lastModified": 1677847796,
- "narHash": "sha256-nuJpPPzJyZvar/aQxTz28pYpdUEmNbuM3grI9YTPMik=",
+ "lastModified": 1678472263,
+ "narHash": "sha256-MaQ+/JNnDzg4l+8Gywu3px9LzWOnUxPsLT7mn1Om/Nk=",
"owner": "NixOS",
"repo": "nix",
- "rev": "0507462c0626d19b59b78e490b7b203df29e7bb0",
+ "rev": "208c8551249361d2383b44123b4ad156218c351b",
"type": "github"
},
"original": {
@@ -126,11 +126,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1677949148,
- "narHash": "sha256-dEdcn+UYs8TUK3VTNCQk9TsJapJLEq50A4q7eC3/PTU=",
+ "lastModified": 1678397099,
+ "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "d63e86cbed3d399c4162594943bd8c1d8392e550",
+ "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea",
"type": "github"
},
"original": {
@@ -186,11 +186,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1677918630,
- "narHash": "sha256-XvfzkZr+GQMm+BTYvQ9gMaJ6lkd1mKSEZ6I184OP5RM=",
+ "lastModified": 1678633766,
+ "narHash": "sha256-7//k+M/CN8uRXuQSteHzv1Cxrhb+JP0ykM9M6QDvTR4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e0737778444ae0aa3baf8d6512288d3310c372ed",
+ "rev": "9bd4087071eb27e47d96cc15ee9db1f2a3584679",
"type": "github"
},
"original": {
@@ -266,11 +266,11 @@
},
"personal-secret": {
"locked": {
- "lastModified": 1677870303,
- "narHash": "sha256-w1WHQGNLT7BRKOhe1ryZKRbrC2DH5nc0a5EpqhU+bg0=",
+ "lastModified": 1678658788,
+ "narHash": "sha256-SBy6oqtIzquFted5C1HS4l+tcB8QVnzugRB/0NEz/WA=",
"ref": "refs/heads/master",
- "rev": "0784e1aefb1352ce15bfce309f11eeac8356b841",
- "revCount": 69,
+ "rev": "368ce315cabd1c875dc1602ea1c84c0e1deddaf2",
+ "revCount": 70,
"type": "git",
"url": "ssh://git@cynerd.cz/nixos-personal-secret"
},
diff --git a/flake.nix b/flake.nix
index 4dce78c..730ef12 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,7 @@
}:
with flake-utils.lib;
{
+ lib = import ./lib nixpkgs.lib;
overlays.default = final: prev:
import ./pkgs {
inherit self;
@@ -35,15 +36,17 @@
};
nixosModules = import ./nixos self;
nixosConfigurations = import ./nixos/configurations.nix self;
- lib = import ./lib nixpkgs.lib;
}
- // eachDefaultSystem (system: {
+ // eachDefaultSystem (system: let
+ pkgs = nixpkgs.legacyPackages."${system}";
+ in {
packages = filterPackages system (flattenTree (
import ./pkgs {
inherit self;
- nixpkgs = nixpkgs.legacyPackages."${system}";
+ nixpkgs = pkgs;
}
));
+ legacyPackages = pkgs.extend self.overlays.default;
devShells =
filterPackages system
(import ./devShells {
@@ -51,6 +54,6 @@
inherit shellrc;
inherit system;
});
- formatter = nixpkgs.legacyPackages.${system}.alejandra;
+ formatter = pkgs.alejandra;
});
}
diff --git a/nixos/machine/errol.nix b/nixos/machine/errol.nix
index 74901f9..ad3137c 100644
--- a/nixos/machine/errol.nix
+++ b/nixos/machine/errol.nix
@@ -22,7 +22,7 @@ with lib; {
services.hardware.openrgb.motherboard = "amd";
cynerd.autounlock = {
- "encroot" = "/dev/disk/by-uuid/8095988e-239b-4417-9df6-94a40e4133ed";
+ "encroot" = "/dev/disk/by-uuid/7c412ae6-6016-45af-8c2a-8fcc394dbbe6";
"enchdd1" = "/dev/disk/by-uuid/87f16080-5ff6-43dd-89f3-307455a46fbe";
"enchdd2" = "/dev/disk/by-uuid/be4a33fa-8bc6-431d-a3ac-787668f223ed";
};
@@ -38,7 +38,7 @@ with lib; {
options = ["compress=lzo" "subvol=@home"];
};
"/boot" = {
- device = "/dev/disk/by-uuid/87B0-A1D5";
+ device = "/dev/disk/by-uuid/49D9-3A0D";
fsType = "vfat";
};
@@ -93,6 +93,7 @@ with lib; {
extraPackages = pkgs:
with pkgs; [
securetar
+ pyipp
];
};
};
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 25fcbde..309dd95 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -68,6 +68,7 @@ in {
mc
screen
tmux
+ pv
# ls tools
tree