outfoxxed/nixnew
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update quickshell

Browse source
This commit is contained in:
outfoxxed 2024-03-14 05:05:41 -07:00
parent 6d493c43b9
commit 6a824b8a58
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
3 changed files with 76 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
flake.lock
View file

@ -48,11 +48,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1709715989, "lastModified": 1710091554,
"narHash": "sha256-x8nsKGkLCq+i1pHj+Jr29GpPkYQrVQjrvJ7Kb3ogY30=", "narHash": "sha256-p4CFIo9dAIgL6KMp1woJxVISoqYKblPGjAgTPkzeOWI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "984860d0f4f5c3a6d1d92d0ac3cd1c081408e138", "rev": "a230393bb7e2db667c63c3f5c279a6e26d8b1c5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,30 +61,6 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"radicle",
"nixpkgs"
],
"rust-analyzer-src": [
"radicle"
]
},
"locked": {
"lastModified": 1701930186,
"narHash": "sha256-t9uIiU1fE7VXi3t460iOuAUW8Ece9mowRKva1aw48zI=",
"owner": "nix-community",
"repo": "fenix",
"rev": "aeb764a8e4c16da3f36b200a302552d8e457b9f4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -156,11 +132,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709722441, "lastModified": 1710062421,
"narHash": "sha256-OdkGhZ+OrOEZWsLyGLNVWS0sQF0adPXCkkwhy8vlEuo=", "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d717f581b7b001b2a1293277a1d3386fca5b87e", "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,11 +158,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709942067, "lastModified": 1710091028,
"narHash": "sha256-DGU4zQDwIx6pXM6oHdA+89UU/QjqE05HiXOvigECJjI=", "narHash": "sha256-yFk2kc8J2kVh0RWlwT+PQf0bpfUNcROOcRYcyQJbpk4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "a2233d4a2a58233457712acfd88d10a2a8a85711", "rev": "05db7dfd7fc261e0195e54f8a6d655d4f370e70f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +184,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1710026388, "lastModified": 1710100374,
"narHash": "sha256-Z/ReJhaauOe+uThHB1LJ/3tJOnNxdYybS72Z8gkRWT8=", "narHash": "sha256-n/BGSmaNw/Vsvsg7MX7LJImdTJ4xWOkK6ikxe5fzM44=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "335506d5557b91a0baf974750c353443841e691b", "rev": "981296f101cf79176a8da7a1aa64fa297b2976dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709708644, "lastModified": 1710040110,
"narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=", "narHash": "sha256-PNAV8VdZkNoSGQHGQWDefNarl0BtKjVMCCzu16+vsr4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "94a1e46434736a40f976a454f8bd3ea2144f349b", "rev": "851fcfd130597c5c91071d46275111522d4fd595",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +334,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708597894, "lastModified": 1709985524,
"narHash": "sha256-KxpKOBDGPJ76k37vLukYHp/wd7U4DoUVIvy8atHfy/k=", "narHash": "sha256-29ZwMJBErP41ZPis1MskhdheDRgt+reDuf53jONSkc8=",
"owner": "nixpak", "owner": "nixpak",
"repo": "nixpak", "repo": "nixpak",
"rev": "535dd408c4b19f407bc22e42eb32ccb9256e5865", "rev": "b0862a125da8fe5d179633d6cc7aed57d5316871",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +349,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709479366, "lastModified": 1709961763,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -388,11 +364,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1709569716, "lastModified": 1710021367,
"narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "617579a787259b9a6419492eaac670a5f7663917", "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -404,11 +380,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1709722017, "lastModified": 1710102312,
"narHash": "sha256-M9ec9GkPGuPpblnZI4vWXvF6qlgh8VSMwYw8odYYFfo=", "narHash": "sha256-wQAzm91MkXgB64feGY9Nla4Bty4oHUJ/nqXWPtdl8bY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e4ea33b9aa652e2871fbc604d1d611e6f5940a66", "rev": "0fd53e800f0db12ac4ed8fb42f6c524417b2a4eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +400,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709945683, "lastModified": 1710417716,
"narHash": "sha256-4mU58/em5UccBXrCBNds7heuoL5TTE4DTFQFsQDcCmY=", "narHash": "sha256-prul6TG6uCKedEq3X4MGErzjWTRRAWsTDnCuCgQtDNY=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "46d15228a690cd0a515f2baf4d94c6875a83686e", "rev": "5731af562b0c576024790f099a489e8a25fba79a",
"revCount": 95, "revCount": 118,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@ -441,20 +417,20 @@
"inputs": { "inputs": {
"advisory-db": "advisory-db", "advisory-db": "advisory-db",
"crane": "crane", "crane": "crane",
"fenix": "fenix",
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1708953793, "lastModified": 1709989290,
"narHash": "sha256-DGgH8+ibr1WspyUeKeHaW87VzYHf9jzzjyFlOeT6ZoA=", "narHash": "sha256-mBAxRpR1Qfy1EbZq9vc4X1x62O/5bAIxnCxJwLpCVL0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "a48081f2717f069d456ec09f31d9e639b232dbed", "rev": "d1e2e3b61e203ec223f5955b7f1b8d6f54be350d",
"revCount": 1712, "revCount": 1735,
"type": "git", "type": "git",
"url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" "url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
}, },
@ -477,11 +453,36 @@
"nur": "nur", "nur": "nur",
"quickshell": "quickshell", "quickshell": "quickshell",
"radicle": "radicle", "radicle": "radicle",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay_2",
"stable": "stable" "stable": "stable"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": {
"flake-utils": [
"radicle",
"flake-utils"
],
"nixpkgs": [
"radicle",
"nixpkgs"
]
},
"locked": {
"lastModified": 1708308739,
"narHash": "sha256-FtKWP6d51kz8282jfziNNcCBpAvEzv2TtKH6dYIXCuA=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d45281ce1027a401255db01ea44972afbc569b7e",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
@ -491,11 +492,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709691047, "lastModified": 1710036830,
"narHash": "sha256-2Vwx1FLufoMEcOS8KAwP8H83IP3Hw6ZPrIDHkSXrFCY=", "narHash": "sha256-pnV4gO3N/7/GzyRSKTRlSfS/19KJiPSvYcL4apnSkoQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d55139f3061cdf2c8f5f7bc8d49e884826e6a4ea", "rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
modules/user/modules/quickshell/background/shell.qml
View file

@ -1,14 +1,18 @@
import Quickshell import Quickshell
import Quickshell.Wayland import Quickshell.Wayland
import QtQuick
import ".." import ".."
ShellRoot { ShellRoot {
Variants { Variants {
variants: Quickshell.screens.map(screen => ({ screen })) model: Quickshell.screens
PanelWindow { PanelWindow {
id: window id: window
WlrLayershell.layer: Layer.Background property var modelData
screen: modelData
WlrLayershell.layer: WlrLayer.Background
anchors { anchors {
top: true top: true
bottom: true bottom: true
@ -16,6 +20,8 @@ ShellRoot {
right: true right: true
} }
color: "#111111"
BackgroundImage { BackgroundImage {
anchors.fill: parent anchors.fill: parent
screen: window.screen screen: window.screen

4
modules/user/modules/quickshell/lockscreen/shell.qml
View file

@ -9,7 +9,7 @@ ShellRoot {
onUnlocked: lock.locked = false onUnlocked: lock.locked = false
} }
SessionLock { WlSessionLock {
id: lock id: lock
locked: true locked: true
@ -17,7 +17,7 @@ ShellRoot {
if (!locked) Qt.quit(); if (!locked) Qt.quit();
} }
SessionLockSurface { WlSessionLockSurface {
id: surface id: surface
BackgroundImage { BackgroundImage {