diff --git a/flake.lock b/flake.lock index abb1b16..211c324 100644 --- a/flake.lock +++ b/flake.lock @@ -161,6 +161,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -636,7 +654,8 @@ "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_3", "rio-term": "rio-term", - "systems": "systems_6", + "spicetify-nix": "spicetify-nix", + "systems": "systems_7", "waybar": "waybar" } }, @@ -678,6 +697,27 @@ "type": "github" } }, + "spicetify-nix": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704167711, + "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=", + "owner": "the-argus", + "repo": "spicetify-nix", + "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4", + "type": "github" + }, + "original": { + "owner": "the-argus", + "repo": "spicetify-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -769,6 +809,21 @@ "type": "github" } }, + "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" + } + }, "waybar": { "inputs": { "flake-compat": "flake-compat_2", diff --git a/flake.nix b/flake.nix index 5cee182..958e64c 100644 --- a/flake.nix +++ b/flake.nix @@ -57,6 +57,10 @@ }; systems.url = "github:nix-systems/default"; + spicetify-nix = { + url = "github:the-argus/spicetify-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 73cc8e8..06e021d 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -4,7 +4,9 @@ inputs, lib, ... -}: { +}: let + spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default; +in { imports = [ ./swayidle.nix ./vim/default.nix @@ -19,6 +21,7 @@ ../rice/wofi.nix ../shell + inputs.spicetify-nix.homeManagerModule inputs.catppuccin.homeManagerModules.catppuccin ]; @@ -41,7 +44,17 @@ }; catppuccin.flavour = "mocha"; + programs.spicetify = { + enable = true; + theme = spicePkgs.themes.catppuccin; + colorScheme = "mocha"; + enabledExtensions = with spicePkgs.extensions; [ + fullAppDisplay + shuffle # shuffle+ (special characters are sanitized out of ext names) + hidePodcasts + ]; + }; xdg.mimeApps.defaultApplications = { "text/html" = "firefox.desktop"; "x-scheme-handler/http" = "firefox.desktop"; @@ -75,7 +88,6 @@ pkgs.slack (pkgs.nerdfonts.override {fonts = ["Iosevka"];}) pkgs.git - pkgs.spotify pkgs.neovide pkgs.wofi pkgs.alejandra