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 ###
|
||||
############################
|
||||
# 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 = $terminal
|
||||
|
||||
|
|
@ -167,8 +164,6 @@ bind = $secMod, S, exec, grim -l 0 -g "$(slurp)" - | wl-copy
|
|||
bind = $mainMod, E, exec, $fileManager
|
||||
bind = $mainMod, B, exec, $browser
|
||||
bind = $mainMod, V, togglefloating,
|
||||
# bind = $mainMod, P, pseudo, # dwindle
|
||||
# bind = $mainMod, J, togglesplit, # dwindle
|
||||
bind = $mainMod, D, exec, rofi -show drun -show-icons
|
||||
|
||||
# Move focus with Alt + arrow keys
|
||||
|
|
|
|||
|
|
@ -14,4 +14,3 @@
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,8 @@ vim.opt.expandtab = true -- Use spaces instead of tabs
|
|||
vim.opt.termguicolors = true -- Enable terminal colors
|
||||
vim.opt.scrolloff = 8 -- Lines above/below cursor
|
||||
vim.opt.signcolumn = "yes" -- Always show the sign column
|
||||
|
||||
-- Set the leader key to space. This is a crucial step for custom mappings.
|
||||
vim.g.mapleader = " "
|
||||
|
||||
-- ====================================
|
||||
-- | Plugin Management with lazy.nvim |
|
||||
-- ====================================
|
||||
|
|
@ -28,7 +26,6 @@ if not vim.loop.fs_stat(lazypath) then
|
|||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
-- Setup the plugins you need.
|
||||
require("lazy").setup({
|
||||
-- === The colorscheme plugin is specified here. ===
|
||||
|
|
@ -39,19 +36,15 @@ require("lazy").setup({
|
|||
-- Load the colorscheme.
|
||||
vim.cmd.colorscheme("gruvbox")
|
||||
end },
|
||||
|
||||
-- Treesitter plugin for syntax highlighting.
|
||||
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
|
||||
|
||||
-- Autocomplete plugins
|
||||
{ "hrsh7th/nvim-cmp" },
|
||||
{ "hrsh7th/cmp-nvim-lsp" },
|
||||
{ "L3MON4D3/LuaSnip" },
|
||||
{ "neovim/nvim-lspconfig" },
|
||||
|
||||
-- Plugin to automatically close paired characters like (), {}, [], and ""
|
||||
{ 'echasnovski/mini.pairs' },
|
||||
|
||||
-- File tree and icon plugins
|
||||
{
|
||||
'nvim-tree/nvim-tree.lua',
|
||||
|
|
@ -66,14 +59,12 @@ require("lazy").setup({
|
|||
end
|
||||
},
|
||||
})
|
||||
|
||||
-- Treesitter configuration.
|
||||
require("nvim-treesitter.configs").setup({
|
||||
highlight = { enable = true },
|
||||
-- You can specify languages to install with `ensure_installed`.
|
||||
-- e.g., ensure_installed = { "lua", "python", "javascript" },
|
||||
})
|
||||
|
||||
-- Autocomplete (cmp) configuration.
|
||||
local cmp = require("cmp")
|
||||
cmp.setup({
|
||||
|
|
@ -89,21 +80,17 @@ cmp.setup({
|
|||
{ name = "nvim_lsp" },
|
||||
},
|
||||
})
|
||||
|
||||
-- Mini.pairs configuration.
|
||||
-- This simple setup is all that's needed for the basic functionality.
|
||||
require('mini.pairs').setup({})
|
||||
|
||||
-- ===================================
|
||||
-- | Custom Keymaps |
|
||||
-- ===================================
|
||||
-- Keymaps are custom commands mapped to a specific key combination.
|
||||
-- The "<leader>" prefix will be replaced with your leader key, which is "space".
|
||||
|
||||
-- Split creation keymaps
|
||||
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' })
|
||||
|
||||
-- Buffer navigation
|
||||
-- <leader>bh/j/k/l to navigate between buffers
|
||||
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.
|
||||
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' })
|
||||
|
||||
-- Split navigation
|
||||
-- <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>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>sl', '<C-w>l', { desc = 'Move to right split' })
|
||||
|
||||
-- Normal mode keymaps
|
||||
-- Save the current file.
|
||||
vim.keymap.set('n', '<leader>w', ':w<CR>', { desc = 'Save file' })
|
||||
|
||||
-- Force quit the current window without saving.
|
||||
vim.keymap.set('n', '<leader>q', ':q!<CR>', { desc = 'Force quit window' })
|
||||
|
||||
-- Save and quit.
|
||||
vim.keymap.set('n', '<leader>x', ':wq<CR>', { desc = 'Save and quit' })
|
||||
|
||||
-- Save all open buffers.
|
||||
vim.keymap.set('n', '<leader>wa', ':wa<CR>', { desc = 'Save all buffers' })
|
||||
|
||||
-- Close all windows except the current one.
|
||||
vim.keymap.set('n', '<leader>o', ':only<CR>', { desc = 'Close all other windows' })
|
||||
|
||||
-- Toggle the file tree.
|
||||
vim.keymap.set('n', '<leader>e', ':NvimTreeToggle<CR>', { desc = 'Toggle file tree' })
|
||||
-- Select the entire file content.
|
||||
|
|
|
|||
|
|
@ -3,10 +3,8 @@
|
|||
;; Load it if the file exists
|
||||
(when (file-exists-p custom-file)
|
||||
(load custom-file))
|
||||
|
||||
;; Setup MELPA
|
||||
(require 'package) (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("org" . "https://orgmode.org/elpa/") ("elpa" . "https://elpa.gnu.org/packages/")))
|
||||
|
||||
;; Setup package.el
|
||||
(unless (package-installed-p 'use-package)
|
||||
(package-refresh-contents)
|
||||
|
|
@ -16,12 +14,10 @@
|
|||
(package-initialize))
|
||||
(require 'use-package)))
|
||||
(setq use-package-always-ensure t)
|
||||
|
||||
;; For up to date org mode.
|
||||
(use-package org)
|
||||
;; Enable Org mode
|
||||
(require 'org)
|
||||
|
||||
;; Enable Babel for specific languages
|
||||
(org-babel-do-load-languages
|
||||
'org-babel-load-languages
|
||||
|
|
@ -30,13 +26,12 @@
|
|||
(lisp . t) ;; Common Lisp support
|
||||
(lua . t) ;; Lua support
|
||||
(latex . t) ;; Latex support
|
||||
(shell . t))) ;; Posix Shell support
|
||||
|
||||
(shell . t)) ;; Posix Shell support
|
||||
)
|
||||
;; Set the default export directory
|
||||
(setq org-export-directory "~/org_exports/")
|
||||
;; Show inline images in org documents
|
||||
(setq org-startup-with-inline-images t)
|
||||
|
||||
;; Set default directory based on operating system
|
||||
(cond
|
||||
;; If using Windows
|
||||
|
|
@ -49,11 +44,9 @@
|
|||
((eq system-type 'darwin)
|
||||
(setq default-directory (format "/Users/%s" (user-login-name))))
|
||||
)
|
||||
|
||||
;; Themeing
|
||||
(use-package gruvbox-theme) ;; Gruvbox is comfy
|
||||
(load-theme 'gruvbox-dark-hard) ;; Dark because I'm a parasite
|
||||
|
||||
; For Unix-like operating systems only running the GUI.
|
||||
(add-to-list 'default-frame-alist '(alpha-background . 80))
|
||||
(use-package doom-modeline
|
||||
|
|
@ -63,28 +56,28 @@
|
|||
(use-package nyan-mode
|
||||
:init
|
||||
(nyan-mode))
|
||||
|
||||
;; Requires the JetBrains Mono font be installed on the system.
|
||||
(add-to-list 'default-frame-alist '(font . "JetBrains Mono-12"))
|
||||
|
||||
;; Import external elisp programs
|
||||
(add-to-list 'load-path "~/.emacs.d/lisp/")
|
||||
;; Xah fly keys
|
||||
(require 'xah-fly-keys)
|
||||
(xah-fly-keys-set-layout "qwerty")
|
||||
;; (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
|
||||
:init ;; tweak evil's configuration before loading it
|
||||
(setq evil-want-keybinding nil)
|
||||
(setq evil-vsplit-window-right t)
|
||||
(setq evil-split-window-below t)
|
||||
(evil-mode))
|
||||
|
||||
(evil-mode)
|
||||
)
|
||||
;; MINIMALISM
|
||||
(menu-bar-mode -1)
|
||||
(tool-bar-mode -1)
|
||||
|
||||
;; Misc stuff
|
||||
(defalias 'yes-or-no-p 'y-or-n-p)
|
||||
(column-number-mode 1)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue