From 6396fb40c3f8cc60831cc3e4242aff916d464871 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Thu, 7 Nov 2024 14:31:38 +0100 Subject: [PATCH] Fixed (hopefully) dolphin and kde connect. Updated all packages and fixed hyprland config --- flake.lock | 72 ++++++++++++++++++------------------- nixos/configuration.nix | 40 +++++++++++---------- nixos/hyprland/hyprland.nix | 31 ++++++++-------- 3 files changed, 73 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index b033111..780cc11 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1729527199, - "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", + "lastModified": 1730968822, + "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", + "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1729894599, - "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729905757, - "narHash": "sha256-4KlQKI/SqiF25pMr7tLZbqHXFdEeoT1KZF+b/6Af7yw=", + "lastModified": 1730969692, + "narHash": "sha256-4Ly9zkqnRB6qLjMeddfUyd4iRLvq+RDspBWABS8DGN4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0b29caf9ab86518ff474eed5e7d19c12f96ebbd0", + "rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", + "lastModified": 1730968903, + "narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", + "rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9", "type": "github" }, "original": { @@ -414,11 +414,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1728804768, - "narHash": "sha256-WG8KWmT72SA1XrmixxJwI1RRWrT9D97kkYSE5OfOJdg=", + "lastModified": 1730294700, + "narHash": "sha256-piHI881ekHn14FEqwGyKkTEHTgXJrsKjX37gJFYx9G8=", "owner": "GermanBread", "repo": "declarative-flatpak", - "rev": "42cc2c4d97a03889d551cc82c43a0b124fd403f6", + "rev": "09b73f988d4a8376b81d0d22126bc8c2e039d36d", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -446,11 +446,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -462,11 +462,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -478,11 +478,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -519,11 +519,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -558,11 +558,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1729963473, - "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", + "lastModified": 1730924223, + "narHash": "sha256-tGvmW0qih+dCAH9L4BEMYMiHcBoJVZtESbC9WH0EEuw=", "owner": "danth", "repo": "stylix", - "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b", + "rev": "762c07ee10b381bc8e085be5b6c2ec43139f13b0", "type": "github" }, "original": { @@ -711,11 +711,11 @@ ] }, "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", + "lastModified": 1730743262, + "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", + "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", "type": "github" }, "original": { diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c886375..cea302b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -78,11 +78,11 @@ neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. kitty kdePackages.qtwayland - libsForQt5.qt5.qtwayland - libsForQt5.qt5.qtsvg + #libsForQt5.qt5.qtwayland + #libsForQt5.qt5.qtsvg kdePackages.qtsvg - kio-fuse #to mount remote filesystems via FUSE - libsForQt5.kio-extras #extra protocols support (sftp, fish and more) + #kio-fuse #to mount remote filesystems via FUSE + #libsForQt5.kio-extras #extra protocols support (sftp, fish and more) kdePackages.kio-fuse #to mount remote filesystems via FUSE kdePackages.kio-extras #extra protocols support (sftp, fish and more) fastfetch @@ -114,29 +114,30 @@ libheif.out #kde - libsForQt5.systemsettings - libsForQt5.kate - libsForQt5.gwenview - libsForQt5.breeze-icons - libsForQt5.breeze-qt5 - libsForQt5.ark - libsForQt5.qtstyleplugin-kvantum - libsForQt5.okular - libsForQt5.kcalc + kdePackages.systemsettings + kdePackages.kate + kdePackages.gwenview + kdePackages.breeze-icons + kdePackages.breeze + kdePackages.ark + kdePackages.qtstyleplugin-kvantum + kdePackages.okular + kdePackages.kcalc polkit-kde-agent - libsForQt5.kdeconnect-kde + kdePackages.kdeconnect-kde kdePackages.kdesdk-thumbnailers - libsForQt5.kdegraphics-thumbnailers kdePackages.kdegraphics-thumbnailers catppuccin-kvantum #kde support tools libsForQt5.qt5ct - kdePackages.qt6ct - libsForQt5.kimageformats - libsForQt5.dolphin - libsForQt5.dolphin-plugins + qt6ct + kdePackages.kimageformats + kdePackages.dolphin + kdePackages.dolphin-plugins ]; + programs.kdeconnect.enable = true; + programs.kdeconnect.package = pkgs.kdePackages.kdeconnect-kde; #xdg.portal = { # enable = true; # config = { @@ -296,6 +297,7 @@ enable = true; package = inputs.hyprland.packages."${pkgs.system}".hyprland; xwayland.enable = true; + systemd.setPath.enable = true; }; #services.hypridle.enable = true; diff --git a/nixos/hyprland/hyprland.nix b/nixos/hyprland/hyprland.nix index 8bedf56..ffbf257 100644 --- a/nixos/hyprland/hyprland.nix +++ b/nixos/hyprland/hyprland.nix @@ -23,14 +23,15 @@ in }; exec-once = [ - "waybar &" - "nm-applet &" - "swaync &" - "solaar -w hide &" - "hypridle &" + "dbus-update-activation-environment --systemd --all" + "${pkgs.waybar}/bin/waybar &" + "${pkgs.networkmanagerapplet}/bin/nm-applet &" + "${pkgs.swaynotificationcenter}/bin/swaync &" + "${pkgs.solaar}/bin/solaar -w hide &" + "${pkgs.hypridle}/bin/hypridle &" "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1 &" #https://nixos.wiki/wiki/Polkit - "clipse -listen &" - "swww-daemon &" + "${pkgs.clipse}/bin/clipse -listen &" + "${pkgs.swww}/bin/swww-daemon &" "${pkgs.swww}/bin/swww img ${wallpaper-image} &" ]; exec = [ @@ -40,11 +41,11 @@ in "$mod" = "SUPER"; "$mainMod" = "$mod"; "$terminal" = "${pkgs.kitty}/bin/kitty"; - "$fileManager" = "dolphin"; - "$browser" = "firefox"; - "$menu" = "wofi --show drun"; + "$fileManager" = "${pkgs.kdePackages.dolphin}/bin/dolphin"; + "$browser" = "${pkgs.firefox}/bin/firefox"; + "$menu" = "${pkgs.wofi}/bin/wofi --show drun"; "$clipboardManager" = "$terminal --class clipse -e 'clipse'"; - "$makeRegionScreenshot" = "grim -g \"$(slurp -w 0)\" - | satty --early-exit --copy-command 'wl-copy' --filename '-' --initial-tool brush"; + "$makeRegionScreenshot" = "${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -w 0)\" - | ${pkgs.satty}/bin/satty --early-exit --copy-command 'wl-copy' --filename '-' --initial-tool brush"; bind = [ "$mod, T, exec, $terminal" "$mod, Q, killactive," @@ -100,7 +101,7 @@ in "$mainMod CTRL, J, resizeactive, 0 50" "$mainMod, P, exec, $makeRegionScreenshot" - "$mainMod ALT, L, exec, hyprlock" + "$mainMod ALT, L, exec, ${pkgs.hyprlock}/bin/hyprlock" ]; bindm = [ @@ -166,9 +167,9 @@ in active_opacity = 0.9; inactive_opacity = 0.7; - drop_shadow = true; - shadow_range = 4; - shadow_render_power = 3; + #drop_shadow = true; + #shadow_range = 4; + #shadow_render_power = 3; #"col.shadow" = "rgba(1a1a1aee)"; blur = {