From c683fb2571e674a0571ec66fd770620cf68bcbde Mon Sep 17 00:00:00 2001 From: William Date: Thu, 6 Feb 2025 21:41:48 -0300 Subject: [PATCH] sticking to plasma for a little longer --- flake.lock | 140 ++++++++++++------------- flake.nix | 4 +- hosts/desktops/common/home-manager.nix | 2 +- users/desktops/common/hyprland.nix | 20 ++-- 4 files changed, 84 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index a43637e..e60ffe3 100644 --- a/flake.lock +++ b/flake.lock @@ -202,24 +202,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -234,7 +216,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { "systems": [ "stylix", @@ -255,6 +237,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -402,16 +402,16 @@ "home-manager_3": { "inputs": { "nixpkgs": [ - "mithrill-shell", + "stylix", "nixpkgs" ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -423,16 +423,16 @@ "home-manager_4": { "inputs": { "nixpkgs": [ - "stylix", + "tritanium-shell", "nixpkgs" ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -472,26 +472,6 @@ "type": "github" } }, - "mithrill-shell": { - "inputs": { - "flake-utils": "flake-utils", - "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1736076994, - "narHash": "sha256-s7G+VqOI0Sv1DS6EFqFKw2Xlk/1h568tfZgHBsr/SKc=", - "owner": "andreashgk", - "repo": "mithril-shell", - "rev": "63e213e1f644de541d3f84050a474acd5bd1511a", - "type": "github" - }, - "original": { - "owner": "andreashgk", - "repo": "mithril-shell", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1711997201, @@ -531,7 +511,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -588,11 +568,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -620,11 +600,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -642,14 +622,14 @@ "home-manager-stable": "home-manager-stable", "homepage": "homepage", "impermanence": "impermanence", - "mithrill-shell": "mithrill-shell", "nix-flatpak": "nix-flatpak", "nix-index-db": "nix-index-db", "nix-minecraft": "nix-minecraft", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", - "stylix": "stylix" + "stylix": "stylix", + "tritanium-shell": "tritanium-shell" } }, "stylix": { @@ -660,14 +640,14 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_4", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs-stable" ], - "systems": "systems_5", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux", @@ -719,16 +699,16 @@ }, "systems_3": { "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" } }, @@ -749,16 +729,16 @@ }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -828,6 +808,26 @@ "type": "github" } }, + "tritanium-shell": { + "inputs": { + "flake-utils": "flake-utils_3", + "home-manager": "home-manager_4", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1738888826, + "narHash": "sha256-xjUMyq7fTidbTwVqKEZ16SZSKECNx7mVDFicQswuZh8=", + "owner": "baduhai", + "repo": "tritanium-shell", + "rev": "d788a288ffc49847849d691824c2f46999b9b864", + "type": "github" + }, + "original": { + "owner": "baduhai", + "repo": "tritanium-shell", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_2" diff --git a/flake.nix b/flake.nix index 554a290..56c9561 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ inputs.nixpkgs.follows = "nixpkgs-stable"; }; - mithrill-shell.url = "github:andreashgk/mithril-shell"; + tritanium-shell.url = "github:baduhai/tritanium-shell"; }; outputs = @@ -72,7 +72,7 @@ nix-minecraft, nixos-generators, stylix, - mithrill-shell, + tritanium-shell, ... }: { diff --git a/hosts/desktops/common/home-manager.nix b/hosts/desktops/common/home-manager.nix index 120f71c..6046b3a 100644 --- a/hosts/desktops/common/home-manager.nix +++ b/hosts/desktops/common/home-manager.nix @@ -8,7 +8,7 @@ users.user = { imports = [ ../../../users/desktops/user.nix - inputs.mithrill-shell.homeManagerModules.default + inputs.tritanium-shell.homeManagerModules.default ]; }; }; diff --git a/users/desktops/common/hyprland.nix b/users/desktops/common/hyprland.nix index 83465c1..49bcd56 100644 --- a/users/desktops/common/hyprland.nix +++ b/users/desktops/common/hyprland.nix @@ -207,15 +207,17 @@ in }; services = { - # mithril-shell = { - # enable = true; - # integrations.hyprland.enable = true; - # settings = { - # animations.activeWorkspace = "smooth"; - # minWorkspaces = 2; - # lockCommand = "hyprlock"; - # }; - # }; + tritanium-shell = { + enable = true; + integrations.hyprland.enable = true; + settings = { + vertical = true; + animations.activeWorkspace = "smooth"; + minWorkspaces = 1; + lockCommand = "hyprlock"; + bar.modules.workspacesIndicator.reverseScrollDirection = true; + }; + }; swaync = { enable = true; settings = {