From f530f81712dd6d8a5af497349cd8e9ff76fd55e3 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Fri, 6 Feb 2026 10:45:59 +0100 Subject: [PATCH] update, use matugen branch from stylix --- flake.lock | 64 ++++++++++++++++++++++++++++++---- flake.nix | 3 +- modules/graphical/hyprland.nix | 1 + modules/graphical/stylix.nix | 4 +++ modules/misc/backup.nix | 2 +- modules/themes/ina-matugen.nix | 21 +++++++++++ overlays.nix | 9 +++++ pkgs/internxt-cli/default.nix | 8 ++--- systems/pc/configuration.nix | 2 +- 9 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 modules/themes/ina-matugen.nix diff --git a/flake.lock b/flake.lock index 405bcf7..bb95097 100644 --- a/flake.lock +++ b/flake.lock @@ -344,6 +344,25 @@ "type": "github" } }, + "matugen": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "systems": "systems_5" + }, + "locked": { + "lastModified": 1769341810, + "narHash": "sha256-5AYLcqR45alSB0C4nsU3EMOLvnMEr9slDH2evoi+M88=", + "owner": "InioX", + "repo": "Matugen", + "rev": "b2b28bf9d92851fde8c737af49984daba3f86226", + "type": "github" + }, + "original": { + "owner": "InioX", + "repo": "Matugen", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1768736227, @@ -447,6 +466,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -571,11 +606,12 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", + "matugen": "matugen", "nixpkgs": [ "nixpkgs-unstable" ], "nur": "nur_2", - "systems": "systems_5", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -583,15 +619,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768744881, - "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", - "owner": "danth", + "lastModified": 1769348032, + "narHash": "sha256-Fy5dre1KS7xxGX2v5HxZSe++S4I0XXd7qCRUImEnrRM=", + "owner": "make-42", "repo": "stylix", - "rev": "06684f00cfbee14da96fd4307b966884de272d3a", + "rev": "89d5e0bffe49c3fa285e93556159be5e27fd600a", "type": "github" }, "original": { - "owner": "danth", + "owner": "make-42", + "ref": "matugen", "repo": "stylix", "type": "github" } @@ -657,6 +694,21 @@ } }, "systems_5": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index c0a7d91..445daf1 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,8 @@ }; # styling stylix = { - url = "github:danth/stylix"; + #url = "github:danth/stylix"; + url = "github:make-42/stylix/matugen"; inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.home-manager.follows = "home-manager-unstable"; }; diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix index dd17944..72e804a 100644 --- a/modules/graphical/hyprland.nix +++ b/modules/graphical/hyprland.nix @@ -71,6 +71,7 @@ in wl-clipboard cava dex # starts applications according to .desktop files + ydotool # simulates keyboard and mouse input on wayland #hyprshade #waybar #qt5.qtwayland diff --git a/modules/graphical/stylix.nix b/modules/graphical/stylix.nix index b19f38e..8a68221 100644 --- a/modules/graphical/stylix.nix +++ b/modules/graphical/stylix.nix @@ -65,6 +65,10 @@ in polarity = "dark"; image = lib.mkForce cfg.image; base16Scheme = lib.mkIf (cfg.base16Scheme != null) cfg.base16Scheme; + colorGeneration = { + polarity = "dark"; + scheme = "fruit-salad"; + }; override = cfg.override; #base16Scheme = ../../home-manager/themes/yorha/scheme.yml; #base16Scheme = diff --git a/modules/misc/backup.nix b/modules/misc/backup.nix index a7e5f6e..ffea266 100644 --- a/modules/misc/backup.nix +++ b/modules/misc/backup.nix @@ -90,7 +90,7 @@ in if [ -z "$USERNAME" ] || [ -z "$PASSWORD" ]; then set -a; source ${config.age.secrets.restic-internxt.path}; set +a fi - ${cli} login --non-interactive -e "$USERNAME" -p "$PASSWORD" + ${cli} login-legacy --non-interactive -e "$USERNAME" -p "$PASSWORD" LOGGED_IN=$(${cli} whoami | grep "You are logged in") if [ -z "$LOGGED_IN" ]; then echo "Internxt CLI login failed. Aborting backup." diff --git a/modules/themes/ina-matugen.nix b/modules/themes/ina-matugen.nix new file mode 100644 index 0000000..1112de3 --- /dev/null +++ b/modules/themes/ina-matugen.nix @@ -0,0 +1,21 @@ +{ + "base00" = "041011"; + "base01" = "152222"; + "base02" = "2a3737"; + "base03" = "7b9696"; + "base04" = "b0cccc"; + "base05" = "d7e5e5"; + "base06" = "b9f0b8"; + "base07" = "89d88f"; + "base08" = "ed8796"; + "base09" = "f5a97f"; + "base0A" = "eed49f"; + "base0B" = "a6da95"; + "base0C" = "8bd5ca"; + "base0D" = "8aadf4"; + "base0E" = "c6a0f6"; + "base0F" = "f0c6c6"; + "author" = "untitled"; + "scheme" = "untitled"; + "slug" = "untitled"; +} diff --git a/overlays.nix b/overlays.nix index 7e144aa..8c79b73 100644 --- a/overlays.nix +++ b/overlays.nix @@ -39,6 +39,15 @@ in # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays modifications = final: prev: { + vencord = prev.vencord.overrideAttrs { + version = "1.14.1"; + src = prev.fetchFromGitHub { + owner = "Vendicated"; + repo = "Vencord"; + tag = "v1.14.1"; + hash = "sha256-g+zyq4KvLhn1aeziTwh3xSYvzzB8FwoxxR13mbivyh4="; + }; + }; discord-canary = prev.discord-canary.override { withVencord = true; }; discord = prev.discord.override { withVencord = true; }; #tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; diff --git a/pkgs/internxt-cli/default.nix b/pkgs/internxt-cli/default.nix index 8fecf36..4fc2a52 100644 --- a/pkgs/internxt-cli/default.nix +++ b/pkgs/internxt-cli/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "internex-cli"; - version = "1.5.7"; + version = "1.6.2"; src = fetchFromGitHub { owner = "internxt"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-fkn16ielYg4mMwWdqKLFYyIl0JDrktsq0PADOM8gi7g="; + hash = "sha256-52mriM6rHpGX5yTAUnRW5n8dTEz62s3zneZyJco66lA="; }; # Tip: use diff -ur to create patches @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-cgIvT/OSlj3MCCMO1MKGECH6R0y+Zp2qhoe3lzWXG2c="; + hash = "sha256-YeQ2vmPL8YfrZKDynIlpI5kb1Srpy13JFc+29Vc//EY="; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Internxt CLI - Manage your Internxt account from the command line"; homepage = "https://internxt.com/"; - license = lib.licenses.unfree; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 3bc2521..d44febb 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -111,7 +111,7 @@ basics.enable = true; stylix = { enable = true; - base16Scheme = import ../../modules/themes/ina.nix; + base16Scheme = import ../../modules/themes/ina-matugen.nix; image = ../../wallpaper/ina.jpg; }; wayvnc.enable = true;