From 14e37841c11c712b7425a366547ba4c3150ed603 Mon Sep 17 00:00:00 2001 From: Zastian Pretorius Date: Tue, 19 Aug 2025 12:39:12 +0100 Subject: [PATCH] fkdsah --- configuration.nix | 3 +- dots/hyprland.nix | 4 +- dots/xdg.nix | 4 +- flake.lock | 166 +++++++++++++++---------------------------- home/homePkgs.nix | 5 +- home/stylix.nix | 5 +- system/nixOSPkgs.nix | 4 ++ system/services.nix | 2 +- 8 files changed, 75 insertions(+), 118 deletions(-) diff --git a/configuration.nix b/configuration.nix index e815f68..fa0f115 100755 --- a/configuration.nix +++ b/configuration.nix @@ -174,7 +174,8 @@ in nixpkgs.config.allowUnfree = true; security.pam.services.swaylock = { }; - security.pam.services.hyprland.enableGnomeKeyring = true; + security.pam.services.greetd.enableGnomeKeyring = true; + security.pam.services.greetd.kwallet.enable = true; # List packages installed in system profile. To search, run: # $ nix search wget diff --git a/dots/hyprland.nix b/dots/hyprland.nix index f9b99ac..9f1d50d 100755 --- a/dots/hyprland.nix +++ b/dots/hyprland.nix @@ -12,7 +12,8 @@ let mod = "Alt"; terminal = "footclient"; fileManager = "dolphin"; - runner = "${lib.getExe caelestia-cli} shell drawers toggle launcher"; + #runner = "${lib.getExe caelestia-cli} shell drawers toggle launcher"; + runner = "anyrun"; browser = "zen-beta"; editor = "emacsclient -c"; in @@ -43,7 +44,6 @@ in "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" "fcitx5 -d" "foot -s" - "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" ] ++ lib.optionals (config.home.username == "work") [ "thunderbird" diff --git a/dots/xdg.nix b/dots/xdg.nix index ab3281f..371a667 100755 --- a/dots/xdg.nix +++ b/dots/xdg.nix @@ -12,8 +12,9 @@ portal = { enable = true; config.common.default = [ - "hyprland" + "hyprland;kde" "river" + "kde" "gtk" ]; xdgOpenUsePortal = true; @@ -21,6 +22,7 @@ xdg-desktop-portal-wlr xdg-desktop-portal-gtk xdg-desktop-portal-hyprland + kdePackages.xdg-desktop-portal-kde ]; }; mime.enable = true; diff --git a/flake.lock b/flake.lock index 733182c..999c87a 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1748365336, - "narHash": "sha256-pg0w4uOZI32dLASD6UbBezeQg5PwOa0GLv7rTwn3VxY=", + "lastModified": 1755503773, + "narHash": "sha256-2iAIrSC4ubTCEM5BeC+R7dywkj9CAV0K6vHbqxCcCtA=", "owner": "Kirottu", "repo": "anyrun", - "rev": "25367153f225a59c5ce5746583e39a71ff052f09", + "rev": "bed987ed5dec0b29865b973ad4fce04c5da2ea21", "type": "github" }, "original": { @@ -22,48 +22,6 @@ "type": "github" } }, - "app2unit": { - "inputs": { - "nixpkgs": [ - "caelestia", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752640923, - "narHash": "sha256-jcoNgqOaD7wuoYg6y+BXuCHueDzJ7gjR7RdFKHBNg2A=", - "owner": "soramanew", - "repo": "app2unit", - "rev": "d0159c1d7090f8563db6bedd153cb8168628b06d", - "type": "github" - }, - "original": { - "owner": "soramanew", - "repo": "app2unit", - "type": "github" - } - }, - "app2unit_2": { - "inputs": { - "nixpkgs": [ - "caelestia-cli", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752640923, - "narHash": "sha256-jcoNgqOaD7wuoYg6y+BXuCHueDzJ7gjR7RdFKHBNg2A=", - "owner": "soramanew", - "repo": "app2unit", - "rev": "d0159c1d7090f8563db6bedd153cb8168628b06d", - "type": "github" - }, - "original": { - "owner": "soramanew", - "repo": "app2unit", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -149,17 +107,16 @@ }, "caelestia": { "inputs": { - "app2unit": "app2unit", "caelestia-cli": "caelestia-cli", "nixpkgs": "nixpkgs", "quickshell": "quickshell" }, "locked": { - "lastModified": 1754382000, - "narHash": "sha256-lBgbdaJNzxArYltYZ7OiYEBYmClMz9IIgTxd36geyIU=", + "lastModified": 1755411875, + "narHash": "sha256-N8t2IJdcFvLj67M6dPcU67Exa3mHszeoRYfFPbd82RE=", "owner": "caelestia-dots", "repo": "shell", - "rev": "26171548bff3fdc959af5368a16d61847dc05f22", + "rev": "d4c5415770d3eeeeb1612e11c1ea8c61765fe715", "type": "github" }, "original": { @@ -170,10 +127,6 @@ }, "caelestia-cli": { "inputs": { - "app2unit": [ - "caelestia", - "app2unit" - ], "caelestia-shell": [ "caelestia" ], @@ -183,11 +136,11 @@ ] }, "locked": { - "lastModified": 1753407718, - "narHash": "sha256-VnqE8hpqyIdJ91OBaJatxGyNccev+OC19U/MVZUd/0E=", + "lastModified": 1755361059, + "narHash": "sha256-cmLq7Vrui0MNqe+wn6VLhIcv2GMWka+9nahx9QVzPM8=", "owner": "caelestia-dots", "repo": "cli", - "rev": "2bde2ddfbf56277fbf93af96fe3a88cb042b6696", + "rev": "63e213283008d95832443a717e23cead25f0a7d6", "type": "github" }, "original": { @@ -198,16 +151,15 @@ }, "caelestia-cli_2": { "inputs": { - "app2unit": "app2unit_2", "caelestia-shell": "caelestia-shell", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1754293738, - "narHash": "sha256-oeWuxJIpO4D5NTbHI0mK4r5I0t2HPCWUwsOsSL2w4EY=", + "lastModified": 1755502775, + "narHash": "sha256-MNRVQgW/H76bJ9P22JTRKIEhYcmjPkE05OPlng2F/to=", "owner": "caelestia-dots", "repo": "cli", - "rev": "f541e99d076cd87a5947200ff0f7a0065329a30a", + "rev": "c72223a7e6ede10931be329620d3b76d592b4eef", "type": "github" }, "original": { @@ -218,10 +170,6 @@ }, "caelestia-shell": { "inputs": { - "app2unit": [ - "caelestia-cli", - "app2unit" - ], "caelestia-cli": [ "caelestia-cli" ], @@ -232,11 +180,11 @@ "quickshell": "quickshell_2" }, "locked": { - "lastModified": 1754283125, - "narHash": "sha256-963FwoaeO99FZaYWNPNxYj2eLd1DAeJleZOO6cRMyDo=", + "lastModified": 1755411875, + "narHash": "sha256-N8t2IJdcFvLj67M6dPcU67Exa3mHszeoRYfFPbd82RE=", "owner": "caelestia-dots", "repo": "shell", - "rev": "c1b844b8571b6a5f9bde2490f841e76a0c8efaac", + "rev": "d4c5415770d3eeeeb1612e11c1ea8c61765fe715", "type": "github" }, "original": { @@ -390,11 +338,11 @@ ] }, "locked": { - "lastModified": 1754365350, - "narHash": "sha256-NLWIkn1qM0wxtZu/2NXRaujWJ4Y1PSZlc7h0y6pOzOQ=", + "lastModified": 1755491080, + "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5d7e957397ecb7d48b99c928611c6e780db1b56", + "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", "type": "github" }, "original": { @@ -413,11 +361,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1754403288, - "narHash": "sha256-FdI2tV45ChVgwly2JRx1lA68gHIdZ38yyzHJeHHYTSc=", + "lastModified": 1755424351, + "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a5151e16afa09a01ef7b360d87956730d0534da7", + "rev": "9aa137af01f05386e5bb5050e983750017007a66", "type": "github" }, "original": { @@ -446,11 +394,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1754400448, - "narHash": "sha256-tP4wYaIKlhMTzNp0S9ouU5Key0+41Z5KkjP9zO6bIQU=", + "lastModified": 1755419373, + "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=", "owner": "YaLTeR", "repo": "niri", - "rev": "52c579d5567d0b16ae68177fad05c612baba38af", + "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599", "type": "github" }, "original": { @@ -468,11 +416,11 @@ ] }, "locked": { - "lastModified": 1752566074, - "narHash": "sha256-hWPv6S5lFn6qOQdSL5Ad/m0mge2ALTC8WEAR7c6YWcE=", + "lastModified": 1755253391, + "narHash": "sha256-8Muat6VcG9HsVNtyeKblnj28nnPZVPCGKh/kP3uUPeU=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "ccf263b7ac5f44f89fd990594b09aa52de3d6585", + "rev": "e62b3ad75e8c9a5e505fc78b9b40eed1178634cb", "type": "github" }, "original": { @@ -508,11 +456,11 @@ ] }, "locked": { - "lastModified": 1752441837, - "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", + "lastModified": 1754800038, + "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "839e02dece5845be3a322e507a79712b73a96ba2", + "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", "type": "github" }, "original": { @@ -528,11 +476,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1754382552, - "narHash": "sha256-ZyIpMq8PLACt+kl0pFOnAf38knBZ7bvyIJOLaQAqmvg=", + "lastModified": 1755395461, + "narHash": "sha256-2zsR2QAE7wnDWzzMpVDpV6k+PCrcoVf1+yiNd4dbd08=", "owner": "kaylorben", "repo": "nixcord", - "rev": "256184ad4a373e101232175bbe7707c622a4e24f", + "rev": "b1260171b674953712e093acfd285585f6586a01", "type": "github" }, "original": { @@ -543,11 +491,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -589,11 +537,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1755274400, + "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", "type": "github" }, "original": { @@ -605,11 +553,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -621,11 +569,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -653,11 +601,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -827,11 +775,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754334303, - "narHash": "sha256-jmBVvEzchjsfH0zpcDl6Ujx2lvpi/rdZ813fkmkIsZw=", + "lastModified": 1755378131, + "narHash": "sha256-0GKZEzTUcaoama56xaagKnMk5hqMbTUfGF4KfzLwje4=", "owner": "nix-community", "repo": "stylix", - "rev": "665a4ede4dbc2f52575a3eeaa457a89d97d3d28e", + "rev": "82242e0f9b1d91b6f170807a6ec622cfdb816eac", "type": "github" }, "original": { @@ -971,11 +919,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1754367142, - "narHash": "sha256-U0gbn4Qe2NfdaQHvSerzjn3iLhrH+Ah0DMBJfRh1OT8=", + "lastModified": 1755219541, + "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ecbe57e7be12452d6fe477f2154a6d93f60c41e0", + "rev": "5a184d435927c3423f0ad189ea2b490578450fb7", "type": "github" }, "original": { @@ -994,11 +942,11 @@ ] }, "locked": { - "lastModified": 1754365690, - "narHash": "sha256-je5DVA23UU2RzJB1A7VTNSohPk/FE8HwDJaSK65/UJg=", + "lastModified": 1755484558, + "narHash": "sha256-1dlhluaqrePy1L8ShBCkiF/KF9ci5tSZzdUI60NjzOI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ec4909d02fb8c2d3c00ca71ceafb65753b4e3ea6", + "rev": "d169f16140842d7ba3183c0321f984368bdd2ee3", "type": "github" }, "original": { diff --git a/home/homePkgs.nix b/home/homePkgs.nix index 6e376b3..c57ca20 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -210,7 +210,6 @@ in zed-editor dualsensectl mangayomi - element-desktop scrcpy fuse fuse-emulator @@ -236,8 +235,8 @@ in inputs.caelestia.packages.${pkgs.system}.caelestia-shell inputs.caelestia-cli.packages.${pkgs.system}.caelestia-cli kdePackages.dolphin - #kdePackages.kio - #kdePackages.kio-extras + kdePackages.kio + kdePackages.kio-extras #kdePackages.breeze-icons #kdePackages.dolphin-plugins kdePackages.kdesdk-thumbnailers # new diff --git a/home/stylix.nix b/home/stylix.nix index 6cd98af..eafee5c 100755 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -14,7 +14,10 @@ in autoEnable = false; targets.font-packages.enable = true; #targets.fontconfig.enable = true; - targets.gtk.enable = true; + targets.gtk = { + enable = true; + flatpakSupport.enable = true; + }; #targets.kde.enable = true; targets.qt.enable = true; targets.vscode.enable = true; diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 6e792c3..6ca7ad1 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -201,5 +201,9 @@ in ladspaPlugins inputs.nix-alien.packages.${pkgs.system}.nix-alien python311 + + kdePackages.kwallet + kdePackages.kwalletmanager + kdePackages.kwallet-pam # For PAM integration if needed ]; } diff --git a/system/services.nix b/system/services.nix index 3a22fbc..2a47f04 100755 --- a/system/services.nix +++ b/system/services.nix @@ -18,7 +18,7 @@ enable = true; }; - services.gnome.gnome-keyring.enable = true; + #services.gnome.gnome-keyring.enable = true; # Configure keymap in X11 # services.xserver.xkb.layout = "us"; # services.xserver.xkb.options = "eurosign:e,caps:escape";