I should commit more frequently 🫣
This commit is contained in:
parent
d7e82621c8
commit
f1483e45f0
70 changed files with 2344 additions and 599 deletions
hosts
|
@ -141,7 +141,10 @@
|
|||
({config, ...}: {
|
||||
home-manager.users."${user}" = {
|
||||
imports = extraHmModules;
|
||||
_module.args.age = config.age or {};
|
||||
_module.args = {
|
||||
age = config.age or {};
|
||||
fleetFlake = self;
|
||||
};
|
||||
};
|
||||
})
|
||||
]))
|
||||
|
@ -168,7 +171,7 @@
|
|||
hyprland.nixosModules.default
|
||||
];
|
||||
extraHmModules = with inputs; [
|
||||
# ccrEmacs.hmModules.default
|
||||
ccrEmacs.hmModules.default
|
||||
hyprland.homeManagerModules.default
|
||||
];
|
||||
overlays = [inputs.nil.overlays.default];
|
||||
|
@ -188,6 +191,9 @@
|
|||
"rock5b-wireguard-private-key" = {};
|
||||
"hercules-ci-join-token".owner = "hercules-ci-agent";
|
||||
"hercules-ci-binary-caches".owner = "hercules-ci-agent";
|
||||
"cachix-personal-token".owner = "ccr";
|
||||
"home-planimetry".owner = "hass";
|
||||
# "nextcloud-admin-pass".owner = "nextcloud";
|
||||
# "aws-credentials" = {};
|
||||
};
|
||||
colmena.deployment.buildOnTarget = true;
|
||||
|
@ -213,13 +219,12 @@
|
|||
# hydra.nixosModules.hydra
|
||||
];
|
||||
extraHmModules = [
|
||||
# inputs.ccrEmacs.hmModules.default
|
||||
inputs.ccrEmacs.hmModules.default
|
||||
{
|
||||
# TODO: remove after https://github.com/nix-community/home-manager/pull/3811
|
||||
imports = let
|
||||
hmModules = "${inputs.homeManagerGitWorkspace}/modules";
|
||||
in [
|
||||
"${hmModules}/programs/git-workspace.nix"
|
||||
"${hmModules}/services/git-workspace.nix"
|
||||
];
|
||||
}
|
||||
|
@ -232,7 +237,7 @@
|
|||
"magit-forge-github-token".owner = "ccr";
|
||||
# "hydra-admin-password".owner = "root";
|
||||
# "hydra-github-token".group = "hydra";
|
||||
"cache-private-key".owner = "nix-serve";
|
||||
# "cache-private-key".owner = "nix-serve";
|
||||
"hercules-ci-join-token".owner = "hercules-ci-agent";
|
||||
"hercules-ci-binary-caches".owner = "hercules-ci-agent";
|
||||
# "minio-credentials".owner = "minio";
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
"nix"
|
||||
# "vm-sala"
|
||||
"vm-mara"
|
||||
# "vm-ubuntu"
|
||||
# "hydra"
|
||||
"hercules-ci"
|
||||
"nix-serve"
|
||||
|
@ -23,13 +24,14 @@
|
|||
# "minio"
|
||||
"proxy"
|
||||
# "binfmt"
|
||||
"xdg"
|
||||
];
|
||||
|
||||
ccr = {
|
||||
enable = true;
|
||||
autologin = true;
|
||||
modules = [
|
||||
# "emacs"
|
||||
"emacs"
|
||||
"git"
|
||||
"gpg"
|
||||
"helix"
|
||||
|
@ -62,6 +64,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
environment.enableAllTerminfo = true;
|
||||
|
||||
nixpkgs.config.joypixels.acceptLicense = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [waypipe];
|
||||
|
|
|
@ -12,10 +12,16 @@
|
|||
"ssh"
|
||||
"ccr"
|
||||
"wireguard-client"
|
||||
"minidlna"
|
||||
# "minidlna"
|
||||
"mediatomb"
|
||||
"transmission"
|
||||
"hercules-ci"
|
||||
"bubbleupnp"
|
||||
# "bubbleupnp"
|
||||
# "nextcloud"
|
||||
"home-assistant"
|
||||
# "immich"
|
||||
"adguard-home"
|
||||
# "mount-hetzner-box"
|
||||
]
|
||||
++ [
|
||||
./disko.nix
|
||||
|
@ -55,6 +61,12 @@
|
|||
# in ["credentials=${credentials},x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"];
|
||||
# };
|
||||
|
||||
fileSystems."/mnt/hd" = {
|
||||
device = "/dev/disk/by-id/ata-WDC_WD10EADS-22M2B0_WD-WCAV52709550-part1";
|
||||
fsType = "ext4";
|
||||
options = ["nofail"];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# kodi-rock5b
|
||||
cifs-utils
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
let
|
||||
emmc = "/dev/mmcblk0";
|
||||
hd1 = "/dev/disk/by-id/ata-WDC_WD10EADS-22M2B0_WD-WCAV52709550";
|
||||
hd2 = "/dev/disk/by-id/ata-WDC_WD10EADX-22TDHB0_WD-WCAV5V359530";
|
||||
# hd1 = "/dev/disk/by-id/ata-WDC_WD10EADS-22M2B0_WD-WCAV52709550";
|
||||
# hd2 = "/dev/disk/by-id/ata-WDC_WD10EADX-22TDHB0_WD-WCAV5V359530";
|
||||
hd = "/dev/disk/by-id/ata-WDC_WD10EADS-22M2B0_WD-WCAV52709550-part1";
|
||||
# old_hd = "/dev/disk/by-id/ata-WDC_WD5000AAKX-08U6AA0_WD-WCC2E5TR40FU";
|
||||
in {
|
||||
disko.devices = {
|
||||
|
@ -33,67 +34,87 @@ in {
|
|||
];
|
||||
};
|
||||
};
|
||||
hd1 = {
|
||||
type = "disk";
|
||||
device = hd1;
|
||||
content = {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
{
|
||||
name = "primary";
|
||||
start = "0";
|
||||
end = "100%";
|
||||
content = {
|
||||
type = "mdraid";
|
||||
name = "raid1";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
hd2 = {
|
||||
type = "disk";
|
||||
device = hd2;
|
||||
content = {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
{
|
||||
name = "primary";
|
||||
start = "0";
|
||||
end = "100%";
|
||||
content = {
|
||||
type = "mdraid";
|
||||
name = "raid1";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
# hd = {
|
||||
# type = "disk";
|
||||
# device = hd;
|
||||
# content = {
|
||||
# type = "table";
|
||||
# format = "gpt";
|
||||
# partitions = [
|
||||
# {
|
||||
# name = "hd";
|
||||
# start = "0%";
|
||||
# end = "100%";
|
||||
# content = {
|
||||
# type = "filesystem";
|
||||
# format = "ext4";
|
||||
# mountpoint = "/mnt/hd";
|
||||
# };
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
# hd1 = {
|
||||
# type = "disk";
|
||||
# device = hd1;
|
||||
# content = {
|
||||
# type = "table";
|
||||
# format = "gpt";
|
||||
# partitions = [
|
||||
# {
|
||||
# name = "primary";
|
||||
# start = "0";
|
||||
# end = "100%";
|
||||
# content = {
|
||||
# type = "mdraid";
|
||||
# name = "raid1";
|
||||
# };
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
# hd2 = {
|
||||
# type = "disk";
|
||||
# device = hd2;
|
||||
# content = {
|
||||
# type = "table";
|
||||
# format = "gpt";
|
||||
# partitions = [
|
||||
# {
|
||||
# name = "primary";
|
||||
# start = "0";
|
||||
# end = "100%";
|
||||
# content = {
|
||||
# type = "mdraid";
|
||||
# name = "raid1";
|
||||
# };
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
mdadm = {
|
||||
raid1 = {
|
||||
type = "mdadm";
|
||||
level = 1;
|
||||
content = {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
{
|
||||
name = "primary";
|
||||
start = "0";
|
||||
end = "100%";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/mnt/raid";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
# mdadm = {
|
||||
# raid1 = {
|
||||
# type = "mdadm";
|
||||
# level = 1;
|
||||
# content = {
|
||||
# type = "table";
|
||||
# format = "gpt";
|
||||
# partitions = [
|
||||
# {
|
||||
# name = "primary";
|
||||
# start = "0";
|
||||
# end = "100%";
|
||||
# content = {
|
||||
# type = "filesystem";
|
||||
# format = "ext4";
|
||||
# mountpoint = "/mnt/raid";
|
||||
# };
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
"xdg"
|
||||
"nix-development"
|
||||
"clamav"
|
||||
"waydroid"
|
||||
# "gnome-keyring"
|
||||
];
|
||||
|
||||
ccr = {
|
||||
|
@ -42,12 +44,14 @@
|
|||
"digikam"
|
||||
"discord"
|
||||
"element"
|
||||
# "nheko"
|
||||
# "thunderbird"
|
||||
"aerc"
|
||||
# "emacs"
|
||||
"emacs"
|
||||
"firefox"
|
||||
"git"
|
||||
"gpg"
|
||||
"gnome-keyring"
|
||||
"helix"
|
||||
"mopidy"
|
||||
"mpv"
|
||||
|
@ -68,11 +72,14 @@
|
|||
"lutris"
|
||||
"wine"
|
||||
"remmina"
|
||||
"whatsapp"
|
||||
# "pantalaimon"
|
||||
];
|
||||
packages = with pkgs; [
|
||||
comma
|
||||
dolphin-emu-beta
|
||||
sc-controller
|
||||
libreoffice
|
||||
];
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
|
@ -173,7 +180,7 @@
|
|||
# services.openssh.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ 5000];
|
||||
networking.firewall.allowedTCPPorts = [8000];
|
||||
# networking.firewall.allowedUDPPorts = [ 5000 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue