From: xa-m Date: Thu, 1 Jan 2026 12:40:52 +0000 (+0300) Subject: Added EMACS X-Git-Url: https://git.xa-m.com/?a=commitdiff_plain;h=446be3dcde18e0c8a75fccc09e9563316487cb2a;p=dotfiles.git Added EMACS --- diff --git a/.DS_Store b/.DS_Store index f02127c..af29352 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/nvim/.DS_Store b/nvim/.DS_Store index b136f11..0fb8c0d 100644 Binary files a/nvim/.DS_Store and b/nvim/.DS_Store differ diff --git a/nvim/init.lua b/nvim/init.lua index d123ec2..91a1cdd 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -102,7 +102,7 @@ end -- Linux spesific attributes --if vim.loop.os_uname().sysname == "Linux" then -- i have no idea why it's called Darwin -- ATTRIBUTES ---end +-- -- Set as the leader key -- See `:help mapleader` @@ -987,6 +987,28 @@ require("lazy").setup({ vim.cmd.colorscheme("gruvbox-material") end, }, + -- lua/plugins/rose-pine.lua + { + "rose-pine/neovim", + name = "rose-pine", + config = function() + -- vim.cmd("colorscheme rose-pine") + end, + }, + { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, + { + "projekt0n/github-nvim-theme", + name = "github-theme", + lazy = false, -- make sure we load this during startup if it is your main colorscheme + priority = 1000, -- make sure to load this before all the other start plugins + config = function() + require("github-theme").setup({ + -- ... + }) + + -- vim.cmd("colorscheme github_dark_dimmed") + end, + }, -- Highlight todo, notes, etc in comments { "folke/todo-comments.nvim", diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index c0a8624..6f58e26 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -2,23 +2,27 @@ "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, "baleia.nvim": { "branch": "main", "commit": "fb3aff021b2b64ef820d0230d2c22ebfaf71bb6a" }, "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, + "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, "compile-mode.nvim": { "branch": "main", "commit": "3f66fb9b28518a1f98d065d8308b5deddf1ae3e4" }, "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "github-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, "gitsigns.nvim": { "branch": "main", "commit": "1b0350ab707713b2bc6c236151f1a324175347b1" }, "gruvbox": { "branch": "master", "commit": "697c00291db857ca0af00ec154e5bd514a79191f" }, "gruvbox-material": { "branch": "master", "commit": "66cfeb7050e081a746a62dd0400446433e802368" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, + "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "c4c84f4521d62de595c0d0f718a9a40c1890c8ce" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, - "mini.nvim": { "branch": "main", "commit": "145476d74aaa3236db9dc6705d0fa3eb0f4f8352" }, + "mini.nvim": { "branch": "main", "commit": "8ca3965e68edfee5f438d4063f5adf5afa255884" }, "nvim-autopairs": { "branch": "master", "commit": "2647cce4cb64fb35c212146663384e05ae126bdf" }, "nvim-lspconfig": { "branch": "master", "commit": "6bba673aa8993eceec233be17b42ddfb9540794b" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "rose-pine": { "branch": "main", "commit": "f93360149e9ed4df8677fbb07c7231ea0fd03b97" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, diff --git a/nvim/lua/kickstart/plugins/autopairs.lua b/nvim/lua/kickstart/plugins/autopairs.lua index 386d392..8d90ead 100644 --- a/nvim/lua/kickstart/plugins/autopairs.lua +++ b/nvim/lua/kickstart/plugins/autopairs.lua @@ -2,7 +2,27 @@ -- https://github.com/windwp/nvim-autopairs return { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - opts = {}, + "windwp/nvim-autopairs", + event = "InsertEnter", + opts = {}, + config = function() + local autopairs = require("nvim-autopairs") + autopairs.setup({}) + + local Rule = require("nvim-autopairs.rule") + + autopairs.add_rules({ + Rule("|", "|", "zig") + :with_pair(function(opts) + -- Only add pair if the previous char isn't already | + local prev_char = opts.line:sub(opts.col - 1, opts.col - 1) + return prev_char ~= "|" + end) + :with_move(function(opts) + -- Move past the closing | if it's already there + return opts.prev_char:match("|") ~= nil + end) + :use_key("|"), + }) + end, }