doloro/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaces rpi flake with a maintained one

Browse Source
This commit is contained in:
Doloro1978
2026-05-20 16:01:36 +01:00
parent 1e8337e380
commit 212af403dc
6 changed files with 144 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/hosts/aspects/doloro-desktop/host.nix
+10 -8
View File
@@ -6,15 +6,16 @@
__findFile, __findFile,
lib, lib,
... ...
}: }: {
{
den.aspects.desktop = { den.aspects.desktop = {
includes = [ includes = [
modules.nix modules.nix
]; ];
nixos = nixos = {
{ pkgs, config, ... }: pkgs,
{ config,
...
}: {
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.grub.devices = [ boot.loader.grub.devices = [
@@ -45,7 +46,7 @@
enable = true; enable = true;
}; };
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = ["nvidia"];
fileSystems."/mnt/2tb" = { fileSystems."/mnt/2tb" = {
device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2"; device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
@@ -62,7 +63,6 @@
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
hardware.nvidia = { hardware.nvidia = {
# Modesetting is required. # Modesetting is required.
modesetting.enable = true; modesetting.enable = true;
@@ -92,7 +92,9 @@
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
boot.binfmt.emulatedSystems = [
"aarch64-linux"
];
}; };
}; };
} }
config/hosts/aspects/servers/rpi5.nix
+3 -3
View File
@@ -3,14 +3,14 @@
__findFile, __findFile,
modules, modules,
... ...
}: }: {
{
den.aspects.rpi5 = { den.aspects.rpi5 = {
includes = [ includes = [
<modules/raspberry-pi/5> <modules/raspberry-pi/5>
# <modules/services/traefik> # <modules/services/traefik>
<modules/services/caddy> <modules/services/caddy>
<modules/services/home-assistant> <modules/services/home-assistant>
<modules/services/docker-registry>
<modules/services/ddns> <modules/services/ddns>
]; ];
nixos = { nixos = {
@@ -23,7 +23,7 @@
443 443
8080 8080
]; ];
allowedUDPPortRanges = [ ]; allowedUDPPortRanges = [];
}; };
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
config/modules/raspberry-pi.nix
+4 -8
View File
@@ -4,20 +4,16 @@
modules, modules,
inputs, inputs,
... ...
}: }: {
{
flake-file.inputs = { flake-file.inputs = {
raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix"; raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
}; };
modules.raspberry-pi = { modules.raspberry-pi = {
provides = { provides = {
"5" = { "5" = {
nixos = nixos = {pkgs, ...}: let
{ pkgs, ... }:
let
rpi-pi = inputs.raspberry-pi-nix; rpi-pi = inputs.raspberry-pi-nix;
in in {
{
imports = [ imports = [
rpi-pi.nixosModules.raspberry-pi rpi-pi.nixosModules.raspberry-pi
rpi-pi.nixosModules.sd-image rpi-pi.nixosModules.sd-image
config/modules/services/registry.nix
+1 -1
View File
@@ -16,7 +16,7 @@
imageDigest = "sha256:85347ed2ecde64161c7a4788a4d7d3dcc9d6f86f7be95834022e3c6a423a945a"; imageDigest = "sha256:85347ed2ecde64161c7a4788a4d7d3dcc9d6f86f7be95834022e3c6a423a945a";
finalImageName = "registry"; finalImageName = "registry";
finalImageTag = "3"; finalImageTag = "3";
sha256 = "sha256-AfPrjUFG1rZ5UWJrYWzjpIg7AIGMqjNIRe1eDuvrOPo"; sha256 = "sha256-rLG0q/MVVz52veqZuZs5W0Qke6FugXkx7fMe3QnE3gU";
arch = "arm64"; arch = "arm64";
}; };
in { in {
flake.lock
Generated
+41 -77
View File
@@ -154,11 +154,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1779135526, "lastModified": 1779226674,
"narHash": "sha256-glCununz6lmaK5fs2X946HA3EkNxB2JagdAAvInuRYU=", "narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d405a179887d52b24c0ddd31e09a150bd1f66779", "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -796,16 +796,16 @@
"libpisp-src": { "libpisp-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724944683, "lastModified": 1740559338,
"narHash": "sha256-Fo2UJmQHS855YSSKKmGrsQnJzXog1cdpkIOO72yYAM4=", "narHash": "sha256-tHfFcNSmXLcUHhqiGRh2YZT8xioUq0zMOMZl9rjG8ys=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "libpisp", "repo": "libpisp",
"rev": "28196ed6edcfeda88d23cc5f213d51aa6fa17bb3", "rev": "50426319aa1a9ba4672f91977429365ad4e335a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "v1.0.7", "ref": "v1.2.0",
"repo": "libpisp", "repo": "libpisp",
"type": "github" "type": "github"
} }
@@ -914,11 +914,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1773628058, "lastModified": 1778036283,
"narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", "narHash": "sha256-62EWg6lI0qyzm7oAx5cAnGkLutvJsRBe0KkEW2JDZCE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", "rev": "ed67bc86e84e51d4a88e73c7fd36006dc876476f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1051,11 +1051,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1736061677, "lastModified": 1745279238,
"narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1085,11 +1085,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1779199181, "lastModified": 1779231450,
"narHash": "sha256-8x/CeqkYNAAOY+Pa5Huyh0aiUmFcOUAyq3VdYxHb5K4=", "narHash": "sha256-5YgsQE2pzHw1YLiemIo55tQDWEeI7Og1n2D/X77kP2A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "13ba3f7ca9da3d49e959745f6d0d1e7a662c1984", "rev": "5de0b035974d6281f0bab3e8ec46015c8ffbeed9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1128,11 +1128,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1779181830, "lastModified": 1779271700,
"narHash": "sha256-lna281k1C80nwnVN8HqGrVIKReLc6GNlws9TTw7M0N0=", "narHash": "sha256-KtWAf0d6xkldTiR4J+m0qDn7uXb8zp/BlLWcHRbRAkg=",
"ref": "main", "ref": "main",
"rev": "6aee92530f8d6c772499b8ac84f3979ae5c06557", "rev": "a5095961bde9827989cf4ed2d6efac2781b9ce3e",
"revCount": 64, "revCount": 66,
"type": "git", "type": "git",
"url": "https://git.molez.org/mandlm/omp-nix" "url": "https://git.molez.org/mandlm/omp-nix"
}, },
@@ -1173,21 +1173,19 @@
"rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
"rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
"rpi-firmware-src": "rpi-firmware-src", "rpi-firmware-src": "rpi-firmware-src",
"rpi-linux-6_12_17-src": "rpi-linux-6_12_17-src", "rpi-linux-6_12_20-src": "rpi-linux-6_12_20-src",
"rpi-linux-6_6_78-src": "rpi-linux-6_6_78-src",
"rpi-linux-stable-src": "rpi-linux-stable-src",
"rpicam-apps-src": "rpicam-apps-src" "rpicam-apps-src": "rpicam-apps-src"
}, },
"locked": { "locked": {
"lastModified": 1742223591, "lastModified": 1745517382,
"narHash": "sha256-ZNTz8r5jlJ1jvpqf5+aUYgpnYJSVX0iP14doOc1Hm0E=", "narHash": "sha256-yGuXArSvZ1AKOY6ufWbO3YNwYYMsYUk6aXOEYeYIJgk=",
"owner": "nix-community", "owner": "cmyk",
"repo": "raspberry-pi-nix", "repo": "raspberry-pi-nix",
"rev": "3e8100d5e976a6a2be363015cb33463af9ef441a", "rev": "79d5db180b4e933389affeee0c8959ae5975c5c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "cmyk",
"repo": "raspberry-pi-nix", "repo": "raspberry-pi-nix",
"type": "github" "type": "github"
} }
@@ -1220,11 +1218,11 @@
"rpi-bluez-firmware-src": { "rpi-bluez-firmware-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708969706, "lastModified": 1741017538,
"narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=", "narHash": "sha256-t+D4VUfEIov83KV4wiKp6TqXTHXGkxg/mANi4GW7QHs=",
"owner": "RPi-Distro", "owner": "RPi-Distro",
"repo": "bluez-firmware", "repo": "bluez-firmware",
"rev": "78d6a07730e2d20c035899521ab67726dc028e1c", "rev": "2bbfb8438e824f5f61dae3f6ebb367a6129a4d63",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1237,11 +1235,11 @@
"rpi-firmware-nonfree-src": { "rpi-firmware-nonfree-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723266537, "lastModified": 1741707399,
"narHash": "sha256-T7eTKXqY9cxEMdab8Snda4CEOrEihy5uOhA6Fy+Mhnw=", "narHash": "sha256-n2u6dnFGVUDfUBXR+xL+k6A78JThMJc2rDjvWblReEY=",
"owner": "RPi-Distro", "owner": "RPi-Distro",
"repo": "firmware-nonfree", "repo": "firmware-nonfree",
"rev": "4b356e134e8333d073bd3802d767a825adec3807", "rev": "3900afffcd85198e3afab396fbf1d0abe5f76173",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1254,68 +1252,34 @@
"rpi-firmware-src": { "rpi-firmware-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728405098, "lastModified": 1742998042,
"narHash": "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=", "narHash": "sha256-o198RfJe2UUEjtEJnAVMrEG5bQkZca1nzsaUKOKVAQo=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "firmware", "repo": "firmware",
"rev": "7bbb5f80d20a2335066a8781459c9f33e5eebc64", "rev": "f49a3960223f20ea0b2e30646f65be67bafe30dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "1.20241008", "ref": "1.20250326",
"repo": "firmware", "repo": "firmware",
"type": "github" "type": "github"
} }
}, },
"rpi-linux-6_12_17-src": { "rpi-linux-6_12_20-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740765145, "lastModified": 1742992765,
"narHash": "sha256-hoCsGc4+RC/2LmxDtswLBL5ZhWlw4vSiL4Vkl39r2MU=", "narHash": "sha256-hSlzUXkfsWiE/HsSOEEx9RQlN4lXj2UV8Qgcfq1T5pg=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "5985ce32e511f4e8279a841a1b06a8c7d972b386", "rev": "cd231d4775b14f228606c09f219b48308f6ab3aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "rpi-6.12.y",
"repo": "linux",
"type": "github"
}
},
"rpi-linux-6_6_78-src": {
"flake": false,
"locked": {
"lastModified": 1740503700,
"narHash": "sha256-Y8+ot4Yi3UKwlZK3ap15rZZ16VZDvmeFkD46+6Ku7bE=",
"owner": "raspberrypi",
"repo": "linux",
"rev": "2e071057fded90e789c0101498e45a1778be93fe",
"type": "github"
},
"original": {
"owner": "raspberrypi",
"ref": "rpi-6.6.y",
"repo": "linux",
"type": "github"
}
},
"rpi-linux-stable-src": {
"flake": false,
"locked": {
"lastModified": 1728403745,
"narHash": "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=",
"owner": "raspberrypi",
"repo": "linux",
"rev": "5aeecea9f4a45248bcf564dec924965e066a7bfd",
"type": "github"
},
"original": {
"owner": "raspberrypi",
"ref": "stable_20241008",
"repo": "linux", "repo": "linux",
"rev": "cd231d4775b14f228606c09f219b48308f6ab3aa",
"type": "github" "type": "github"
} }
}, },
flake.nix
+1 -1
View File
@@ -33,7 +33,7 @@
nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main"; omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix"; raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";