Merge branch 'development' into 'main'
Created service for noctalia-shell updated nixvim See merge request Zaney/zaneyos!177
This commit is contained in:
commit
1560ddd95d
4 changed files with 178 additions and 20 deletions
157
CHANGELOG.md
157
CHANGELOG.md
|
|
@ -9,6 +9,163 @@
|
|||
|
||||
#### 📅 **Updated: December 21st, 2025**
|
||||
|
||||
- Added user systemd service for `noctalia-shell`
|
||||
- Updated Hyprland bindings to accomodate change
|
||||
- Updated `nixvim`
|
||||
|
||||
## `nixvim` Features Migrated from Bugsvim
|
||||
|
||||
#### Custom Diagnostic Icons
|
||||
|
||||
```lua
|
||||
Error = " "
|
||||
Warn = " "
|
||||
Hint = ""
|
||||
Info = ""
|
||||
```
|
||||
- Custom unicode symbols for each diagnostic severity level
|
||||
- Integrated into vim.diagnostic.config() for gutter display
|
||||
|
||||
#### Diagnostic Display Options
|
||||
|
||||
- **Sign Column**: Shows diagnostic icons in the gutter with custom text and highlight groups
|
||||
- **Virtual Text**: Inline diagnostics with custom prefix (`●`) and 2-space spacing
|
||||
- **Virtual Lines**: Enhanced visibility for error context without cluttering
|
||||
- **Underline**: Visual underline for error locations
|
||||
- **Floating Window**: Hover diagnostics with rounded borders and source attribution
|
||||
- **Severity Sorting**: Errors prioritized over warnings
|
||||
|
||||
### 2. Text Yank Highlighting
|
||||
|
||||
**Migration**: Highlight yanked text for 200ms (IncSearch highlight group)
|
||||
- Autocmd-based implementation in extraConfigLua
|
||||
- Uses vim.hl.on_yank for smooth visual feedback
|
||||
|
||||
### 3. LSP Attachment Keybindings
|
||||
|
||||
**Enhanced LSP Integration** with on-attach callbacks:
|
||||
```
|
||||
K - Hover documentation
|
||||
gd - Goto definition
|
||||
gD - Goto declaration
|
||||
gi - Goto implementation
|
||||
gr - References
|
||||
<leader>rn - Rename symbol
|
||||
<leader>ca - Code action
|
||||
```
|
||||
- Buffer-local scope prevents global pollution
|
||||
- Guard against multiple registrations with flag check
|
||||
|
||||
### 4. Startup Dashboard
|
||||
|
||||
**Migration**: alpha-nvim with custom banner generation
|
||||
|
||||
#### Dynamic Header Generation
|
||||
|
||||
- Primary: `toilet -f ansi-shadow NIXOS`
|
||||
- Secondary: `figlet -f "ANSI Shadow" NIXOS`
|
||||
- Tertiary: `figlet NIXOS`
|
||||
- Fallback: ASCII art banner (9 lines)
|
||||
|
||||
#### Dashboard Buttons
|
||||
|
||||
| Shortcut | Action | Command |
|
||||
|----------|--------|---------|
|
||||
| `f` | Find file | Telescope find_files |
|
||||
| `r` | Recent files | Telescope oldfiles |
|
||||
| `g` | Live grep | Telescope live_grep |
|
||||
| `n` | New file | :enew |
|
||||
| `e` | File browser | Neotree toggle |
|
||||
| `q` | Quit | :qa |
|
||||
|
||||
#### Footer
|
||||
|
||||
Dynamic version display: `NixVim • Neovim X.Y.Z`
|
||||
|
||||
### 5. Theme Integration
|
||||
|
||||
**Migration**: Tokyo Night colorscheme with Stylix integration
|
||||
- Tokyo Night colors for status line (lualine)
|
||||
- Notify background color tied to Stylix palette: `#${config.lib.stylix.colors.base01}`
|
||||
- Consistent color management across UI components
|
||||
|
||||
## Comprehensive Feature Set
|
||||
|
||||
### UI/Visuals Migrated
|
||||
|
||||
- Lualine status line (Tokyo Night theme)
|
||||
- Bufferline for buffer management
|
||||
- Indent-blankline for visual indentation
|
||||
- Colorizer for inline color display
|
||||
- Illuminate for reference highlighting
|
||||
- Which-key for keybinding discovery (Helix preset)
|
||||
|
||||
### Core Editing
|
||||
|
||||
- Treesitter for syntax highlighting
|
||||
- Neo-tree file browser
|
||||
- Telescope fuzzy finder with media_files extension
|
||||
- Project.nvim for project management
|
||||
- Hop/Leap motion plugins
|
||||
- vim-surround for text manipulation
|
||||
- Comment.nvim for toggle comments
|
||||
|
||||
### Advanced Features
|
||||
|
||||
- snacks.nvim ecosystem (terminal, scratch buffers, zen mode, git integration, notifier)
|
||||
- Noice for enhanced UI/messages
|
||||
- Notify for notifications
|
||||
- todo-comments for task navigation
|
||||
- nvim-autopairs with Treesitter support
|
||||
|
||||
### Language Support
|
||||
|
||||
**LSP Servers**: nil_ls, lua_ls, pyright, ts_ls, html, cssls, clangd, zls, marksman, hyprls, tailwindcss, bashls
|
||||
|
||||
**Formatters**:
|
||||
- Nix: alejandra
|
||||
- Lua: stylua
|
||||
- JavaScript/TypeScript: prettierd
|
||||
- Shell: shfmt
|
||||
|
||||
**Completion**: blink-cmp with luasnip snippets
|
||||
|
||||
### Development Tools
|
||||
|
||||
- Git integration: gitsigns + diffview
|
||||
- Markdown preview
|
||||
- Trouble diagnostics panel
|
||||
- Terminal: toggleterm with float direction
|
||||
|
||||
## Implementation Details
|
||||
|
||||
### Module Structure
|
||||
|
||||
- **File**: `modules/home/editors/nixvim.nix` (743 lines)
|
||||
- **Framework**: Nixvim home-manager module
|
||||
- **Theme**: Tokyo Night (primary), Catppuccin (fallback)
|
||||
- **Runtime Tools**: 23+ packages (bat, chafa, fd, figlet, lazygit, prettierd, ripgrep, etc.)
|
||||
|
||||
## Keybinding Highlights
|
||||
|
||||
```
|
||||
jk - Exit insert mode
|
||||
<leader>ff - Find files
|
||||
<leader>fm - Find media files
|
||||
<leader>lg - Live grep
|
||||
<leader>fe - File explorer toggle
|
||||
<leader>t - Toggle terminal
|
||||
<leader>. - Toggle comment (line/visual)
|
||||
<leader>z - Zen mode
|
||||
<leader>Z - Zoom
|
||||
<leader>gg - Lazygit
|
||||
<c-/> - Terminal (via snacks)
|
||||
]t / [t - Next/prev TODO comment
|
||||
<leader>n - Notification history
|
||||
```
|
||||
|
||||
#### 📅 **Updated: December 21st, 2025**
|
||||
|
||||
- Updated:
|
||||
- `nixvim.nix` now uses `blink-cmp` for completion/suggestions
|
||||
- This replaces `nvim-cmp`
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
# Bar/Shell Settings
|
||||
# Choose between noctalia or waybar
|
||||
barChoice = "waybar";
|
||||
barChoice = "noctalia";
|
||||
|
||||
# Waybar Settings (used when barChoice = "waybar")
|
||||
clock24h = false;
|
||||
|
|
|
|||
|
|
@ -407,17 +407,18 @@
|
|||
return #lines > 0 and lines or nil
|
||||
end
|
||||
|
||||
header_lines = gen_banner('toilet -f ansi-shadow NIXOS 2>/dev/null')
|
||||
or gen_banner('figlet -f "ANSI Shadow" NIXOS 2>/dev/null')
|
||||
or gen_banner('figlet NIXOS 2>/dev/null')
|
||||
header_lines = gen_banner('toilet -f ansi-shadow NIXVIM 2>/dev/null')
|
||||
or gen_banner('figlet -f "ANSI Shadow" NIXVIM 2>/dev/null')
|
||||
or gen_banner('figlet NIXVIM 2>/dev/null')
|
||||
|
||||
if not header_lines then
|
||||
header_lines = {
|
||||
" _ _ ___ __ __ ___ ___ ____ ",
|
||||
"| \\ | |_ _| \\ \\/ / / _ \\ / _ \\\ | _ \\ ",
|
||||
"| \\| || | \\ / | | | | | | || | | |",
|
||||
"| |\\ || | / \\ | |_| | |_| || |_| |",
|
||||
"|_| \\_|___| /_/\\_\\ \\___/ \\___/ |____/ ",
|
||||
"███╗ ██╗██╗██╗ ██╗██╗ ██╗██╗███╗ ███╗",
|
||||
"████╗ ██║██║╚██╗██╔╝██║ ██║██║████╗ ████║",
|
||||
"██╔██╗ ██║██║ ╚███╔╝ ██║ ██║██║██╔████╔██║",
|
||||
"██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║",
|
||||
"██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║",
|
||||
"╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝",
|
||||
}
|
||||
end
|
||||
dashboard.section.header.val = header_lines
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
noctaliaBind =
|
||||
if barChoice == "noctalia"
|
||||
then [
|
||||
"$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
|
||||
"$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
|
||||
"$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory"
|
||||
"$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard"
|
||||
"$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
|
||||
"$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
|
||||
"$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend"
|
||||
"$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle"
|
||||
"$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle"
|
||||
"$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle"
|
||||
"$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle"
|
||||
"$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle"
|
||||
"$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle"
|
||||
"$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory"
|
||||
"$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard"
|
||||
"$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle"
|
||||
"$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle"
|
||||
"$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend"
|
||||
"$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle"
|
||||
"$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle"
|
||||
"$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle"
|
||||
"$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle"
|
||||
]
|
||||
else [];
|
||||
# Rofi launcher bindings (only included when barChoice != "noctalia")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue