From 5911da7f9982c004855752a920c011a98eff21bc Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Wed, 28 Jan 2026 10:05:27 +0000 Subject: [PATCH] various fixes --- flake.nix | 48 +++++++++++++++++------------------ hosts/doloro-laptop/nixos.nix | 4 +++ hosts/doloro/nixos.nix | 5 +++- modules/hyprland/nixos.nix | 4 +-- modules/hyprland/runner.nix | 24 ++++++++++++++++-- modules/hyprland/settings.nix | 6 ++--- 6 files changed, 59 insertions(+), 32 deletions(-) diff --git a/flake.nix b/flake.nix index c0ecb73..6ee6c3a 100644 --- a/flake.nix +++ b/flake.nix @@ -98,30 +98,30 @@ }; }); }) - ( - final: prev: - let - system = prev.stdenv.hostPlatform.system; - pkgs_gamescope = import inputs.nixpkgs-gamescope { - inherit system; - config = { - allow_unfree = true; - }; - }; - packageNix = "${inputs.nixpkgs-gamescope}/pkgs/by-name/ga/gamescope/package.nix"; - in - { - gamescope = pkgs_gamescope.callPackage packageNix { }; - } - ) - (self: super: { - intel-npu-driver = super.intel-npu-driver.overrideAttrs (oldAttrs: rec { - installPhase = '' - mkdir -p $out/lib/firmware - ${oldAttrs.installPhase} - ''; - }); - }) + # ( + # final: prev: + # let + # system = prev.stdenv.hostPlatform.system; + # pkgs_gamescope = import inputs.nixpkgs-gamescope { + # inherit system; + # config = { + # allow_unfree = true; + # }; + # }; + # packageNix = "${inputs.nixpkgs-gamescope}/pkgs/by-name/ga/gamescope/package.nix"; + # in + # { + # gamescope = pkgs_gamescope.callPackage packageNix { }; + # } + # ) + # (self: super: { + # intel-npu-driver = super.intel-npu-driver.overrideAttrs (oldAttrs: rec { + # installPhase = '' + # mkdir -p $out/lib/firmware + # ${oldAttrs.installPhase} + # ''; + # }); + # }) (final: prev: { vesktop = prev.vesktop.overrideAttrs (old: { preBuild = '' diff --git a/hosts/doloro-laptop/nixos.nix b/hosts/doloro-laptop/nixos.nix index bdcd16c..3f2fe33 100644 --- a/hosts/doloro-laptop/nixos.nix +++ b/hosts/doloro-laptop/nixos.nix @@ -61,6 +61,9 @@ in "doloro" ]; }; + + services.gnome.gnome-keyring.enable = true; + hardware = { firmware = [ pkgs.intel-npu-driver ]; cpu.intel = { @@ -149,6 +152,7 @@ in # tlp-pd brightnessctl nvtopPackages.intel + seahorse ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/hosts/doloro/nixos.nix b/hosts/doloro/nixos.nix index 7679fed..ea65385 100644 --- a/hosts/doloro/nixos.nix +++ b/hosts/doloro/nixos.nix @@ -31,6 +31,8 @@ in services.resolved.enable = true; + services.gnome.gnome-keyring.enable = true; + # Use the systemd-boot EFI boot loader. boot.loader.grub.enable = true; boot.loader.grub.device = "nodev"; @@ -234,7 +236,7 @@ in programs = { ssh = { # enable = true; - startAgent = true; + # startAgent = true; }; fish.enable = true; @@ -272,6 +274,7 @@ in wget killall sops + seahorse ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/modules/hyprland/nixos.nix b/modules/hyprland/nixos.nix index afc6014..2406d96 100644 --- a/modules/hyprland/nixos.nix +++ b/modules/hyprland/nixos.nix @@ -37,8 +37,8 @@ in package = pkgs-unstable.mesa; # if you also want 32-bit support (e.g for Steam) - enable32Bit = true; - package32 = pkgs-unstable.pkgsi686Linux.mesa; + # enable32Bit = true; + # package32 = pkgs-unstable.pkgsi686Linux.mesa; }; }; } diff --git a/modules/hyprland/runner.nix b/modules/hyprland/runner.nix index d40ebd6..20e451a 100644 --- a/modules/hyprland/runner.nix +++ b/modules/hyprland/runner.nix @@ -1,11 +1,31 @@ { inputs, pkgs, ... }: +let + config = pkgs.writeTextFile { + name = "config"; + text = '' + width = 100% + height = 100% + border-width = 0 + outline-width = 0 + padding-left = 35% + padding-top = 35% + result-spacing = 25 + num-results = 5 + font = monospace + background-color = #000A + ''; + }; + script = pkgs.writeShellScript "mreow" '' + exec $(tofi-drun -c ${config}) + ''; +in { home.packages = [ - pkgs.kickoff + pkgs.tofi ]; wayland.windowManager.hyprland.settings = { bind = [ - "$mainMod, R, exec, kickoff" + "$mainMod, R, exec, ${script}" ]; }; # systemd.user.services.hyprlauncher-deamon = { diff --git a/modules/hyprland/settings.nix b/modules/hyprland/settings.nix index b3f3fb1..b0b85f2 100644 --- a/modules/hyprland/settings.nix +++ b/modules/hyprland/settings.nix @@ -143,9 +143,9 @@ in ]; windowrule = [ "match:class .*, suppress_event maximize" - "match:class ^(gamescope)$, workspace 5" - "match:class ^(gamescope)$, fullscreen true" - "match:class ^(gamescope)$, immediate true" + "match:class gamescope, workspace 5" + "match:class gamescope, fullscreen true" + "match:class gamescope, immediate true" "match:class ^(steam)$, workspace 6 silent" "match:class ^(vesktop)$, workspace 8 silent" "match:class ^(org.telegram.desktop)$, workspace 8 silent"