diff --git a/flake.lock b/flake.lock index 09be161..f4ed0e7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "tpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764289441, - "narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=", - "owner": "aylur", - "repo": "ags", - "rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -55,28 +33,6 @@ "type": "github" } }, - "astal": { - "inputs": { - "nixpkgs": [ - "tpanel", - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764173295, - "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=", - "owner": "aylur", - "repo": "astal", - "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "awww": { "inputs": { "flake-compat": "flake-compat", @@ -1777,6 +1733,27 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "tshell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1787279335, + "narHash": "sha256-CLX2Zp5i5BuLbOxNOkwRd9YY84IOrACNxBV79o9/F9Y=", + "ref": "refs/heads/master", + "rev": "1a4716cde794a59928d9d9fc15f2afc7a95de360", + "revCount": 846, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "awww": "awww", @@ -1804,8 +1781,8 @@ "opencode": "opencode", "sops-nix": "sops-nix", "tnvim": "tnvim", - "tpanel": "tpanel", "treefmt-nix": "treefmt-nix_2", + "tshell": "tshell", "vicinae-extensions": "vicinae-extensions", "voxtype": "voxtype", "wezterm-flake": "wezterm-flake" @@ -2079,27 +2056,6 @@ "type": "github" } }, - "tpanel": { - "inputs": { - "ags": "ags", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1787384344, - "narHash": "sha256-SH8hdgMneFElM8SGKtVpobr/wO+MrGb0JwW35meEvdg=", - "owner": "tuxdotrs", - "repo": "tpanel", - "rev": "bce512ef2fd64161d98b323b252f45b78f4fed7b", - "type": "github" - }, - "original": { - "owner": "tuxdotrs", - "repo": "tpanel", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2139,6 +2095,49 @@ "type": "github" } }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "tshell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "tshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell", + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1787584097, + "narHash": "sha256-h69INfmULNqQs0ob1Bvfx/TV2w7E3yyeud8uC1dRU88=", + "owner": "tuxdotrs", + "repo": "tshell", + "rev": "4453c280bfb79c4bb4b6f5e146196acf78b74ceb", + "type": "github" + }, + "original": { + "owner": "tuxdotrs", + "repo": "tshell", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" diff --git a/flake.nix b/flake.nix index 48ad10a..9c52771 100644 --- a/flake.nix +++ b/flake.nix @@ -24,8 +24,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - tpanel = { - url = "github:tuxdotrs/tpanel"; + tshell = { + url = "github:tuxdotrs/tshell"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix index 1290933..9dc6bf5 100644 --- a/modules/flake/overlays.nix +++ b/modules/flake/overlays.nix @@ -6,9 +6,8 @@ flake.overlays = { modifications = final: prev: { tnvim = inputs.tnvim.packages.${prev.stdenv.hostPlatform.system}.default; - tpanel = inputs.tpanel.packages.${prev.stdenv.hostPlatform.system}.default; + tshell = inputs.tshell.packages.${prev.stdenv.hostPlatform.system}.default; cyber-tux = inputs.cyber-tux.packages.${prev.stdenv.hostPlatform.system}.default; - ags = inputs.tpanel.packages.${prev.stdenv.hostPlatform.system}.ags.default; wezterm-git = inputs.wezterm-flake.packages.${prev.stdenv.hostPlatform.system}.default; hyprland-git = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}; awww = inputs.awww.packages.${prev.stdenv.hostPlatform.system}.awww; diff --git a/modules/nixos/desktop/tpanel.nix b/modules/nixos/desktop/tshell.nix similarity index 53% rename from modules/nixos/desktop/tpanel.nix rename to modules/nixos/desktop/tshell.nix index cb236df..83b65ac 100644 --- a/modules/nixos/desktop/tpanel.nix +++ b/modules/nixos/desktop/tshell.nix @@ -2,6 +2,6 @@ flake.modules.nixos.desktop = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ tpanel ]; + environment.systemPackages = with pkgs; [ tshell ]; }; }