aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock34
-rw-r--r--flake.nix2
-rw-r--r--nixos/configurations/spt-mox2.nix7
-rw-r--r--nixos/modules/desktop.nix12
-rw-r--r--nixos/modules/develop.nix3
-rw-r--r--pkgs/default.nix29
6 files changed, 50 insertions, 37 deletions
diff --git a/flake.lock b/flake.lock
index 2814127..96cce4f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1716561646,
- "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
+ "lastModified": 1718371084,
+ "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
+ "rev": "3a56735779db467538fb2e577eda28a9daacaca6",
"type": "github"
},
"original": {
@@ -274,11 +274,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1717995329,
- "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=",
+ "lastModified": 1719895800,
+ "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "58b52b0dd191af70f538c707c66c682331cfdffc",
+ "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"type": "github"
},
"original": {
@@ -332,16 +332,16 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1717974879,
- "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
+ "lastModified": 1720067112,
+ "narHash": "sha256-RqDbuJnwe29ffD8KE810dLxzCyaX5cvXks8TaJZK4H4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
+ "rev": "1af787b0e7fda63e5313fb1a6815019e0c4d6f9b",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-unstable",
+ "ref": "nixos-unstable-small",
"type": "indirect"
}
},
@@ -450,11 +450,11 @@
},
"personal-secret": {
"locked": {
- "lastModified": 1716452759,
- "narHash": "sha256-leiQrRghrECNEwkNA/TFVlNFLe+yu/qS+IHKcsLXUxw=",
+ "lastModified": 1718186830,
+ "narHash": "sha256-gWvYesgp4/ZHuZZDpSSgpNm/lFGLAZaBnVw1MG0eHC4=",
"ref": "refs/heads/master",
- "rev": "a437d31815d8ce9f5907884fd9d87a0d7f9011f0",
- "revCount": 107,
+ "rev": "07c3c94e37721b4a1365a2cd1ad84a1bac10c4da",
+ "revCount": 108,
"type": "git",
"url": "ssh://git@cynerd.cz/nixos-personal-secret"
},
@@ -693,11 +693,11 @@
},
"vpsadminos": {
"locked": {
- "lastModified": 1717952947,
- "narHash": "sha256-RAgrrmJvCJb4Kntsb49hbucPIY0833V9V9I7pKcqbl8=",
+ "lastModified": 1720004960,
+ "narHash": "sha256-3side3GccLz9lIhZFnQRrkkLdAoPfs01aNvkHL9ex5s=",
"owner": "vpsfreecz",
"repo": "vpsadminos",
- "rev": "0330fef1b06f3b7186825d236381f94a5bed7938",
+ "rev": "4e9159b4357e45a065834c30ad94b39d21233ba2",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index daf69b4..c9a68bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
description = "Cynerd's personal flake";
inputs = {
- nixpkgs.url = "nixpkgs/nixos-unstable";
+ nixpkgs.url = "nixpkgs/nixos-unstable-small";
nixos-hardware.url = "nixos-hardware";
nixdeploy.url = "gitlab:cynerd/nixosdeploy";
personal-secret.url = "git+ssh://git@cynerd.cz/nixos-personal-secret";
diff --git a/nixos/configurations/spt-mox2.nix b/nixos/configurations/spt-mox2.nix
index 085bb5f..d596369 100644
--- a/nixos/configurations/spt-mox2.nix
+++ b/nixos/configurations/spt-mox2.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{
+ config,
+ pkgs,
+ ...
+}: {
turris.board = "mox";
deploy = {
enable = true;
@@ -22,6 +26,7 @@
};
};
+ boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_1_turris_mox;
services.journald.extraConfig = ''
SystemMaxUse=512M
'';
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 2b19b93..bdf32f5 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -24,9 +24,9 @@ in {
config = mkIf cnf.enable {
hardware = {
- opengl = {
- driSupport = true;
- driSupport32Bit = true;
+ graphics = {
+ enable = true;
+ enable32Bit = true;
};
bluetooth.enable = mkIf cnf.laptop true;
};
@@ -37,7 +37,7 @@ in {
wrapperFeatures.gtk = true;
extraPackages = with pkgs;
[
- gnome.dconf-editor
+ dconf-editor
glib
gsettings-desktop-schemas
sysstat
@@ -49,7 +49,7 @@ in {
myswaylock
alacritty
- gnome.nautilus
+ nautilus
kanshi
wdisplays
@@ -110,7 +110,7 @@ in {
nordic
nordzy-cursor-theme
nordzy-icon-theme
- gnome.adwaita-icon-theme
+ adwaita-icon-theme
vanilla-dmz
sound-theme-freedesktop
gnome.gnome-characters
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 2a20527..971d219 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -41,7 +41,6 @@ in {
dev
cachix
nurl
- nix-universal-prefetch
nil
alejandra
statix
@@ -54,7 +53,7 @@ in {
bats
shellcheck
shfmt
- nodePackages.bash-language-server
+ bash-language-server
jq
yq
fq
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0a09f9f..7094b78 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,6 +1,12 @@
final: prev: let
- inherit (final.lib) optional;
- is_cross = final.buildPlatform != final.targetPlatform;
+ # The NodeJS packages has to be build in 32bit environment if host platform is
+ # also 32bit because it uses 32bit stubs and links against 32bit OpenSSL. The
+ # only architecture that generally supports execution of 32bit is x86_64 and
+ # thus that is the only one handled here.
+ callPackageNodejs =
+ if prev.stdenv.buildPlatform.isx86_64 && prev.stdenv.is32bit
+ then prev.buildPackages.pkgsi686Linux.callPackage
+ else prev.callPackage;
in {
luks-hw-password = final.callPackage ./luks-hw-password {};
dev = final.callPackage ./dev {
@@ -24,9 +30,17 @@ in {
bigclown-leds = final.callPackage ./bigclown-leds {};
# nixpkgs patches
- #zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs (oldAttrs: {
- # npmInstallFlags = ["--no-optional"]; # Fix cross build
- #});
+ zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs (oldAttrs: {
+ npmInstallFlags = ["--no-optional"]; # Fix cross build
+ });
+ nodejs_18 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v18.nix") {};
+ nodejs-slim_18 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v18.nix") {enableNpm = false;};
+ nodejs_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {};
+ nodejs-slim_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {enableNpm = false;};
+ nodejs_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {};
+ nodejs-slim_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {enableNpm = false;};
+
+ # Older version of packages
flac1_3 = prev.flac.overrideAttrs {
version = "1.3.4";
src = final.fetchurl {
@@ -35,9 +49,4 @@ in {
};
outputs = ["out"];
};
- gnupg = prev.gnupg.overrideAttrs (oldAttrs: {
- nativeBuildInputs =
- oldAttrs.nativeBuildInputs
- ++ (optional is_cross prev.libgpg-error);
- });
}