From a6871f94a8fef2053ae822b0d8e88bf62f94f497 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 6 Aug 2025 11:22:10 +0200 Subject: [PATCH] stuff --- home/lukas/catppuccin.nix | 2 ++ home/lukas/hyprland.nix | 3 ++- home/lukas/packages.nix | 7 +++++++ hosts/segfault-machine/configuration.nix | 2 ++ hosts/segfault-machine/hardware.nix | 5 +++++ modules/input/katana.nix | 11 ----------- modules/system/gpg.nix | 10 ++++++++++ modules/system/virtualbox.nix | 14 ++++++++++++++ 8 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 modules/system/gpg.nix create mode 100644 modules/system/virtualbox.nix diff --git a/home/lukas/catppuccin.nix b/home/lukas/catppuccin.nix index 250f692..bd532b9 100644 --- a/home/lukas/catppuccin.nix +++ b/home/lukas/catppuccin.nix @@ -13,6 +13,8 @@ accent = "mauve"; }; + gtk.enable = true; + waybar.enable = false; rofi.enable = false; }; diff --git a/home/lukas/hyprland.nix b/home/lukas/hyprland.nix index 50d26d6..e0b22ee 100644 --- a/home/lukas/hyprland.nix +++ b/home/lukas/hyprland.nix @@ -8,12 +8,13 @@ exec-once = [ "waybar" "dunst" + "kwalletd6" "nm-applet" "blueman-applet" "swww-daemon" "swayidle -w timeout 300 'hyprlock' timeout 360 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'hyprlock'" "swww img $HOME/Bilder/Wallpapers/mountain.jpg" - + "nextcloud" ]; env = [ diff --git a/home/lukas/packages.nix b/home/lukas/packages.nix index 6e837b3..df7214d 100644 --- a/home/lukas/packages.nix +++ b/home/lukas/packages.nix @@ -16,6 +16,9 @@ pkgs.wget pkgs.unzip + pkgs.zathura + pkgs.xfce.thunar + pkgs.nerd-fonts.fira-code pkgs.fira-code pkgs.meslo-lgs-nf @@ -24,11 +27,15 @@ pkgs.bat pkgs.ripgrep + pkgs.seahorse + pkgs.binutils pkgs.gcc pkgs.nil + pkgs.quickemu + pkgs.zotero (pkgs.aspellWithDicts diff --git a/hosts/segfault-machine/configuration.nix b/hosts/segfault-machine/configuration.nix index 5dcbb82..f0437f2 100644 --- a/hosts/segfault-machine/configuration.nix +++ b/hosts/segfault-machine/configuration.nix @@ -10,6 +10,8 @@ ../../modules/system/audio.nix ../../modules/system/printing.nix ../../modules/system/docker.nix + ../../modules/system/gpg.nix + ../../modules/system/virtualbox.nix ]; networking.hostName = "segfault-machine"; diff --git a/hosts/segfault-machine/hardware.nix b/hosts/segfault-machine/hardware.nix index 66c3241..0dc9195 100644 --- a/hosts/segfault-machine/hardware.nix +++ b/hosts/segfault-machine/hardware.nix @@ -13,6 +13,9 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + boot.kernelParams = [ "amd_iommu=on" ]; + + fileSystems."/" = { device = "/dev/disk/by-uuid/5af0ed50-72c4-4bee-8c6e-7b0556cffbc7"; fsType = "ext4"; @@ -41,5 +44,7 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + services.hardware.bolt.enable = true; + services.fwupd.enable = true; } diff --git a/modules/input/katana.nix b/modules/input/katana.nix index d178014..2d88e93 100644 --- a/modules/input/katana.nix +++ b/modules/input/katana.nix @@ -28,17 +28,6 @@ enable = true; keyboards = { internalKeyboard = { - devices = [ - # Replace the paths below with the appropriate device paths for your setup. - # Use `ls /dev/input/by-path/` to find your keyboard devices. - "/dev/input/by-path/pci-0000:66:00.0-usb-0:2.3:1.0-event-kbd" - "/dev/input/by-path/pci-0000:66:00.0-usb-0:2.4:1.0-event-kbd" - "/dev/input/by-path/pci-0000:66:00.0-usb-0:2.4:1.2-event-kbd" - "/dev/input/by-path/pci-0000:66:00.0-usbv2-0:2.3:1.0-event-kbd" - "/dev/input/by-path/pci-0000:66:00.0-usbv2-0:2.4:1.0-event-kbd" - "/dev/input/by-path/pci-0000:66:00.0-usbv2-0:2.4:1.2-event-kbd" - "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - ]; extraDefCfg = "process-unmapped-keys yes"; config = '' (defsrc diff --git a/modules/system/gpg.nix b/modules/system/gpg.nix new file mode 100644 index 0000000..fecf019 --- /dev/null +++ b/modules/system/gpg.nix @@ -0,0 +1,10 @@ +{pkgs, ...}: + +{ + services.pcscd.enable = true; + programs.gnupg.agent = { + enable = true; + pinentryPackage = pkgs.pinentry-curses; + enableSSHSupport = true; + }; +} diff --git a/modules/system/virtualbox.nix b/modules/system/virtualbox.nix new file mode 100644 index 0000000..792ccdc --- /dev/null +++ b/modules/system/virtualbox.nix @@ -0,0 +1,14 @@ +{ + nixpkgs.config.allowUnfree = true; + + virtualisation.virtualbox.host = { + enable = true; + enableKvm = true; + + enableHardening = false; + addNetworkInterface = false; + }; + + users.extraGroups.vboxusers.members = [ "lukas" ]; + virtualisation.virtualbox.host.enableExtensionPack = true; +}