From d37e468ae83df132a6c24747bb48a5e253e9adb4 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Wed, 18 Mar 2026 11:04:59 +0000 Subject: [PATCH] meow ? --- config/hosts/aspects/doloro-desktop/home.nix | 2 +- config/modules/hyprland/hyprland.nix | 13 +++++- config/modules/niri/niri.nix | 49 +++++++++++++++----- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index aa31199..de22601 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -25,7 +25,7 @@ ( { default = true; }) - modules.niri # Testing + # modules.niri # Testing modules.stylix modules.quickshell modules.nix-ld diff --git a/config/modules/hyprland/hyprland.nix b/config/modules/hyprland/hyprland.nix index 48bbdc8..dc8ada1 100644 --- a/config/modules/hyprland/hyprland.nix +++ b/config/modules/hyprland/hyprland.nix @@ -1,6 +1,7 @@ { modules, inputs, + lib, ... }: { @@ -17,6 +18,7 @@ grim slurp wlogout + ranger ]; programs.xwayland.enable = true; programs.hyprland = { @@ -28,9 +30,13 @@ portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; + # gtk.enable = lib.mkForce false; xdg.portal = { - enable = true; - # extraPortals = [ pkgs.xdg-desktop-portal-cosmic ]; + enable = lib.mkForce false; + extraPortals = [ + pkgs.xdg-desktop-portal-termfilechooser + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland + ]; }; environment.sessionVariables.NIXOS_OZONE_WL = "1"; hardware.graphics = { @@ -44,6 +50,9 @@ homeManager = { pkgs, ... }: { + gtk = { + enable = true; + }; wayland.windowManager.hyprland = { enable = true; systemd.variables = [ "--all" ]; diff --git a/config/modules/niri/niri.nix b/config/modules/niri/niri.nix index 87deb35..9436f04 100644 --- a/config/modules/niri/niri.nix +++ b/config/modules/niri/niri.nix @@ -13,25 +13,23 @@ }; }; modules.niri = { - nixpkgs.overlays = [ inputs.niri-flake.overlays.niri ]; nixos = { pkgs, ... }: { - programs.niri = { - enable = true; - package = pkgs.niri-unstable; - }; - niri-flake.cache.enable = true; + imports = [ inputs.niri-flake.nixosModules.niri ]; + programs.niri.enable = true; + programs.niri.package = pkgs.niri-unstable; + nixpkgs.overlays = [ inputs.niri-flake.overlays.niri ]; }; homeManager = { pkgs, ... }: { - imports = [ inputs.niri-flake.homeModules.niri ]; + # The nixos module already imports the hm module + # imports = [ inputs.niri-flake.homeModules.niri ]; gtk.enable = lib.mkForce false; - home.packages = with pkgs; [ kickoff ]; programs = { niri = { - enable = true; + # enable = true; # package = pkgs.niri-unstable; settings = { input = { @@ -42,16 +40,19 @@ numlock = true; }; }; + cursor = { + size = 16; + }; outputs = { DP-3 = { # Philips Consumer Electronics Company PHL 272E1GZ UK02101011104 mode = { width = 1920; height = 1080; - refresh = 165.0; + refresh = 144.0; }; focus-at-startup = true; - variable-refresh-rate = true; + variable-refresh-rate = false; }; HDMI-A-1 = { position = { @@ -98,7 +99,30 @@ }; # Program Spawning "Mod+E".action.spawn = "helium"; - "Mod+R".action.spawn = "kickoff"; + + "Mod+R".action.spawn = + 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 + "${script}"; + "Mod+Q".action.spawn = "kitty"; # -- }; @@ -118,6 +142,7 @@ ]; xwayland-satellite = { enable = true; + path = lib.getExe pkgs.xwayland-satellite; }; }; };