From 42f13ee16fd8c5b1078ca5ec1bda1b0925e210eb Mon Sep 17 00:00:00 2001 From: rocketcamel Date: Thu, 26 Jun 2025 22:47:17 -0700 Subject: [PATCH] feat: add kumatani host, add kanshi profile --- nix/flake.nix | 4 + nix/hosts/kumatani/configuration.nix | 76 +++++++++++++++++++ nix/hosts/kumatani/hardware-configuration.nix | 39 ++++++++++ nix/modules/desktop.nix | 44 ++++++++++- 4 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 nix/hosts/kumatani/configuration.nix create mode 100644 nix/hosts/kumatani/hardware-configuration.nix diff --git a/nix/flake.nix b/nix/flake.nix index 05b1b6f..82549f7 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -48,6 +48,10 @@ architecture = "x86_64-linux"; isWSL = true; } + { + name = "kumatani"; + architecture = "x86_64-linux"; + } ]; in { diff --git a/nix/hosts/kumatani/configuration.nix b/nix/hosts/kumatani/configuration.nix new file mode 100644 index 0000000..834d30f --- /dev/null +++ b/nix/hosts/kumatani/configuration.nix @@ -0,0 +1,76 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ + config, + lib, + pkgs, + meta, + ... +}: + +{ + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + boot.loader.grub = { + enable = true; + efiSupport = true; + device = "nodev"; + efiInstallAsRemovable = true; + }; + networking.hostName = meta.hostname; + networking.networkmanager.enable = true; + hardware.bluetooth.enable = true; + hardware.nvidia = { + modesetting.enable = true; + open = true; + videoAcceleration = true; + }; + + time.timeZone = "America/Vancouver"; + + i18n.defaultLocale = "en_US.UTF-8"; + services.pipewire = { + enable = true; + pulse.enable = true; + }; + + security.sudo = { + enable = true; + wheelNeedsPassword = false; + }; + + desktop.enable = true; + kanata.enable = true; + users.users.luca = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + shell = pkgs.zsh; + packages = with pkgs; [ + tree + ]; + hashedPassword = config.hashedPassword; + openssh.authorizedKeys.keys = config.authorized_ssh; + }; + + hardware.graphics.enable = true; + environment.sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + NIXOS_OZONE_WL = "1"; + }; + + services.flatpak.enable = true; + environment.systemPackages = + with pkgs; + config.commonPackages + ++ [ + ]; + + services.openssh.enable = true; + + system.stateVersion = "25.11"; +} diff --git a/nix/hosts/kumatani/hardware-configuration.nix b/nix/hosts/kumatani/hardware-configuration.nix new file mode 100644 index 0000000..ca68748 --- /dev/null +++ b/nix/hosts/kumatani/hardware-configuration.nix @@ -0,0 +1,39 @@ +# 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, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/d751775f-e83d-4230-9228-d1b58c5cc534"; + fsType = "btrfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5C2F-86EC"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = [ ]; + + # 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..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nix/modules/desktop.nix b/nix/modules/desktop.nix index f74f994..37bcf10 100644 --- a/nix/modules/desktop.nix +++ b/nix/modules/desktop.nix @@ -33,10 +33,10 @@ pa_applet libnotify adwaita-icon-theme - swaybg gnome-themes-extra wl-clipboard wl-clip-persist + wdisplays ]; programs.thunar.enable = true; programs.hyprland.enable = true; @@ -70,6 +70,15 @@ }; services.hyprpolkitagent.enable = true; services.cliphist.enable = true; + services.hyprpaper = { + enable = true; + settings = { + preload = [ "~/dotfiles/.config/wallpaper/bg.jpg" ]; + wallpaper = [ + ",~/dotfiles/.config/wallpaper/bg.jpg" + ]; + }; + }; gtk = { enable = true; theme.name = "Adwaita-dark"; @@ -81,11 +90,38 @@ enable = true; style.name = "adwaita-dark"; }; + services.kanshi = { + enable = true; + settings = [ + { + profile.name = "main"; + profile.outputs = [ + { + criteria = "DP-1"; + status = "enable"; + scale = 1.0; + mode = "1920x1080"; + position = "0,190"; + } + { + criteria = "HDMI-A-1"; + status = "enable"; + scale = 1.0; + mode = "3440x1440"; + position = "1920,0"; + } + ]; + } + ]; + }; wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; systemd.enable = true; + extraConfig = '' + cursor:no_hardware_cursors=1 + ''; settings = { "$mod" = "SUPER"; "$terminal" = "ghostty"; @@ -141,13 +177,15 @@ }; }; env = [ - "XCURSOR_THEME, Adwaita" + "XCURSOR_THEME,Adwaita" "XCURSOR_SIZE,24" + "LIBVA_DRIVER_NAME,nvidia" + "__GLX_VENDOR_LIBRARY_NAME,nvidia" ]; exec-once = [ - "swaybg -i ~/.config/wallpaper/bg.jpg" "status-bar" "wl-clip-persist --clipboard regular" + "sleep 4 && kanshi" ]; monitor = [ "eDP-1, 1920x1080, 0x0, 1"