diff --git a/flake.lock b/flake.lock index aa4424a..9732d09 100644 --- a/flake.lock +++ b/flake.lock @@ -201,11 +201,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1777089773, - "narHash": "sha256-ZIlNuebeWTncyl7mcV9VbceSLAaZki+UeXLPQG959xI=", + "lastModified": 1777435375, + "narHash": "sha256-2WRfJbipnTz+EY3rHRnCoG4kWkzPczb/cLcWwhy/0QA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "402ba229617a12d918c2a887a4c83a9a24f9a36c", + "rev": "4d89e8e2c50711ee3fea3a25e662cfa5c6628e07", "type": "gitlab" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1777138498, - "narHash": "sha256-mZdL0akv+PiA9h4DXNVGCqUeV5NiODy5lzRWoDsYhtI=", + "lastModified": 1777476904, + "narHash": "sha256-EeLoE8n4+QCbteyAsYXxhfr97RFfWL1ga0xwfL6lpKw=", "owner": "nix-community", "repo": "home-manager", - "rev": "026e21038902970e54226133e718e8c197fac799", + "rev": "8c8e5389e75a36bee53920de8ee24f017b3ae03e", "type": "github" }, "original": { @@ -476,11 +476,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777079905, - "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", + "lastModified": 1777427472, + "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", + "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186", "type": "github" }, "original": { @@ -552,11 +552,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1776585574, - "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", + "lastModified": 1777380063, + "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", + "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", "type": "github" }, "original": { diff --git a/modules/core/default.nix b/modules/core/default.nix index 4f04bfc..1332769 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -13,7 +13,6 @@ ./nfs.nix ./nh.nix ./printing.nix - ./quickshell.nix ./greetd.nix ./security.nix ./services.nix diff --git a/modules/core/quickshell.nix b/modules/core/quickshell.nix deleted file mode 100644 index b7d0651..0000000 --- a/modules/core/quickshell.nix +++ /dev/null @@ -1,30 +0,0 @@ -{pkgs, ...}: { - environment = { - systemPackages = with pkgs; [ - quickshell - - # Qt6 related kits(for slove Qt5Compat problem) - qt6.qt5compat - qt6.qtbase - qt6.qtquick3d - qt6.qtwayland - qt6.qtdeclarative - qt6.qtsvg - - # alternate options - # libsForQt5.qt5compat - kdePackages.qt5compat - libsForQt5.qt5.qtgraphicaleffects - ]; - # necessary environment variables - variables = { - QML_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml"; - QML2_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml"; - }; - # make sure the Qt application is working properly - sessionVariables = { - QT_QPA_PLATFORM = "wayland;xcb"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - }; - }; -} diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index f3abc1e..23afb87 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -32,7 +32,7 @@ shiftBinds = [ "SUPER SHIFT, C, exec, dex ${desktopEntriesPath}/claude.desktop #\"Claude AI chat\"" - "SUPER SHIFT, D, exec, delfin \"Jellyfin media client\"" + "SUPER SHIFT, D, exec, delfin #\"Jellyfin media client\"" "SUPER SHIFT, E, exec, evolution #\"Personal information management application\"" "SUPER SHIFT, Escape, exec, noctalia-shell ipc call sessionMenu toggle #\"Open Session Menu\"" "SUPER SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop #\"ChatGPT AI chat\"" @@ -50,7 +50,7 @@ altBinds = [ "SUPER ALT, C, exec, noctalia-shell ipc call controlCenter toggle #\"Toggle control center\"" - "SUPER ALT, F, exec, finamp \"Jellyfin music client\"" + "SUPER ALT, F, exec, finamp #\"Jellyfin music client\"" "SUPER ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop #\"Glance server panel\"" "SUPER ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop #\"Mastodon social network client\"" "SUPER ALT, P, exec, noctalia-shell ipc call settings toggle #\"Open settings panel\""