From aff76ee9fb507535a19c4ad8bc30ae580a7e5e7c Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Tue, 12 May 2026 23:42:32 +0200 Subject: [PATCH] update, attempt to fix kwallet --- .config/hypr/hyprland.conf | 1 + dots-hyprland | 1 - flake.lock | 65 ++++++++++++++++++++++++++++--- flake.nix | 4 ++ servers/ui-mode/configuration.nix | 9 ++++- servers/ui-mode/home.nix | 4 +- 6 files changed, 76 insertions(+), 8 deletions(-) delete mode 160000 dots-hyprland diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 7bca069..2eba070 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -80,6 +80,7 @@ exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTO exec-once = systemctl --user start hyprpolkitagent exec-once=otd-daemon exec-once=lorri daemon +exec-once=/etc/pam_init #exec-once=wlsunset -S 6:00 -s 21:30 # exec-once=swaybg -m fill -i ~/.config/hypr/wallpapers/sunflowers.jpg diff --git a/dots-hyprland b/dots-hyprland deleted file mode 160000 index 80f912a..0000000 --- a/dots-hyprland +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 80f912aa8bbc857fccd340be5d1a903bd9b8a1c7 diff --git a/flake.lock b/flake.lock index c009d07..9455587 100644 --- a/flake.lock +++ b/flake.lock @@ -66,10 +66,31 @@ "type": "github" } }, + "codexbar": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1778481276, + "narHash": "sha256-vLFMeN1lw/Y6p1ZhPVcF6aALLPXS05Bi6PpgqSIVENk=", + "owner": "0xferrous", + "repo": "CodexBar-flake", + "rev": "4e3491c7233b0840341c5340474e53dd05461662", + "type": "github" + }, + "original": { + "owner": "0xferrous", + "repo": "CodexBar-flake", + "type": "github" + } + }, "colmena": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_4", "stable": "stable" @@ -90,7 +111,7 @@ }, "copyparty": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -462,6 +483,24 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -476,7 +515,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1678901627, "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", @@ -766,7 +805,7 @@ "hyprwire": "hyprwire", "nixpkgs": "nixpkgs_9", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -1650,6 +1689,7 @@ "root": { "inputs": { "affinity-nix": "affinity-nix", + "codexbar": "codexbar", "colmena": "colmena", "copyparty": "copyparty", "danksearch": "danksearch", @@ -1761,6 +1801,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1795,7 +1850,7 @@ }, "utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 5b4fdd5..9be6202 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,10 @@ url = "github:getpaseo/paseo"; inputs.nixpkgs.follows = "nixpkgs"; }; + codexbar = { + url = "github:0xferrous/CodexBar-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; dms = { url = "github:AvengeMedia/DankMaterialShell/stable"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/servers/ui-mode/configuration.nix b/servers/ui-mode/configuration.nix index a8c8ce6..a09e24e 100644 --- a/servers/ui-mode/configuration.nix +++ b/servers/ui-mode/configuration.nix @@ -153,6 +153,7 @@ in fonts.enableDefaultPackages = true; # https://github.com/NixOS/nixpkgs/issues/409986 environment.etc."xdg/menus/applications.menu".source = ./dolphin.menu; + environment.etc."pam_init".source = "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init"; users.users.dan = { isNormalUser = true; @@ -228,6 +229,12 @@ in compositor.name = "hyprland"; # "niri" or "hyprland" or "sway" configHome = "/home/dan"; }; + security.pam.services = { + greetd.kwallet = { + enable = true; + package = pkgs.kdePackages.kwallet-pam; + }; + }; services.logind.settings.Login = { HandlePowerKey = "suspend"; @@ -356,7 +363,7 @@ in kdePackages.kirigami-addons kdePackages.kirigami-addons.dev # libsForQt5.appstream-qt -# libsForQt5.kcoreaddons + # libsForQt5.kcoreaddons #libsForQt5.kirigami2 kdePackages.syntax-highlighting diff --git a/servers/ui-mode/home.nix b/servers/ui-mode/home.nix index e4056a5..9bbe15d 100644 --- a/servers/ui-mode/home.nix +++ b/servers/ui-mode/home.nix @@ -13,6 +13,7 @@ inputs, nix-monitor, rusic, + codexbar, config, # paseo, ... @@ -40,6 +41,7 @@ in stateVersion = "25.11"; packages = with pkgs; [ + codexbar.packages.${system}.default jellyfin-desktop (kdePackages.qt6ct.overrideAttrs (oldAttrs: { patches = (oldAttrs.patches or [ ]) ++ [ ../../pkgs/qt6ct-0.11.patch ]; @@ -324,7 +326,7 @@ in liberation_ttf noto-fonts-color-emoji - rubik + # rubik nerd-fonts.jetbrains-mono google-fonts ];