diff --git a/flake.lock b/flake.lock index 6a2562a..352fbb7 100755 --- a/flake.lock +++ b/flake.lock @@ -20,40 +20,6 @@ "type": "github" } }, - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -203,14 +169,10 @@ "root": { "inputs": { "agenix": "agenix", - "base16": "base16", "nix-easyroam": "nix-easyroam", "nix-maid": "nix-maid", "nixcord": "nixcord", - "nixpkgs": "nixpkgs", - "tt-discord": "tt-discord", - "tt-schemes": "tt-schemes", - "tt-terminal": "tt-terminal" + "nixpkgs": "nixpkgs" } }, "treefmt-nix": { @@ -233,54 +195,6 @@ "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" - } - }, - "tt-terminal": { - "flake": false, - "locked": { - "lastModified": 1791802932, - "narHash": "sha256-iWnep1ODMSZ89sQ+4zHxLddne3xSHWBCKENkGwaFako=", - "owner": "tinted-theming", - "repo": "tinted-terminal", - "rev": "e64e440b8364f5b83e0058f264a3dc1efaeda7a2", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-terminal", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 249757c..ac51cd7 100755 --- a/flake.nix +++ b/flake.nix @@ -16,19 +16,6 @@ url = "github:ryantm/agenix"; 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; - }; - tt-terminal = { - url = "github:tinted-theming/tinted-terminal"; - flake = false; - }; }; outputs = @@ -37,29 +24,15 @@ nixpkgs, nixcord, nix-maid, - base16, agenix, nix-easyroam, - tt-schemes, - tt-discord, - tt-terminal, }@inputs: let - scheme = "catppuccin-mocha"; - schemePath = inputs.nixpkgs.lib.strings.concatStrings [ - "${inputs.tt-schemes}/base16/" - "${scheme}" - ".yaml" - ]; mods = [ nix-maid.nixosModules.default nixcord.nixosModules.nixcord agenix.nixosModules.default nix-easyroam.nixosModules.nix-easyroam - base16.nixosModule - { - scheme = schemePath; - } ./configuration.nix ./modules/maid ./modules/default.nix diff --git a/modules/maid/emacs.nix b/modules/maid/emacs.nix new file mode 100644 index 0000000..4b4e697 --- /dev/null +++ b/modules/maid/emacs.nix @@ -0,0 +1,8 @@ +{ config, ... }: +let + themeName = config.scheme.scheme-slug + in +{ + + +} diff --git a/modules/maid/ghostty.nix b/modules/maid/ghostty.nix index f9eb4b0..3218131 100644 --- a/modules/maid/ghostty.nix +++ b/modules/maid/ghostty.nix @@ -4,13 +4,6 @@ inputs, ... }: -let - ghosttyTheme = config.scheme { - templateRepo = inputs.tt-terminal; - target = "ghostty-base24"; - check-parsed-config-yaml = false; - }; -in { users.users.lucy.maid.file = { xdg_config.ghostty = { @@ -26,9 +19,5 @@ in ''; target = "ghostty/config.ghostty"; }; - xdg_config.ghostty_theme = { - text = builtins.readFile ghosttyTheme; - target = "ghostty/themes/tinted-theming"; - }; }; } diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix index 3df274b..7bade12 100644 --- a/modules/programs/nixcord.nix +++ b/modules/programs/nixcord.nix @@ -5,7 +5,6 @@ discord.enable = false; vesktop.enable = true; config.useQuickCss = true; - quickCss = "${builtins.readFile (config.scheme inputs.tt-discord)} "; config.plugins = { messageLogger.enable = true; messageClickActions.enable = true;