lots of stuff

Signed-off-by: gwg313 <gwg313@pm.me>
This commit is contained in:
gwg313 2025-06-30 18:13:14 -04:00
parent cf1df09a9e
commit 58f06d6729
Signed by: gwg313
GPG key ID: 60FF63B4826B7400
55 changed files with 2154 additions and 584 deletions

View file

@ -19,6 +19,8 @@
inputs.ags.homeManagerModules.default
# You can also split up your configuration and import pieces of it here:
../modules/nvf
./candlekeep/variables.nix
# ./nvim.nix
../modules/common.nix
@ -30,7 +32,7 @@
../modules/ssh.nix
../modules/gh-dash.nix
../modules/ags.nix
../modules/neovim
# ../modules/neovim
../modules/yazi.nix
# ../modules/hyprpanel.nix
# ../modules/hyprlock.nix
@ -50,7 +52,7 @@
# You can also add overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default
(final: prev: { neovim = inputs.neovim-config.packages."x86_64-linux".default; })
# (final: prev: { neovim = inputs.neovim-config.packages."x86_64-linux".default; })
# Or define it inline, for example:
# (final: prev: {
@ -75,28 +77,38 @@
};
stylix = {
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml";
image = ../../wallpapers/hollow-knight.jpg;
fonts = {
sizes = {
applications = 13; # UI font (GTK/Qt)
terminal = 14; # Comfortable for reading code/math
desktop = 13; # WM, notifications
popups = 12; # Tooltips, menus
};
};
# base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml";
base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-sulphurpool-light.yaml";
image = ../../wallpapers/floating_city.jpg;
# polarity = "dark";
autoEnable = true;
enable = true;
targets.nixvim.enable = false;
opacity.terminal = 1.0;
fonts.sizes.terminal = 15;
fonts = {
serif = {
package = pkgs.meslo-lgs-nf;
name = "MesloLGS NF";
package = pkgs.lmodern;
name = "Latin Modern Roman";
};
sansSerif = {
package = pkgs.meslo-lgs-nf;
name = "MesloLGS NF";
package = pkgs.inter;
name = "Inter";
};
monospace = {
package = pkgs.ibm-plex;
name = "IBM Plex Mono";
package = pkgs.fira-code;
name = "Fire Code";
};
emoji = {
@ -105,12 +117,30 @@
};
};
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 20;
package = pkgs.vanilla-dmz;
name = "Vanilla-DMZ";
size = 24;
};
};
gtk = {
enable = true;
iconTheme = {
name = "WhiteSur-Light";
package = pkgs.whitesur-icon-theme.override {
boldPanelIcons = true;
alternativeIcons = true;
};
};
# font.name = "Inter 13";
};
qt = {
enable = true;
platformTheme.name = "gtk";
style.name = "adwaita";
};
# Add stuff for your user as you see fit:
# programs.neovim.enable = true;
home.packages = with pkgs; [

View file

@ -24,6 +24,7 @@
# ../modules/hyprlock.nix
# ../modules/hypridle.nix
# ./nvim.nix
../modules/nvf
../modules/common.nix
../modules/hyprland
# ../modules/hyprland.nix
@ -32,9 +33,10 @@
../modules/devenv.nix
../modules/gh-dash.nix
../modules/ssh.nix
../modules/neovim/default.nix
# ../modules/neovim/default.nix
../modules/yazi.nix
../modules/qutebrowser.nix
../scripts/default.nix
];
nixpkgs = {
@ -73,31 +75,38 @@
};
stylix = {
# base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml";
fonts = {
sizes = {
applications = 13; # UI font (GTK/Qt)
terminal = 14; # Comfortable for reading code/math
desktop = 13; # WM, notifications
popups = 12; # Tooltips, menus
};
};
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml";
image = ../../wallpapers/hollow-knight.jpg;
# base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-sulphurpool-light.yaml";
image = ../../wallpapers/nixos-wallpaper-catppuccin-latte.png;
# polarity = "dark";
autoEnable = true;
enable = true;
targets.nixvim.enable = false;
opacity.terminal = 1.0;
fonts.sizes.terminal = 20;
fonts = {
serif = {
package = pkgs.meslo-lgs-nf;
name = "MesloLGS NF";
package = pkgs.lmodern;
name = "Latin Modern Roman";
};
sansSerif = {
package = pkgs.meslo-lgs-nf;
name = "MesloLGS NF";
package = pkgs.inter;
name = "Inter";
};
monospace = {
package = pkgs.ibm-plex;
name = "IBM Plex Mono";
package = pkgs.fira-code;
name = "Fire Code";
};
emoji = {
@ -106,12 +115,29 @@
};
};
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 20;
package = pkgs.vanilla-dmz;
name = "Vanilla-DMZ";
size = 24;
};
};
gtk = {
enable = true;
iconTheme = {
name = "WhiteSur-Light";
package = pkgs.whitesur-icon-theme.override {
boldPanelIcons = true;
alternativeIcons = true;
};
};
# font.name = "Inter 13";
};
qt = {
enable = true;
platformTheme.name = "gtk";
style.name = "adwaita";
};
# Add stuff for your user as you see fit:
# programs.neovim.enable = true;
home.packages = with pkgs; [ openvpn ];

View file

@ -1,5 +1,6 @@
# A cat clone with syntax highlighting and Git integration.
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.ags = {
enable = true;
# null or path, leave as null if you don't want hm to manage the config
@ -8,7 +9,6 @@
# additional packages to add to gjs's runtime
extraPackages = with pkgs; [
gtksourceview
webkitgtk
accountsservice
libdbusmenu-gtk3
];

View file

@ -26,6 +26,7 @@
home.packages =
with pkgs;
[
ncdu
# Editors
# neovim # Improved version of vim, often used with overlays.
# vim # Highly configurable text editor popular for efficiency and extensibility.
@ -46,7 +47,7 @@
ripgrep # Faster alternative to 'grep,' recursively searching directories for a regex pattern.
rm-improved # Enhanced file and directory removal tool with interactive prompts, advanced options, and improved user feedback.
tealdeer # Command-line utility providing simplified and community-driven man pages.
thefuck # Handy tool that corrects mistyped console commands.
pay-respects # Handy tool that corrects mistyped console commands.
viddy # A modern watch command. Time machine and pager etc.
# Multiplexers

View file

@ -10,8 +10,10 @@
enable = true;
userName = "gwg313";
userEmail = "gwg313@pm.me";
extraConfig = {
credential = {
helper = "!pass-git-helper $@";
};
user = {
signingkey = "60FF63B4826B7400";
};
@ -60,7 +62,6 @@
default = "simple";
autoSetupRemote = "true";
followTags = "true";
};
pull = {
rebase = "true";
@ -142,5 +143,12 @@
pre-commit
graphite-cli
tig
pass-git-helper
];
xdg.configFile."pass-git-helper/git-pass-mapping.ini".text = ''
[git.gwg313.xyz*]
target=git/https/git.gwg313.xyz
line_username=1
'';
}

View file

@ -144,6 +144,7 @@ in
disable_autoreload = true;
focus_on_activate = true;
new_window_takes_over_fullscreen = 2;
middle_click_paste = false;
};
windowrulev2 = [

View file

@ -8,7 +8,13 @@ in
enable = true;
settings = lib.mkForce {
disableStartupPopups = true;
notARepository = "skip";
promptToReturnFromSubprocess = false;
update.method = "never";
git = {
commit.signOff = true;
overrideGpg = true;
};
gui = {

View file

@ -22,7 +22,7 @@
inkscape
nicotine-plus
anki
obsidian
# obsidian
chromium
vlc
zotero

View file

@ -1,39 +1,96 @@
{ pkgs, lib, ... }:
with lib;
let
defaultApps = {
browser = [ "zen-beta.desktop" ];
text = [ "org.gnome.TextEditor.desktop" ];
image = [ "imv-dir.desktop" ];
audio = [ "mpv.desktop" ];
video = [ "mpv.desktop" ];
directory = [ "thunar.desktop" ];
office = [ "libreoffice.desktop" ];
pdf = [ "zathura.desktop" ];
terminal = [ "kitty.desktop" ];
discord = [ "discord.desktop" ];
archive = [ "xarchiver.desktop" ];
};
mimeMap = {
text = [ "text/plain" ];
image = [
"image/bmp"
"image/gif"
"image/jpeg"
"image/jpg"
"image/png"
"image/svg+xml"
"image/tiff"
"image/vnd.microsoft.icon"
"image/webp"
];
audio = [
"audio/aac"
"audio/mpeg"
"audio/ogg"
"audio/opus"
"audio/wav"
"audio/webm"
"audio/x-matroska"
];
video = [
"video/mp2t"
"video/mp4"
"video/mpeg"
"video/ogg"
"video/webm"
"video/x-flv"
"video/x-matroska"
"video/x-msvideo"
];
directory = [ "inode/directory" ];
browser = [
"text/html"
"x-scheme-handler/about"
"x-scheme-handler/http"
"x-scheme-handler/https"
"x-scheme-handler/unknown"
];
office = [
"application/vnd.oasis.opendocument.text"
"application/vnd.oasis.opendocument.spreadsheet"
"application/vnd.oasis.opendocument.presentation"
"application/vnd.openxmlformats-officedocument.wordprocessingml.document"
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
"application/vnd.openxmlformats-officedocument.presentationml.presentation"
"application/msword"
"application/vnd.ms-excel"
"application/vnd.ms-powerpoint"
"application/rtf"
];
pdf = [ "application/pdf" ];
terminal = [ "terminal" ];
archive = [
"application/zip"
"application/rar"
"application/7z"
"application/*tar"
];
discord = [ "x-scheme-handler/discord" ];
};
associations =
with lists;
listToAttrs (
flatten (mapAttrsToList (key: map (type: attrsets.nameValuePair type defaultApps."${key}")) mimeMap)
);
in
{
xdg.mimeApps = {
enable = true;
defaultApplications = {
"text/markdown" = "nvim.desktop";
"text/plain" = "nvim.desktop";
"text/x-shellscript" = "nvim.desktop";
"text/x-python" = "nvim.desktop";
"text/x-go" = "nvim.desktop";
"text/css" = "nvim.desktop";
"text/javascript" = "nvim.desktop";
"text/x-c" = "nvim.desktop";
"text/x-c++" = "nvim.desktop";
"text/x-java" = "nvim.desktop";
"text/x-rust" = "nvim.desktop";
"text/x-yaml" = "nvim.desktop";
"text/x-toml" = "nvim.desktop";
"text/x-dockerfile" = "nvim.desktop";
"text/x-xml" = "nvim.desktop";
"text/x-php" = "nvim.desktop";
"image/jpeg" = "imv.desktop";
"image/jpg" = "imv.desktop";
"image/webp" = "imv.desktop";
"image/gif" = "zen.desktop";
"x-scheme-handler/http" = "zen.desktop";
"x-scheme-handler/https" = "zen.desktop";
"text/html" = "zen.desktop";
"application/pdf" = "zathura.desktop";
"image/png" = "imv-dir.desktop";
"x-scheme-handler/chrome" = "zen.desktop";
"application/x-extension-htm" = "zen.desktop";
"application/x-extension-html" = "zen.desktop";
"application/x-extension-shtml" = "zen.desktop";
"application/xhtml+xml" = "zen.desktop";
"application/x-extension-xhtml" = "zen.desktop";
"application/x-extension-xht" = "zen.desktop";
xdg = {
configFile."mimeapps.list".force = true;
mimeApps = {
enable = true;
associations.added = associations;
defaultApplications = associations;
};
};
}

View file

@ -8,6 +8,8 @@
loaded_python_provider = 0; # Python 2
};
colorscheme = "base16-atelier-sulphurpool-light";
clipboard = {
# Use system clipboard
register = "unnamedplus";

View file

@ -0,0 +1,10 @@
{ ... }:
{
programs.nixvim = {
colorschemes.base16 = {
enable = true;
colorscheme = "atelier-sulphurpool-light";
autoLoad = true;
};
};
}

View file

@ -99,6 +99,7 @@
fsharp = [ "fantomas" ];
go = [ "gofmt" ];
haskell = [ "ormolu" ];
java = [ "google-java-format" ];
javascript = [
[
"prettierd"

View file

@ -3,7 +3,8 @@ _: {
# ./none-ls.nix
./autopairs.nix
./bufferline.nix
./catppuccin.nix
./base16.nix
# ./catppuccin.nix
./comment.nix
./conform.nix
./clangd-extensions.nix

View file

@ -101,6 +101,7 @@
#
# initOptions.compilationDatabaseDirectory = "build";
# };
jdtls.enable = true;
clangd = {
enable = true;
filetypes = [

View file

@ -0,0 +1,26 @@
{
inputs,
pkgs,
...
}:
{
imports = [
inputs.nvf.homeManagerModules.default
./options.nix
./languages.nix
./picker.nix
./snacks.nix
./keymaps.nix
./utils.nix
./mini.nix
];
programs.nvf = {
enable = true;
settings.vim = {
startPlugins = [
pkgs.vimPlugins.vim-kitty-navigator
];
};
};
}

View file

@ -0,0 +1,275 @@
{
programs.nvf.settings.vim = {
globals.mapleader = " ";
binds = {
whichKey = {
enable = true;
# TODO: registers
register = { };
};
};
keymaps = [
# General Mappings
{
key = "s";
mode = "n";
silent = true;
action = "<cmd>lua require('flash').jump()<cr>";
desc = "Flash";
}
{
key = "K";
mode = "n";
silent = true;
action = "<cmd>lua vim.lsp.buf.hover()<cr>";
desc = "LSP Hover";
}
{
key = "<C-tab>";
mode = "n";
silent = true;
action = "<cmd>bnext<cr>";
desc = "Next Buffer";
}
# Kitty navigator
{
key = "<C-h>";
mode = "n";
silent = true;
action = "<cmd>KittyNavigateLeft<cr>";
}
{
key = "<C-j>";
mode = "n";
silent = true;
action = "<cmd>KittyNavigateDown<cr>";
}
{
key = "<C-k>";
mode = "n";
silent = true;
action = "<cmd>KittyNavigateUp<cr>";
}
{
key = "<C-l>";
mode = "n";
silent = true;
action = "<cmd>KittyNavigateRight<cr>";
}
# Disable Arrow Keys in Normal Mode
# {
# key = "<Up>";
# mode = "n";
# silent = true;
# action = "k";
# desc = "Disable Up Arrow";
# }
# {
# key = "<Down>";
# mode = "n";
# silent = true;
# action = "j";
# desc = "Disable Down Arrow";
# }
# {
# key = "<Left>";
# mode = "n";
# silent = true;
# action = "h";
# desc = "Disable Left Arrow";
# }
# {
# key = "<Right>";
# mode = "n";
# silent = true;
# action = "l";
# desc = "Disable Right Arrow";
# }
# UI
{
key = "<leader>uw";
mode = "n";
silent = true;
action = "<cmd>set wrap!<cr>";
desc = "Toggle word wrapping";
}
{
key = "<leader>ul";
mode = "n";
silent = true;
action = "<cmd>set linebreak!<cr>";
desc = "Toggle linebreak";
}
{
key = "<leader>us";
mode = "n";
silent = true;
action = "<cmd>set spell!<cr>";
desc = "Toggle spellLazyGitcheck";
}
{
key = "<leader>uc";
mode = "n";
silent = true;
action = "<cmd>set cursorline!<cr>";
desc = "Toggle cursorline";
}
{
key = "<leader>un";
mode = "n";
silent = true;
action = "<cmd>set number!<cr>";
desc = "Toggle line numbers";
}
{
key = "<leader>ur";
mode = "n";
silent = true;
action = "<cmd>set relativenumber!<cr>";
desc = "Toggle relative line numbers";
}
{
key = "<leader>ut";
mode = "n";
silent = true;
action = "<cmd>set showtabline=2<cr>";
desc = "Show tabline";
}
{
key = "<leader>uT";
mode = "n";
silent = true;
action = "<cmd>set showtabline=0<cr>";
desc = "Hide tabline";
}
# Windows
{
key = "<leader>ws";
mode = "n";
silent = true;
action = "<cmd>split<cr>";
desc = "Split";
}
{
key = "<leader>wv";
mode = "n";
silent = true;
action = "<cmd>vsplit<cr>";
desc = "VSplit";
}
{
key = "<leader>wd";
mode = "n";
silent = true;
action = "<cmd>close<cr>";
desc = "Close";
}
{
key = "<leader>ma";
mode = "n";
silent = true;
action = "<cmd>close<cr>";
desc = "Close";
}
{
key = "<C-Left>";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').move_cursor_left()<cr>";
desc = "Move to left split";
}
{
key = "<C-Down>";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').move_cursor_down()<cr>";
desc = "Move to lower split";
}
{
key = "<C-Up>";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').move_cursor_up()<cr>";
desc = "Move to upper split";
}
{
key = "<C-Right>";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').move_cursor_right()<cr>";
desc = "Move to right split";
}
{
key = "<M-Left>";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').resize_left()<cr>";
desc = "Resize left";
}
{
key = "<M-Down>";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').resize_down()<cr>";
desc = "Resize down";
}
{
key = "<M-Up>";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').resize_up()<cr>";
desc = "Resize up";
}
{
key = "<M-Right>";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').resize_right()<cr>";
desc = "Resize right";
}
{
key = "<leader>w=";
mode = "n";
silent = true;
action = "<C-w>=";
desc = "Equalize Splits";
}
{
key = "<leader>we";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').swap_buf_right()<cr>";
desc = "Swap Buffer Right";
}
{
key = "<leader>wh";
mode = "n";
silent = true;
action = "<cmd>lua require('smart-splits').swap_buf_left()<cr>";
desc = "Swap Buffer Left";
}
{
key = "<C-o>";
mode = "n";
silent = true;
action = "<C-o>zz";
desc = "Jump back and center";
}
{
key = "<C-i>";
mode = "n";
silent = true;
action = "<C-i>zz";
desc = "Jump forward and center";
}
];
};
}

View file

@ -0,0 +1,49 @@
{
programs.nvf.settings.vim = {
diagnostics = {
enable = true;
nvim-lint.enable = true;
config.virtual_text = true;
};
syntaxHighlighting = true;
treesitter = {
enable = true;
autotagHtml = true;
context.enable = true;
highlight = {
enable = true;
additionalVimRegexHighlighting = true;
};
};
lsp = {
enable = true;
trouble.enable = true;
formatOnSave = true;
inlayHints.enable = true;
lightbulb.enable = true;
null-ls.enable = true;
otter-nvim.enable = true;
};
languages = {
enableDAP = true;
enableExtraDiagnostics = true;
enableFormat = true;
enableTreesitter = true;
astro.enable = true;
python.enable = true;
java.enable = true;
clang.enable = true;
go.enable = true;
markdown.enable = true;
ts.enable = true;
ts.extensions.ts-error-translator.enable = true;
css.enable = true;
svelte.enable = true;
html.enable = true;
bash.enable = true;
nix.enable = true;
tailwind.enable = true;
};
};
}

View file

@ -0,0 +1,13 @@
{
programs.nvf.settings.vim.mini = {
starter.enable = true;
comment.enable = true;
# cursorword.enable = true;
icons.enable = true;
indentscope.enable = true;
notify.enable = true;
pairs.enable = true;
diff.enable = true;
git.enable = true;
};
}

View file

@ -0,0 +1,23 @@
{
programs.nvf.settings.vim = {
viAlias = false;
vimAlias = true;
withNodeJs = true;
# syntaxHighlighting = true;
options = {
autoindent = true;
shiftwidth = 2;
signcolumn = "yes";
tabstop = 2;
softtabstop = 2;
wrap = false;
undofile = true;
shada = "!,'100,<50,s10,h";
};
clipboard = {
enable = true;
registers = "unnamedplus";
providers.wl-copy.enable = true;
};
};
}

View file

@ -0,0 +1,256 @@
{
programs.nvf.settings.vim = {
utility = {
oil-nvim.enable = true;
snacks-nvim = {
setupOpts = {
picker.enabled = true;
explorer.enabled = true;
};
};
};
keymaps = [
# Top Pickers & Explorer
{
key = "<leader> ";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.smart()<cr>";
desc = "Smart Find Files";
}
{
key = "<leader>,";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.buffers()<cr>";
desc = "Buffers";
}
{
key = "<leader>/";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.grep()<cr>";
desc = "Grep";
}
{
key = "<leader>:";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.command_history()<cr>";
desc = "Command History";
}
{
key = "<leader>e";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.explorer()<cr>";
desc = "File Explorer";
}
{
key = "-";
mode = "n";
silent = true;
action = "<cmd>Oil<cr>";
desc = "Oil";
}
# Find
{
key = "<leader>fb";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.buffers()<cr>";
desc = "Buffers";
}
{
key = "<leader>fc";
mode = "n";
silent = true;
action = ''<cmd>lua Snacks.picker.files({ cwd = vim.fn.stdpath("config") })<cr>'';
desc = "Find Config File";
}
{
key = "<leader>ff";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.files()<cr>";
desc = "Find Files";
}
{
key = "<leader>fg";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.git_files()<cr>";
desc = "Find Git Files";
}
{
key = "<leader>fp";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.projects()<cr>";
desc = "Projects";
}
{
key = "<leader>fr";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.recent()<cr>";
desc = "Recent";
}
{
key = "<leader>fn";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.notifications()<cr>";
desc = "Notification History";
}
{
key = "<leader>fe";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.icons()<cr>";
desc = "Emoji";
}
# Git
{
key = "<leader>gb";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.git_branches()<cr>";
desc = "Git Branches";
}
{
key = "<leader>gL";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.git_log()<cr>";
desc = "Git Log Line";
}
{
key = "<leader>gs";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.git_status()<cr>";
desc = "Git Status";
}
{
key = "<leader>gS";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.git_stash()<cr>";
desc = "Git Stash";
}
{
key = "<leader>gd";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.git_diff()<cr>";
desc = "Git Diff (Hunks)";
}
{
key = "<leader>gf";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.git_log_file()<cr>";
desc = "Git Log File";
}
# Grep
{
key = "<leader>sb";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.lines()<cr>";
desc = "Buffer Lines";
}
{
key = "<leader>st";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.todo_comments()<cr>";
desc = "Todos";
}
{
key = "<leader>sB";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.grep_buffers()<cr>";
desc = "Grep Open Buffers";
}
{
key = "<leader>sg";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.grep()<cr>";
desc = "Grep";
}
{
key = "<leader>sw";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.grep_word()<cr>";
desc = "Visual selection or word";
}
{
key = "<leader>sr";
mode = "n";
silent = true;
action = "<cmd>nohlsearch<cr>";
desc = "Reset search";
}
# LSP
{
key = "gd";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.lsp_definitions()<cr>";
desc = "Goto Definition";
}
{
key = "gD";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.lsp_declarations()<cr>";
desc = "Goto Declaration";
}
{
key = "gr";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.lsp_references()<cr>";
desc = "References";
nowait = true;
}
{
key = "gI";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.lsp_implementations()<cr>";
desc = "Goto Implementation";
}
{
key = "gy";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.lsp_type_definitions()<cr>";
desc = "Goto Type Definition";
}
{
key = "<leader>ss";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.lsp_symbols()<cr>";
desc = "LSP Symbols";
}
{
key = "<leader>sS";
mode = "n";
silent = true;
action = "<cmd>lua Snacks.picker.lsp_workspace_symbols()<cr>";
desc = "LSP Workspace Symbols";
}
];
};
}

View file

@ -0,0 +1,16 @@
{
programs.nvf.settings.vim.utility.snacks-nvim = {
enable = true;
setupOpts = {
image = {
enabled = true;
setupOpts.doc.inline = false;
};
quickfile.enabled = true;
statuscolumn.enabled = true;
zen.enabled = true;
bufdelete.enabled = true;
gitsigns.enabled = true;
};
};
}

View file

@ -0,0 +1,82 @@
{ lib, ... }:
{
programs.nvf.settings.vim = {
theme = lib.mkForce {
enable = true;
name = "catppuccin";
style = "latte";
transparent = false;
};
navigation = {
harpoon.enable = true;
};
utility = {
motion.flash-nvim.enable = true;
outline.aerial-nvim.enable = true;
diffview-nvim.enable = true;
surround.enable = true;
smart-splits.enable = true;
yanky-nvim.enable = true;
};
tabline.nvimBufferline.enable = true;
notes.todo-comments.enable = true;
assistant.copilot = {
enable = true;
cmp.enable = true;
};
statusline.lualine.enable = true;
autocomplete.blink-cmp = {
enable = true;
friendly-snippets.enable = true;
};
snippets.luasnip.enable = true;
ui = {
noice.enable = true;
colorizer.enable = true;
};
visuals = {
cinnamon-nvim.enable = true;
};
git = {
enable = true;
gitsigns.enable = true;
};
terminal.toggleterm = {
enable = true;
lazygit = {
enable = true;
mappings.open = "<leader>gl";
};
};
formatter.conform-nvim.enable = true;
binds.hardtime-nvim.enable = true;
utility.motion.precognition.enable = true;
binds.hardtime-nvim.setupOpts = {
max_count = 3; # Optional: limit of consecutive presses
disabled_keys = {
"<Up>" = false;
"<Down>" = false;
"<Left>" = false;
"<Right>" = false;
};
restricted_keys = {
"<Up>" = [
"n"
"x"
];
"<Down>" = [
"n"
"x"
];
"<Left>" = [
"n"
"x"
];
"<Right>" = [
"n"
"x"
];
};
};
};
}

View file

@ -5,11 +5,14 @@
enable = true;
# additional packages to add to gjs's runtime
# extraPackages = with pkgs; [
# gtksourceview
# webkitgtk
# accountsservice
# libdbusmenu-gtk3
# ];
plugins = with pkgs.obs-studio-plugins; [
wlrobs
obs-backgroundremoval
obs-pipewire-audio-capture
obs-vaapi # optional AMD hardware acceleration
obs-gstreamer
obs-vkcapture
];
};
}

View file

@ -2,22 +2,25 @@
{ pkgs, user, ... }:
{
# ctrl + m to toggle the menubar
home.packages = with pkgs.xfce; [
thunar
xfconf
tumbler
thunar-archive-plugin
thunar-volman
home.packages = with pkgs; [
xfce.thunar
xfce.xfconf
xfce.tumbler
xfce.thunar-archive-plugin
xfce.thunar-volman
xfce.thunar-media-tags-plugin
p7zip
xarchiver
];
gtk = {
iconTheme = {
name = "WhiteSur";
package = pkgs.whitesur-icon-theme.override {
boldPanelIcons = true;
alternativeIcons = true;
};
};
};
# gtk = {
# iconTheme = {
# name = "WhiteSur";
# package = pkgs.whitesur-icon-theme.override {
# boldPanelIcons = true;
# alternativeIcons = true;
# };
# };
# };
home.sessionVariables = {
XDG_ICON_DIR = "${pkgs.whitesur-icon-theme}/share/icons/WhiteSur";
@ -30,6 +33,38 @@
"file:///home/gwg313/repos Repositories"
];
home.file.".config/xarchiver/xarchiverrc".text = ''
[xarchiver]
preferred_format=0
prefer_unzip=true
confirm_deletion=true
sort_filename_content=false
advanced_isearch=true
auto_expand=true
store_output=false
icon_size=2
show_archive_comment=false
show_sidebar=true
show_location_bar=true
show_toolbar=true
preferred_custom_cmd=
preferred_temp_dir=/tmp
preferred_extract_dir=/home/gwg313/Downloads
allow_sub_dir=0
ensure_directory=true
overwrite=false
full_path=2
touch=false
fresh=false
update=false
store_path=false
updadd=true
freshen=false
recurse=true
solid_archive=false
remove_files=false
'';
home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = ''
<?xml version="1.0" encoding="UTF-8"?>

View file

@ -61,6 +61,7 @@
c = "clear";
listen = "lsof -P -i -n";
octal = "stat -c '%a %n'";
f = "$(pay-respects zsh)";
};
history = {
@ -68,67 +69,67 @@
path = "${config.xdg.dataHome}/zsh/history";
};
initExtra = ''
eval $(thefuck --alias)
eval "$(pay-respects zsh --alias)"
# search history based on what's typed in the prompt
autoload -U history-search-end
zle -N history-beginning-search-backward-end history-search-end
zle -N history-beginning-search-forward-end history-search-end
bindkey "^[OA" history-beginning-search-backward-end
bindkey "^[OB" history-beginning-search-forward-end
# search history based on what's typed in the prompt
autoload -U history-search-end
zle -N history-beginning-search-backward-end history-search-end
zle -N history-beginning-search-forward-end history-search-end
bindkey "^[OA" history-beginning-search-backward-end
bindkey "^[OB" history-beginning-search-forward-end
# General completion behavior
zstyle ':completion:*' completer _extensions _complete _approximate
# Use cache
zstyle ':completion:*' use-cache on
zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
# General completion behavior
zstyle ':completion:*' completer _extensions _complete _approximate
# Use cache
zstyle ':completion:*' use-cache on
zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
# Complete the alias
zstyle ':completion:*' complete true
# Autocomplete options
zstyle ':completion:*' complete-options true
# Complete the alias
zstyle ':completion:*' complete true
# Autocomplete options
zstyle ':completion:*' complete-options true
# Completion matching control
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
zstyle ':completion:*' keep-prefix true
# Completion matching control
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
zstyle ':completion:*' keep-prefix true
# Group matches and describe
zstyle ':completion:*' menu select
zstyle ':completion:*' list-grouped false
zstyle ':completion:*' list-separator '''
zstyle ':completion:*' group-name '''
zstyle ':completion:*' verbose yes
zstyle ':completion:*:matches' group 'yes'
zstyle ':completion:*:warnings' format '%F{red}%B-- No match for: %d --%b%f'
zstyle ':completion:*:messages' format '%d'
zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b'
zstyle ':completion:*:descriptions' format '[%d]'
# Group matches and describe
zstyle ':completion:*' menu select
zstyle ':completion:*' list-grouped false
zstyle ':completion:*' list-separator '''
zstyle ':completion:*' group-name '''
zstyle ':completion:*' verbose yes
zstyle ':completion:*:matches' group 'yes'
zstyle ':completion:*:warnings' format '%F{red}%B-- No match for: %d --%b%f'
zstyle ':completion:*:messages' format '%d'
zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b'
zstyle ':completion:*:descriptions' format '[%d]'
# Colors
zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
# Colors
zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
# case insensitive tab completion
zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands
zstyle ':completion:*' special-dirs true
zstyle ':completion:*' squeeze-slashes true
# case insensitive tab completion
zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands
zstyle ':completion:*' special-dirs true
zstyle ':completion:*' squeeze-slashes true
# Sort
zstyle ':completion:*' sort false
zstyle ":completion:*:git-checkout:*" sort false
zstyle ':completion:*' file-sort modification
zstyle ':completion:*:eza' sort false
zstyle ':completion:complete:*:options' sort false
zstyle ':completion:files' sort false
# Sort
zstyle ':completion:*' sort false
zstyle ":completion:*:git-checkout:*" sort false
zstyle ':completion:*' file-sort modification
zstyle ':completion:*:eza' sort false
zstyle ':completion:complete:*:options' sort false
zstyle ':completion:files' sort false
'';
};