Compare commits

..

No commits in common. "b6117d062b214736bf667e0de919f78f79083c42" and "019781e6c6f2df71ed37ddf8fa0ff84c7a2692d6" have entirely different histories.

4 changed files with 9 additions and 162 deletions

103
flake.lock generated
View file

@ -33,22 +33,6 @@
"type": "github" "type": "github"
} }
}, },
"argononed": {
"flake": false,
"locked": {
"lastModified": 1729566243,
"narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=",
"owner": "nvmd",
"repo": "argononed",
"rev": "16dbee54d49b66d5654d228d1061246b440ef7cf",
"type": "github"
},
"original": {
"owner": "nvmd",
"repo": "argononed",
"type": "github"
}
},
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -82,21 +66,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -625,76 +594,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1791721963,
"narHash": "sha256-BYhx89XJltnRyQeuDKHVL5eSqbbfAcOKuDts7QRsrxQ=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "60a624466c08787ee8303393b7d4752d1826f14f",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixos-images": {
"inputs": {
"nixos-stable": [
"nixos-raspberrypi",
"nixpkgs"
],
"nixos-unstable": [
"nixos-raspberrypi",
"nixpkgs"
]
},
"locked": {
"lastModified": 1747747741,
"narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
"owner": "nvmd",
"repo": "nixos-images",
"rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
"type": "github"
},
"original": {
"owner": "nvmd",
"ref": "sdimage-installer",
"repo": "nixos-images",
"type": "github"
}
},
"nixos-raspberrypi": {
"inputs": {
"argononed": "argononed",
"flake-compat": "flake-compat_2",
"nixos-images": "nixos-images",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1785596452,
"narHash": "sha256-KT/OleUMpSKsWgi0eTuqS/0GD4ucPQcvLgmvlw8ZuCM=",
"owner": "nvmd",
"repo": "nixos-raspberrypi",
"rev": "7e39508bcf9c1da82cf11c1e22f74f9d9fd0fe10",
"type": "github"
},
"original": {
"owner": "nvmd",
"ref": "main",
"repo": "nixos-raspberrypi",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1790822859, "lastModified": 1790822859,
@ -780,8 +679,6 @@
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew", "nix-homebrew": "nix-homebrew",
"nixos-hardware": "nixos-hardware",
"nixos-raspberrypi": "nixos-raspberrypi",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nur": "nur", "nur": "nur",
"secrets": "secrets", "secrets": "secrets",

View file

@ -3,11 +3,7 @@
inputs = { inputs = {
# Nix main stuff # Nix main stuff
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs = { url = "github:nixos/nixpkgs/nixos-26.05"; };
nixos-hardware = {
url = "github:NixOS/nixos-hardware";
inputs.nixpkgs.follows = "nixpkgs";
};
nur = { nur = {
url = "github:nix-community/NUR"; url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -52,10 +48,6 @@
url = "github:zjeffer/split-monitor-workspaces"; url = "github:zjeffer/split-monitor-workspaces";
flake = false; flake = false;
}; };
nixos-raspberrypi = {
url = "github:nvmd/nixos-raspberrypi/main";
inputs.nixpkgs.follows = "nixpkgs";
};
# secrets # secrets
sops-nix = { sops-nix = {
@ -68,7 +60,7 @@
}; };
}; };
outputs = { self, nixpkgs, nix-darwin, nixos-raspberrypi, home-manager, ... } @ inputs: outputs = { self, nixpkgs, nix-darwin, home-manager, ... } @ inputs:
let let
blades = import ./hosts/servers/blades/systems.nix { inherit inputs; }; blades = import ./hosts/servers/blades/systems.nix { inherit inputs; };
in in
@ -83,11 +75,10 @@
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
iris = nixos-raspberrypi.lib.nixosSystem { iris = nixpkgs.lib.nixosSystem {
modules = [ modules = [
./hosts/base.nix ./hosts/base.nix
./hosts/servers/iris ./hosts/servers/iris
nixos-raspberrypi.nixosModules.raspberry-pi-3.base
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };

View file

@ -50,7 +50,6 @@
cores = 6; cores = 6;
}; };
}; };
systems = [ "aarch64-linux" ];
}; };
# Necessary for using flakes on this system. # Necessary for using flakes on this system.

View file

@ -8,64 +8,24 @@
networking.hostName = "iris"; networking.hostName = "iris";
system.nixos.tags = let
cfg = config.boot.loader.raspberry-pi;
in [
"raspberry-pi-${cfg.variant}"
cfg.bootloader
config.boot.kernelPackages.kernel.version
];
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
boot.loader.raspberry-pi.bootloader = "kernel"; boot.loader.generic-extlinux-compatible.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
swiftpm swiftpm
(python3.withPackages (ps: with ps; [ gpiozero rpi-gpio ]))
]; ];
services.udev.extraRules = ''
SUBSYSTEM=="gpio", KERNEL=="gpiochip*", GROUP="gpio", MODE="0660"
SUBSYSTEM=="gpiomem", GROUP="gpio", MODE="0660"
'';
nix.settings = {
substituters = [
"https://nixos-raspberrypi.cachix.org"
];
trusted-public-keys = [
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
];
};
users.groups.gpio = {};
users.users.nyxerinys.extraGroups = [ "gpio" ];
boot.supportedFilesystems.zfs = false;
boot.initrd.availableKernelModules = [ "usbhid" ]; boot.initrd.availableKernelModules = [ "usbhid" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "/dev/disk/by-label/NIXOS_SD"; { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot/firmware" = { swapDevices = [ ];
device = "/dev/disk/by-label/FIRMWARE";
fsType = "vfat";
options = [
"nofail"
"fmask=0077"
"dmask=0077"
"flush"
];
};
swapDevices = [{
device = "/swapfile";
size = 8 * 1024; # Adjust size in MiB as needed
}];
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
} }