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

Update flake

Browse source
This commit is contained in:
Invariantspace 2024-12-19 20:42:14 -08:00
parent cdd034fb96
commit 359a59476d
Signed by: macronova
GPG key ID: CE969670FB4B4A56
5 changed files with 38 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/default.nix
View file

@ -5,6 +5,7 @@
./constants.nix ./constants.nix
./secrets.nix ./secrets.nix
./users.nix ./users.nix
./nix.nix
]; ];
home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];

22
common/nix.nix Normal file
View file

@ -0,0 +1,22 @@
{config, ...}: {
nix = {
gc = {
automatic = true;
options = "--delete-older-than 30d";
};
settings = {
auto-optimise-store = true;
experimental-features = ["nix-command" "flakes"];
trusted-users = [config.constants.userName];
};
};
nixpkgs = {
config.allowUnfree = true;
config.permittedInsecurePackages = [
"aspnetcore-runtime-6.0.36"
"aspnetcore-runtime-wrapped-6.0.36"
"dotnet-sdk-6.0.428"
"dotnet-sdk-wrapped-6.0.428"
];
};
}

24
flake.lock generated
View file

@ -159,11 +159,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1734344598, "lastModified": 1734622215,
"narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "83ecd50915a09dca928971139d3a102377a8d242", "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +199,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1734162608, "lastModified": 1734591594,
"narHash": "sha256-m2AX+3eiVqIK6uO7GbGY7SFnkkYOlR5fQiNI0eRvWOQ=", "narHash": "sha256-7Q4hXE+b9A4DebZ5Q+q3WStuMiWR5bMW0ltpzbY/zMQ=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "31bdf4c7c91204d65afbde01146deee0259a8fb7", "rev": "ce2abe494524cdb389a5d31c11c41834d4362ac5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1734119587, "lastModified": 1734424634,
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,11 +516,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1733965552, "lastModified": 1734546875,
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"type": "github" "type": "github"
}, },
"original": { "original": {

27
flake.nix
View file

@ -34,33 +34,10 @@
modules = [ modules = [
# Import config from folder # Import config from folder
(linuxCfgDir + "/${instance}") (linuxCfgDir + "/${instance}")
# Setup Nix # Common setups
({pkgs, ...}: { ({pkgs, ...}: {
networking.hostName = instance; networking.hostName = instance;
nix = { nixpkgs.overlays = [nix-custom.overlays.default];
gc = {
automatic = true;
options = "--delete-older-than 30d";
};
settings = {
auto-optimise-store = true;
experimental-features = ["nix-command" "flakes"];
trusted-substituters = ["https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"];
};
};
nixpkgs = {
config.allowUnfree = true;
# TODO: Remove this when possible
config.permittedInsecurePackages = [
"aspnetcore-runtime-6.0.36"
"aspnetcore-runtime-wrapped-6.0.36"
"dotnet-sdk-6.0.428"
"dotnet-sdk-wrapped-6.0.428"
];
overlays = [nix-custom.overlays.default];
};
}) })
]; ];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};

11
linux/quasar/hardware-configuration.nix
View file

@ -13,20 +13,11 @@
]; ];
boot = { boot = {
extraModulePackages = [config.boot.kernelPackages.it87];
extraModprobeConfig = "options it87 force_id=0x8628";
initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod"]; initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod"];
kernelModules = ["coretemp" "kvm-amd" "it87"]; kernelModules = ["coretemp" "kvm-amd"];
kernelParams = ["acpi_enforce_resources=lax"];
}; };
# 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.useDHCP = lib.mkDefault true;
# networking.interfaces.enp10s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;