ant/nix-system
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: ant:632061ac6122e17c9ab349a345034d48ece4f624
Branches Tags
ant:master
..
compare: ant:9dc02e7aabc9e86565557785b591c6b033111a53
Branches Tags
ant:master

No commits in common. "632061ac6122e17c9ab349a345034d48ece4f624" and "9dc02e7aabc9e86565557785b591c6b033111a53" have entirely different histories.
632061ac61 ... 9dc02e7aab

7 changed files with 62 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -192,16 +192,16 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1773122722,
"narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
"lastModified": 1736549401,
"narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
"rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
@ -244,11 +244,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1773351562,
"narHash": "sha256-H5flYFBFbyhMh0j+7aEbIBo2vyFmVIhJZNlKhRgOfBc=",
"rev": "398cfc9a93b3d1d56dd205839e30b5e7fe062fec",
"lastModified": 1773136055,
"narHash": "sha256-wvTn86J1kugxIBliYHW5+WQtm96+qt8dhJoSYE5pyHI=",
"rev": "3a062c2ba8d4b390090f53f6c38ce2c583098625",
"type": "tarball",
"url": "https://git.antoinevaure.fr/api/v1/repos/ant/st-flexipatch/archive/398cfc9a93b3d1d56dd205839e30b5e7fe062fec.tar.gz"
"url": "https://git.antoinevaure.fr/api/v1/repos/ant/st-flexipatch/archive/3a062c2ba8d4b390090f53f6c38ce2c583098625.tar.gz"
},
"original": {
"type": "tarball",

51
flake.nix
View file

@ -23,13 +23,14 @@
pkgs = inputs.nixpkgs.legacyPackages.${system};
pkgs-unstable = inputs.unstable.legacyPackages.${system};
nixgl = inputs.nixgl.packages.${system};
sshKeys = (import ./sshKeys.nix);
osConfig = modules: nixpkgs.lib.nixosSystem {
osConfig = name: nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs;
};
inherit modules;
modules = [
./os/${name}/configuration.nix
];
};
homeConfig = modules: inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;
@ -91,46 +92,10 @@
./home/moon.nix
];
nixosConfigurations.basado = osConfig [
./os/basado/configuration.nix
./os/basado/hardware-configuration.nix
./os/common.nix
./os/common-graphics.nix
(import ./os/remote-disk-unlock.nix ["igb"] (with sshKeys; [moon]))
./os/builder.nix
./os/kdeconnect-ports.nix
(import ./os/swapfile.nix 64)
./os/ccache.nix
];
nixosConfigurations.moon = osConfig [
./os/moon/configuration.nix
./os/moon/hardware-configuration.nix
./os/common.nix
./os/common-graphics.nix
./os/kdeconnect-ports.nix
];
nixosConfigurations.hs = osConfig [
./os/hs/configuration.nix
./os/hs/hardware-configuration.nix
./os/hs/syncthing.nix
./os/hs/disks.nix
./os/hs/backup.nix
./os/common.nix
./os/forgejo.nix
(import ./os/remote-disk-unlock.nix ["r8169"] (with sshKeys; [moon basado]))
./os/builder.nix
./os/ccache.nix
(import ./os/swapfile.nix 64)
];
nixosConfigurations.ks = osConfig [
./os/ks/configuration.nix
./os/ks/hardware-configuration.nix
./os/common.nix
./os/3proxy.nix
];
nixosConfigurations.basado = osConfig "basado";
nixosConfigurations.moon = osConfig "moon";
nixosConfigurations.hs = osConfig "hs";
nixosConfigurations.ks = osConfig "ks";
build-all = pkgs.runCommand "build-all" {
buildInputs =

2
home/ui.nix
View file

@ -30,7 +30,7 @@ in
nerd-fonts.caskaydia-cove
cascadia-code
inter
symbola
joypixels
bluetuith
keepmenu

15
os/basado/configuration.nix
View file

@ -1,5 +1,20 @@
{ config, pkgs, ... }:
let sshKeys = with (import ../../sshKeys.nix); [
moon
];
in
{
imports = [
./hardware-configuration.nix
../common.nix
../common-graphics.nix
(import ../remote-disk-unlock.nix ["igb"] sshKeys)
../builder.nix
../kdeconnect-ports.nix
(import ../swapfile.nix 64)
../ccache.nix
];
boot.loader = {
grub = {
enable = true;

22
os/hs/configuration.nix
View file

@ -1,10 +1,28 @@
{ config, pkgs, ... }:
let
sshKeys = import ../../sshKeys.nix;
sshKeys = with (import ../../sshKeys.nix); [
basado
moon
allegro
hs
];
domain = "antoinev.freeboxos.fr";
utils = import ../utils.nix;
in {
imports = [
./hardware-configuration.nix
./syncthing.nix
./disks.nix
./backup.nix
../common.nix
../forgejo.nix
(import ../remote-disk-unlock.nix ["r8169"] sshKeys)
../builder.nix
../ccache.nix
(import ../swapfile.nix 64)
];
boot = {
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
@ -31,7 +49,7 @@ in {
"wheel"
"jellyfin"
];
openssh.authorizedKeys.keys = (with sshKeys; [ basado moon allegro hs ]);
openssh.authorizedKeys.keys = sshKeys;
};
security.sudo.wheelNeedsPassword = false;

3
os/ks/configuration.nix
View file

@ -6,6 +6,9 @@ let
sshKeys = (import ../../sshKeys.nix);
in {
imports = [
./hardware-configuration.nix
../common.nix
../3proxy.nix
inputs.simple-nixos-mailserver.nixosModule
];

7
os/moon/configuration.nix
View file

@ -1,5 +1,12 @@
{ config, pkgs, ... }:
{
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
../common.nix
../common-graphics.nix
../kdeconnect-ports.nix
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;