aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-09-15 10:08:12 +0200
committerKarel Kočí <cynerd@email.cz>2022-09-15 10:08:12 +0200
commit7b5f6bd95230c4eaac16d3fc2f02365497bd63d7 (patch)
tree6815e7a9492211e79a63a6189373d5616268cfbb
parent929d898bf77ee0d8f8d4f504483369411e2009da (diff)
downloadnixos-personal-7b5f6bd95230c4eaac16d3fc2f02365497bd63d7.tar.gz
nixos-personal-7b5f6bd95230c4eaac16d3fc2f02365497bd63d7.tar.bz2
nixos-personal-7b5f6bd95230c4eaac16d3fc2f02365497bd63d7.zip
Add few packages and allow access to the dhcpcd for wheel
-rw-r--r--devShells/c.nix3
-rw-r--r--flake.lock25
-rw-r--r--flake.nix4
-rw-r--r--nixos/modules/desktop.nix3
-rw-r--r--nixos/modules/develop.nix2
-rw-r--r--nixos/modules/generic.nix4
6 files changed, 25 insertions, 16 deletions
diff --git a/devShells/c.nix b/devShells/c.nix
index cf179d0..79c2273 100644
--- a/devShells/c.nix
+++ b/devShells/c.nix
@@ -24,6 +24,9 @@ in pkgs.mkShell {
flex bison
gtk3 gtk4
+ # Various libraries
+ openssl.dev zlib.dev curl.dev
+
# LVGL
SDL2 libffi.dev
diff --git a/flake.lock b/flake.lock
index c0fe697..2c84497 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1660407119,
- "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=",
+ "lastModified": 1663133271,
+ "narHash": "sha256-juBxlETvfMetD/pUFLtdDLQ8BOayxROra8d5Hg6Zg1M=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1",
+ "rev": "93580fca1000c37e382d7e2c19c78c1c3852482d",
"type": "github"
},
"original": {
@@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1661239106,
- "narHash": "sha256-C5OCLnrv2c4CHs9DMEtYKkjJmGL7ySAZ1PqPkHBonxQ=",
+ "lastModified": 1663202367,
+ "narHash": "sha256-62sI03nVTWKMULPnjUC+Ig952PqPDnkCSJ56MLoFvDI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "963d27a0767422be9b8686a8493dcade6acee992",
+ "rev": "e731e6638c7726241c352c74bc7f860872e4cbd2",
"type": "github"
},
"original": {
@@ -108,10 +108,7 @@
},
"locked": {
"lastModified": 1660980319,
- "narHash": "sha256-kOmTRZQW7iCLFKX5/XavdE9Y6WdZlNgJ+ZcnpwcSgCk=",
- "ref": "refs/heads/master",
- "rev": "28175647be4ef4f5539857b7dc102e674700f775",
- "revCount": 39,
+ "narHash": "sha256-pS2wmG0hJIK/t+X0eO1+qtJJr1rSbFiOrcMLqgNrg54=",
"type": "git",
"url": "file:///home/cynerd/projects/nixturris"
},
@@ -122,11 +119,11 @@
},
"personal-secret": {
"locked": {
- "lastModified": 1660915143,
- "narHash": "sha256-tx1GravYySdBr+jngQf5O4nCr1Wxoxuv7MSnc0/97+k=",
+ "lastModified": 1662805434,
+ "narHash": "sha256-S4tk5PW94Eg7Kfrq2/MChJaNE+3+Xl3pqe3NcUrR7iE=",
"ref": "refs/heads/master",
- "rev": "0c198386f5641a793651264d571a076b63dcf5cb",
- "revCount": 29,
+ "rev": "a3a643d9685407f6e707af9e7c1367d2a50ac91c",
+ "revCount": 30,
"type": "git",
"url": "ssh://git@cynerd.cz/nixos-personal-secret"
},
diff --git a/flake.nix b/flake.nix
index 469ebf3..af6346d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,10 @@
nixturris.nixosModules.turris-crossbuild
nixturris.nixosModules.armv7l-overlay
{ boot.loader.systemd-boot.enable = false; }
+ { nixpkgs.overlays = [ (final: super: {
+ makeModulesClosure = x:
+ super.makeModulesClosure (x // { allowMissing = true; });
+ })]; }
];};
raspi3System = genericSystem {system = "aarch64-linux"; extra_modules = [
nixturris.nixosModules.turris-crossbuild
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index bff2c1e..898db66 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -103,6 +103,9 @@ in {
gst_all_1.gst-plugins-ugly
gst_all_1.gst-plugins-viperfx
+ # Latex
+ texlive.combined.scheme-full
+
] ++ (optionals cnf.laptop [
# Power management
powertop
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 51e106a..70c8910 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -32,7 +32,7 @@ in {
# Shell
dash # Posix shell
bats
- shellcheck
+ shellcheck shfmt
jq yq
# Python
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 6469a9d..04957b1 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -49,7 +49,7 @@ in {
gnumake
exfat exfatprogs
nix-index
- usbutils
+ usbutils pciutils
# NCurses tools
htop iotop #glances
@@ -112,6 +112,8 @@ in {
security.sudo.extraRules = [
{ groups = [ "wheel" ]; commands = [ "ALL" ]; }
];
+ networking.dhcpcd.extraConfig = "controlgroup wheel";
+ environment.etc."dhcpcd.conf".text = "controlgroup wheel";
services.openssh.enable = true;