From e86486bc365d0999965b7289af99f5b0abeeff38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Tue, 7 May 2024 17:41:56 +0100 Subject: [PATCH] add novena image def, update --- flake.lock | 84 ++++++++++++++++----------------- flake.nix | 43 +++++++++++++++++ nixos/boxes/cupsnet/default.nix | 1 + nixos/boxes/foryog/default.nix | 2 +- nixos/common.nix | 1 - nixos/gui/default.nix | 1 - 6 files changed, 87 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index be09fdad..05299a40 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1694541876, - "narHash": "sha256-lStDIPizbJipd1JpNKX1olBKzyIosyC2U/mVFwJPcZE=", + "lastModified": 1714332968, + "narHash": "sha256-DVAMHUa4M0kjhK9soNclnZ/QDuNtGsUMgKCpGd8TYEs=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "e53c2c6c6c103dc3f848dbd9fbd93ee7c69c109f", + "rev": "98556f8ecb3286e8123286071a307733a99cf763", "type": "github" }, "original": { @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1713543876, - "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1713406758, - "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", + "lastModified": 1714959124, + "narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=", "owner": "nix-community", "repo": "disko", - "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", + "rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713668430, - "narHash": "sha256-HnM70sE7OryisMQ8GYOovO/zRXTcFGIDg4BKrGiFtWk=", + "lastModified": 1715014280, + "narHash": "sha256-70dgc0r7vCVkp93yTwzaQ7Xfh9cE63t+0mCVbreK8SQ=", "owner": "helix-editor", "repo": "helix", - "rev": "26d9610e78b287c2316577af91adfd920baa7fa6", + "rev": "beb5afcbef9f102c209de7aa32f126ded9dda515", "type": "github" }, "original": { @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1713707619, - "narHash": "sha256-g73hSx1osp8G7pbFQbiz7OCosAogf0WrLSOWyEF+F9M=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ad83c154bdfedad9807e86dd0633729ea3b116c5", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1704611696, - "narHash": "sha256-4ZCgV5oHdEc3q+XaIzy//gh20uC/aSuAtMU9bsfgLZk=", + "lastModified": 1714571717, + "narHash": "sha256-o4tqlTzi9kcVub167kTGXgCac9jM3kW4+v9MH/ue4Hk=", "owner": "oxalica", "repo": "nil", - "rev": "059d33a24bb76d2048740bcce936362bf54b5bc9", + "rev": "2f3ed6348bbf1440fcd1ab0411271497a0fbbfa4", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713521961, - "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", + "lastModified": 1715010655, + "narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", + "rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", "type": "github" }, "original": { @@ -324,11 +324,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1713709641, - "narHash": "sha256-Q4bPpC8UNjiR7Gg4GEeIi5XrG8yQai9cxOjkXlRQmVc=", + "lastModified": 1715014754, + "narHash": "sha256-XotRSyN0TN9SO8PfuHDIOV+AKhm4Ol/a/aE0HJ4o3Tk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e8bfab8324ef1aab71d47339ea5662e0249c4c0", + "rev": "e049102f0fb2d47c888a2c1a4007b19c0d73cf96", "type": "github" }, "original": { @@ -340,11 +340,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -356,11 +356,11 @@ }, "nixpkgs-rust-analyzer": { "locked": { - "lastModified": 1713709641, - "narHash": "sha256-Q4bPpC8UNjiR7Gg4GEeIi5XrG8yQai9cxOjkXlRQmVc=", + "lastModified": 1715014754, + "narHash": "sha256-XotRSyN0TN9SO8PfuHDIOV+AKhm4Ol/a/aE0HJ4o3Tk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e8bfab8324ef1aab71d47339ea5662e0249c4c0", + "rev": "e049102f0fb2d47c888a2c1a4007b19c0d73cf96", "type": "github" }, "original": { @@ -372,11 +372,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713564160, - "narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=", + "lastModified": 1714782413, + "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c", + "rev": "651b4702e27a388f0f18e1b970534162dec09aff", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nur": { "locked": { - "lastModified": 1713707886, - "narHash": "sha256-eixmKYCzDqq0II8yOiuoQNmTE/lNCiIt71lh7V4PSvk=", + "lastModified": 1715012402, + "narHash": "sha256-ee0XFi37bs9yYSWQDRWD3rls0ubNLkBPkON3X8Gh5o4=", "owner": "nix-community", "repo": "NUR", - "rev": "e558232e47b407866c8e2974739fac7ccc17e452", + "rev": "18c7dafe6d596235e0b462fd01576a737763e9e6", "type": "github" }, "original": { @@ -478,11 +478,11 @@ ] }, "locked": { - "lastModified": 1704593904, - "narHash": "sha256-nDoXZDTRdgF3b4n3m011y99nYFewvOl9UpzFvP8Rb3c=", + "lastModified": 1714529851, + "narHash": "sha256-YMKJW880f7LHXVRzu93xa6Ek+QLECIu0IRQbXbzZe38=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c36fd70a99decfa6e110c86f296a97613034a680", + "rev": "9ca720fdcf7865385ae3b93ecdf65f1a64cb475e", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1713668495, - "narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=", + "lastModified": 1714878026, + "narHash": "sha256-YJ1k/jyd6vKqmVgGkkAb4n+ZfPPAt8+L5a73eAThqFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "09f1bc8ba3277c0f052f7887ec92721501541938", + "rev": "10dc39496d5b027912038bde8d68c836576ad0bc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f0c7acf9..c50acc79 100644 --- a/flake.nix +++ b/flake.nix @@ -220,6 +220,49 @@ ]; specialArgs = {inherit inputs;}; }; + novenaimage = nixpkgs-stable.lib.nixosSystem { + system = "armv7l-linux"; + modules = [ + (import + "${inputs.nixpkgs-stable}/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix") + { + environment.systemPackages = with nixpkgs-nixos-unstable.legacyPackages."armv7l-linux"; [ + neovim + htop + btop + atop + ]; + + boot.kernelPackages = nixpkgs-stable.lib.mkForce nixpkgs-nixos-unstable.legacyPackages."armv7l-linux".linuxPackages_latest; + boot.supportedFilesystems = nixpkgs-stable.lib.mkForce ["ext2" "ext4"]; + + networking.networkmanager.enable = false; + hardware.enableRedistributableFirmware = true; + networking.wireless.enable = true; + + services.openssh = { + enable = true; + permitRootLogin = + nixpkgs-stable.lib.mkForce "prohibit-password"; + passwordAuthentication = false; + }; + + services.xserver = { + enable = true; + displayManager.lightdm.enable = true; + desktopManager.gnome.enable = true; + libinput.enable = true; + }; + + users.extraUsers.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEo4R+6J3h6Ix3xWpOMdU7Es1/YxFchHw0c+kcCOJxFb cyryl@foureighty" + ]; + sdImage.compressImage = false; + console.earlySetup = true; + } + ]; + specialArgs = {inherit inputs;}; + }; }; }; inputs = { diff --git a/nixos/boxes/cupsnet/default.nix b/nixos/boxes/cupsnet/default.nix index 442f38b5..b5c7f52b 100644 --- a/nixos/boxes/cupsnet/default.nix +++ b/nixos/boxes/cupsnet/default.nix @@ -23,6 +23,7 @@ ]; networking.hostName = "cupsnet"; + boot.binfmt.emulatedSystems = ["armv7l-linux"]; zramSwap = { enable = true; algorithm = "zstd"; diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix index 1041fb0f..79470375 100644 --- a/nixos/boxes/foryog/default.nix +++ b/nixos/boxes/foryog/default.nix @@ -30,7 +30,7 @@ boot = { kernelParams = ["initcall_debug" ''dyndbg="file suspend.c +p"'' "no_console_suspend"]; tmp.cleanOnBoot = true; - binfmt.emulatedSystems = ["aarch64-linux"]; + binfmt.emulatedSystems = ["armv7l-linux" "aarch64-linux"]; plymouth = { enable = true; logo = ./boot.png; diff --git a/nixos/common.nix b/nixos/common.nix index b1e1b1ae..1bc251f2 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -109,7 +109,6 @@ in { settings.auto-optimise-store = true; gc.automatic = true; optimise.automatic = true; - package = pkgs.nixUnstable; extraOptions = '' experimental-features = nix-command flakes stalled-download-timeout = 30 diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 0de36648..1a36211e 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -34,7 +34,6 @@ anarchism cheese digikam - electrum element-desktop eog evince