Merge branch 'flakes_update' into 'master'
Update NixOS Flakes See merge request Ciapa/infrastructure!6
This commit is contained in:
commit
4bf9404968
30
flake.lock
30
flake.lock
|
|
@ -9,11 +9,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683779844,
|
"lastModified": 1685948350,
|
||||||
"narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=",
|
"narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=",
|
||||||
"owner": "serokell",
|
"owner": "serokell",
|
||||||
"repo": "deploy-rs",
|
"repo": "deploy-rs",
|
||||||
"rev": "c80189917086e43d49eece2bd86f56813500a0eb",
|
"rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -40,11 +40,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683408522,
|
"lastModified": 1686319658,
|
||||||
"narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
|
"narHash": "sha256-tGWdoUAqKnE866mYFlEfc2a99kxFy31hOQJH5YQKrTQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
|
"rev": "ae766d59b07c450e0f1de8a1bfd6529089f40849",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -56,11 +56,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683504292,
|
"lastModified": 1685758009,
|
||||||
"narHash": "sha256-jlZbBIKGa6IMGkcJkQ08pbKnouTAPfeq1fD5I7l/rBw=",
|
"narHash": "sha256-IT4Z5WGhafrq+xbDTyuKrRPRQ1f+kVOtE+4JU1CHFeo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ba0086c178d4ed60a7899f739caea553eca2e046",
|
"rev": "eaf03591711b46d21abc7082a8ebee4681f9dbeb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -86,11 +86,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683545104,
|
"lastModified": 1685848844,
|
||||||
"narHash": "sha256-48wC0zzHAej/wLFWIgV+uj63AvQ2UUk85g7wmXJzTqk=",
|
"narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "36b062a2c85a0efb37de1300c79c54602a094fab",
|
"rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -134,11 +134,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681202837,
|
"lastModified": 1685518550,
|
||||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
23
flake.nix
23
flake.nix
|
|
@ -60,16 +60,6 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
"kitty.elmosco.lewd.wtf" = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = { inherit inputs self; };
|
|
||||||
modules = [
|
|
||||||
sops-nix.nixosModules.sops
|
|
||||||
./default.nix
|
|
||||||
./hosts/seedbox/kitty/configuration.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
"rene.elmosco.lewd.wtf" = nixpkgs.lib.nixosSystem {
|
"rene.elmosco.lewd.wtf" = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = { inherit inputs self; };
|
specialArgs = { inherit inputs self; };
|
||||||
|
|
@ -157,19 +147,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
"kitty.elmosco.lewd.wtf" = {
|
|
||||||
sshOpts = [ "-p" "22105" "-o" "StrictHostKeyChecking=no" ];
|
|
||||||
hostname = "kitty.elmosco.lewd.wtf";
|
|
||||||
fastConnection = true;
|
|
||||||
|
|
||||||
profiles.system = {
|
|
||||||
sshUser = "root";
|
|
||||||
path =
|
|
||||||
deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations."kitty.elmosco.lewd.wtf";
|
|
||||||
user = "root";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
"rene.elmosco.lewd.wtf" = {
|
"rene.elmosco.lewd.wtf" = {
|
||||||
sshOpts = [ "-p" "22113" "-o" "StrictHostKeyChecking=no" ];
|
sshOpts = [ "-p" "22113" "-o" "StrictHostKeyChecking=no" ];
|
||||||
hostname = "rene.elmosco.lewd.wtf";
|
hostname = "rene.elmosco.lewd.wtf";
|
||||||
|
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
{ self, config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
utils = import ../../../util/include.nix { lib = lib; };
|
|
||||||
imports =
|
|
||||||
(utils.includeDir ./services) ++
|
|
||||||
[
|
|
||||||
./hardware-configuration.nix
|
|
||||||
./networking.nix
|
|
||||||
./users.nix
|
|
||||||
];
|
|
||||||
in
|
|
||||||
{
|
|
||||||
inherit imports;
|
|
||||||
|
|
||||||
networking.hostName = "kitty";
|
|
||||||
networking.domain = "elmosco.lewd.wtf";
|
|
||||||
|
|
||||||
boot.loader.grub = {
|
|
||||||
enable = true;
|
|
||||||
efiSupport = false;
|
|
||||||
devices = [ "/dev/sda" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
system.stateVersion = "22.11";
|
|
||||||
}
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{ modulesPath, ... }:
|
|
||||||
{
|
|
||||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
|
||||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
|
|
||||||
fileSystems."/" = {
|
|
||||||
device = "/dev/disk/by-label/nixos";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/home" = {
|
|
||||||
device = "/dev/disk/by-label/home";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.qemuGuest.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
networking.defaultGateway = "192.168.99.1";
|
|
||||||
networking.nameservers = [ "1.1.1.1" ];
|
|
||||||
networking.interfaces.ens18.ipv4.addresses = [
|
|
||||||
{
|
|
||||||
address = "192.168.99.105";
|
|
||||||
prefixLength = 24;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{
|
|
||||||
virtualisation.oci-containers.containers = {
|
|
||||||
filebrowser = {
|
|
||||||
image = "filebrowser/filebrowser:s6";
|
|
||||||
autoStart = true;
|
|
||||||
ports = [ "80:8080" ];
|
|
||||||
volumes = [
|
|
||||||
"/home/kitty:/home/kitty"
|
|
||||||
"/home/kitty/filebrowser/config:/config"
|
|
||||||
"/home/kitty/filebrowser/database:/database"
|
|
||||||
];
|
|
||||||
environment = {
|
|
||||||
PUID = "1000";
|
|
||||||
PGID = "994";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[
|
|
||||||
../../../../deployments/seedbox/qbittorrent/default.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
variables.qbittorrent = {
|
|
||||||
user = "kitty";
|
|
||||||
group = "kitty";
|
|
||||||
torrentPort = 43991;
|
|
||||||
uiPort = 8888;
|
|
||||||
configDir = "/home/kitty";
|
|
||||||
openFilesLimit = 8192;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{ pkgs, ...}:
|
|
||||||
{
|
|
||||||
networking.firewall.allowedTCPPorts = [ 9000 ];
|
|
||||||
|
|
||||||
services.thelounge = {
|
|
||||||
enable = true;
|
|
||||||
public = false;
|
|
||||||
extraConfig = {
|
|
||||||
prefetch = true;
|
|
||||||
messageStorage = [ "sqlite" "text" ];
|
|
||||||
};
|
|
||||||
plugins = [ pkgs.theLoungePlugins.themes.solarized ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
users.groups.kitty = {};
|
|
||||||
users.users.kitty = {
|
|
||||||
group = "kitty";
|
|
||||||
isNormalUser = true;
|
|
||||||
home = "/home/kitty";
|
|
||||||
homeMode = "755";
|
|
||||||
createHome = true;
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIERtfY26/h5xl+bzZm2htR4+Wd879DvZRPHsosFaEqIW gaming@DESKTOP-4ACM3JU"
|
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQMGFxzIW62c1rudlhYOB9kKuzm3dZWu/PKh89GAtXccRz5Lq+AempZvuKX8LxvMoDsctocAmqKOfthQUUNP3rJtrEzyuEV7tpZ21oJ03ALW4uJUz306lsHoEjet6x2w83OmXp3p7bX+PphjVu83M2P6rO0QuWxSutoQRK/Zc09lSpJiSMqh8tH9rc7t3gBwhvhIRAWGBSjXBV0G5L+Ws8gGP+br5YhtHR39tq0EypV8ZfZs7Q8KQngioF+sX8ry0U0MNBC2ueTY0yGFpM1mE6OHW00gZPXxLb38oPvj2o76bMoI/jCqoX9C0YO1So6QM49Useiwxo2R6igDPYcT4r1g3Qdz5DXp1U/81qADxAl4IoeW6zMtrLXRAGa1qRlHA4HfOBjQShCdKbh0Vj927QPM2sSbVRngL7fNkUl19ChkA7HEMt8l446y9e84VCMpkYOBanUOZlpcGsn/TGlQVoWuk80ZgCt7fdP4JOHhmggvWiHhmJ4fDmSXxXQjRfL7k= kitty@fedora"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue