removed newlines to reduce line count (absolutely useless)
This commit is contained in:
parent
25d776ccf6
commit
bb1d899da2
6 changed files with 13 additions and 46 deletions
|
|
@ -14,9 +14,6 @@ $fileManager = lf
|
||||||
############################
|
############################
|
||||||
### AUTO STARTUP ###
|
### AUTO STARTUP ###
|
||||||
############################
|
############################
|
||||||
# Autostart necessary processes (like notifications daemons, status bars, etc.)
|
|
||||||
# Or execute your favorite apps at launch like this:
|
|
||||||
|
|
||||||
exec-once = bash ~/.config/hypr/start.sh
|
exec-once = bash ~/.config/hypr/start.sh
|
||||||
exec-once = $terminal
|
exec-once = $terminal
|
||||||
|
|
||||||
|
|
@ -167,8 +164,6 @@ bind = $secMod, S, exec, grim -l 0 -g "$(slurp)" - | wl-copy
|
||||||
bind = $mainMod, E, exec, $fileManager
|
bind = $mainMod, E, exec, $fileManager
|
||||||
bind = $mainMod, B, exec, $browser
|
bind = $mainMod, B, exec, $browser
|
||||||
bind = $mainMod, V, togglefloating,
|
bind = $mainMod, V, togglefloating,
|
||||||
# bind = $mainMod, P, pseudo, # dwindle
|
|
||||||
# bind = $mainMod, J, togglesplit, # dwindle
|
|
||||||
bind = $mainMod, D, exec, rofi -show drun -show-icons
|
bind = $mainMod, D, exec, rofi -show drun -show-icons
|
||||||
|
|
||||||
# Move focus with Alt + arrow keys
|
# Move focus with Alt + arrow keys
|
||||||
|
|
@ -240,4 +235,4 @@ bindl = , XF86AudioPrev, exec, playerctl previous
|
||||||
# Ignore maximize requests from apps. You'll probably like this.
|
# Ignore maximize requests from apps. You'll probably like this.
|
||||||
windowrule = suppressevent maximize, class:.*
|
windowrule = suppressevent maximize, class:.*
|
||||||
|
|
||||||
windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
|
windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
|
||||||
|
|
@ -3,4 +3,4 @@
|
||||||
swww-daemon &
|
swww-daemon &
|
||||||
swww img ~/.config/hypr/bg.jpg &
|
swww img ~/.config/hypr/bg.jpg &
|
||||||
waybar &
|
waybar &
|
||||||
dunst
|
dunst
|
||||||
|
|
@ -181,4 +181,4 @@
|
||||||
# system.copySystemConfiguration = true;
|
# system.copySystemConfiguration = true;
|
||||||
|
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
}
|
}
|
||||||
|
|
@ -13,5 +13,4 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -12,10 +12,8 @@ vim.opt.expandtab = true -- Use spaces instead of tabs
|
||||||
vim.opt.termguicolors = true -- Enable terminal colors
|
vim.opt.termguicolors = true -- Enable terminal colors
|
||||||
vim.opt.scrolloff = 8 -- Lines above/below cursor
|
vim.opt.scrolloff = 8 -- Lines above/below cursor
|
||||||
vim.opt.signcolumn = "yes" -- Always show the sign column
|
vim.opt.signcolumn = "yes" -- Always show the sign column
|
||||||
|
|
||||||
-- Set the leader key to space. This is a crucial step for custom mappings.
|
-- Set the leader key to space. This is a crucial step for custom mappings.
|
||||||
vim.g.mapleader = " "
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
-- ====================================
|
-- ====================================
|
||||||
-- | Plugin Management with lazy.nvim |
|
-- | Plugin Management with lazy.nvim |
|
||||||
-- ====================================
|
-- ====================================
|
||||||
|
|
@ -28,7 +26,6 @@ if not vim.loop.fs_stat(lazypath) then
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
vim.opt.rtp:prepend(lazypath)
|
vim.opt.rtp:prepend(lazypath)
|
||||||
|
|
||||||
-- Setup the plugins you need.
|
-- Setup the plugins you need.
|
||||||
require("lazy").setup({
|
require("lazy").setup({
|
||||||
-- === The colorscheme plugin is specified here. ===
|
-- === The colorscheme plugin is specified here. ===
|
||||||
|
|
@ -39,19 +36,15 @@ require("lazy").setup({
|
||||||
-- Load the colorscheme.
|
-- Load the colorscheme.
|
||||||
vim.cmd.colorscheme("gruvbox")
|
vim.cmd.colorscheme("gruvbox")
|
||||||
end },
|
end },
|
||||||
|
|
||||||
-- Treesitter plugin for syntax highlighting.
|
-- Treesitter plugin for syntax highlighting.
|
||||||
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
|
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
|
||||||
|
|
||||||
-- Autocomplete plugins
|
-- Autocomplete plugins
|
||||||
{ "hrsh7th/nvim-cmp" },
|
{ "hrsh7th/nvim-cmp" },
|
||||||
{ "hrsh7th/cmp-nvim-lsp" },
|
{ "hrsh7th/cmp-nvim-lsp" },
|
||||||
{ "L3MON4D3/LuaSnip" },
|
{ "L3MON4D3/LuaSnip" },
|
||||||
{ "neovim/nvim-lspconfig" },
|
{ "neovim/nvim-lspconfig" },
|
||||||
|
|
||||||
-- Plugin to automatically close paired characters like (), {}, [], and ""
|
-- Plugin to automatically close paired characters like (), {}, [], and ""
|
||||||
{ 'echasnovski/mini.pairs' },
|
{ 'echasnovski/mini.pairs' },
|
||||||
|
|
||||||
-- File tree and icon plugins
|
-- File tree and icon plugins
|
||||||
{
|
{
|
||||||
'nvim-tree/nvim-tree.lua',
|
'nvim-tree/nvim-tree.lua',
|
||||||
|
|
@ -66,14 +59,12 @@ require("lazy").setup({
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Treesitter configuration.
|
-- Treesitter configuration.
|
||||||
require("nvim-treesitter.configs").setup({
|
require("nvim-treesitter.configs").setup({
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
-- You can specify languages to install with `ensure_installed`.
|
-- You can specify languages to install with `ensure_installed`.
|
||||||
-- e.g., ensure_installed = { "lua", "python", "javascript" },
|
-- e.g., ensure_installed = { "lua", "python", "javascript" },
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Autocomplete (cmp) configuration.
|
-- Autocomplete (cmp) configuration.
|
||||||
local cmp = require("cmp")
|
local cmp = require("cmp")
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
|
|
@ -89,21 +80,17 @@ cmp.setup({
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Mini.pairs configuration.
|
-- Mini.pairs configuration.
|
||||||
-- This simple setup is all that's needed for the basic functionality.
|
-- This simple setup is all that's needed for the basic functionality.
|
||||||
require('mini.pairs').setup({})
|
require('mini.pairs').setup({})
|
||||||
|
|
||||||
-- ===================================
|
-- ===================================
|
||||||
-- | Custom Keymaps |
|
-- | Custom Keymaps |
|
||||||
-- ===================================
|
-- ===================================
|
||||||
-- Keymaps are custom commands mapped to a specific key combination.
|
-- Keymaps are custom commands mapped to a specific key combination.
|
||||||
-- The "<leader>" prefix will be replaced with your leader key, which is "space".
|
-- The "<leader>" prefix will be replaced with your leader key, which is "space".
|
||||||
|
|
||||||
-- Split creation keymaps
|
-- Split creation keymaps
|
||||||
vim.keymap.set('n', '<leader>sv', ':vsplit<CR>', { desc = 'Create a vertical split' })
|
vim.keymap.set('n', '<leader>sv', ':vsplit<CR>', { desc = 'Create a vertical split' })
|
||||||
vim.keymap.set('n', '<leader>ss', ':split<CR>', { desc = 'Create a horizontal split' })
|
vim.keymap.set('n', '<leader>ss', ':split<CR>', { desc = 'Create a horizontal split' })
|
||||||
|
|
||||||
-- Buffer navigation
|
-- Buffer navigation
|
||||||
-- <leader>bh/j/k/l to navigate between buffers
|
-- <leader>bh/j/k/l to navigate between buffers
|
||||||
vim.keymap.set('n', '<leader>bh', ':bprev<CR>', { desc = 'Go to previous buffer' })
|
vim.keymap.set('n', '<leader>bh', ':bprev<CR>', { desc = 'Go to previous buffer' })
|
||||||
|
|
@ -111,30 +98,23 @@ vim.keymap.set('n', '<leader>bl', ':bnext<CR>', { desc = 'Go to next buffer' })
|
||||||
-- The following mappings are less common, but fulfill your request.
|
-- The following mappings are less common, but fulfill your request.
|
||||||
vim.keymap.set('n', '<leader>bj', ':bnext<CR>', { desc = 'Go to next buffer' })
|
vim.keymap.set('n', '<leader>bj', ':bnext<CR>', { desc = 'Go to next buffer' })
|
||||||
vim.keymap.set('n', '<leader>bk', ':bprev<CR>', { desc = 'Go to previous buffer' })
|
vim.keymap.set('n', '<leader>bk', ':bprev<CR>', { desc = 'Go to previous buffer' })
|
||||||
|
|
||||||
-- Split navigation
|
-- Split navigation
|
||||||
-- <leader>sh/j/k/l to move between splits
|
-- <leader>sh/j/k/l to move between splits
|
||||||
vim.keymap.set('n', '<leader>sh', '<C-w>h', { desc = 'Move to left split' })
|
vim.keymap.set('n', '<leader>sh', '<C-w>h', { desc = 'Move to left split' })
|
||||||
vim.keymap.set('n', '<leader>sj', '<C-w>j', { desc = 'Move to split below' })
|
vim.keymap.set('n', '<leader>sj', '<C-w>j', { desc = 'Move to split below' })
|
||||||
vim.keymap.set('n', '<leader>sk', '<C-w>k', { desc = 'Move to split above' })
|
vim.keymap.set('n', '<leader>sk', '<C-w>k', { desc = 'Move to split above' })
|
||||||
vim.keymap.set('n', '<leader>sl', '<C-w>l', { desc = 'Move to right split' })
|
vim.keymap.set('n', '<leader>sl', '<C-w>l', { desc = 'Move to right split' })
|
||||||
|
|
||||||
-- Normal mode keymaps
|
-- Normal mode keymaps
|
||||||
-- Save the current file.
|
-- Save the current file.
|
||||||
vim.keymap.set('n', '<leader>w', ':w<CR>', { desc = 'Save file' })
|
vim.keymap.set('n', '<leader>w', ':w<CR>', { desc = 'Save file' })
|
||||||
|
|
||||||
-- Force quit the current window without saving.
|
-- Force quit the current window without saving.
|
||||||
vim.keymap.set('n', '<leader>q', ':q!<CR>', { desc = 'Force quit window' })
|
vim.keymap.set('n', '<leader>q', ':q!<CR>', { desc = 'Force quit window' })
|
||||||
|
|
||||||
-- Save and quit.
|
-- Save and quit.
|
||||||
vim.keymap.set('n', '<leader>x', ':wq<CR>', { desc = 'Save and quit' })
|
vim.keymap.set('n', '<leader>x', ':wq<CR>', { desc = 'Save and quit' })
|
||||||
|
|
||||||
-- Save all open buffers.
|
-- Save all open buffers.
|
||||||
vim.keymap.set('n', '<leader>wa', ':wa<CR>', { desc = 'Save all buffers' })
|
vim.keymap.set('n', '<leader>wa', ':wa<CR>', { desc = 'Save all buffers' })
|
||||||
|
|
||||||
-- Close all windows except the current one.
|
-- Close all windows except the current one.
|
||||||
vim.keymap.set('n', '<leader>o', ':only<CR>', { desc = 'Close all other windows' })
|
vim.keymap.set('n', '<leader>o', ':only<CR>', { desc = 'Close all other windows' })
|
||||||
|
|
||||||
-- Toggle the file tree.
|
-- Toggle the file tree.
|
||||||
vim.keymap.set('n', '<leader>e', ':NvimTreeToggle<CR>', { desc = 'Toggle file tree' })
|
vim.keymap.set('n', '<leader>e', ':NvimTreeToggle<CR>', { desc = 'Toggle file tree' })
|
||||||
-- Select the entire file content.
|
-- Select the entire file content.
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,8 @@
|
||||||
;; Load it if the file exists
|
;; Load it if the file exists
|
||||||
(when (file-exists-p custom-file)
|
(when (file-exists-p custom-file)
|
||||||
(load custom-file))
|
(load custom-file))
|
||||||
|
|
||||||
;; Setup MELPA
|
;; Setup MELPA
|
||||||
(require 'package) (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("org" . "https://orgmode.org/elpa/") ("elpa" . "https://elpa.gnu.org/packages/")))
|
(require 'package) (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("org" . "https://orgmode.org/elpa/") ("elpa" . "https://elpa.gnu.org/packages/")))
|
||||||
|
|
||||||
;; Setup package.el
|
;; Setup package.el
|
||||||
(unless (package-installed-p 'use-package)
|
(unless (package-installed-p 'use-package)
|
||||||
(package-refresh-contents)
|
(package-refresh-contents)
|
||||||
|
|
@ -16,12 +14,10 @@
|
||||||
(package-initialize))
|
(package-initialize))
|
||||||
(require 'use-package)))
|
(require 'use-package)))
|
||||||
(setq use-package-always-ensure t)
|
(setq use-package-always-ensure t)
|
||||||
|
|
||||||
;; For up to date org mode.
|
;; For up to date org mode.
|
||||||
(use-package org)
|
(use-package org)
|
||||||
;; Enable Org mode
|
;; Enable Org mode
|
||||||
(require 'org)
|
(require 'org)
|
||||||
|
|
||||||
;; Enable Babel for specific languages
|
;; Enable Babel for specific languages
|
||||||
(org-babel-do-load-languages
|
(org-babel-do-load-languages
|
||||||
'org-babel-load-languages
|
'org-babel-load-languages
|
||||||
|
|
@ -30,13 +26,12 @@
|
||||||
(lisp . t) ;; Common Lisp support
|
(lisp . t) ;; Common Lisp support
|
||||||
(lua . t) ;; Lua support
|
(lua . t) ;; Lua support
|
||||||
(latex . t) ;; Latex support
|
(latex . t) ;; Latex support
|
||||||
(shell . t))) ;; Posix Shell support
|
(shell . t)) ;; Posix Shell support
|
||||||
|
)
|
||||||
;; Set the default export directory
|
;; Set the default export directory
|
||||||
(setq org-export-directory "~/org_exports/")
|
(setq org-export-directory "~/org_exports/")
|
||||||
;; Show inline images in org documents
|
;; Show inline images in org documents
|
||||||
(setq org-startup-with-inline-images t)
|
(setq org-startup-with-inline-images t)
|
||||||
|
|
||||||
;; Set default directory based on operating system
|
;; Set default directory based on operating system
|
||||||
(cond
|
(cond
|
||||||
;; If using Windows
|
;; If using Windows
|
||||||
|
|
@ -49,11 +44,9 @@
|
||||||
((eq system-type 'darwin)
|
((eq system-type 'darwin)
|
||||||
(setq default-directory (format "/Users/%s" (user-login-name))))
|
(setq default-directory (format "/Users/%s" (user-login-name))))
|
||||||
)
|
)
|
||||||
|
|
||||||
;; Themeing
|
;; Themeing
|
||||||
(use-package gruvbox-theme) ;; Gruvbox is comfy
|
(use-package gruvbox-theme) ;; Gruvbox is comfy
|
||||||
(load-theme 'gruvbox-dark-hard) ;; Dark because I'm a parasite
|
(load-theme 'gruvbox-dark-hard) ;; Dark because I'm a parasite
|
||||||
|
|
||||||
; For Unix-like operating systems only running the GUI.
|
; For Unix-like operating systems only running the GUI.
|
||||||
(add-to-list 'default-frame-alist '(alpha-background . 80))
|
(add-to-list 'default-frame-alist '(alpha-background . 80))
|
||||||
(use-package doom-modeline
|
(use-package doom-modeline
|
||||||
|
|
@ -63,30 +56,30 @@
|
||||||
(use-package nyan-mode
|
(use-package nyan-mode
|
||||||
:init
|
:init
|
||||||
(nyan-mode))
|
(nyan-mode))
|
||||||
|
|
||||||
;; Requires the JetBrains Mono font be installed on the system.
|
;; Requires the JetBrains Mono font be installed on the system.
|
||||||
(add-to-list 'default-frame-alist '(font . "JetBrains Mono-12"))
|
(add-to-list 'default-frame-alist '(font . "JetBrains Mono-12"))
|
||||||
|
|
||||||
;; Import external elisp programs
|
;; Import external elisp programs
|
||||||
(add-to-list 'load-path "~/.emacs.d/lisp/")
|
(add-to-list 'load-path "~/.emacs.d/lisp/")
|
||||||
;; Xah fly keys
|
;; Xah fly keys
|
||||||
(require 'xah-fly-keys)
|
(require 'xah-fly-keys)
|
||||||
(xah-fly-keys-set-layout "qwerty")
|
(xah-fly-keys-set-layout "qwerty")
|
||||||
;; (xah-fly-keys)
|
;; (xah-fly-keys)
|
||||||
;; I've been using Neovim a lot lately, so I'm using Evil mode for the time being. I think XFK is technically better, but it messes with my muscle memory a bit, and I need to be able to get stuff done, frankly. I'm already wasting time configuring emacs (*  ̄︿ ̄)
|
;; I've been using Neovim a lot lately, so I'm using Evil mode for the
|
||||||
|
;; time being. I think XFK is technically better, but it messes with
|
||||||
|
;; my muscle memory a bit, and I need to be able to get stuff done,
|
||||||
|
;; frankly. I'm already wasting time configuring emacs (*  ̄︿ ̄)
|
||||||
(use-package evil
|
(use-package evil
|
||||||
:init ;; tweak evil's configuration before loading it
|
:init ;; tweak evil's configuration before loading it
|
||||||
(setq evil-want-keybinding nil)
|
(setq evil-want-keybinding nil)
|
||||||
(setq evil-vsplit-window-right t)
|
(setq evil-vsplit-window-right t)
|
||||||
(setq evil-split-window-below t)
|
(setq evil-split-window-below t)
|
||||||
(evil-mode))
|
(evil-mode)
|
||||||
|
)
|
||||||
;; MINIMALISM
|
;; MINIMALISM
|
||||||
(menu-bar-mode -1)
|
(menu-bar-mode -1)
|
||||||
(tool-bar-mode -1)
|
(tool-bar-mode -1)
|
||||||
|
|
||||||
;; Misc stuff
|
;; Misc stuff
|
||||||
(defalias 'yes-or-no-p 'y-or-n-p)
|
(defalias 'yes-or-no-p 'y-or-n-p)
|
||||||
(column-number-mode 1)
|
(column-number-mode 1)
|
||||||
(setq make-backup-files nil)
|
(setq make-backup-files nil)
|
||||||
(setq global-visual-line-mode t)
|
(setq global-visual-line-mode t)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue