diff --git a/config/nix/flake.lock b/config/nix/flake.lock index 161cea5e..7b99721c 100644 --- a/config/nix/flake.lock +++ b/config/nix/flake.lock @@ -8,15 +8,15 @@ ] }, "locked": { - "lastModified": 1701453400, - "narHash": "sha256-hI9+KBShsSfvWX7bmRa/1VI20WGat3lDXmbceMZzMS4=", - "owner": "Kirottu", + "lastModified": 1708281605, + "narHash": "sha256-I25ZCH4lr8upYUWolS1UXaq3xEfoMA20bjTHkB07cVU=", + "owner": "uttarayan21", "repo": "anyrun", - "rev": "e14da6c37337ffa3ee1bc66965d58ef64c1590e5", + "rev": "4673f0a6049329235597658f2494043b6b222e76", "type": "github" }, "original": { - "owner": "Kirottu", + "owner": "uttarayan21", "repo": "anyrun", "type": "github" } @@ -81,16 +81,17 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "dirtyRev": "0fd7377026e800022e661ae887b99a8ce7f1846d-dirty", - "dirtyShortRev": "0fd7377-dirty", - "lastModified": 1708266468, + "lastModified": 1708279042, "narHash": "sha256-z2KAA2Jtphn8+psnDDZClhXG3N7zwNfBFrVu5lqrK6w=", - "type": "git", - "url": "file:///home/servius/Projects/anyrun-rink" + "owner": "uttarayan21", + "repo": "anyrun-rink", + "rev": "45feb4fb26f7a03fd99ff1d558c0eaf4e6862201", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/servius/Projects/anyrun-rink" + "owner": "uttarayan21", + "repo": "anyrun-rink", + "type": "github" } }, "crane": { diff --git a/config/nix/flake.nix b/config/nix/flake.nix index 8cbe9651..c63c12eb 100644 --- a/config/nix/flake.nix +++ b/config/nix/flake.nix @@ -20,7 +20,7 @@ }; anyrun = { - url = "github:Kirottu/anyrun"; + url = "github:uttarayan21/anyrun"; inputs.nixpkgs.follows = "nixpkgs"; }; anyrun-hyprwin = { @@ -33,8 +33,7 @@ }; anyrun-rink = { - # url = "github:uttarayan21/anyrun-rink"; - url = "git+file:///home/servius/Projects/anyrun-rink"; + url = "github:uttarayan21/anyrun-rink"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/config/nix/linux/anyrun.nix b/config/nix/linux/anyrun.nix index b5408998..5ae74246 100644 --- a/config/nix/linux/anyrun.nix +++ b/config/nix/linux/anyrun.nix @@ -6,7 +6,7 @@ plugins = with inputs.anyrun.packages.${pkgs.system}; [ inputs.anyrun-nixos-options.packages.${pkgs.system}.default inputs.anyrun-hyprwin.packages.${pkgs.system}.default - inputs.anyrun-rink.packages.${pkgs.system}.default + # inputs.anyrun-rink.packages.${pkgs.system}.default # rink applications websearch diff --git a/config/nix/nixos/configuration.nix b/config/nix/nixos/configuration.nix index d7fa63c7..9768d507 100644 --- a/config/nix/nixos/configuration.nix +++ b/config/nix/nixos/configuration.nix @@ -7,6 +7,8 @@ ./hardware-configuration.nix ]; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 6a42d2a6..557f3c45 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -105,22 +105,22 @@ vim.g.copilot_no_tab_map = true require('keymaps') require('plugins') -require 'nvim-treesitter.configs'.setup { - -- ensure_installed = "all", - ensure_installed = { "c", "rust", "toml", "lua", "json", "python", "cmake", "make", "typescript", "bash", "cpp", - "comment", "css", "fish", "http", "html", "vim", "yaml" }, - highlight = { - enable = true, -- false will disable the whole extension - additional_vim_regex_highlighting = false, - }, -} -require('nvim-treesitter.install').compilers = { "gcc-11", "clang" } -require('nvim-treesitter.parsers').get_parser_configs().just = { - install_info = { - url = "https://github.com/IndianBoy42/tree-sitter-just", -- local path or git repo - files = { "src/parser.c", "src/scanner.cc" }, - branch = "main", - use_makefile = true, -- this may be necessary on MacOS (try if you see compiler errors) - }, - maintainers = { "@IndianBoy42" }, -} +-- require 'nvim-treesitter.configs'.setup { +-- -- ensure_installed = "all", +-- ensure_installed = { "c", "rust", "toml", "lua", "json", "python", "cmake", "make", "typescript", "bash", "cpp", +-- "comment", "css", "fish", "http", "html", "vim", "yaml" }, +-- highlight = { +-- enable = true, -- false will disable the whole extension +-- additional_vim_regex_highlighting = false, +-- }, +-- } +-- require('nvim-treesitter.install').compilers = { "gcc-11", "clang" } +-- require('nvim-treesitter.parsers').get_parser_configs().just = { +-- install_info = { +-- url = "https://github.com/IndianBoy42/tree-sitter-just", -- local path or git repo +-- files = { "src/parser.c", "src/scanner.cc" }, +-- branch = "main", +-- use_makefile = true, -- this may be necessary on MacOS (try if you see compiler errors) +-- }, +-- maintainers = { "@IndianBoy42" }, +-- } diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua index fa27648c..3b75748e 100644 --- a/config/nvim/lua/lsp.lua +++ b/config/nvim/lua/lsp.lua @@ -4,51 +4,51 @@ local lspstatus = require 'lsp-status' local cmp_nvim_lsp = require 'cmp_nvim_lsp' local capabilities = cmp_nvim_lsp.default_capabilities() -if not vim.fn.filereadable('/etc/nix/nix.conf') then ( -require("mason-lspconfig").setup_handlers { - function(server_name) -- default handler (optional) - lspconfig[server_name].setup { - on_attach = function(client, bufnr) - lspstatus.on_attach(client, bufnr) - if client.server_capabilities.inlayHintProvider then - vim.lsp.inlay_hint.enable(bufnr, true) - end - end, - capabilities = capabilities, - } - end, - ["rust_analyzer"] = function() - vim.cmd([[autocmd BufEnter *.rs lua require("setup.rtools")]]) - end, - ["clangd"] = function() - lspconfig.clangd.setup { - capabilities = capabilities, - cmd = { "clangd" }, - filetypes = { "c", "cpp", "objc", "objcpp" }, - root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"), - single_file_support = true, - } - end, - ["ast_grep"] = function() - lspconfig.ast_grep.setup { - cmd = { "sg", "lsp" }, - filetypes = { "c", "cpp", "rust", "typescript" }, - root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"), - single_file_support = true, - } - end, - ['nil_ls'] = function() - lspconfig.nil_ls.setup { - capabilities = capabilities, - settings = { - ['nil'] = { - formatting = { - command = { "nixfmt" }, - } - } - } - }; - end -} -) -end +-- if not vim.fn.filereadable('/etc/nix/nix.conf') then ( +-- require("mason-lspconfig").setup_handlers { +-- function(server_name) -- default handler (optional) +-- lspconfig[server_name].setup { +-- on_attach = function(client, bufnr) +-- lspstatus.on_attach(client, bufnr) +-- if client.server_capabilities.inlayHintProvider then +-- vim.lsp.inlay_hint.enable(bufnr, true) +-- end +-- end, +-- capabilities = capabilities, +-- } +-- end, +-- ["rust_analyzer"] = function() +-- vim.cmd([[autocmd BufEnter *.rs lua require("setup.rtools")]]) +-- end, +-- ["clangd"] = function() +-- lspconfig.clangd.setup { +-- capabilities = capabilities, +-- cmd = { "clangd" }, +-- filetypes = { "c", "cpp", "objc", "objcpp" }, +-- root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"), +-- single_file_support = true, +-- } +-- end, +-- ["ast_grep"] = function() +-- lspconfig.ast_grep.setup { +-- cmd = { "sg", "lsp" }, +-- filetypes = { "c", "cpp", "rust", "typescript" }, +-- root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"), +-- single_file_support = true, +-- } +-- end, +-- ['nil_ls'] = function() +-- lspconfig.nil_ls.setup { +-- capabilities = capabilities, +-- settings = { +-- ['nil'] = { +-- formatting = { +-- command = { "nixfmt" }, +-- } +-- } +-- } +-- }; +-- end +-- } +-- ) +-- end diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 22b7d082..a3395397 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -31,7 +31,6 @@ return require('lazy').setup({ 'mhartington/formatter.nvim' }, - -- 'christianrondeau/vim-base64', { 'tpope/vim-commentary', lazy = false }, { @@ -45,10 +44,7 @@ return require('lazy').setup({ { 'tpope/vim-vinegar', lazy = false }, { 'tpope/vim-abolish', lazy = false }, { 'yuttie/comfortable-motion.vim', event = "BufEnter" }, - -- 'ruanyl/vim-gh-line', { 'rest-nvim/rest.nvim', event = "BufEnter" }, - -- 'b0o/SchemaStore.nvim', - -- 'rcarriga/nvim-notify', { 'echasnovski/mini.nvim', version = '*' }, { 'folke/todo-comments.nvim', @@ -61,21 +57,6 @@ return require('lazy').setup({ -- cmd = "Copilot", -- }, -- 'ggandor/leap.nvim', - { - 'shortcuts/no-neck-pain.nvim', - cmd = { "NoNeckPain", "NoNeckPainResize", "NoNeckPainScratchPad", "NoNeckPainWidthUp", "NoNeckPainWidthDown" }, - version = "*" - }, - -- { 'folke/zen-mode.nvim', config = function() require('zen-mode').setup() end }, - -- { 'folke/twilight.nvim', config = function() require('twilight').setup() end }, - { - 'pwntester/octo.nvim', - cmd = "Octo", - config = function() - require( - 'octo').setup() - end - }, { 'sainnhe/sonokai', lazy = false, @@ -83,14 +64,6 @@ return require('lazy').setup({ require('colorscheme') end }, - -- { - -- "catppuccin/nvim", - -- name = "catppuccin", - -- lazy = false, - -- config = function() - -- require('colorscheme') - -- end - -- }, { { "nvim-neorg/neorg", @@ -128,54 +101,43 @@ return require('lazy').setup({ 'nvim-telescope/telescope-fzf-native.nvim' } }, -- { - -- 'utilyre/barbecue.nvim', - -- event = "LspAttach", + -- 'akinsho/git-conflict.nvim', -- version = "*", - -- config = function() require('barbecue').setup() end, - -- dependencies = { - -- 'neovim/nvim-lspconfig', - -- 'SmiteshP/nvim-navic', - -- 'nvim-tree/nvim-web-devicons' - -- }, + -- config = function() + -- require('git-conflict').setup() + -- end + -- }, + -- { + -- 'williamboman/mason.nvim', + -- cmd = { "Mason", "MasonInstall", "MasonUpdate", "MasonUninstall" }, + -- config = function() + -- require("mason").setup({ + -- ui = { + -- icons = { + -- package_installed = "✓", + -- package_pending = "➜", + -- package_uninstalled = "✗" + -- } + -- } + -- }) + -- end, + -- }, + -- { + -- "williamboman/mason-lspconfig.nvim", + -- config = function() + -- require("mason-lspconfig").setup({ + -- automatic_installation = true, + -- }) + -- -- if not vim.fn.filereadable("/etc/nix/nix.conf") then ( + -- -- require("mason-lspconfig").setup({ + -- -- ensure_installed = { "lua_ls" }, + -- -- automatic_installation = true, + -- -- }) + -- -- ) + -- -- end + -- end, + -- lazy = false, -- }, - { - 'akinsho/git-conflict.nvim', - version = "*", - config = function() - require('git-conflict').setup() - end - }, - { - 'williamboman/mason.nvim', - cmd = { "Mason", "MasonInstall", "MasonUpdate", "MasonUninstall" }, - config = function() - require("mason").setup({ - ui = { - icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗" - } - } - }) - end, - }, - { - "williamboman/mason-lspconfig.nvim", - config = function() - require("mason-lspconfig").setup({ - automatic_installation = true, - }) - -- if not vim.fn.filereadable("/etc/nix/nix.conf") then ( - -- require("mason-lspconfig").setup({ - -- ensure_installed = { "lua_ls" }, - -- automatic_installation = true, - -- }) - -- ) - -- end - end, - lazy = false, - }, { 'NTBBloodbath/galaxyline.nvim', branch = 'main', @@ -229,8 +191,6 @@ return require('lazy').setup({ end, ft = "nu" }, - -- lsp - -- use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, } { 'folke/trouble.nvim', cmd = { @@ -348,117 +308,10 @@ return require('lazy').setup({ 'nvim-lua/lsp-status.nvim', event = "LspAttach" }, - -- { - -- 'ray-x/lsp_signature.nvim', - -- -- event = "LspAttach", - -- config = function() - -- require("lsp_signature").setup({ - -- floating_window_above_cur_line = true, - -- }) - -- end, - -- }, { 'terrastruct/d2-vim', ft = "d2", }, - { - 'andweeb/presence.nvim', - config = function() - require "presence".setup({ - auto_update = true, - main_image = "file", - }) - end - }, - -- { - -- 'ms-jpq/coq_nvim', - -- ft = { "rust", "toml", "lua" }, - -- dependencies = { 'ms-jpq/coq.artifacts', 'ms-jpq/coq.thirdparty' }, - -- build = ':COQdeps', - -- config = function() - -- vim.g.coq_settings.keymap = { jump_to_mark = "" } - -- end - -- }, - -- { 'ms-jpq/chadtree', build = ':CHADdeps' }, - -- { - -- 'ms-jpq/coq.thirdparty', - -- config = function() - -- require("coq_3p")({ - -- { - -- src = "repl", - -- sh = "sh", - -- shell = { p = "perl", n = "node" }, - -- max_lines = 99, - -- deadline = 500, - -- unsafe = { "rm", "poweroff", "mv" } - -- }, - -- { src = "bc", short_name = "MATH", precision = 6 }, - -- { src = "copilot", short_name = "COP", accept_key = "" }, - -- { src = "dap" } - -- }) - -- end - -- }, - -- use 'airblade/vim-rooter' - -- use({ - -- "https://git.sr.ht/~whynothugo/lsp_lines.nvim", - -- config = function() - -- require("lsp_lines").setup() - -- end, - -- }) - - { - 'lukas-reineke/indent-blankline.nvim', - config = function() - require("indent_blankline").setup { - show_end_of_line = true, - } - end - }, - { - 'sindrets/diffview.nvim', - cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewToggleFiles", "DiffviewFocusFiles", "DiffviewRefresh" }, - dependencies = 'nvim-lua/plenary.nvim' - }, - { - 'akinsho/toggleterm.nvim', - cmd = "ToggleTerm", - config = function() require 'setup.toggleterm' end, - }, - -- { - -- 'glepnir/dashboard-nvim', - -- config = function() require 'setup.dashboard' end, - -- }, - - { - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate' - }, - { - 'nvim-treesitter/nvim-treesitter-context', - dependencies = { 'nvim-treesitter/nvim-treesitter' } - }, - -- { - -- 'saecki/crates.nvim', - -- tag = 'v0.2.1', - -- dependencies = { 'nvim-lua/plenary.nvim' }, - -- config = function() - -- require('crates').setup { - -- src = { - -- coq = { - -- enabled = true, - -- name = "crates.nvim", - -- }, - -- }, - -- } - -- end, - -- }, - -- { - -- 'simrat39/rust-tools.nvim', - -- ft = 'rust', - -- config = function() - -- require 'setup.rtools' - -- end, - -- }, { 'mrcjkb/rustaceanvim', version = '^3', -- Recommended @@ -467,21 +320,6 @@ return require('lazy').setup({ require 'setup.rtools' end, }, - - - -- " For luasnip users. - -- " Plug 'L3MON4D3/LuaSnip' - -- " Plug 'saadparwaiz1/cmp_luasnip' - - -- " For ultisnips users. - -- " Plug 'SirVer/ultisnips' - -- " Plug 'quangnguyen30192/cmp-nvim-ultisnips' - - -- " For snippy users. - -- " Plug 'dcampos/nvim-snippy' - -- " Plug 'dcampos/cmp-snippy' - - { "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap" }, @@ -528,15 +366,6 @@ return require('lazy').setup({ end }, - -- { - -- 'phaazon/hop.nvim', - -- branch = 'v2', -- optional but strongly recommended - -- config = function() - -- -- you can configure Hop the way you like here; see :h hop-config - -- require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' } - -- end - -- }, - -- https://github.com/simrat39/symbols-outline.nvim { 'simrat39/symbols-outline.nvim', cmd = "SymbolsOutline", @@ -560,49 +389,10 @@ return require('lazy').setup({ --Please make sure you install markdown and markdown_inline parser } }, - { - "cshuaimin/ssr.nvim", - module = "ssr", - -- Calling setup is optional. - config = function() - require("ssr").setup { - border = "rounded", - min_width = 50, - min_height = 5, - max_width = 120, - max_height = 25, - keymaps = { - close = "q", - next_match = "n", - prev_match = "N", - replace_confirm = "", - replace_all = "", - }, - } - end - }, - { - "j-hui/fidget.nvim", - -- tag = "", - event = "LspAttach", - opts = {}, - }, - { - "kdheepak/lazygit.nvim", - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - cmd = { "LazyGit" } - }, { "ron-rs/ron.vim", ft = "ron", }, - -- require("copilot").setup({ - -- suggestion = { enabled = false }, - -- panel = { enabled = false }, - -- }) { "zbirenbaum/copilot.lua", cmd = "Copilot",