Compare commits
No commits in common. "3133e2bc51e8804b9d2575b7b283db67d4d1134b" and "54d2d8a6c6bf0f6fe4c982cc6d488af972a16849" have entirely different histories.
3133e2bc51
...
54d2d8a6c6
8 changed files with 27 additions and 39 deletions
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -5,11 +5,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777505151,
|
"lastModified": 1775213373,
|
||||||
"narHash": "sha256-ul1iRBfVX2vc971tHHhVtxX2hycU3nVwgO005OcOKnw=",
|
"narHash": "sha256-wJHsijC2l/E+ovmlpPGha8pXA6RHSwHWmBV97gvkmyI=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "e82c195f2276825b0a08024fdaff80f965edcd69",
|
"rev": "ba73719e673e7c2d89ac2f8df0bc0d48983e4907",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -62,11 +62,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777518431,
|
"lastModified": 1775622785,
|
||||||
"narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=",
|
"narHash": "sha256-/yFxO+7oS1SymDfJ2iVO7K5vJKcYfe9XGIJ+quLqz0Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2e54a938cdd4c8e414b2518edc3d82308027c670",
|
"rev": "527e47b78fe67213072f706bf933a9705a8c4974",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -78,11 +78,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776548001,
|
"lastModified": 1775036866,
|
||||||
"narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
|
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
|
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -109,11 +109,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777268161,
|
"lastModified": 1775423009,
|
||||||
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
10
flake.nix
10
flake.nix
|
|
@ -6,18 +6,18 @@
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/master";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
gl.url = "github:nix-community/nixGL";
|
gl.url = "github:nix-community/nixGL";
|
||||||
ctp.url = "github:catppuccin/nix";
|
ctp.url = "github:catppuccin/nix";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs: let
|
outputs = inputs: let
|
||||||
pkgs = import inputs.nixpkgs {
|
pkgs = import inputs.nixpkgs {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
overlays = [ inputs.gl.overlay ];
|
overlays = [ inputs.gl.overlay ];
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
permittedInsecurePackages = [ "ventoy-qt5-1.1.12" ];
|
permittedInsecurePackages = [ "ventoy-qt5-1.1.10" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
args = {
|
args = {
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
inputs.ctp.nixosModules.catppuccin
|
inputs.ctp.nixosModules.catppuccin
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosConfigWithHome = host: inputs.nixpkgs.lib.nixosSystem {
|
nixosConfigWithHome = host: inputs.nixpkgs.lib.nixosSystem {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
specialArgs = args // { hostname = host; };
|
specialArgs = args // { hostname = host; };
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
homeConfig = host: inputs.hm.lib.homeManagerConfiguration {
|
homeConfig = host: inputs.hm.lib.homeManagerConfiguration {
|
||||||
extraSpecialArgs = args // { hostname = host; };
|
extraSpecialArgs = args // { hostname = host; };
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
{ ... }: {
|
{ ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
# ./misc/cpu-hotplug.nix
|
./misc/cpu-hotplug.nix
|
||||||
# ./misc/serial.nix
|
./misc/serial.nix
|
||||||
# ./misc/qemu-virtio.nix
|
./misc/qemu-virtio.nix
|
||||||
# ^^ only used if vm
|
# ^^ only used if vm
|
||||||
|
|
||||||
./core/firmware.nix
|
./core/firmware.nix
|
||||||
|
|
|
||||||
|
|
@ -5,35 +5,26 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/e5a7d45d-b9e9-43e7-ba5f-f4e67821bd0b";
|
{ device = "/dev/disk/by-uuid/e33ab472-e518-4b4d-89d1-d75cfecb9f06";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/EC01-36B5";
|
{ device = "/dev/disk/by-uuid/880C-9F0A";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
options = [ "fmask=0077" "dmask=0077" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
}
|
||||||
}
|
|
||||||
|
|
@ -19,6 +19,5 @@ in {
|
||||||
device = "/mnt/data/apps/cryptpad";
|
device = "/mnt/data/apps/cryptpad";
|
||||||
depends = [ "/mnt/data" ];
|
depends = [ "/mnt/data" ];
|
||||||
options = [ "bind" "nofail" ];
|
options = [ "bind" "nofail" ];
|
||||||
fsType = "none";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,5 @@
|
||||||
device = "/mnt/data/apps/vaultwarden/data";
|
device = "/mnt/data/apps/vaultwarden/data";
|
||||||
depends = [ "/mnt/data" ];
|
depends = [ "/mnt/data" ];
|
||||||
options = [ "bind" "nofail" ];
|
options = [ "bind" "nofail" ];
|
||||||
fsType = "none";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -31,7 +31,6 @@ in {
|
||||||
device = "/mnt/data/apps/acme/${homelab.proxy.base}";
|
device = "/mnt/data/apps/acme/${homelab.proxy.base}";
|
||||||
depends = [ "/mnt/data" ];
|
depends = [ "/mnt/data" ];
|
||||||
options = [ "bind" "nofail" ];
|
options = [ "bind" "nofail" ];
|
||||||
fsType = "none";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
ts-flags = [
|
ts-flags = [
|
||||||
"--advertise-exit-node"
|
"--advertise-exit-node"
|
||||||
"--advertise-routes=10.3.14.0/24,192.168.1.0/24"
|
"--advertise-routes=10.3.14.0/24,192.168.1.0/24"
|
||||||
"--ssh"
|
"--ssh" "--webclient"
|
||||||
];
|
];
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue