why did this not format in the previous commit????

This commit is contained in:
blahai 2024-12-20 15:15:01 +02:00
parent e08f66d286
commit 997bff55a2
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc

View file

@ -1,4 +1,11 @@
{ config, pkgs, pkgs-smol, inputs, lib, ... }: { {
config,
pkgs,
pkgs-smol,
inputs,
lib,
...
}: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/nixos/default.nix ../../modules/nixos/default.nix
@ -16,16 +23,16 @@
}; };
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
supportedFilesystems = [ "zfs" "ext4" "btrfs" ]; supportedFilesystems = ["zfs" "ext4" "btrfs"];
zfs = { zfs = {
forceImportRoot = false; forceImportRoot = false;
extraPools = [ "zpool" "zootfs" ]; extraPools = ["zpool" "zootfs"];
devNodes = "/dev/disk/by-id"; devNodes = "/dev/disk/by-id";
package = pkgs.zfs; package = pkgs.zfs;
allowHibernation = true; # might cause corruption? allowHibernation = true; # might cause corruption?
}; };
kernelPackages = pkgs.linuxPackages_6_12; kernelPackages = pkgs.linuxPackages_6_12;
kernel = { sysctl = { "vm.max_map_count" = 2147483642; }; }; kernel = {sysctl = {"vm.max_map_count" = 2147483642;};};
kernelParams = [ kernelParams = [
"elevator=none" # for zfs "elevator=none" # for zfs
"zfs.zfs_arc_max=8589934592" "zfs.zfs_arc_max=8589934592"
@ -41,14 +48,15 @@
networking = { networking = {
hostName = "nyx"; hostName = "nyx";
hostId = builtins.substring 0 8 hostId =
builtins.substring 0 8
(builtins.hashString "md5" config.networking.hostName); (builtins.hashString "md5" config.networking.hostName);
networkmanager.enable = true; networkmanager.enable = true;
stevenblack = { stevenblack = {
enable = true; enable = true;
block = [ "fakenews" "gambling" ]; block = ["fakenews" "gambling"];
}; };
nameservers = [ "1.1.1.1" "1.0.0.1" "9.9.9.9" ]; nameservers = ["1.1.1.1" "1.0.0.1" "9.9.9.9"];
}; };
time.timeZone = "Europe/Helsinki"; time.timeZone = "Europe/Helsinki";
@ -91,7 +99,7 @@
pingu = { pingu = {
isNormalUser = true; isNormalUser = true;
description = "Elissa"; description = "Elissa";
extraGroups = [ "networkmanager" "wheel" "input" "render" ]; extraGroups = ["networkmanager" "wheel" "input" "render"];
shell = pkgs.fish; shell = pkgs.fish;
packages = with pkgs; [ packages = with pkgs; [
floorp floorp
@ -105,24 +113,23 @@
}; };
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
verbose = true; verbose = true;
backupFileExtension = "bak"; backupFileExtension = "bak";
users = { "pingu" = import ./home.nix; }; users = {"pingu" = import ./home.nix;};
}; };
systemd = { systemd = {
user.services.polkit-gnome-authentication-agent-1 = { user.services.polkit-gnome-authentication-agent-1 = {
description = "polkit-gnome-authentication-agent-1"; description = "polkit-gnome-authentication-agent-1";
wantedBy = [ "graphical-session.target" ]; wantedBy = ["graphical-session.target"];
wants = [ "graphical-session.target" ]; wants = ["graphical-session.target"];
after = [ "graphical-session.target" ]; after = ["graphical-session.target"];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 1; RestartSec = 1;
TimeoutStopSec = 10; TimeoutStopSec = 10;
@ -141,7 +148,7 @@
portalPackage = inputs.hyprland.packages."${pkgs.system}".hyprland; portalPackage = inputs.hyprland.packages."${pkgs.system}".hyprland;
}; };
direnv = { enable = true; }; direnv = {enable = true;};
nh = { nh = {
enable = true; enable = true;
@ -163,17 +170,17 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; nixPath = ["nixpkgs=${inputs.nixpkgs}"];
package = pkgs.lix; package = pkgs.lix;
settings = { settings = {
experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" ]; experimental-features = ["nix-command" "flakes" "auto-allocate-uids"];
max-jobs = "auto"; max-jobs = "auto";
sandbox = true; sandbox = true;
auto-optimise-store = true; auto-optimise-store = true;
keep-going = true; keep-going = true;
warn-dirty = false; warn-dirty = false;
use-xdg-base-directories = true; use-xdg-base-directories = true;
trusted-users = [ "@wheel" "pingu" "root" ]; trusted-users = ["@wheel" "pingu" "root"];
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://nixpkgs-unfree.cachix.org" "https://nixpkgs-unfree.cachix.org"
@ -193,8 +200,7 @@
qt.enable = true; qt.enable = true;
environment.sessionVariables.GST_PLUGIN_SYSTEM_PATH_1_0 = environment.sessionVariables.GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1; [
lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1; [
gst-plugins-good gst-plugins-good
gst-plugins-bad gst-plugins-bad
gst-plugins-ugly gst-plugins-ugly