Format with alejandra

This commit is contained in:
blahai 2024-12-20 15:11:42 +02:00
parent 4771948682
commit e08f66d286
No known key found for this signature in database
31 changed files with 398 additions and 278 deletions

View file

@ -1,6 +1,4 @@
{ config, pkgs, pkgs-smol, inputs, system, lib, ... }:
{
{ config, pkgs, pkgs-smol, inputs, lib, ... }: {
imports = [
./hardware-configuration.nix
../../modules/nixos/default.nix
@ -28,8 +26,8 @@
};
kernelPackages = pkgs.linuxPackages_6_12;
kernel = { sysctl = { "vm.max_map_count" = 2147483642; }; };
kernelParams = [
"elevator=none" # for zfs
kernelParams = [
"elevator=none" # for zfs
"zfs.zfs_arc_max=8589934592"
"nvme.noacpi=1"
];
@ -84,7 +82,6 @@
};
gnome.gnome-keyring.enable = true;
};
hardware.pulseaudio.enable = false;
@ -131,7 +128,6 @@
TimeoutStopSec = 10;
};
};
};
programs = {
@ -248,7 +244,8 @@
lua-language-server
nil
nixd
nixfmt-classic
nix-output-monitor
alejandra
zip
nodejs
typescript
@ -274,7 +271,6 @@
imagemagick
wireguard-tools
mission-center
nix-output-monitor
speedcrunch
geogebra
];
@ -298,6 +294,11 @@
enableSSHSupport = true;
};
programs.localsend = {
enable = true;
openFirewall = true;
};
services.openssh = {
enable = true;
settings = {
@ -307,5 +308,4 @@
};
system.stateVersion = "24.05";
}

View file

@ -1,78 +1,95 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "hid_generic" "uas" "sd_mod" ];
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" "amd-pstate" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "hid_generic" "uas" "sd_mod"];
boot.initrd.kernelModules = ["amdgpu"];
boot.kernelModules = ["kvm-amd" "amd-pstate"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "zpool/root";
fsType = "zfs";
options = [ "zfsutil" ];
options = ["zfsutil"];
};
fileSystems."/nix" = {
device = "zpool/nix";
fsType = "zfs";
options = [ "zfsutil" ];
options = ["zfsutil"];
};
fileSystems."/var" = {
device = "zpool/var";
fsType = "zfs";
options = [ "zfsutil" ];
options = ["zfsutil"];
};
fileSystems."/home" = {
device = "zpool/home";
fsType = "zfs";
options = [ "zfsutil" ];
options = ["zfsutil"];
};
fileSystems."/var/lib/virt/images" = {
device = "zpool/virt/images";
fsType = "zfs";
options = ["zfsutil"];
};
fileSystems."/var/lib/virt/disks" = {
device = "zpool/virt/disks";
fsType = "zfs";
options = ["zfsutil"];
};
fileSystems."/mnt/zootfs/Storage" = {
device = "zootfs/Storage";
fsType = "zfs";
options = [ "zfsutil" ];
options = ["zfsutil"];
};
fileSystems."/mnt/zootfs/Media" = {
device = "zootfs/Media";
fsType = "zfs";
options = [ "zfsutil" ];
options = ["zfsutil"];
};
# https://github.com/atuinsh/atuin/issues/952#issuecomment-1902164562
fileSystems."/home/pingu/.local/share/atuin" = {
device = "/dev/zvol/zpool/nixos/atuin";
fsType = "ext4";
options = [ "async" "auto" "nofail" ];
options = ["async" "auto" "nofail"];
};
fileSystems."/boot" = {
device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
options = ["fmask=0022" "dmask=0022"];
};
fileSystems."/mnt/ssd" = {
device = "/dev/disk/by-uuid/e4c31e1c-6667-4582-8d6a-d142d6118ce2";
fsType = "btrfs";
options = [ "async" "auto" "noatime" "rw" ];
options = ["async" "auto" "noatime" "rw"];
};
fileSystems."/mnt/ext" = {
device = "/dev/disk/by-uuid/43280a82-cf9a-452e-9bdc-a8cc66ccd7c8";
fsType = "btrfs";
options = [ "async" "auto" "nofail" "noatime" ];
options = ["async" "auto" "nofail" "noatime"];
};
swapDevices = [{ device = "/dev/disk/by-uuid/04281bd7-784a-4287-b4f2-ce406d2ab6ac"; }];
swapDevices = [{device = "/dev/disk/by-uuid/04281bd7-784a-4287-b4f2-ce406d2ab6ac";}];
# networking.useDHCP = lib.mkDefault true;
hardware.enableRedistributableFirmware = true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true;
}

View file

@ -1,4 +1,9 @@
{ inputs, config, pkgs, ... }: {
{
inputs,
config,
pkgs,
...
}: {
imports = [
../../modules/home-manager/default.nix
inputs.catppuccin.homeManagerModules.catppuccin
@ -23,10 +28,10 @@
autocrlf = "input";
};
url = {
"ssh://git@github.com/" = { insteadOf = "https://github.com/"; };
"ssh://git@github.com/" = {insteadOf = "https://github.com/";};
};
gpg = { format = "ssh"; };
init = { defaultBranch = "main"; };
gpg = {format = "ssh";};
init = {defaultBranch = "main";};
};
};
@ -45,12 +50,15 @@
gtk = {
enable = true;
catppuccin = {
};
catppuccin = {
gtk = {
enable = true;
flavor = "mocha";
accent = "pink";
size = "standard";
tweaks = [ "normal" ];
tweaks = ["normal"];
icon.enable = true;
};
};
@ -64,9 +72,12 @@
home.stateVersion = "24.11";
home.packages = with pkgs; [ obsidian ];
home.packages = with pkgs; [
obsidian
inputs.haivim.packages.${pkgs.system}.default
];
home.sessionVariables = { EDITOR = "nvim"; };
home.sessionVariables = {EDITOR = "nvim";};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;