From 670d44fec82252ab2785049e29604a9119439b63 Mon Sep 17 00:00:00 2001 From: lorenzhohermuth Date: Sun, 28 Jul 2024 00:10:53 +0200 Subject: [PATCH] changed fork and finished setting up spicetify --- flake.lock | 91 ++++++++++++++++++++++----------------------------- flake.nix | 15 +++++---- home.nix | 21 ++++++++++-- spicetify.nix | 27 --------------- 4 files changed, 66 insertions(+), 88 deletions(-) delete mode 100644 spicetify.nix diff --git a/flake.lock b/flake.lock index af8c10c..a4d481e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "base16-schemes": { - "flake": false, - "locked": { - "lastModified": 1696158499, - "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", - "owner": "tinted-theming", - "repo": "base16-schemes", - "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-schemes", - "type": "github" - } - }, "catppuccin": { "locked": { "lastModified": 1721784420, @@ -31,6 +15,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -52,25 +52,6 @@ "type": "github" } }, - "nix-colors": { - "inputs": { - "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1707825078, - "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", - "owner": "Misterio77", - "repo": "nix-colors", - "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", - "type": "github" - }, - "original": { - "owner": "Misterio77", - "repo": "nix-colors", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1721379653, @@ -87,27 +68,33 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1697935651, - "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "root": { "inputs": { "catppuccin": "catppuccin", "home-manager": "home-manager", - "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "spicetify-nix": "spicetify-nix" + } + }, + "spicetify-nix": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722053480, + "narHash": "sha256-DG1jdoSIcRLkQvCs63MSMJmssHTwm4zGOmP3hUtAzSY=", + "owner": "Gerg-L", + "repo": "spicetify-nix", + "rev": "e954f700aeaeb1b4df261c68c2391089f655fac8", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "spicetify-nix", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 98285c8..2e3a003 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,14 @@ description = "A simple flake for a nix-shell"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/master"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - catppuccin.url = "github:catppuccin/nix"; - spicetify-nix.url = "github:the-argus/spicetify-nix"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager/master"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + catppuccin.url = "github:catppuccin/nix"; + spicetify-nix = { + url = "github:Gerg-L/spicetify-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { nixpkgs, home-manager, catppuccin, spicetify-nix, ... } @ inputs: let @@ -25,11 +28,9 @@ inherit pkgs; extraSpecialArgs = { inherit inputs; - inherit spicetify-nix; }; modules = [ ./home.nix - ./spicetify.nix catppuccin.homeManagerModules.catppuccin ]; }; diff --git a/home.nix b/home.nix index 255228b..a3d488e 100644 --- a/home.nix +++ b/home.nix @@ -1,5 +1,23 @@ { config, pkgs, inputs, ... }: { + imports = [ + inputs.spicetify-nix.homeManagerModules.default + ]; + + programs.spicetify = + let + spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; + in + { + enable = true; + enabledExtensions = with spicePkgs.extensions; [ + adblock + hidePodcasts + shuffle # shuffle+ (special characters are sanitized out of extension names) + ]; + theme = spicePkgs.themes.catppuccin; + colorScheme = "macchiato"; + }; #themes catppuccin.flavor = "macchiato"; @@ -15,7 +33,7 @@ tweaks = [ "normal" ]; }; }; - + # gtk.theme.package = pkgs.catppuccin-gtk; # gtk.theme.name = "adw-gtk3-dark"; @@ -58,7 +76,6 @@ pkgs.arandr # manager monitor pkgs.keepassxc # passwords pkgs.devdocs-desktop # docs - pkgs.spotify pkgs.cargo pkgs.spicetify-cli diff --git a/spicetify.nix b/spicetify.nix deleted file mode 100644 index 921cb99..0000000 --- a/spicetify.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, lib, spicetify-nix, ... }: -let - spicePkgs = spicetify-nix.packages.${pkgs.system}.default; -in -{ - # allow spotify to be installed if you don't have unfree enabled already - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "spotify" - ]; - - # import the flake's module for your system - imports = [ spicetify-nix.homeManagerModule ]; - - # configure spicetify :) - 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 - ]; - }; -}