diff --git a/flake.lock b/flake.lock index e1015e2..8f5c175 100644 --- a/flake.lock +++ b/flake.lock @@ -65,14 +65,13 @@ "nt": [ "nt" ], - "sops-nix": "sops-nix", "systems": [ "systems" ] }, "locked": { - "lastModified": 1772461566, - "narHash": "sha256-1Rib48xxOv5unR6KyBRs1wRoyC8MGguBno75fFGGbPs=", + "lastModified": 1772102584, + "narHash": "sha256-tGcuWO36uW4+BPs8vP/PrMJM/e84Zcn69r1EhzTr/m4=", "path": "/home/me/cry/mk/cerulean", "type": "path" }, @@ -945,7 +944,6 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nt": "nt", "sddm-silent": "sddm-silent", - "spicetify-nix": "spicetify-nix", "systems": "systems_4" } }, @@ -1011,27 +1009,6 @@ "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": { @@ -1048,29 +1025,6 @@ "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 843794c..3123130 100644 --- a/flake.nix +++ b/flake.nix @@ -69,14 +69,6 @@ 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/groups/cryos/default.nix b/groups/cryos/default.nix index e24392b..345bf8d 100644 --- a/groups/cryos/default.nix +++ b/groups/cryos/default.nix @@ -99,7 +99,6 @@ sessionVariables = { # folder names with capitalisation look awful! XDG_DOWNLOAD_DIR = "$HOME/downloads"; - XDG_CONFIG_HOME = "$HOME/.config"; }; }; diff --git a/homes/me/default.nix b/homes/me/default.nix index 4b16636..ad21f43 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -17,7 +17,6 @@ ../modules/apps/firefox.nix ../modules/apps/thunderbird.nix ../modules/apps/nixcord.nix - ../modules/apps/spicetify.nix # ../modules/wm ../modules/wm/mangowc.nix @@ -29,8 +28,7 @@ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.GetName pkg) [ - # "vscode-extension-ms-dotnettools-csharp" - "spotify" + "vscode-extension-ms-dotnettools-csharp" ]; home = { @@ -62,7 +60,6 @@ # for services.gnome-keyring pkgs.gcr # provides org.gnome.keyring.SystemPrompter seahorse # gui - krita tor-browser @@ -102,20 +99,6 @@ # these are both required for home-manager to work home-manager.enable = true; - hyfetch = { - enable = true; - settings = { - preset = "nonbinary"; - mode = "rgb"; - backend = "fastfetch"; - color_align = { - mode = "vertical"; - }; - auto_detect_light_dark = true; - pride_month_disable = false; - }; - }; - zsh = { enable = true; enableCompletion = true; diff --git a/homes/modules/apps/spicetify.nix b/homes/modules/apps/spicetify.nix deleted file mode 100644 index 7fa740e..0000000 --- a/homes/modules/apps/spicetify.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - 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/homes/modules/btop.nix b/homes/modules/btop.nix index 765ccea..918eb25 100644 --- a/homes/modules/btop.nix +++ b/homes/modules/btop.nix @@ -16,9 +16,9 @@ # UI background_update = true; - update_ms = 100; + update_ms = 2000; rounded_corners = false; - graph_symbol = "braille"; # braille/block/tty + graph_symbol = "block"; # braille/block/tty graph_symbol_cpu = "default"; graph_symbol_mem = "default"; graph_symbol_net = "default"; diff --git a/homes/modules/editor/helix.nix b/homes/modules/editor/helix.nix index 986f880..bccdc13 100755 --- a/homes/modules/editor/helix.nix +++ b/homes/modules/editor/helix.nix @@ -132,7 +132,7 @@ in { hidden = true; # show hidden files follow-symlinks = true; deduplicate-links = true; - git-ignore = true; # dont read .gitignore files + git-ignore = false; # dont read .gitignore files ignore = true; # use .ignore for helix instead of .gitignore }; diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix index 03343c3..1e31d8d 100644 --- a/hosts/modules/steam.nix +++ b/hosts/modules/steam.nix @@ -3,6 +3,13 @@ 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 f088efc..fa6e201 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -18,7 +18,6 @@ "steam" "steamcmd" "steam-unwrapped" - "spotify" "obsidian" "gitkraken" diff --git a/patches b/patches deleted file mode 100644 index 7be726f..0000000 --- a/patches +++ /dev/null @@ -1,11 +0,0 @@ -# add sddm profile pic -systemd.tmpfiles.rules = let - imagePath = root + "/homes/aurora/profile.png"; - in - lib.mkIf (builtins.pathExists imagePath) [ - "L /var/lib/AccountsService/icons/${config.home.username} - - - - ${imagePath}" - ]; - - -# Cerulean should automatically add set home-managers `home.username` and `home.homeDirectory` -# (this can be done by using .extendModule from the nixos module system :3)