From 3cb61816635ff6492aafb6e7e54063b22db34d3a Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 15 Oct 2026 11:17:59 +0200 Subject: [PATCH] add base16-nix --- configuration.nix | 3 + flake.lock | 155 ++++++++++++----------------------- flake.nix | 24 ++++-- modules/programs/nixcord.nix | 14 +--- theme.nix | 1 + 5 files changed, 76 insertions(+), 121 deletions(-) create mode 100644 theme.nix diff --git a/configuration.nix b/configuration.nix index 1b4babb..f5c5cd7 100755 --- a/configuration.nix +++ b/configuration.nix @@ -86,6 +86,9 @@ nmgui kdePackages.qtdeclarative ghostty + rnote + gsettings-desktop-schemas + glib ]; }; environment.sessionVariables = { diff --git a/flake.lock b/flake.lock index c78069c..b7c0731 100755 --- a/flake.lock +++ b/flake.lock @@ -20,43 +20,37 @@ "type": "github" } }, - "flake-parts": { + "base16": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", + "owner": "SenchoPens", + "repo": "base16.nix", "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": [ - "mangowm", - "scenefx", - "systems" - ] - }, + "fromYaml": { + "flake": false, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "SenchoPens", + "repo": "fromYaml", "type": "github" } }, @@ -82,28 +76,6 @@ "type": "github" } }, - "mangowm": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "scenefx": "scenefx" - }, - "locked": { - "lastModified": 1791764863, - "narHash": "sha256-0l5W82KBEukdzkTsDgXquRPNAZ1f8d2qT9169jRnOOY=", - "owner": "mangowm", - "repo": "mango", - "rev": "468680e24b6cb872ebaadf9aa9948f538c1f0ab1", - "type": "github" - }, - "original": { - "owner": "mangowm", - "repo": "mango", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -215,21 +187,6 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1782614948, - "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-packages": { "locked": { "lastModified": 1791130267, @@ -246,49 +203,13 @@ "root": { "inputs": { "agenix": "agenix", - "mangowm": "mangowm", + "base16": "base16", "nix-easyroam": "nix-easyroam", "nix-maid": "nix-maid", "nixcord": "nixcord", - "nixpkgs": "nixpkgs" - } - }, - "scenefx": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "mangowm", - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1782624992, - "narHash": "sha256-vUjLG6eubEhJJVa9LPygIcVmNoHwYbSUTJcWEcbxnU4=", - "owner": "wlrfx", - "repo": "scenefx", - "rev": "37ccd723bef49e6891156ffafce8f549f01446cc", - "type": "github" - }, - "original": { - "owner": "wlrfx", - "repo": "scenefx", - "type": "github" - } - }, - "systems": { - "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" + "nixpkgs": "nixpkgs", + "tt-discord": "tt-discord", + "tt-schemes": "tt-schemes" } }, "treefmt-nix": { @@ -311,6 +232,38 @@ "repo": "treefmt-nix", "type": "github" } + }, + "tt-discord": { + "flake": false, + "locked": { + "lastModified": 1791492260, + "narHash": "sha256-JWwTrlUCNdyWFlwC7szEwN3YH9UjUXTMQ2FWG+OlchA=", + "ref": "refs/heads/main", + "rev": "7c0d3fdc88e1130a2df4ab3e8484841af523b835", + "revCount": 11, + "type": "git", + "url": "https://git.lucy.rip/lucy/tinted-discord.git" + }, + "original": { + "type": "git", + "url": "https://git.lucy.rip/lucy/tinted-discord.git" + } + }, + "tt-schemes": { + "flake": false, + "locked": { + "lastModified": 1791580487, + "narHash": "sha256-ONFLryA9ab+m00ROqtG2u7z1P0OvGvL4z6ZXdDcWhCk=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "3ac91137e879502c442ab89ba0f1a98077d0da9d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3747fb9..f3afe98 100755 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nix-maid.url = "git+https://codeberg.org/viperML/nix-maid"; - nix-easyroam = { url = "github:0x5a4/nix-easyroam"; inputs.nixpkgs.follows = "nixpkgs"; @@ -19,33 +17,41 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - mangowm = { - url = "github:mangowm/mango"; - inputs.nixpkgs.follows = "nixpkgs"; + base16.url = "github:SenchoPens/base16.nix"; + tt-schemes = { + url = "github:tinted-theming/schemes"; + flake = false; + }; + tt-discord = { + url = "git+https://git.lucy.rip/lucy/tinted-discord.git"; + flake = false; }; }; outputs = - inputs@{ + { self, nixpkgs, nixcord, nix-maid, - mangowm, + base16, agenix, nix-easyroam, - }: + tt-schemes, + tt-discord, + }@inputs: let mods = [ nix-maid.nixosModules.default nixcord.nixosModules.nixcord - mangowm.nixosModules.mango agenix.nixosModules.default nix-easyroam.nixosModules.nix-easyroam + base16.nixosModule ./configuration.nix ./maid.nix ./modules/default.nix ./secrets/age.nix + ./theme.nix ]; in { diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix index f0bcef4..3df274b 100644 --- a/modules/programs/nixcord.nix +++ b/modules/programs/nixcord.nix @@ -1,22 +1,14 @@ -{ +{ config, inputs, ... }: { programs.nixcord = { enable = true; user = "lucy"; discord.enable = false; vesktop.enable = true; - vesktop.useSystemVencord = true; - userPlugins = { - betterMarkdown = "github:farrrr/vencord-better-markdown/a741b0968cd6c9d3bece0d83745e48731248dc30"; - }; - extraConfig = { - plugins = { - BetterMarkdown.enable = true; - }; - }; + config.useQuickCss = true; + quickCss = "${builtins.readFile (config.scheme inputs.tt-discord)} "; config.plugins = { messageLogger.enable = true; messageClickActions.enable = true; }; - config.enabledThemes = [ "tinted.css" ]; }; } diff --git a/theme.nix b/theme.nix new file mode 100644 index 0000000..5da6dc1 --- /dev/null +++ b/theme.nix @@ -0,0 +1 @@ +{ config, lib, inputs, ...}: {}