diff --git a/flake.lock b/flake.lock index db5a489..8fa277d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1721135360, - "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=", - "owner": "Kirottu", - "repo": "anyrun", - "rev": "c6101a31a80b51e32e96f6a77616b609770172e0", - "type": "github" - }, - "original": { - "owner": "Kirottu", - "repo": "anyrun", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -218,27 +196,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -256,7 +213,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -274,7 +231,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nix-super", @@ -295,7 +252,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixpak", @@ -316,7 +273,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixpkgs-wayland", @@ -338,7 +295,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "schizofox", @@ -359,7 +316,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, @@ -379,7 +336,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, @@ -397,7 +354,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1709126324, @@ -415,7 +372,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -463,7 +420,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -603,7 +560,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", - "systems": "systems_4", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -847,7 +804,7 @@ }, "neovim-flake": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", @@ -956,7 +913,7 @@ "plugin-vim-vsnip": "plugin-vim-vsnip", "plugin-which-key": "plugin-which-key", "rnix-lsp": "rnix-lsp", - "systems": "systems_6", + "systems": "systems_5", "zig": "zig" }, "locked": { @@ -1001,7 +958,7 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_8", "treefmt-nix": "treefmt-nix" @@ -1060,7 +1017,7 @@ "nix-super": { "inputs": { "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "libgit2": "libgit2", "nixpkgs": "nixpkgs_6", "nixpkgs-23-11": "nixpkgs-23-11", @@ -1099,7 +1056,7 @@ }, "nixpak": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" @@ -3096,10 +3053,9 @@ }, "root": { "inputs": { - "anyrun": "anyrun", "devshell": "devshell", "emacs-overlay": "emacs-overlay", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", @@ -3173,7 +3129,7 @@ "schizofox": { "inputs": { "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_6", "home-manager": "home-manager_2", "nixpak": [ "nixpak" @@ -3182,7 +3138,7 @@ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1723400986, @@ -3201,7 +3157,7 @@ "searx-randomizer": { "inputs": { "crane": "crane_2", - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_7", "nixpkgs": [ "schizofox", "nixpkgs" @@ -3265,16 +3221,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -3294,21 +3250,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -3323,6 +3264,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_5": { "locked": { "lastModified": 1681028828, @@ -3354,21 +3310,6 @@ } }, "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", diff --git a/flake.nix b/flake.nix index b89ab9a..533a032 100644 --- a/flake.nix +++ b/flake.nix @@ -77,16 +77,6 @@ emacs-overlay.url = "github:nix-community/emacs-overlay"; - anyrun = { - url = "github:Kirottu/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - schizofox = { url = "github:schizofox/schizofox"; inputs = { @@ -94,10 +84,5 @@ nixpak.follows = "nixpak"; }; }; - - spicetify-nix = { - url = "github:gerg-l/spicetify-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; } diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix index 9a6cbe4..a3ce472 100644 --- a/hosts/vali/hermit/configuration.nix +++ b/hosts/vali/hermit/configuration.nix @@ -86,9 +86,6 @@ services = { dunst.enable = true; }; - theming = { - quickshell.enable = true; - }; }; system.stateVersion = "23.11"; } diff --git a/hosts/vali/temperance/configuration.nix b/hosts/vali/temperance/configuration.nix index 81e4ffc..4296d89 100644 --- a/hosts/vali/temperance/configuration.nix +++ b/hosts/vali/temperance/configuration.nix @@ -82,7 +82,6 @@ dunst.enable = true; }; theming = { - quickshell.enable = true; qt = { enable = false; package = pkgs.kde-gruvbox; diff --git a/modules/programs/gui/default.nix b/modules/programs/gui/default.nix index f29ee79..ca64aeb 100644 --- a/modules/programs/gui/default.nix +++ b/modules/programs/gui/default.nix @@ -4,7 +4,6 @@ _: { ./foot.nix ./mpv.nix ./zathura.nix - ./spicetify.nix ./steam.nix ./waybar.nix ./schizofox.nix diff --git a/modules/programs/gui/spicetify.nix b/modules/programs/gui/spicetify.nix deleted file mode 100644 index 3e725dd..0000000 --- a/modules/programs/gui/spicetify.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - pkgs, - lib, - inputs, - inputs', - ... -}: let - cfg = config.modules.system.programs.spotify; - inherit (config.modules.other.system) username; - spicePkgs = inputs'.spicetify-nix.legacyPackages; -in { - config = lib.mkIf cfg.enable { - home-manager.users.${username} = { - imports = [inputs.spicetify-nix.homeManagerModules.default]; - programs.spicetify = { - enable = true; - spotifyPackage = pkgs.spotify; - theme = spicePkgs.themes.catppuccin; - colorScheme = "mocha"; - enabledExtensions = with spicePkgs.extensions; [ - # shuffle - # popupLyrics - adblock - # betterGenres - # playlistIcons - ]; - }; - }; - }; -} diff --git a/modules/runners/fuzzel/module.nix b/modules/runners/fuzzel/module.nix index 9dc8416..839271e 100644 --- a/modules/runners/fuzzel/module.nix +++ b/modules/runners/fuzzel/module.nix @@ -10,6 +10,7 @@ in { config = { home-manager.users.${username}.programs.fuzzel = mkIf cfg.enable { + # enable schizo dnklware! enable = true; package = pkgs.fuzzel; settings = { diff --git a/modules/style/default.nix b/modules/style/default.nix index c922155..8cb43d4 100644 --- a/modules/style/default.nix +++ b/modules/style/default.nix @@ -1,6 +1,5 @@ _: { imports = [ - ./quickshell ./qt.nix ./gtk.nix ./module.nix diff --git a/modules/style/quickshell/bar/Bar.qml b/modules/style/quickshell/bar/Bar.qml deleted file mode 100644 index 7ce955d..0000000 --- a/modules/style/quickshell/bar/Bar.qml +++ /dev/null @@ -1,27 +0,0 @@ -import Quickshell // for ShellRoot and PanelWindow -import Quickshell.Io // For Processes -import QtQuick // For Text - -Scope { - - Variants { - model: Quickshell.screens - - PanelWindow { - property var modelData - screen: modelData - - anchors { - bottom: true - left: true - right: true - } - - height: 25 - - ClockWidget { - anchors.centerIn: parent - } - } - } -} diff --git a/modules/style/quickshell/bar/ClockWidget.qml b/modules/style/quickshell/bar/ClockWidget.qml deleted file mode 100644 index f7d45fa..0000000 --- a/modules/style/quickshell/bar/ClockWidget.qml +++ /dev/null @@ -1,31 +0,0 @@ - -import Quickshell.Io -import QtQuick -import QtQuick.Layouts - -Item { - property string time - - Text { - text: time - } - - Process { - id: dateProc - command: ["date", "-u", "+%a, %d %b %H:%M:%S"] - running: true - - stdout: SplitParser { - onRead: data => time = data - } - } - - Timer { - interval: 1000 - running: true - repeat: true - onTriggered: dateProc.running = true - } - -} - diff --git a/modules/style/quickshell/bar/shell.qml b/modules/style/quickshell/bar/shell.qml deleted file mode 100644 index d6e6f17..0000000 --- a/modules/style/quickshell/bar/shell.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Quickshell // for ShellRoot and PanelWindow - -ShellRoot { - - Bar {} -} diff --git a/modules/style/quickshell/bar/time/Time.qml b/modules/style/quickshell/bar/time/Time.qml deleted file mode 100644 index 6750d42..0000000 --- a/modules/style/quickshell/bar/time/Time.qml +++ /dev/null @@ -1,28 +0,0 @@ -// with this line our type becomes a singleton -pragma Singleton - -import Quickshell -import Quickshell.Io -import QtQuick - -// your singletons should always have Singleton as the type -Singleton { - property string time - - Process { - id: dateProc - command: ["date"] - running: true - - stdout: SplitParser { - onRead: data => time = data - } - } - - Timer { - interval: 1000 - running: true - repeat: true - onTriggered: dateProc.running = true - } -} diff --git a/modules/style/quickshell/bar/workspaces/Widget.qml b/modules/style/quickshell/bar/workspaces/Widget.qml deleted file mode 100644 index 117325e..0000000 --- a/modules/style/quickshell/bar/workspaces/Widget.qml +++ /dev/null @@ -1,110 +0,0 @@ -import QtQuick -import QtQuick.Layouts -import Quickshell.Hyprland -import ".." -import "root:." - -MouseArea { - id: root - required property var bar; - required property int wsBaseIndex; - property int wsCount: 10; - property bool hideWhenEmpty: false; - implicitHeight: column.implicitHeight + 10; - acceptedButtons: Qt.NoButton - onWheel: event => { - event.accepted = true; - const step = -Math.sign(event.angleDelta.y); - const targetWs = currentIndex + step; - if (targetWs >= wsBaseIndex && targetWs < wsBaseIndex + wsCount) { - Hyprland.dispatch(`workspace ${targetWs}`) - } - } - readonly property HyprlandMonitor monitor: Hyprland.monitorFor(bar.screen); - property int currentIndex: 0; - property int existsCount: 0; - visible: !hideWhenEmpty || existsCount > 0; - - property real animPos: 0; - Behavior on animPos { SmoothedAnimation { velocity: 100 } } - - // destructor takes care of nulling - signal workspaceAdded(workspace: HyprlandWorkspace); - - ColumnLayout { - id: column - spacing: 0 - anchors { - fill: parent; - topMargin: 0; - margins: 5; - } - - Repeater { - model: 10 - - MouseArea { - id: wsItem - onPressed: Hyprland.dispatch(`workspace ${wsIndex}`); - - Layout.fillWidth: true - implicitHeight: 15 - - required property int index; - property int wsIndex: wsBaseIndex + index; - property HyprlandWorkspace workspace: null; - property bool exists: workspace != null; - property bool active: (monitor?.activeWorkspace ?? false) && monitor.activeWorkspace == workspace; - - onActiveChanged: { - if (active) root.currentIndex = wsIndex; - } - - onExistsChanged: { - root.existsCount += exists ? 1 : -1; - } - - Connections { - target: root - - function onWorkspaceAdded(workspace: HyprlandWorkspace) { - if (workspace.id == wsItem.wsIndex) { - wsItem.workspace = workspace; - } - } - } - - property real animActive: active ? 100 : 0 - Behavior on animActive { NumberAnimation { duration: 100 } } - - property real animExists: exists ? 100 : 0 - Behavior on animExists { NumberAnimation { duration: 100 } } - - Rectangle { - anchors.centerIn: parent - height: 10 - width: parent.width - scale: 1 + animActive * 0.003 - radius: height / 2 - border.color: ShellGlobals.colors.widgetOutline - border.width: 1 - color: ShellGlobals.interpolateColors(animExists * 0.01, ShellGlobals.colors.widget, ShellGlobals.colors.widgetActive); - } - } - } - } - - Connections { - target: Hyprland.workspaces - - function onObjectInsertedPost(workspace) { - root.workspaceAdded(workspace); - } - } - - Component.onCompleted: { - Hyprland.workspaces.values.forEach(workspace => { - root.workspaceAdded(workspace) - }); - } -} diff --git a/modules/style/quickshell/default.nix b/modules/style/quickshell/default.nix deleted file mode 100644 index 6bf9165..0000000 --- a/modules/style/quickshell/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - inputs, - pkgs, - impurity, - ... -}: let - inherit (inputs) quickshell; - inherit (lib) mkIf mkEnableOption; - inherit (lib.generators) toKeyValue; - inherit (config.modules.other.system) username; - cfg = config.modules.theming.quickshell; -in { - options.modules.theming.quickshell.enable = mkEnableOption "quickshell"; - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - qt6.qtimageformats - qt6.qt5compat - quickshell.packages."x86_64-linux".default - pamtester - ]; - home-manager.users.${username}.xdg.configFile."quickshell/manifest.conf".text = toKeyValue {} { - # bar = "${impurity.link ./bar}"; - # bar = "${./bar}"; - }; - }; -} diff --git a/modules/style/quickshell/systray/Widget.qml b/modules/style/quickshell/systray/Widget.qml deleted file mode 100644 index e69de29..0000000 diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix index 2008eed..2fcafc2 100644 --- a/modules/wms/wayland/hypr/land.nix +++ b/modules/wms/wayland/hypr/land.nix @@ -7,7 +7,6 @@ }: let cfg = config.modules.usrEnv.desktops.hyprland; inherit (config.modules.other.system) username; - inherit (inputs'.anyrun.packages) anyrun; inherit (config.modules.style) cursor; inherit (inputs'.nixpkgs-wayland.packages) @@ -218,7 +217,7 @@ in { "$mainMod, RETURN, exec, ${foot}/bin/foot" "$mainMod, Q, killactive" "$mainMod, F, fullscreen, 0" - "$mainMod, D, exec, ${pkgs.procps}/bin/pkill fuzzel || ${anyrun}/bin/fuzzel" + "$mainMod, D, exec, ${pkgs.procps}/bin/pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" "$mainMod, SPACE, togglefloating, active" # workspaces