diff --git a/flake.lock b/flake.lock index 8f5c175..e1015e2 100644 --- a/flake.lock +++ b/flake.lock @@ -65,13 +65,14 @@ "nt": [ "nt" ], + "sops-nix": "sops-nix", "systems": [ "systems" ] }, "locked": { - "lastModified": 1772102584, - "narHash": "sha256-tGcuWO36uW4+BPs8vP/PrMJM/e84Zcn69r1EhzTr/m4=", + "lastModified": 1772461566, + "narHash": "sha256-1Rib48xxOv5unR6KyBRs1wRoyC8MGguBno75fFGGbPs=", "path": "/home/me/cry/mk/cerulean", "type": "path" }, @@ -944,6 +945,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nt": "nt", "sddm-silent": "sddm-silent", + "spicetify-nix": "spicetify-nix", "systems": "systems_4" } }, @@ -1009,6 +1011,27 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "cerulean", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772495394, + "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "spectrum": { "flake": false, "locked": { @@ -1025,6 +1048,29 @@ "url": "https://spectrum-os.org/git/spectrum" } }, + "spicetify-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1772494187, + "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=", + "owner": "Gerg-L", + "repo": "spicetify-nix", + "rev": "915ab06b046d05613041780c575c62a32fe67cea", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "spicetify-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 3123130..843794c 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,14 @@ url = "github:DreamMaoMao/mango"; inputs.nixpkgs.follows = "nixpkgs"; }; + + spicetify-nix = { + url = "github:Gerg-L/spicetify-nix"; + inputs = { + systems.follows = "systems"; + nixpkgs.follows = "nixpkgs-unstable"; + }; + }; }; nixConfig = { diff --git a/homes/me/default.nix b/homes/me/default.nix index 5c68034..4b16636 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -17,6 +17,7 @@ ../modules/apps/firefox.nix ../modules/apps/thunderbird.nix ../modules/apps/nixcord.nix + ../modules/apps/spicetify.nix # ../modules/wm ../modules/wm/mangowc.nix @@ -28,7 +29,8 @@ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.GetName pkg) [ - "vscode-extension-ms-dotnettools-csharp" + # "vscode-extension-ms-dotnettools-csharp" + "spotify" ]; home = { diff --git a/homes/modules/apps/spicetify.nix b/homes/modules/apps/spicetify.nix new file mode 100644 index 0000000..7fa740e --- /dev/null +++ b/homes/modules/apps/spicetify.nix @@ -0,0 +1,32 @@ +{ + inputs, + upkgs, + system, + ... +}: let + spicetifyPkgs = inputs.spicetify-nix.legacyPackages.${system}; +in { + imports = [inputs.spicetify-nix.homeManagerModules.default]; + programs.spicetify = { + enable = true; + + enabledExtensions = with spicetifyPkgs.extensions; [ + adblock + shuffle + keyboardShortcut + { + src = + (upkgs.fetchFromGitHub { + owner = "Spikerko"; + repo = "spicy-lyrics"; + rev = "568c83326aa6aba6ded28c95df6fcfb25cab3648"; + hash = "sha256-lej93EDzGkmyrg5YMdPSqzrxlIfKsfaDBZosTvxoTNw="; + }) + + /builds; + name = "spicy-lyrics.mjs"; + } + ]; + theme = spicetifyPkgs.themes.comfy; + colorScheme = "Sakura"; + }; +} diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix index 1e31d8d..03343c3 100644 --- a/hosts/modules/steam.nix +++ b/hosts/modules/steam.nix @@ -3,13 +3,6 @@ lib, ... }: { - # nixpkgs.config.allowUnfreePredicate = pkg: - # builtins.elem (lib.getName pkg) [ - # "steam" - # "steam-original" - # "steam-unwrapped" - # "steam-run" - # ]; nixpkgs.overlays = [ (self: super: { lutris = super.lutris.overrideAttrs (final: prev: { diff --git a/nixpkgs.nix b/nixpkgs.nix index fa6e201..f088efc 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -18,6 +18,7 @@ "steam" "steamcmd" "steam-unwrapped" + "spotify" "obsidian" "gitkraken"