servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(flake): Added subflake

Browse Source 
So as to not specify fetchFromGitHub commit hashes
Added mullvad packages
This commit is contained in:
uttarayan21
2024-03-25 20:35:16 +05:30
parent 8497db7318
commit 7ebb723857
12 changed files with 486 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/firefox.nix
View File

@@ -7,6 +7,7 @@
enable = device.isLinux;
profiles.default = {
userChrome = let
# TODO: Move to subflake
csshacks = pkgs.fetchFromGitHub {
owner = "MrOtherGuy";
repo = "firefox-csshacks";

6
common/home.nix
View File

@@ -80,7 +80,9 @@
gptfdisk
polkit_gnome
dig
mullvad
mullvad-vpn
mullvad-closest
mullvad-browser
steam-run
usbutils
handlr-regex
@@ -218,7 +220,7 @@
};
carapace = {
enable = true;
# enableFishIntegration = true;
enableFishIntegration = true;
enableNushellIntegration = true;
};
fzf = {

77
common/nvim.nix
View File

@@ -54,13 +54,13 @@ in {
lua
*/
''
function(bufnr)
local opts = { highlight = true }
return require'nvim-navic'.get_location(opts)
end,
cond = function()
return require'nvim-navic'.is_available()
end
function(bufnr)
local opts = { highlight = true }
return require'nvim-navic'.get_location(opts)
end,
cond = function()
return require'nvim-navic'.is_available()
end
'';
}
];
@@ -226,6 +226,7 @@ in {
cmp = {
enable = true;
settings = {
autoEnableSources = true;
sources = [
{name = "buffer";}
{name = "buffer";}
@@ -291,33 +292,36 @@ in {
};
keymaps = mkMappings {
normal = {
"<leader>c" = "[[<cmd>ChatGPT<cr>]]";
"<leader>o" = "[[<cmd>TroubleToggle<cr>]]";
"<leader>ee" = "[[<cmd>Rest run<cr>]]";
"<leader>el" = "[[<cmd>Rest run last<cr>]]";
"vff" = "[[<cmd>vertical Gdiffsplit<cr>]]";
"<leader>\"" = ''[["+]]'';
"gh" = "[[<cmd>Octo actions<cr>]]";
"<leader><leader>" = "'<c-^>'";
"<leader>q" = "[[<cmd>bw<cr>]]";
"<leader>n" = "[[<cmd>bnext<cr>]]";
"<leader>p" = "[[<cmd>bprev<cr>]]";
"<C-l>" = "[[<cmd>Outline<cr>]]";
"<C-w>\"" = "[[<cmd>split<cr>]]";
"<C-w>%" = "[[<cmd>vsplit<cr>]]";
"gh" = "[[<cmd>Octo actions<cr>]]";
"<leader>\"" = ''[["+]]'';
"<leader>c" = "[[<cmd>ChatGPT<cr>]]";
"<leader>dr" = "[[<cmd>RustLsp debuggables<cr>]]";
"<C-l>" = "[[<cmd>Outline<cr>]]";
"<leader>ee" = "[[<cmd>Rest run<cr>]]";
"<leader>el" = "[[<cmd>Rest run last<cr>]]";
"<leader>hh" = "[[<cmd>DevdocsOpenFloat<cr>]]";
"<leader>hl" = "[[<cmd>DevdocsToggle<cr>]]";
"<leader><leader>" = "'<c-^>'";
"<leader>n" = "[[<cmd>bnext<cr>]]";
"<leader>o" = "[[<cmd>TroubleToggle<cr>]]";
"<leader>p" = "[[<cmd>bprev<cr>]]";
"<leader>q" = "[[<cmd>bw<cr>]]";
"<leader>nn" = "[[<cmd>Neorg<cr>]]";
"vff" = "[[<cmd>vertical Gdiffsplit<cr>]]";
"<C-k>" = "vim.lsp.buf.definition";
"<C-\\>" = "require('FTerm').toggle";
"F" = "function() vim.lsp.buf.format({ async = true }) end";
"gi" = "require'telescope.builtin'.lsp_implementations";
"<leader>a" = "vim.lsp.buf.code_action";
"<leader>bb" = "require'dap'.toggle_breakpoint";
"<leader>du" = "require'dapui'.toggle";
"<leader>fb" = "require'telescope'.extensions.file_browser.file_browser";
"<leader>ff" = "require'telescope.builtin'.find_files";
"<leader>gg" = "require'telescope.builtin'.live_grep";
"<leader>;" = "require'telescope.builtin'.buffers";
"<C-k>" = "vim.lsp.buf.definition";
"gi" = "require'telescope.builtin'.lsp_implementations";
"<leader>a" = "vim.lsp.buf.code_action";
"F" = "function() vim.lsp.buf.format({ async = true }) end";
"<leader>bb" = "require'dap'.toggle_breakpoint";
"<leader>du" = "require'dapui'.toggle";
"<C-\\>" = "require('FTerm').toggle";
};
terminal = {
"<C-\\>" = "require('FTerm').toggle";
@@ -505,6 +509,20 @@ in {
require('lspconfig.ui.windows').default_options.border = 'single'
catcher(require('nvim_context_vt').setup)
catcher(function()
require('nvim-devdocs').setup({
ensure_installed = {"nix", "rust"},
float_win = {
relative = "editor",
height = 80,
width = 100,
border = "rounded",
},
after_open = function()
vim.o.conceallevel = 3
end,
})
end)
'';
package = pkgs.neovim-nightly;
options = {
@@ -524,6 +542,7 @@ in {
undodir = "${config.xdg.cacheHome}/undodir";
undofile = true;
viewoptions = "cursor,folds";
concealcursor = "n";
};
extraPlugins = with pkgs.vimPlugins; [
# neorg
@@ -547,6 +566,7 @@ in {
# lsp stuff
copilot-lua
crates-nvim
luasnip
# No more postman
rest-nvim
@@ -563,8 +583,11 @@ in {
# Testing
neotest
# neotest-rust
# Helper libs
webapi-vim
# Treesitter
nvim_context_vt
nvim-devdocs
];
};
}

53
common/zellij.nix
View File

@@ -1,4 +1,8 @@
{lib, ...}: {
{
lib,
pkgs,
...
}: {
home.sessionVariables = {
"ZELLIJ_AUTO_ATTACH" = "true";
# "ZELLIJ_AUTO_EXIT" = "true";
@@ -59,7 +63,7 @@
default_shell = "fish";
pane_frames = false;
theme = "catppuccin-mocha";
default_layout = "compact";
# default_layout = "compact";
keybinds = mkKeybinds {
normal = {
clear-defaults = true;
@@ -93,4 +97,49 @@
};
enableFishIntegration = true;
};
xdg.configFile."zellij/layouts/default.kdl" = {
text =
/*
kdl
*/
''
layout {
pane split_direction="vertical" {
pane
}
pane size=1 borderless=true {
plugin location="file:${pkgs.zellijPlugins.zjstatus}/bin/zjstatus.wasm" {
hide_frame_for_single_pane "true"
format_left "{mode}#[fg=#89B4FA,bg=#181825,bold] {session}#[bg=#181825] {tabs}"
format_right "{command_kubectx}#[fg=#424554,bg=#181825]::{command_kubens}{datetime}"
format_space "#[bg=#181825]"
mode_normal "#[bg=#89B4FA] "
mode_tmux "#[bg=#ffc387] "
mode_default_to_mode "tmux"
tab_normal "#[fg=#6C7086,bg=#181825] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
tab_active "#[fg=#9399B2,bg=#181825,bold,italic] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
tab_fullscreen_indicator "□ "
tab_sync_indicator " "
tab_floating_indicator "󰉈 "
command_kubectx_command "kubectx -c"
command_kubectx_format "#[fg=#6C7086,bg=#181825,italic] {stdout}"
command_kubectx_interval "2"
command_kubens_command "kubens -c"
command_kubens_format "#[fg=#6C7086,bg=#181825]{stdout} "
command_kubens_interval "2"
datetime "#[fg=#9399B2,bg=#181825] {format} "
datetime_format "%A, %d %b %Y %H:%M"
datetime_timezone "Asia/Kolkata"
}
}
}
'';
};
}

229
flake.lock generated
View File

@@ -176,6 +176,27 @@
"type": "github"
}
},
"crane_4": {
"inputs": {
"nixpkgs": [
"zjstatus",
"nixpkgs"
]
},
"locked": {
"lastModified": 1708794349,
"narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=",
"owner": "ipetkov",
"repo": "crane",
"rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"devshell": {
"inputs": {
"flake-utils": "flake-utils_9",
@@ -459,6 +480,60 @@
"type": "github"
}
},
"flake-utils_11": {
"inputs": {
"systems": "systems_12"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_12": {
"inputs": {
"systems": "systems_13"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_13": {
"inputs": {
"systems": "systems_14"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
@@ -1118,6 +1193,22 @@
"type": "github"
}
},
"nvim-devdocs": {
"flake": false,
"locked": {
"lastModified": 1703234230,
"narHash": "sha256-qqtBNfBBGyxMsHL3UXu+MF/UyfVAubG+6fnwLK9kY9Q=",
"owner": "luckasRanarison",
"repo": "nvim-devdocs",
"rev": "521d24661ffe6d1ba025debea2675c765a9c1ee1",
"type": "github"
},
"original": {
"owner": "luckasRanarison",
"repo": "nvim-devdocs",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_5",
@@ -1195,7 +1286,10 @@
"nixpkgs": "nixpkgs_5",
"nixpkgs-main": "nixpkgs-main",
"nixvim": "nixvim",
"nur": "nur"
"nur": "nur",
"rust-overlay": "rust-overlay_6",
"subflakes": "subflakes",
"zjstatus": "zjstatus"
}
},
"rust-overlay": {
@@ -1310,6 +1404,71 @@
"type": "github"
}
},
"rust-overlay_6": {
"inputs": {
"flake-utils": "flake-utils_11",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1711332768,
"narHash": "sha256-SFnlIwnrwJxEawLcrH7+zGb8spePcYyai5asMZnm0BM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8a8e3ea9a9a4b2225cb5e33e07c3a337f820168c",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_7": {
"inputs": {
"flake-utils": [
"zjstatus",
"flake-utils"
],
"nixpkgs": [
"zjstatus",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709259239,
"narHash": "sha256-MbrpgqpvUND7+UnOSLazrAMj0+zle16RRiOKTtjBefw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "0e031ddb3f5a339dc6eda93d271ae43618b14eec",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"subflakes": {
"inputs": {
"flake-utils": "flake-utils_12",
"nixpkgs": [
"nixpkgs"
],
"nvim-devdocs": "nvim-devdocs"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-PaTXAe/aVsZln/cKtHPXfiWIL+VwFxRiSQU0CRmglLI=",
"path": "/nix/store/8cxiy6xfbllk45hi741dgynwxc3qza1j-source/flakes",
"type": "path"
},
"original": {
"path": "/nix/store/8cxiy6xfbllk45hi741dgynwxc3qza1j-source/flakes",
"type": "path"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
@@ -1355,6 +1514,51 @@
"type": "github"
}
},
"systems_12": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_13": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_14": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
@@ -1474,6 +1678,29 @@
"repo": "default",
"type": "github"
}
},
"zjstatus": {
"inputs": {
"crane": "crane_4",
"flake-utils": "flake-utils_13",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_7"
},
"locked": {
"lastModified": 1710671797,
"narHash": "sha256-mltImYImYfqGUjqS6yIdW2x0ZjQIC+PLjtSoW63rnv4=",
"owner": "dj95",
"repo": "zjstatus",
"rev": "8e938da9c303e392f323b38498348f6c33e4de5a",
"type": "github"
},
"original": {
"owner": "dj95",
"repo": "zjstatus",
"type": "github"
}
}
},
"root": "root",

18
flake.nix
View File

@@ -55,6 +55,20 @@
url = "github:hyprwm/hyprlock";
inputs.nixpkgs.follows = "nixpkgs";
};
zjstatus = {
url = "github:dj95/zjstatus";
inputs.nixpkgs.follows = "nixpkgs";
};
subflakes = {
# TODO: Will eventualy move all the non-flake fetchFromGitHub urls to this flake
# As inputs for the flake that way I don't have to update the hashes manually
url = "./flakes";
inputs.nixpkgs.follows = "nixpkgs";
};
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
@@ -120,7 +134,9 @@
linux_devices = builtins.filter (x: x.isLinux) devices;
darwin_devices = builtins.filter (x: x.isMac) devices;
overlays = import ./overlays.nix {inherit inputs;};
overlays = import ./overlays.nix {
inherit inputs;
};
in {
nixosConfigurations = let
devices = nixos_devices;

78
flakes/flake.lock generated Normal file
View File

@@ -0,0 +1,78 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nvim-devdocs": {
"flake": false,
"locked": {
"lastModified": 1703234230,
"narHash": "sha256-qqtBNfBBGyxMsHL3UXu+MF/UyfVAubG+6fnwLK9kY9Q=",
"owner": "luckasRanarison",
"repo": "nvim-devdocs",
"rev": "521d24661ffe6d1ba025debea2675c765a9c1ee1",
"type": "github"
},
"original": {
"owner": "luckasRanarison",
"repo": "nvim-devdocs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"nvim-devdocs": "nvim-devdocs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

26
flakes/flake.nix Normal file
View File

@@ -0,0 +1,26 @@
{
description = "Get all overlays as subflakes";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
nvim-devdocs.url = "github:luckasRanarison/nvim-devdocs";
nvim-devdocs.flake = false;
};
outputs = {
nixpkgs,
flake-utils,
...
} @ inputs: let
overlay = final: prev: {
vimPlugins =
prev.vimPlugins
// {
nvim-devdocs = final.pkgs.vimUtils.buildVimPlugin {
pname = "nvim-devdocs";
version = "0.4.1";
src = inputs.nvim-devdocs;
};
};
};
in {overlays.default = overlay;};
}

1
linux/ironbar/default.nix
View File

@@ -78,6 +78,7 @@
# url = "https://github.com/catppuccin/waybar/releases/download/v1.0/mocha.css";
# sha256 = pkgs.lib.fakeSha256;
# };
# TODO: Move to subflake
catppuccin = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "waybar";

10
modules/goread.nix
View File

@@ -41,9 +41,13 @@ in {
config = {
home.packages = mkIf cfg.enable [pkgs.goread];
xdg.configFile = mkIf cfg.enable {
"goread/urls.yml".text = generators.toYAML {} cfg.config.urls;
# "goread/colorscheme.json".text = lib.generators.toJSON cfg.config.colorscheme;
# xdg.configFile = mkIf cfg.enable {
# "goread/urls.yml".text = generators.toYAML {} cfg.config.urls;
# # "goread/colorscheme.json".text = lib.generators.toJSON cfg.config.colorscheme;
# };
# Possibly fixes it on macos
home.file = {
".config/goread/urls.yml".text = generators.toYAML {} cfg.config.urls;
};
};
}

25
overlays.nix
View File

@@ -13,6 +13,7 @@
pname = "goread";
version = "v1.6.4";
vendorHash = "sha256-/kxEnw8l9S7WNMcPh1x7xqiQ3L61DSn6DCIvJlyrip0";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "TypicalAM";
repo = "goread";
@@ -24,6 +25,7 @@
};
music-player-git = inputs.music-player.packages.${prev.system}.default;
davis = let
# TODO: Move to subflake
davis-src = final.pkgs.fetchFromGitHub {
owner = "SimonPersson";
repo = "davis";
@@ -54,6 +56,7 @@
};
picat = let
# https://github.com/SimonPersson/picat
# TODO: Move to subflake
picat-src = final.pkgs.fetchFromGitHub {
owner = "SimonPersson";
repo = "picat";
@@ -89,6 +92,7 @@
final.rustPlatform.buildRustPackage rec {
pname = "psst";
version = "1";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
# https://github.com/jpochyla/psst
owner = "jpochyla";
@@ -125,6 +129,7 @@
// {
comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
name = "comfortable-motion";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "yuttie";
repo = "comfortable-motion.vim";
@@ -134,6 +139,7 @@
};
nvim-dap-rr = final.pkgs.vimUtils.buildVimPlugin {
name = "nvim-dap-rr";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "jonboh";
repo = "nvim-dap-rr";
@@ -143,6 +149,7 @@
};
sqls-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "sqls-nvim";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "nanotee";
repo = "sqls.nvim";
@@ -152,6 +159,7 @@
};
outline-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "outline-nvim";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "hedyhli";
repo = "outline.nvim";
@@ -168,6 +176,7 @@
tmux-super-fingers = final.pkgs.tmuxPlugins.mkTmuxPlugin {
pluginName = "tmux-super-fingers";
version = "v1-2024-02-14";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "artemave";
repo = "tmux_super_fingers";
@@ -200,6 +209,7 @@
tree-sitter-just = final.pkgs.tree-sitter.buildGrammar {
language = "just";
version = "1";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "IndianBoy42";
repo = "tree-sitter-just";
@@ -210,6 +220,7 @@
tree-sitter-nu = final.pkgs.tree-sitter.buildGrammar {
language = "nu";
version = "0.0.1";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
@@ -220,6 +231,7 @@
};
};
rest-nvim-overlay = final: prev: let
# TODO: Move to subflake
rest-nvim-src = final.pkgs.fetchFromGitHub {
owner = "rest-nvim";
repo = "rest.nvim";
@@ -259,6 +271,7 @@
python-final: python-prev: {
catppuccin = python-prev.catppuccin.overridePythonAttrs (oldAttrs: rec {
version = "1.3.2";
# TODO: Move to subflake
src = prev.fetchFromGitHub {
owner = "catppuccin";
repo = "python";
@@ -274,7 +287,14 @@
)
];
};
zellij = final: prev: {
zellijPlugins = {
zjstatus = inputs.zjstatus.packages.${prev.system}.default;
};
};
in [
inputs.subflakes.overlays.default
zellij
catppuccinThemes
vimPlugins
tree-sitter-grammars
@@ -286,8 +306,5 @@ in [
inputs.neovim-nightly-overlay.overlay
inputs.nur.overlay
catppuccin
(import (builtins.fetchTarball {
url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz";
sha256 = "sha256:143qm7bj651v2pwzq4sf5sp33g733inixf2b98sxf89ia0cabaqn";
}))
inputs.rust-overlay.overlays.default
]

2
themes/catppuccin.nix
View File

@@ -10,6 +10,8 @@
pkgs.stdenv.mkDerivation {
inherit version override;
pname = item;
# TODO: Move to subflake
# NOTE: It might not make sense to move this to subflake
src = pkgs.fetchFromGitHub {
inherit owner rev sha256;
repo = item;