update, use matugen branch from stylix

This commit is contained in:
Kopatz
2026-02-06 10:45:59 +01:00
parent cf910c4273
commit f530f81712
9 changed files with 101 additions and 13 deletions

64
flake.lock generated
View File

@@ -344,6 +344,25 @@
"type": "github" "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": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1768736227, "lastModified": 1768736227,
@@ -447,6 +466,22 @@
"type": "github" "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": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@@ -571,11 +606,12 @@
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"matugen": "matugen",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"nur": "nur_2", "nur": "nur_2",
"systems": "systems_5", "systems": "systems_6",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
@@ -583,15 +619,16 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1768744881, "lastModified": 1769348032,
"narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", "narHash": "sha256-Fy5dre1KS7xxGX2v5HxZSe++S4I0XXd7qCRUImEnrRM=",
"owner": "danth", "owner": "make-42",
"repo": "stylix", "repo": "stylix",
"rev": "06684f00cfbee14da96fd4307b966884de272d3a", "rev": "89d5e0bffe49c3fa285e93556159be5e27fd600a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "make-42",
"ref": "matugen",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@@ -657,6 +694,21 @@
} }
}, },
"systems_5": { "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": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

View File

@@ -40,7 +40,8 @@
}; };
# styling # styling
stylix = { stylix = {
url = "github:danth/stylix"; #url = "github:danth/stylix";
url = "github:make-42/stylix/matugen";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.home-manager.follows = "home-manager-unstable"; inputs.home-manager.follows = "home-manager-unstable";
}; };

View File

@@ -71,6 +71,7 @@ in
wl-clipboard wl-clipboard
cava cava
dex # starts applications according to .desktop files dex # starts applications according to .desktop files
ydotool # simulates keyboard and mouse input on wayland
#hyprshade #hyprshade
#waybar #waybar
#qt5.qtwayland #qt5.qtwayland

View File

@@ -65,6 +65,10 @@ in
polarity = "dark"; polarity = "dark";
image = lib.mkForce cfg.image; image = lib.mkForce cfg.image;
base16Scheme = lib.mkIf (cfg.base16Scheme != null) cfg.base16Scheme; base16Scheme = lib.mkIf (cfg.base16Scheme != null) cfg.base16Scheme;
colorGeneration = {
polarity = "dark";
scheme = "fruit-salad";
};
override = cfg.override; override = cfg.override;
#base16Scheme = ../../home-manager/themes/yorha/scheme.yml; #base16Scheme = ../../home-manager/themes/yorha/scheme.yml;
#base16Scheme = #base16Scheme =

View File

@@ -90,7 +90,7 @@ in
if [ -z "$USERNAME" ] || [ -z "$PASSWORD" ]; then if [ -z "$USERNAME" ] || [ -z "$PASSWORD" ]; then
set -a; source ${config.age.secrets.restic-internxt.path}; set +a set -a; source ${config.age.secrets.restic-internxt.path}; set +a
fi 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") LOGGED_IN=$(${cli} whoami | grep "You are logged in")
if [ -z "$LOGGED_IN" ]; then if [ -z "$LOGGED_IN" ]; then
echo "Internxt CLI login failed. Aborting backup." echo "Internxt CLI login failed. Aborting backup."

View File

@@ -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";
}

View File

@@ -39,6 +39,15 @@ in
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: { 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-canary = prev.discord-canary.override { withVencord = true; };
discord = prev.discord.override { withVencord = true; }; discord = prev.discord.override { withVencord = true; };
#tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; #tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; };

View File

@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "internex-cli"; pname = "internex-cli";
version = "1.5.7"; version = "1.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "internxt"; owner = "internxt";
repo = "cli"; repo = "cli";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-fkn16ielYg4mMwWdqKLFYyIl0JDrktsq0PADOM8gi7g="; hash = "sha256-52mriM6rHpGX5yTAUnRW5n8dTEz62s3zneZyJco66lA=";
}; };
# Tip: use diff <filea> <fileb> -ur to create patches # Tip: use diff <filea> <fileb> -ur to create patches
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
yarnOfflineCache = fetchYarnDeps { yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock"; yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-cgIvT/OSlj3MCCMO1MKGECH6R0y+Zp2qhoe3lzWXG2c="; hash = "sha256-YeQ2vmPL8YfrZKDynIlpI5kb1Srpy13JFc+29Vc//EY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = { meta = {
description = "Internxt CLI - Manage your Internxt account from the command line"; description = "Internxt CLI - Manage your Internxt account from the command line";
homepage = "https://internxt.com/"; homepage = "https://internxt.com/";
license = lib.licenses.unfree; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ]; maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all; platforms = lib.platforms.all;
}; };

View File

@@ -111,7 +111,7 @@
basics.enable = true; basics.enable = true;
stylix = { stylix = {
enable = true; enable = true;
base16Scheme = import ../../modules/themes/ina.nix; base16Scheme = import ../../modules/themes/ina-matugen.nix;
image = ../../wallpaper/ina.jpg; image = ../../wallpaper/ina.jpg;
}; };
wayvnc.enable = true; wayvnc.enable = true;