From 9a85f906996cd917cfbaeeea5ffb68c90ac51508 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 24 Jan 2025 12:57:53 +1100 Subject: [PATCH] user/catppuccin: init --- flake.lock | 207 +++++++++++++++++++++++++++++++++++- flake.nix | 5 +- modules/default.nix | 1 + modules/user/catppuccin.nix | 12 +++ modules/user/kitty.nix | 10 +- res/config.lua | 29 ++--- users/rin/wayland.nix | 1 + users/rin/xorg.nix | 1 + 8 files changed, 243 insertions(+), 23 deletions(-) create mode 100644 modules/user/catppuccin.nix diff --git a/flake.lock b/flake.lock index 5871a04..eb41764 100644 --- a/flake.lock +++ b/flake.lock @@ -42,6 +42,61 @@ "type": "github" } }, + "catppuccin": { + "inputs": { + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager_2", + "home-manager-stable": "home-manager-stable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" + }, + "locked": { + "lastModified": 1736069220, + "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", + "owner": "catppuccin", + "repo": "nix", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", + "type": "github" + } + }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734734291, + "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", + "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", + "revCount": 344, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -224,6 +279,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -353,6 +426,28 @@ } }, "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-stable_2": { "inputs": { "nixpkgs": [ "nixpkgs-stable" @@ -374,6 +469,27 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737669579, + "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -409,6 +525,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "linux-tkg": { "flake": false, "locked": { @@ -582,6 +726,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1720535198, "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", @@ -629,6 +789,29 @@ "type": "github" } }, + "nuscht-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737372689, + "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", + "owner": "NuschtOS", + "repo": "search", + "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "nvim-treesitter": { "flake": false, "locked": { @@ -681,12 +864,13 @@ "inputs": { "aagl": "aagl", "agenix": "agenix", + "catppuccin": "catppuccin", "discord-tokyonight": "discord-tokyonight", "discover": "discover", "fast-syntax-highlighting": "fast-syntax-highlighting", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "home-manager-raccoon": "home-manager-raccoon", - "home-manager-stable": "home-manager-stable", + "home-manager-stable": "home-manager-stable_2", "hosts-blocklists": "hosts-blocklists", "linux-tkg": "linux-tkg", "neovim-nightly": "neovim-nightly", @@ -695,7 +879,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-raccoon": "nixpkgs-raccoon", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": "nixpkgs-stable_2", "nvim-treesitter": "nvim-treesitter", "packwiz": "packwiz", "pure": "pure", @@ -733,7 +917,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -814,6 +998,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tree-sitter-glimmer": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ec87a43..fa17cc1 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,8 @@ aagl.url = "github:ezKEa/aagl-gtk-on-nix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; + catppuccin.url = "github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e"; + catppuccin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; @@ -50,7 +52,7 @@ rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, agenix, nixos-generators, nixpkgs, nixpkgs-raccoon, nixpkgs-stable, ... } @ inputs: + outputs = { self, agenix, catppuccin, nixos-generators, nixpkgs, nixpkgs-raccoon, nixpkgs-stable, ... } @ inputs: let overlays = (import ./overlays) ++ [(final: prev: { @@ -64,6 +66,7 @@ modules = [ { nixpkgs.overlays = overlays; } agenix.nixosModules.age + catppuccin.nixosModules.catppuccin (./hosts + "/${name}") ] ++ extraModules; specialArgs = { diff --git a/modules/default.nix b/modules/default.nix index 8316340..92e7519 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -50,6 +50,7 @@ in { ]; user = mkAttrsFromPaths [ ./user/bspwm.nix + ./user/catppuccin.nix ./user/direnv.nix ./user/dunst.nix ./user/eww.nix diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix new file mode 100644 index 0000000..e99b0d7 --- /dev/null +++ b/modules/user/catppuccin.nix @@ -0,0 +1,12 @@ +{ inputs, ... }: { + imports = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; + + catppuccin = { + accent = "maroon"; + flavor = "mocha"; + kitty.enable = true; + nvim.enable = true; + }; +} diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix index a7a7601..893e74c 100644 --- a/modules/user/kitty.nix +++ b/modules/user/kitty.nix @@ -9,10 +9,12 @@ settings = { font_features = "-ss01 +ss19"; enable_audio_bell = false; + color5 = "#cba6f7"; + color13 = "#cba6f7"; }; - extraConfig = builtins.readFile (builtins.fetchurl { - url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/eede574f9ef57137e6d7e4bab37b09db636c5a56/extras/kitty_tokyonight_night.conf"; - sha256 = "0l9yl3qmgf7b10x7hy7q5hma0hsyamq3n14lfbw31cimm6snwim6"; - }); + # extraConfig = builtins.readFile (builtins.fetchurl { + # url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/eede574f9ef57137e6d7e4bab37b09db636c5a56/extras/kitty_tokyonight_night.conf"; + # sha256 = "0l9yl3qmgf7b10x7hy7q5hma0hsyamq3n14lfbw31cimm6snwim6"; + # }); }; } diff --git a/res/config.lua b/res/config.lua index 0df0f6a..e9f30a9 100644 --- a/res/config.lua +++ b/res/config.lua @@ -49,24 +49,25 @@ vim.g.signify_sign_change_delete = vim.g.signify_sign_delete vim.g.vimtex_view_method = "zathura" -- Theming -require("tokyonight").setup({ - style = "night" -}) -vim.cmd[[ - syntax enable - colorscheme tokyonight -]] -local colors = require("tokyonight.colors").setup {} -vim.cmd("highlight SignifySignAdd guifg="..colors.green) -vim.cmd("highlight SignifySignChange guifg="..colors.orange) -vim.cmd("highlight SignifySignDelete guifg="..colors.red) -vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red) -vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red) +vim.api.nvim_command("syntax enable") +-- require("tokyonight").setup({ +-- style = "night" +-- }) +-- vim.cmd[[ +-- syntax enable +-- colorscheme tokyonight +-- ]] +-- local colors = require("tokyonight.colors").setup {} +-- vim.cmd("highlight SignifySignAdd guifg="..colors.green) +-- vim.cmd("highlight SignifySignChange guifg="..colors.orange) +-- vim.cmd("highlight SignifySignDelete guifg="..colors.red) +-- vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red) +-- vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red) -- Set this specific highlight group in rust -- Shown when using #[cfg] directives, entire chunks of disabled code has squiggly lines and I don't want -- to see it -vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.comment) +-- vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.comment) -- Plugins require('nvim-treesitter.configs').setup { diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix index 74354b8..1bfef8c 100644 --- a/users/rin/wayland.nix +++ b/users/rin/wayland.nix @@ -19,6 +19,7 @@ ./packages.nix sessionVariables + catppuccin direnv git gpg diff --git a/users/rin/xorg.nix b/users/rin/xorg.nix index d940f7b..8668bb0 100644 --- a/users/rin/xorg.nix +++ b/users/rin/xorg.nix @@ -19,6 +19,7 @@ ./packages.nix sessionVariables + catppuccin direnv git gpg