[feat] Add stuff
This commit is contained in:
@@ -7,10 +7,15 @@ in {
|
||||
# Include the results of the hardware scan.
|
||||
./tmux.nix
|
||||
./wezterm.nix
|
||||
./nvim.nix
|
||||
|
||||
] ++ (if device.isLinux then [ ../linux ] else [ ]);
|
||||
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
ngrok
|
||||
gh
|
||||
yarn
|
||||
just
|
||||
jq
|
||||
tldr
|
||||
@@ -32,6 +37,7 @@ in {
|
||||
clang
|
||||
neovim-nightly
|
||||
nil
|
||||
pkg-config
|
||||
# neovim
|
||||
(nerdfonts.override { fonts = [ "Hasklig" ]; })
|
||||
mpv
|
||||
@@ -64,7 +70,7 @@ in {
|
||||
'';
|
||||
})
|
||||
] else
|
||||
[ ]);
|
||||
[ ]) ++ (if device.isMac then [ ] else [ ]);
|
||||
|
||||
# xdg.enable = true;
|
||||
|
||||
@@ -114,6 +120,17 @@ in {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableNushellIntegration = true;
|
||||
settings = let flavour = "mocha"; # Replace with your preferred palette
|
||||
in {
|
||||
# Other config here
|
||||
format = "$all"; # Remove this line to disable the default prompt format
|
||||
palette = "catppuccin_${flavour}";
|
||||
} // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "starship";
|
||||
rev = "main"; # Replace with the latest commit hash
|
||||
sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0";
|
||||
} + /palettes/${flavour}.toml));
|
||||
};
|
||||
eza = {
|
||||
enable = true;
|
||||
@@ -137,6 +154,22 @@ in {
|
||||
enableFishIntegration = true;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
bat = {
|
||||
enable = true;
|
||||
config = { theme = "catppuccin"; };
|
||||
themes = {
|
||||
catppuccin = let flavor = "mocha";
|
||||
in {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "bat";
|
||||
rev = "main";
|
||||
sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw";
|
||||
};
|
||||
file = "Catppuccin-${flavor}.tmTheme";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
home-manager = { enable = true; };
|
||||
@@ -156,8 +189,8 @@ in {
|
||||
|
||||
file = {
|
||||
".config/tmux/sessions".source = ../../tmux/sessions;
|
||||
".config/nvim/lua".source = ../../nvim/lua;
|
||||
".config/nvim/init.lua".source = ../../nvim/init.lua;
|
||||
# ".config/nvim/lua".source = ../../nvim/lua;
|
||||
# ".config/nvim/init.lua".source = ../../nvim/init.lua;
|
||||
".config/macchina".source = ../../macchina;
|
||||
|
||||
# # You can also set the file content immediately.
|
||||
|
||||
46
config/nix/common/nvim.nix
Normal file
46
config/nix/common/nvim.nix
Normal file
@@ -0,0 +1,46 @@
|
||||
{ pkgs, inputs, ... }: {
|
||||
imports = [ inputs.nixneovim.nixosModules.default ];
|
||||
programs.nixneovim = {
|
||||
enable = true;
|
||||
extraConfigLua = ''
|
||||
vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
|
||||
vim.opt.foldtext = "v:lua.vim.treesitter.foldtext()"
|
||||
'';
|
||||
options = {
|
||||
number = true;
|
||||
relativenumberr = true;
|
||||
};
|
||||
plugins = {
|
||||
lspconfig = {
|
||||
enable = true;
|
||||
servers = {
|
||||
rust-analyzer.enable = true;
|
||||
nil.enable = true;
|
||||
};
|
||||
};
|
||||
treesitter = {
|
||||
enable = true;
|
||||
indent = true;
|
||||
};
|
||||
};
|
||||
colorschemes = {
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
flavour = "mocha";
|
||||
};
|
||||
};
|
||||
mappings = {
|
||||
normal = {
|
||||
"<leader>ff" = "require'telescope.builtin'.find_files()";
|
||||
"<leader>gg" = "require'telescope.builtin'.live_grep()";
|
||||
"<leader>;" = "require'telescope.builtin'.buffers()";
|
||||
"<leader><leader>" = "<c-^>";
|
||||
"vff" = "<cmd>vertical Gdiffsplit<cr>";
|
||||
"<C-k>" = "vim.lsp.buf.definition()";
|
||||
"gi" = "vim.lsp.buf.implementation()";
|
||||
"<leader>a" = "vim.lsp.buf.code_action()";
|
||||
"F" = "vim.lsp.buf.format( async = true )";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -10,39 +10,40 @@
|
||||
-- "Symbols Nerd Font Mono"
|
||||
-- }),
|
||||
|
||||
color_scheme = "Catppuccin Mocha",
|
||||
font_size = 16,
|
||||
colors = {
|
||||
-- The default text color
|
||||
foreground = "#f8f8f2",
|
||||
-- The default background color
|
||||
-- background = "#282a36",
|
||||
-- Overrides the cell background color when the current cell is occupied by the
|
||||
-- cursor and the cursor style is set to Block
|
||||
cursor_bg = "#f8f8f2",
|
||||
-- Overrides the text color when the current cell is occupied by the cursor
|
||||
cursor_fg = "#000",
|
||||
-- Specifies the border color of the cursor when the cursor style is set to Block,
|
||||
-- or the color of the vertical or horizontal bar when the cursor style is set to
|
||||
-- Bar or Underline.
|
||||
cursor_border = "#52ad70",
|
||||
-- the foreground color of selected text
|
||||
selection_fg = "#ffffff",
|
||||
-- the background color of selected text
|
||||
selection_bg = "#ffffff",
|
||||
-- The color of the scrollbar "thumb"; the portion that represents the current viewport
|
||||
scrollbar_thumb = "#222222",
|
||||
-- The color of the split lines between panes
|
||||
split = "#444444",
|
||||
ansi = { "#21222c", "#ff5555", "#50fa7b", "#f1fa8c", "#bd93f9", "#ff79c6", "#8be9fd", "#f8f8f2" },
|
||||
brights = { "#6272a4", "#ff6e6e", "#69ff94", "#ffffa5", "#d6acff", "#ff92df", "#a4ffff", "#ffffff" },
|
||||
-- Arbitrary colors of the palette in the range from 16 to 255
|
||||
indexed = { [136] = "#af8700" },
|
||||
-- Since: nightly builds only
|
||||
-- When the IME, a dead key or a leader key are being processed and are effectively
|
||||
-- holding input pending the result of input composition, change the cursor
|
||||
-- to this color to give a visual cue about the compose state.
|
||||
compose_cursor = "orange",
|
||||
},
|
||||
-- colors = {
|
||||
-- -- The default text color
|
||||
-- foreground = "#f8f8f2",
|
||||
-- -- The default background color
|
||||
-- -- background = "#282a36",
|
||||
-- -- Overrides the cell background color when the current cell is occupied by the
|
||||
-- -- cursor and the cursor style is set to Block
|
||||
-- cursor_bg = "#f8f8f2",
|
||||
-- -- Overrides the text color when the current cell is occupied by the cursor
|
||||
-- cursor_fg = "#000",
|
||||
-- -- Specifies the border color of the cursor when the cursor style is set to Block,
|
||||
-- -- or the color of the vertical or horizontal bar when the cursor style is set to
|
||||
-- -- Bar or Underline.
|
||||
-- cursor_border = "#52ad70",
|
||||
-- -- the foreground color of selected text
|
||||
-- selection_fg = "#ffffff",
|
||||
-- -- the background color of selected text
|
||||
-- selection_bg = "#ffffff",
|
||||
-- -- The color of the scrollbar "thumb"; the portion that represents the current viewport
|
||||
-- scrollbar_thumb = "#222222",
|
||||
-- -- The color of the split lines between panes
|
||||
-- split = "#444444",
|
||||
-- ansi = { "#21222c", "#ff5555", "#50fa7b", "#f1fa8c", "#bd93f9", "#ff79c6", "#8be9fd", "#f8f8f2" },
|
||||
-- brights = { "#6272a4", "#ff6e6e", "#69ff94", "#ffffa5", "#d6acff", "#ff92df", "#a4ffff", "#ffffff" },
|
||||
-- -- Arbitrary colors of the palette in the range from 16 to 255
|
||||
-- indexed = { [136] = "#af8700" },
|
||||
-- -- Since: nightly builds only
|
||||
-- -- When the IME, a dead key or a leader key are being processed and are effectively
|
||||
-- -- holding input pending the result of input composition, change the cursor
|
||||
-- -- to this color to give a visual cue about the compose state.
|
||||
-- compose_cursor = "orange",
|
||||
-- },
|
||||
initial_cols = 120,
|
||||
hide_tab_bar_if_only_one_tab = true,
|
||||
window_background_opacity = 0.8,
|
||||
|
||||
Reference in New Issue
Block a user