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

Compare commits

base: doloro/dotfiles:6b8e08fb7ae49b7fcac81a0d3cde49e0b5b201bc
Branches Tags
doloro/dotfiles:main doloro/dotfiles:laptop-test-compile
...
compare: doloro/dotfiles:212af403dca50aebf8917fe711313e3895fce4ab
Branches Tags
doloro/dotfiles:main doloro/dotfiles:laptop-test-compile

2 Commits
6b8e08fb7a ... 212af403dc

Author SHA1 Message Date
doloro 212af403dc replaces rpi flake with a maintained one 2026-05-20 16:01:36 +01:00
doloro 1e8337e380 server: added docker reg 2026-05-20 11:54:03 +01:00
6 changed files with 226 additions and 215 deletions
Expand all files Collapse all files
config/hosts/aspects/doloro-desktop/host.nix
+10 -8
View File
@@ -6,15 +6,16 @@
__findFile,
lib,
...
}:
{
}: {
den.aspects.desktop = {
includes = [
modules.nix
];
nixos =
{ pkgs, config, ... }:
{
nixos = {
pkgs,
config,
...
}: {
boot.loader.grub.enable = true;
boot.loader.grub.device = "nodev";
boot.loader.grub.devices = [
@@ -45,7 +46,7 @@
enable = true;
};
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.videoDrivers = ["nvidia"];
fileSystems."/mnt/2tb" = {
device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
@@ -62,7 +63,6 @@
services.gnome.gnome-keyring.enable = true;
hardware.nvidia = {
# Modesetting is required.
modesetting.enable = true;
@@ -92,7 +92,9 @@
# Optionally, you may need to select the appropriate driver version for your specific GPU.
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,
modules,
...
}:
{
}: {
den.aspects.rpi5 = {
includes = [
<modules/raspberry-pi/5>
# <modules/services/traefik>
<modules/services/caddy>
<modules/services/home-assistant>
<modules/services/docker-registry>
<modules/services/ddns>
];
nixos = {
@@ -23,7 +23,7 @@
443
8080
];
allowedUDPPortRanges = [ ];
allowedUDPPortRanges = [];
};
virtualisation.docker.enable = true;
config/modules/raspberry-pi.nix
+4 -8
View File
@@ -4,20 +4,16 @@
modules,
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 = {
provides = {
"5" = {
nixos =
{ pkgs, ... }:
let
nixos = {pkgs, ...}: let
rpi-pi = inputs.raspberry-pi-nix;
in
{
in {
imports = [
rpi-pi.nixosModules.raspberry-pi
rpi-pi.nixosModules.sd-image
config/modules/services/registry.nix
+49
View File
@@ -0,0 +1,49 @@
{
den,
__findFile,
modules,
...
}: {
# Basic traefik
modules.services.provides.docker-registry = {
nixos = {
config,
pkgs,
...
}: let
registryImg = pkgs.dockerTools.pullImage {
imageName = "registry";
imageDigest = "sha256:85347ed2ecde64161c7a4788a4d7d3dcc9d6f86f7be95834022e3c6a423a945a";
finalImageName = "registry";
finalImageTag = "3";
sha256 = "sha256-rLG0q/MVVz52veqZuZs5W0Qke6FugXkx7fMe3QnE3gU";
arch = "arm64";
};
in {
virtualisation.oci-containers.containers = {
docker-registry = {
image = "registry";
imageFile = registryImg;
volumes = [
"/data/dockerRegistry:/var/lib/registry"
"/run/dbus:/run/dbus:ro"
"/etc/localtime:/etc/localtime:ro"
];
ports = ["0.0.0.0:5000:5000"];
# networks = [ "meow" ];
};
};
networking.firewall = {
allowedTCPPorts = [
5000
];
allowedUDPPortRanges = [];
};
services.caddy = pkgs.lib.mkIf config.services.caddy.enable {
virtualHosts."dockerRegistry.h.doloro.co.uk".extraConfig = ''
reverse_proxy :5000
'';
};
};
};
}
flake.lock
Generated
+75 -111
View File
@@ -104,11 +104,11 @@
"cachyos-kernel": {
"flake": false,
"locked": {
"lastModified": 1778851262,
"narHash": "sha256-lEtNQQdQkC1bWIxBr9po1cW6aD+UzAMxUbe6k3hH1tA=",
"lastModified": 1779085181,
"narHash": "sha256-ZdiBlGOkI9tS3ggyNlJ5gU4qCkvGWLT3sbrnHEemN2o=",
"owner": "CachyOS",
"repo": "linux-cachyos",
"rev": "e625438b981d774a22e2ba431a2d93e1737462ff",
"rev": "391e1e35d62d30dccd14ec3af01d58e5310b7d80",
"type": "github"
},
"original": {
@@ -120,11 +120,11 @@
"cachyos-kernel-patches": {
"flake": false,
"locked": {
"lastModified": 1778864443,
"narHash": "sha256-3OIBgFPMab0avw5A0OcnGrmRTAbw573aAIgYERYRZ8g=",
"lastModified": 1779082750,
"narHash": "sha256-yyk+TU5OF0JwTlTVqqvQIwsYWFZeSzGD5JqSUg52vHw=",
"owner": "CachyOS",
"repo": "kernel-patches",
"rev": "a62c86e5d6ce4efcd4f3be9526adfa52aa7286af",
"rev": "2c2eb7e421e954960dd336d7d45c24f949475958",
"type": "github"
},
"original": {
@@ -154,11 +154,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1778958912,
"narHash": "sha256-6pvS9rIF9mZRj1ENwu9fDLHeG1JFDTCpRyy6vJhXkTA=",
"lastModified": 1779226674,
"narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
"owner": "nix-community",
"repo": "disko",
"rev": "6e8dc7aa0e65fce67c76e18227a13a7d529f2cdf",
"rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
"type": "github"
},
"original": {
@@ -217,11 +217,11 @@
},
"flake-file": {
"locked": {
"lastModified": 1777679829,
"narHash": "sha256-zQxY90pq7BDbeimAiOfuK2U0huzo6oHOiC8zEpRgsbQ=",
"lastModified": 1779051720,
"narHash": "sha256-+jbXnODsR19pFKB0x/6kHhFgW6yV6N+CGClFr45eDU8=",
"owner": "vic",
"repo": "flake-file",
"rev": "04ca28cf570276e70a9a5f694791ab2a60f1f300",
"rev": "c58eb27d9434e5be0c8693f1eb18d47035bc21ba",
"type": "github"
},
"original": {
@@ -429,11 +429,11 @@
]
},
"locked": {
"lastModified": 1778954430,
"narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=",
"lastModified": 1779213149,
"narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a",
"rev": "bd868f769a69d3b6091a1da68a75cb83a181033c",
"type": "github"
},
"original": {
@@ -517,11 +517,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1778966108,
"narHash": "sha256-nq8lNb/YRIH6Re3AKtlJDjbx2RhhQYm1sCQVCf5moeY=",
"lastModified": 1779190425,
"narHash": "sha256-C0hPhLeo3ztBXYSnpYarYjw6HDvlgZRnNyFfG5PoaVI=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "24c5c13c2cef2b4324478f2fb8c2ecc386dd42d3",
"rev": "203a121537d0868bd4d8258b58861ca970483157",
"type": "github"
},
"original": {
@@ -796,16 +796,16 @@
"libpisp-src": {
"flake": false,
"locked": {
"lastModified": 1724944683,
"narHash": "sha256-Fo2UJmQHS855YSSKKmGrsQnJzXog1cdpkIOO72yYAM4=",
"lastModified": 1740559338,
"narHash": "sha256-tHfFcNSmXLcUHhqiGRh2YZT8xioUq0zMOMZl9rjG8ys=",
"owner": "raspberrypi",
"repo": "libpisp",
"rev": "28196ed6edcfeda88d23cc5f213d51aa6fa17bb3",
"rev": "50426319aa1a9ba4672f91977429365ad4e335a2",
"type": "github"
},
"original": {
"owner": "raspberrypi",
"ref": "v1.0.7",
"ref": "v1.2.0",
"repo": "libpisp",
"type": "github"
}
@@ -818,11 +818,11 @@
]
},
"locked": {
"lastModified": 1776018244,
"narHash": "sha256-rIuCVr2m4Lkz7j8mDUNqCz2R4Tzqyv/DTrr3yIis0Ec=",
"lastModified": 1779050451,
"narHash": "sha256-tnytppL6f/7YJ4hKceNmkKpmwwZOKuqBFKmIEKUmy6c=",
"ref": "refs/heads/main",
"rev": "a93e9362031abd8d5315c1487d118c04305feea2",
"revCount": 58,
"rev": "6c53c5847556d335f7a5ef97820d8bfae79fd280",
"revCount": 66,
"type": "git",
"url": "https://git.scug.io/nikkuss/pkgs.git"
},
@@ -843,11 +843,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1778942403,
"narHash": "sha256-SPCWvqeVySTNUgX/shARpRl5fi/NnkObUgDGR/Aco4c=",
"lastModified": 1779213531,
"narHash": "sha256-B4pOfIX6CpCD/cKckwNP3DYDxEUBG1x/K3vqwYNonx4=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "daefca3370581223fedc24d0101c4915a3689f9e",
"rev": "f4027707431220ffb660ae0da0e03fd5229ab4d9",
"type": "github"
},
"original": {
@@ -898,11 +898,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1778956518,
"narHash": "sha256-bbZMrzJtCqksaUBmAWSqmme/7PHEedPRAI3VmOSuP4A=",
"lastModified": 1779131761,
"narHash": "sha256-DIdXwxWzhECkp2n/OF15llkEHoGXLjwjCCg7oU+Qd2o=",
"owner": "xddxdd",
"repo": "nix-cachyos-kernel",
"rev": "ae5bc7641fb4178e4d9582ea49cab201f60f7869",
"rev": "56707a2b9725fd5b030f508565ae3a1327d6ac44",
"type": "github"
},
"original": {
@@ -914,11 +914,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1773628058,
"narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=",
"lastModified": 1778036283,
"narHash": "sha256-62EWg6lI0qyzm7oAx5cAnGkLutvJsRBe0KkEW2JDZCE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
"rev": "ed67bc86e84e51d4a88e73c7fd36006dc876476f",
"type": "github"
},
"original": {
@@ -945,11 +945,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1778737229,
"narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
"lastModified": 1779102034,
"narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
"rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
"type": "github"
},
"original": {
@@ -990,11 +990,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1778930970,
"narHash": "sha256-FqqcYr0c5in/HRL5bkRWykAGp/Q10Vj/zUiSr1P8URE=",
"lastModified": 1779024751,
"narHash": "sha256-fIE/HazjcoU/27WI3//uVg5AIntnVo1Q/GjMuBwPuHw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5a51fe22e18a6ce886b3cffa4c255378c151323c",
"rev": "3849902757e881ccbf21df80d592e3b94a35131c",
"type": "github"
},
"original": {
@@ -1019,11 +1019,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1778794387,
"narHash": "sha256-BL04pOS9453Awkeb9f90XBJXBSkWxN+vB7HIgnL0iMM=",
"lastModified": 1778869304,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a1b0127302ea51e05bf4ea5a291743fac442406",
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github"
},
"original": {
@@ -1051,11 +1051,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1736061677,
"narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
"lastModified": 1745279238,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
"rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
"type": "github"
},
"original": {
@@ -1085,11 +1085,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1778906310,
"narHash": "sha256-LqASEJRtLuKRBJd9051T1KMAEaYvsVrc6m64jhD6xbw=",
"lastModified": 1779231450,
"narHash": "sha256-5YgsQE2pzHw1YLiemIo55tQDWEeI7Og1n2D/X77kP2A=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "06cace835d7ee727852ac789e3dcd42fc2fd360e",
"rev": "5de0b035974d6281f0bab3e8ec46015c8ffbeed9",
"type": "github"
},
"original": {
@@ -1128,11 +1128,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1778886193,
"narHash": "sha256-4W9rjS2PN8iVcFYkJgiGOE/U383njIRFxrRnL/edo6c=",
"lastModified": 1779271700,
"narHash": "sha256-KtWAf0d6xkldTiR4J+m0qDn7uXb8zp/BlLWcHRbRAkg=",
"ref": "main",
"rev": "105e55b9baa8eafd7927038c59c43199444cf4b0",
"revCount": 60,
"rev": "a5095961bde9827989cf4ed2d6efac2781b9ce3e",
"revCount": 66,
"type": "git",
"url": "https://git.molez.org/mandlm/omp-nix"
},
@@ -1173,21 +1173,19 @@
"rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
"rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
"rpi-firmware-src": "rpi-firmware-src",
"rpi-linux-6_12_17-src": "rpi-linux-6_12_17-src",
"rpi-linux-6_6_78-src": "rpi-linux-6_6_78-src",
"rpi-linux-stable-src": "rpi-linux-stable-src",
"rpi-linux-6_12_20-src": "rpi-linux-6_12_20-src",
"rpicam-apps-src": "rpicam-apps-src"
},
"locked": {
"lastModified": 1742223591,
"narHash": "sha256-ZNTz8r5jlJ1jvpqf5+aUYgpnYJSVX0iP14doOc1Hm0E=",
"owner": "nix-community",
"lastModified": 1745517382,
"narHash": "sha256-yGuXArSvZ1AKOY6ufWbO3YNwYYMsYUk6aXOEYeYIJgk=",
"owner": "cmyk",
"repo": "raspberry-pi-nix",
"rev": "3e8100d5e976a6a2be363015cb33463af9ef441a",
"rev": "79d5db180b4e933389affeee0c8959ae5975c5c3",
"type": "github"
},
"original": {
"owner": "nix-community",
"owner": "cmyk",
"repo": "raspberry-pi-nix",
"type": "github"
}
@@ -1220,11 +1218,11 @@
"rpi-bluez-firmware-src": {
"flake": false,
"locked": {
"lastModified": 1708969706,
"narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=",
"lastModified": 1741017538,
"narHash": "sha256-t+D4VUfEIov83KV4wiKp6TqXTHXGkxg/mANi4GW7QHs=",
"owner": "RPi-Distro",
"repo": "bluez-firmware",
"rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
"rev": "2bbfb8438e824f5f61dae3f6ebb367a6129a4d63",
"type": "github"
},
"original": {
@@ -1237,11 +1235,11 @@
"rpi-firmware-nonfree-src": {
"flake": false,
"locked": {
"lastModified": 1723266537,
"narHash": "sha256-T7eTKXqY9cxEMdab8Snda4CEOrEihy5uOhA6Fy+Mhnw=",
"lastModified": 1741707399,
"narHash": "sha256-n2u6dnFGVUDfUBXR+xL+k6A78JThMJc2rDjvWblReEY=",
"owner": "RPi-Distro",
"repo": "firmware-nonfree",
"rev": "4b356e134e8333d073bd3802d767a825adec3807",
"rev": "3900afffcd85198e3afab396fbf1d0abe5f76173",
"type": "github"
},
"original": {
@@ -1254,68 +1252,34 @@
"rpi-firmware-src": {
"flake": false,
"locked": {
"lastModified": 1728405098,
"narHash": "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=",
"lastModified": 1742998042,
"narHash": "sha256-o198RfJe2UUEjtEJnAVMrEG5bQkZca1nzsaUKOKVAQo=",
"owner": "raspberrypi",
"repo": "firmware",
"rev": "7bbb5f80d20a2335066a8781459c9f33e5eebc64",
"rev": "f49a3960223f20ea0b2e30646f65be67bafe30dc",
"type": "github"
},
"original": {
"owner": "raspberrypi",
"ref": "1.20241008",
"ref": "1.20250326",
"repo": "firmware",
"type": "github"
}
},
"rpi-linux-6_12_17-src": {
"rpi-linux-6_12_20-src": {
"flake": false,
"locked": {
"lastModified": 1740765145,
"narHash": "sha256-hoCsGc4+RC/2LmxDtswLBL5ZhWlw4vSiL4Vkl39r2MU=",
"lastModified": 1742992765,
"narHash": "sha256-hSlzUXkfsWiE/HsSOEEx9RQlN4lXj2UV8Qgcfq1T5pg=",
"owner": "raspberrypi",
"repo": "linux",
"rev": "5985ce32e511f4e8279a841a1b06a8c7d972b386",
"rev": "cd231d4775b14f228606c09f219b48308f6ab3aa",
"type": "github"
},
"original": {
"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",
"rev": "cd231d4775b14f228606c09f219b48308f6ab3aa",
"type": "github"
}
},
flake.nix
+1 -1
View File
@@ -33,7 +33,7 @@
nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
nixvim.url = "github:nix-community/nixvim";
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 = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";