From c7ad18f0286db5cc30f8952021dc2b9d720d592e Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Thu, 1 May 2025 10:53:16 +0200 Subject: [PATCH] fix hyprland and dolphin --- .config/hypr/hyprland.conf | 3 ++- configuration.nix | 3 ++- flake.lock | 21 +++++++++++++++++++++ flake.nix | 9 ++++++++- home.nix | 4 ++-- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index a8dc823..02e66c6 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -68,7 +68,8 @@ plugin { exec-once=dbus-update-activation-environment --systemd --all exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME -exec-once=/usr/lib/polkit-kde-authentication-agent-1 +# exec-once=/usr/lib/polkit-kde-authentication-agent-1 +exec-once = systemctl --user start hyprpolkitagent exec-once=otd-daemon exec-once=lorri daemon diff --git a/configuration.nix b/configuration.nix index f4a6d4b..fca5502 100644 --- a/configuration.nix +++ b/configuration.nix @@ -157,7 +157,7 @@ # Comment out below for the first time to avoid cache miss, if using flake programs.hyprland = { enable = true; - package = hyprland.packages.${pkgs.system}.hyprland; +# package = hyprland.packages.${pkgs.system}.hyprland; # portalPackage = hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland.override # { # inherit (pkgs) mesa; @@ -269,6 +269,7 @@ nvtopPackages.full btop lshw + hyprpolkitagent ]; nixpkgs.config.allowUnfree = true; diff --git a/flake.lock b/flake.lock index f4772ef..85bb71f 100644 --- a/flake.lock +++ b/flake.lock @@ -70,6 +70,26 @@ "type": "github" } }, + "dolphin-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743892246, + "narHash": "sha256-AHeavUWjnDPT/hffE5hM8RIew+mZJSSr9tUEiSvZW30=", + "owner": "rumboon", + "repo": "dolphin-overlay", + "rev": "55fec3268972876890d6081d3d76a701c37c01d7", + "type": "github" + }, + "original": { + "owner": "rumboon", + "repo": "dolphin-overlay", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -967,6 +987,7 @@ }, "root": { "inputs": { + "dolphin-overlay": "dolphin-overlay", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", diff --git a/flake.nix b/flake.nix index 3e2ac5c..4d01392 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,10 @@ # inputs.hyprland.follows = "hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + dolphin-overlay = { + url = "github:rumboon/dolphin-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # suyu = { # url = "git+https://git.suyu.dev/suyu/nix-flake"; # inputs.nixpkgs.follows = "nixpkgs"; @@ -26,11 +30,14 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { nixpkgs, hyprland-plugins, hyprland, home-manager, nixpkgs-unstable, nix-gaming,/* suyu, */nix-index-database, ... }@attrs: { + outputs = { nixpkgs, dolphin-overlay, hyprland-plugins, hyprland, home-manager, nixpkgs-unstable, nix-gaming,/* suyu, */nix-index-database, ... }@attrs: { nixosConfigurations.lenovo-nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; modules = [ + { + nixpkgs.overlays = [ dolphin-overlay.overlays.default ]; + } # ./obs.nix # doesn't work. Use nix-shell -p obs-studio instead home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/home.nix b/home.nix index c762c4d..fc2c672 100644 --- a/home.nix +++ b/home.nix @@ -78,7 +78,7 @@ in nwg-displays wireguard-tools mongodb-compass - mongo-tools + unstable.mongodb-tools hashcat tldr dunst @@ -87,7 +87,6 @@ in wl-clipboard nextcloud-client kdePackages.plasma-workspace - kdePackages.partitionmanager kdePackages.filelight kdePackages.kate kdePackages.ksystemstats @@ -112,6 +111,7 @@ in heaptrack cinny-desktop gping + gparted # redisinsight valgrind caddy