From 3cb7360f5e5a1759eb1e5bb1daafb3966b65ba52 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 3 Dec 2025 13:12:31 +0100 Subject: [PATCH] bweh --- hosts/denkbrett/hardware-configuration.nix | 83 +++++++++++++++------- hosts/denkbrett/modules/graphics.nix | 2 +- modules/desktop/dm.nix | 12 ++-- modules/desktop/home/layaway.nix | 1 - modules/desktop/home/niri/style.nix | 11 +-- modules/input/evremap.nix | 1 - modules/shell/git.nix | 14 ++-- 7 files changed, 73 insertions(+), 51 deletions(-) diff --git a/hosts/denkbrett/hardware-configuration.nix b/hosts/denkbrett/hardware-configuration.nix index 800ddc9..e37a94d 100644 --- a/hosts/denkbrett/hardware-configuration.nix +++ b/hosts/denkbrett/hardware-configuration.nix @@ -1,45 +1,74 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci_renesas" "xhci_pci" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci_renesas" + "xhci_pci" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; + fsType = "btrfs"; + options = [ + "subvol=@" + "compress=zstd:3" + ]; + }; - boot.initrd.luks.devices."luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122".device = "/dev/disk/by-uuid/9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; + boot.initrd.luks.devices."luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122".device = + "/dev/disk/by-uuid/9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; - fileSystems."/swap" = - { device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; - fsType = "btrfs"; - options = [ "subvol=@/@swap" ]; - }; + fileSystems."/swap" = { + device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; + fsType = "btrfs"; + options = [ + "subvol=@/@swap" + "noatime" + ]; + }; - fileSystems."/home" = - { device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; + fsType = "btrfs"; + options = [ + "subvol=@home" + "compress=zstd:3" + ]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C6CA-5DE8"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/C6CA-5DE8"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; - swapDevices = [ ]; + swapDevices = [ + { + device = "/swap/swapfile"; + size = 1024 * 24; + } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/denkbrett/modules/graphics.nix b/hosts/denkbrett/modules/graphics.nix index 3666bc9..8251f77 100644 --- a/hosts/denkbrett/modules/graphics.nix +++ b/hosts/denkbrett/modules/graphics.nix @@ -15,7 +15,7 @@ intel-vaapi-driver intel-compute-runtime libvdpau-va-gl - mesa.drivers + mesa ]; }; } diff --git a/modules/desktop/dm.nix b/modules/desktop/dm.nix index f4f3470..23edaaf 100644 --- a/modules/desktop/dm.nix +++ b/modules/desktop/dm.nix @@ -18,18 +18,16 @@ with lib; }; config.services = { displayManager = { + gdm = { + enable = true; + banner = "Meow :3"; + autoLogin.delay = cfg.autoLogin.delay; + }; autoLogin = { enable = cfg.autoLogin.enable; user = "jade"; }; defaultSession = "niri"; }; - xserver.displayManager.gdm = { - enable = true; - banner = "Meow :3"; - autoLogin = { - delay = cfg.autoLogin.delay; - }; - }; }; } diff --git a/modules/desktop/home/layaway.nix b/modules/desktop/home/layaway.nix index 7687d3b..d82afa4 100644 --- a/modules/desktop/home/layaway.nix +++ b/modules/desktop/home/layaway.nix @@ -16,7 +16,6 @@ let hash = "sha256-SzAuVFEy56svasO3+1p6ysBRrIQd0UZX++/P4ZuwWm0="; }; - useFetchCargoVendor = true; cargoHash = "sha256-QVxlkE+sq4U048LnshI/tq6HInKiSgjQLAdR+27/wEI="; meta = with lib; { diff --git a/modules/desktop/home/niri/style.nix b/modules/desktop/home/niri/style.nix index e9b0085..d41414e 100644 --- a/modules/desktop/home/niri/style.nix +++ b/modules/desktop/home/niri/style.nix @@ -10,11 +10,12 @@ hide-after-inactive-ms = 10000; }; - animations.window-open.easing = { - curve = "linear"; - duration-ms = 230; - }; - animations.shaders.window-open = builtins.readFile ./shaders/glitch-open.frag; + # animations.window-open = { + # kind = "easing"; + # curve = "linear"; + # duration-ms = 230; + # }; + # animations.window-open.custom-shader = builtins.readFile ./shaders/glitch-open.frag; layout = { gaps = 15; # :GAPS:- gaps = %GAPS%;-:# diff --git a/modules/input/evremap.nix b/modules/input/evremap.nix index 1c37c7e..8f13d89 100644 --- a/modules/input/evremap.nix +++ b/modules/input/evremap.nix @@ -15,7 +15,6 @@ let rev = "4480c4eda223b98899b0fbd926bc34f7bd0e1a18"; sha256 = "sha256-BxSrphgW1n465FX6bKVkq6O0XE2JqanfSYlsGwWUWkQ="; }; - useFetchCargoVendor = true; cargoHash = "sha256-O1rJ48m8Q7kZABw/UNpmUT7FFBWQedo6CuV+NX9kDt8="; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libevdev ]; diff --git a/modules/shell/git.nix b/modules/shell/git.nix index 52a2e40..f0315df 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -14,15 +14,11 @@ { programs.git = { enable = true; - userName = "Schrottkatze"; - userEmail = "git@schrottkatze.de"; - aliases = { - a = "add"; - c = "commit"; - ca = "commit --all"; - p = "push"; - pl = "pull"; - s = "status"; + settings = { + user = { + name = "Schrottkatze"; + email = "git@schrottkatze.de"; + }; }; signing = { format = "ssh";