From 32d8f9bd4ff76a59c2d4271b71da9aa3c2ad5869 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Tue, 17 Feb 2026 23:40:43 +0000 Subject: [PATCH] ba --- .../hosts/aspects/doloro-desktop/hardware.nix | 5 ++-- config/hosts/aspects/doloro-desktop/home.nix | 25 ++++++++++++++++++- config/hosts/aspects/doloro-desktop/host.nix | 3 +++ config/hosts/computers.nix | 17 ++++++------- config/modules/dunst.nix | 12 +++++---- config/modules/helium.nix | 1 + config/modules/hyprland/doloro-settings.nix | 4 +++ 7 files changed, 50 insertions(+), 17 deletions(-) diff --git a/config/hosts/aspects/doloro-desktop/hardware.nix b/config/hosts/aspects/doloro-desktop/hardware.nix index 21421f2..1396a41 100644 --- a/config/hosts/aspects/doloro-desktop/hardware.nix +++ b/config/hosts/aspects/doloro-desktop/hardware.nix @@ -4,6 +4,7 @@ nixos = { modulesPath, + lib, pkgs, config, ... @@ -23,8 +24,8 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - nixpkgs.hostPlatform = pkgs.lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = pkgs.lib.mkDefault config.hardware.enableRedistributableFirmware; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; }; } diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 4774ec7..ea57ff0 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -11,12 +11,18 @@ den.aspects.doloro-shared modules.sops modules.hyprland + modules.fish + modules.tuigreet + modules.kitty + modules.fonts (modules.obs { virtual_audio_devices = true; autostart = true; }) + modules.helium + modules.stylix ]; nixos = { config, pkgs, ... }: @@ -29,9 +35,26 @@ homeManager = { home, pkgs, ... }: { + wayland.windowManager.hyprland.settings = { + monitor = [ + "HDMI-A-1, 1920x1080@60, 0x0, 1" + "DP-3, 1920x1080@144, 1920x0, 1" + ]; + exec-once = [ + "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor + ]; + workspace = [ + "name:2, monitor:DP-3" + ]; + input = { + kb_layout = "gb"; + follow_mouse = 2; + sensitivity = -0.5; + }; + }; home.packages = with pkgs; [ legcord - telegram + telegram-desktop ]; }; }; diff --git a/config/hosts/aspects/doloro-desktop/host.nix b/config/hosts/aspects/doloro-desktop/host.nix index 71cafef..82a8873 100644 --- a/config/hosts/aspects/doloro-desktop/host.nix +++ b/config/hosts/aspects/doloro-desktop/host.nix @@ -31,6 +31,8 @@ "rd.systemd.show_status=auto" ]; + services.openssh.enable = true; + networking.networkmanager.enable = true; networking.firewall.enable = false; @@ -54,6 +56,7 @@ "exec" ]; }; + services.gnome.gnome-keyring.enable = true; hardware.nvidia = { diff --git a/config/hosts/computers.nix b/config/hosts/computers.nix index 4a2b0a2..8e423e3 100644 --- a/config/hosts/computers.nix +++ b/config/hosts/computers.nix @@ -1,20 +1,19 @@ { den, __findFile, ... }: { # Homes - # den.homes.x86_64-linux.doloro-desktop = { - # userName = "doloro"; - # }; + den.homes.x86_64-linux.doloro-desktop = { + userName = "doloro"; + }; # TODO den.homes.x86_64-linux.doloro-laptop = { userName = "doloro"; }; # Machines - # den.hosts.x86_64-linux.desktop = { - # users.doloro = { - # includes = [ ]; - # aspect = "doloro-desktop"; - # }; - # }; + den.hosts.x86_64-linux.desktop = { + users.doloro = { + aspect = "doloro-desktop"; + }; + }; # TODO den.hosts.x86_64-linux.laptop = { users.doloro = { diff --git a/config/modules/dunst.nix b/config/modules/dunst.nix index 3a63e90..0afb9a7 100644 --- a/config/modules/dunst.nix +++ b/config/modules/dunst.nix @@ -1,11 +1,13 @@ { modules, ... }: { modules.dunst = { - services.dunst = { - enable = true; - settings = { - global = { - font = "Noto Nerd Font 8"; + homeManager = { + services.dunst = { + enable = true; + settings = { + global = { + font = "Noto Nerd Font 8"; + }; }; }; }; diff --git a/config/modules/helium.nix b/config/modules/helium.nix index d0aef24..295402a 100644 --- a/config/modules/helium.nix +++ b/config/modules/helium.nix @@ -18,6 +18,7 @@ home.packages = [ inputs.heliumFlake.packages.x86_64-linux.helium ]; + nixpkgs.config.allowUnfree = true; # Gives me widevine support. yay xdg.configFile."net.imput.helium/WidevineCdm/latest-component-updated-widevine-cdm" = { text = ''{"Path":"${pkgs.widevine-cdm}/share/google/chrome/WidevineCdm"}''; diff --git a/config/modules/hyprland/doloro-settings.nix b/config/modules/hyprland/doloro-settings.nix index ee4703c..8919920 100644 --- a/config/modules/hyprland/doloro-settings.nix +++ b/config/modules/hyprland/doloro-settings.nix @@ -3,6 +3,9 @@ modules.hyprland = { provides = { doloro-settings = { + includes = [ + modules.dunst + ]; homeManager = { pkgs, home, ... }: { @@ -10,6 +13,7 @@ pkgs.hyprcursor pkgs.wlogout pkgs.tofi + pkgs.killall ]; home.pointerCursor = { enable = true;