Update
This commit is contained in:
Hadi
@@ -1,47 +0,0 @@
|
||||
{
|
||||
programs.nixvim = {
|
||||
# colorschemes = {
|
||||
# catppuccin = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# background = {
|
||||
# light = "macchiato";
|
||||
# dark = "mocha";
|
||||
# };
|
||||
# flavour =
|
||||
# "mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code
|
||||
# disable_bold = false;
|
||||
# disable_italic = false;
|
||||
# disable_underline = false;
|
||||
# transparent_background = true;
|
||||
# term_colors = true;
|
||||
# integrations = {
|
||||
# cmp = true;
|
||||
# noice = true;
|
||||
# notify = true;
|
||||
# neotree = true;
|
||||
# harpoon = true;
|
||||
# gitsigns = true;
|
||||
# which_key = true;
|
||||
# illuminate = { enabled = true; };
|
||||
# treesitter = true;
|
||||
# treesitter_context = true;
|
||||
# telescope.enabled = true;
|
||||
# indent_blankline.enabled = true;
|
||||
# mini.enabled = true;
|
||||
# native_lsp = {
|
||||
# enabled = true;
|
||||
# inlay_hints = { background = true; };
|
||||
# underlines = {
|
||||
# errors = [ "underline" ];
|
||||
# hints = [ "underline" ];
|
||||
# information = [ "underline" ];
|
||||
# warnings = [ "underline" ];
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
@@ -10,7 +10,6 @@
|
||||
./plugins/utils.nix
|
||||
|
||||
./options.nix
|
||||
./colorscheme.nix
|
||||
./keymaps.nix
|
||||
];
|
||||
|
||||
|
||||
@@ -1,123 +1,53 @@
|
||||
{ pkgs, inputs, ... }: {
|
||||
# The render-markdown.nvim plugin is a plugin that renders markdown files in a neovim in a more readable way.
|
||||
{ pkgs, config, inputs, ... }: {
|
||||
programs.nixvim = {
|
||||
extraFiles = {
|
||||
"ftplugin/markdown.lua".text = ''
|
||||
vim.opt.tabstop = 2
|
||||
vim.opt.shiftwidth = 2
|
||||
'';
|
||||
};
|
||||
highlight = {
|
||||
RenderMarkdownBg.bg = "#${config.lib.stylix.colors.base00}";
|
||||
RenderMarkdownH1.fg = "#${config.lib.stylix.colors.base0D}";
|
||||
RenderMarkdownH2.fg = "#${config.lib.stylix.colors.base0D}";
|
||||
RenderMarkdownH3.fg = "#${config.lib.stylix.colors.base05}";
|
||||
RenderMarkdownH4.fg = "#${config.lib.stylix.colors.base05}";
|
||||
RenderMarkdownH5.fg = "#${config.lib.stylix.colors.base03}";
|
||||
RenderMarkdownH6.fg = "#${config.lib.stylix.colors.base03}";
|
||||
};
|
||||
extraPlugins = [
|
||||
(pkgs.vimUtils.buildVimPlugin {
|
||||
name = "markdown.nvim";
|
||||
src = inputs.plugin-markdown;
|
||||
})
|
||||
];
|
||||
extraConfigLua = "require('render-markdown').setup({})";
|
||||
plugins = {
|
||||
mkdnflow = {
|
||||
enable = false;
|
||||
mappings = {
|
||||
|
||||
# Main
|
||||
MkdnEnter = {
|
||||
key = "<CR>";
|
||||
modes = [ "n" "v" "i" ];
|
||||
};
|
||||
|
||||
# Links
|
||||
MkdnCreateLink = false;
|
||||
MkdnCreateLinkFromClipboard = false;
|
||||
MkdnDestroyLink = false;
|
||||
MkdnFollowLink = false;
|
||||
MkdnNextLink = {
|
||||
key = "<Tab>";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnPrevLink = {
|
||||
key = "<S-Tab>";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnYankAnchorLink = false;
|
||||
MkdnYankFileAnchorLink = false;
|
||||
MkdnDecreaseHeading = {
|
||||
key = "-";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnIncreaseHeading = {
|
||||
key = "+";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnExtendList = false;
|
||||
MkdnFoldSection = {
|
||||
key = "<leader>ff";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnUnfoldSection = {
|
||||
key = "<leader>fu";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnGoBack = {
|
||||
key = "<BS>";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnGoForward = false;
|
||||
MkdnMoveSource = false;
|
||||
MkdnNewListItem = false;
|
||||
MkdnNewListItemAboveInsert = {
|
||||
key = "O";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnNewListItemBelowInsert = {
|
||||
key = "o";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnNextHeading = {
|
||||
key = "]]";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnPrevHeading = {
|
||||
key = "[[";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnSTab = false;
|
||||
MkdnTab = false;
|
||||
MkdnTableFormat = {
|
||||
key = "<leader>tf";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNewColAfter = {
|
||||
key = "<leader>tc";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNewColBefore = {
|
||||
key = "<leader>tC";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNewRowAbove = {
|
||||
key = "<leader>tR";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNewRowBelow = {
|
||||
key = "<leader>tr";
|
||||
modes = "n";
|
||||
};
|
||||
MkdnTableNextCell = {
|
||||
key = "<S-Tab>";
|
||||
modes = "i";
|
||||
};
|
||||
MkdnTableNextRow = false;
|
||||
MkdnTablePrevCell = {
|
||||
key = "<M-Tab>";
|
||||
modes = "i";
|
||||
};
|
||||
MkdnTablePrevRow = {
|
||||
key = "<M-CR>";
|
||||
modes = "i";
|
||||
};
|
||||
MkdnToggleToDo = {
|
||||
key = "<C-Space>";
|
||||
modes = [ "n" "v" ];
|
||||
};
|
||||
MkdnUpdateNumbering = {
|
||||
key = "<leader>nn";
|
||||
modes = "n";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
extraConfigLua =
|
||||
# lua
|
||||
''
|
||||
require('render-markdown').setup({
|
||||
heading = {
|
||||
icons = { '# ', ' ', ' ', ' ', ' ', ' ' },
|
||||
backgrounds = {
|
||||
'RenderMarkdownBg',
|
||||
},
|
||||
foregrounds = {
|
||||
'RenderMarkdownH1',
|
||||
'RenderMarkdownH2',
|
||||
'RenderMarkdownH3',
|
||||
'RenderMarkdownH4',
|
||||
'RenderMarkdownH5',
|
||||
'RenderMarkdownH6',
|
||||
},
|
||||
},
|
||||
checkbox = {
|
||||
custom = {
|
||||
pending = { raw = '[-]', rendered = ' ', highlight = 'RenderMarkdownTodo' },
|
||||
important = { raw = '[!]', rendered = ' ', highlight = 'RenderMarkdownTodo' },
|
||||
cancle = { raw = '[/]', rendered = ' ', highlight = 'RenderMarkdownTodo' },
|
||||
},
|
||||
},
|
||||
})
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
{ pkgs, config, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [ ctags ];
|
||||
|
||||
programs.nixvim = {
|
||||
highlight = {
|
||||
Headline.bg = "#${config.lib.stylix.colors.base0D}";
|
||||
Headline.bold = true;
|
||||
Headline1.bg = "#${config.lib.stylix.colors.base01}";
|
||||
Headline1.bold = true;
|
||||
};
|
||||
plugins = {
|
||||
lualine = {
|
||||
enable = true;
|
||||
@@ -56,7 +50,6 @@
|
||||
enable = true;
|
||||
settings.current_line_blame = false;
|
||||
};
|
||||
# bufferline.enable = true;
|
||||
trouble.enable = true;
|
||||
indent-blankline.enable = true;
|
||||
which-key.enable = true;
|
||||
|
||||
@@ -6,26 +6,24 @@
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
nerdfont-fzf = pkgs.writeShellScriptBin "nerdfont-fzf" ''
|
||||
# Dependencies: jq, fzf, wl-copy, wget
|
||||
icons=$(jq -r 'to_entries[] | "\(.key):\(.value.char)"' "/home/${config.var.username}/.config/nerdfont_glyphnames.json" | awk -F: '{print "\033[95m "$2" \033[0m "$1}')
|
||||
fzf_result=$(echo "$icons" | fzf --ansi --border none | awk '{print $1}')
|
||||
icons=$(${pkgs.jq}/bin/jq -r 'to_entries[] | "\(.key):\(.value.char)"' "/home/${config.var.username}/.config/nerdfont_glyphnames.json" | awk -F: '{print "\033[95m "$2" \033[0m "$1}')
|
||||
fzf_result=$(echo "$icons" | ${pkgs.fzf}/bin/fzf --ansi --border none | awk '{print $1}')
|
||||
if [ -z "$fzf_result" ]; then
|
||||
echo "No icon selected"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Copied to clipboard: $fzf_result"
|
||||
${pkgs.wl-clipboard}/bin/wl-copy "$fzf_result" # wait for paste before exiting.. not cool
|
||||
'';
|
||||
|
||||
nerdfont-fzf-fetch = pkgs.writeShellScriptBin "nerdfont-fzf-fetch" ''
|
||||
wget "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/glyphnames.json" -O "glyphnames.json" || exit 1
|
||||
jq 'del(.METADATA)' "glyphnames.json"
|
||||
${pkgs.wl-clipboard}/bin/wl-copy "$fzf_result"
|
||||
'';
|
||||
in {
|
||||
home.packages = [ nerdfont-fzf nerdfont-fzf-fetch ];
|
||||
home.packages = [ nerdfont-fzf ];
|
||||
|
||||
xdg.configFile."nerdfont_glyphnames.json" = {
|
||||
source = ./nerdfont_glyphnames.json;
|
||||
source = pkgs.fetchurl {
|
||||
url =
|
||||
"https://raw.githubusercontent.com/ryanoasis/nerd-fonts/384b1825ea0037b0314f7f9c660a80c1ecdb219a/glyphnames.json";
|
||||
hash = "sha256-Ps0dyFcMs51RMTthBOVSOf/lafPV/53JxuNSKlmZ7cc=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -5,7 +5,7 @@
|
||||
#- - `nixy` - UI wizard to manage the system.
|
||||
#- - `nixy rebuild` - Rebuild the system.
|
||||
#- - `nixy ...` - ... see the script for more commands.
|
||||
{ pkgs, config, ... }:
|
||||
{ pkgs, config, inputs, ... }:
|
||||
let
|
||||
nixy = pkgs.writeShellScriptBin "nixy"
|
||||
# bash
|
||||
@@ -24,7 +24,8 @@ let
|
||||
";Update;nixy update"
|
||||
";Collect Garbage;nixy gc"
|
||||
";Clean Boot Menu;nixy cb"
|
||||
" ;Hyprland Keybindings;nvim ${config.var.configDirectory}/docs/KEYBINDINGS-HYPRLAND.md"
|
||||
";Hyprland Keybindings;nvim ${config.var.configDirectory}/docs/KEYBINDINGS-HYPRLAND.md"
|
||||
";Wallpapers;nvim ${inputs.nixy-wallpapers}/docs/MOBILE-VIEW.md"
|
||||
)
|
||||
|
||||
# Apply default icons if empty:
|
||||
|
||||
Reference in New Issue
Block a user