gwg313/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some formatting

Browse source
This commit is contained in:
gwg313 2024-12-02 18:12:36 -05:00
parent c91faa5aaf
commit 57c3bb3e61
Signed by: gwg313
GPG key ID: 60FF63B4826B7400
21 changed files with 472 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hosts/candlekeep/configuration.sync-conflict-20240508-115349-N2TYFZ4.nix
View file

@ -8,7 +8,8 @@
pkgs,
user,
...
}: {
}:
{
# You can import other NixOS modules here
imports = [
# If you want to use modules your own flake exports (from modules/nixos):
@ -90,18 +91,17 @@
# This will add each flake input as a registry
# To make nix3 commands consistent with your flake
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
nix.registry = (lib.mapAttrs (_: flake: { inherit flake; })) (
(lib.filterAttrs (_: lib.isType "flake")) inputs
);
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nix.nixPath = ["/etc/nix/path"];
environment.etc =
lib.mapAttrs'
(name: value: {
name = "nix/path/${name}";
value.source = value.flake;
})
config.nix.registry;
nix.nixPath = [ "/etc/nix/path" ];
environment.etc = lib.mapAttrs' (name: value: {
name = "nix/path/${name}";
value.source = value.flake;
}) config.nix.registry;
networking.hostName = "candlekeep";
networking.networkmanager.enable = true;
@ -113,7 +113,7 @@
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILq54YrM3BbhBs0oDLOrc1bkg6FCCmkV4E3pWLZp0ejN gwg313@pm.me"
];
extraGroups = ["wheel"];
extraGroups = [ "wheel" ];
};
};

19
hosts/candlekeep/hardware-configuration.nix
View file

@ -7,16 +7,23 @@
pkgs,
modulesPath,
...
}: {
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
../../common/nixos/nfs.nix
];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/f2c87d99-ea17-4ef3-9ef6-bcc6637357f2";
@ -31,7 +38,7 @@
};
swapDevices = [
{device = "/dev/disk/by-uuid/dd8d717a-d872-4780-af3c-af4c702b587a";}
{ device = "/dev/disk/by-uuid/dd8d717a-d872-4780-af3c-af4c702b587a"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking

13
hosts/candlekeep/syncthing.nix
View file

@ -2,7 +2,8 @@
config,
user,
...
}: {
}:
{
services.syncthing = {
enable = true;
dataDir = "/home/gwg313";
@ -17,13 +18,15 @@
settings = {
devices = {
"grymforge" = {id = "N2TYFZ4-ODIIHIZ-UP27V4V-NYMAZNI-SIATS5S-5NTM6JX-A67HCZ5-ZB4TVQJ";};
"grymforge" = {
id = "N2TYFZ4-ODIIHIZ-UP27V4V-NYMAZNI-SIATS5S-5NTM6JX-A67HCZ5-ZB4TVQJ";
};
};
folders = {
"repos" = {
path = "/home/gwg313/repos";
devices = ["grymforge"];
devices = [ "grymforge" ];
versioning = {
type = "staggered";
params = {
@ -34,7 +37,7 @@
};
"documents" = {
path = "/home/gwg313/Documents";
devices = ["grymforge"];
devices = [ "grymforge" ];
versioning = {
type = "staggered";
params = {
@ -45,7 +48,7 @@
};
"obsidian" = {
path = "/home/gwg313/vault";
devices = ["grymforge"];
devices = [ "grymforge" ];
versioning = {
type = "staggered";
params = {

13
hosts/grymforge/syncthing.nix
View file

@ -2,7 +2,8 @@
config,
user,
...
}: {
}:
{
services.syncthing = {
enable = true;
dataDir = "/home/gwg313";
@ -17,13 +18,15 @@
settings = {
devices = {
"candlekeep" = {id = "762A3TK-Z3ZX6DG-V4VASMJ-H6DJHE5-PBD6YZQ-MPILUWT-E7EY4O7-4EAPHAX";};
"candlekeep" = {
id = "762A3TK-Z3ZX6DG-V4VASMJ-H6DJHE5-PBD6YZQ-MPILUWT-E7EY4O7-4EAPHAX";
};
};
folders = {
"repos" = {
path = "/home/gwg313/repos";
devices = ["candlekeep"];
devices = [ "candlekeep" ];
versioning = {
type = "staggered";
params = {
@ -34,7 +37,7 @@
};
"documents" = {
path = "/home/gwg313/Documents";
devices = ["candlekeep"];
devices = [ "candlekeep" ];
versioning = {
type = "staggered";
params = {
@ -45,7 +48,7 @@
};
"obsidian" = {
path = "/home/gwg313/vault";
devices = ["candlekeep"];
devices = [ "candlekeep" ];
versioning = {
type = "staggered";
params = {