diff --git a/nix/local_home.nix b/nix/local_home.nix index 7882628..cad7a94 100644 --- a/nix/local_home.nix +++ b/nix/local_home.nix @@ -6,7 +6,7 @@ # accordingly, and then commit it. home = { # Stub values for demonstration. Override these in local branch. - username = "larssonmartin1998-mac"; - homeDirectory = "/Users/larssonmartin1998-mac"; + username = "nixos"; + homeDirectory = "/home/nixos"; }; } diff --git a/nix/local_system.nix b/nix/local_system.nix index fd440f0..6bdfb5f 100644 --- a/nix/local_system.nix +++ b/nix/local_system.nix @@ -3,8 +3,6 @@ }: { system = { - stateVersion = 5; + stateVersion = "24.11"; }; - - nix-homebrew.user = "larssonmartin1998-mac"; } diff --git a/nvim/lua/plugs/fzf.lua b/nvim/lua/plugs/fzf.lua deleted file mode 100644 index 3aa8088..0000000 --- a/nvim/lua/plugs/fzf.lua +++ /dev/null @@ -1,71 +0,0 @@ -return { - "ibhagwan/fzf-lua", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = { - "telescope", - winopts = { - preview = { - default = "bat" - } - }, - lsp = { - workspace_symbols = { - symbol_kinds = { "Variable", "Function", "Method", "Class", "Struct", "Interface" }, - }, - }, - previewers = { - builtin = { - -- turn off syntax highlighting for files with more than 100KB - -- this avoid hanging when previewing large files (due to treesitter parsing on minified files) - syntax_limit_b = 1024 * 100, -- 100KB - } - } - }, - config = function() - local fzf = require("fzf-lua") - local pickers = { - { - mapping = "o", - action = function() - fzf.files({ - git_icons = false, - }) - end - }, - { - mapping = "a", - action = function() - fzf.live_grep_native({ - git_icons = false, - rg_opts = "--hidden --column --line-number --no-heading --color=always --smart-case", - fzf_opts = { - ['--exact'] = false, -- Disable exact matching - }, - }) - end - }, - { - mapping = "g", - action = function() - fzf.git_bcommits({}) - end - }, - { - mapping = "s", - action = function() - fzf.lsp_live_workspace_symbols({}) - end - } - } - - local keymaps = {} - keymaps.n = {} - for _, picker in ipairs(pickers) do - keymaps.n["t" .. picker.mapping] = { - cmd = picker.action - } - end - - require("utils").add_keymaps(keymaps) - end -} diff --git a/nvim/lua/plugs/indent_blankline.lua b/nvim/lua/plugs/indent_blankline.lua deleted file mode 100644 index e009902..0000000 --- a/nvim/lua/plugs/indent_blankline.lua +++ /dev/null @@ -1,32 +0,0 @@ -return { - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - event = "BufRead", - config = function() - local ibl = require("ibl") - ibl.setup({ - debounce = 100, - indent = { - char = "▏", - }, - scope = { - enabled = true, - char = "▏", - show_start = false, - show_end = false, - highlight = { "IblScope" }, - }, - }) - - local colors = require("ayu.colors") - colors.generate(true) - local highlights = { - { "IblScope", { fg = colors.keyword } }, - { "@ibl.scope.char.1", { fg = colors.keyword } }, - } - - for _, hl in ipairs(highlights) do - vim.api.nvim_set_hl(0, hl[1], hl[2]) - end - end -} diff --git a/nvim/lua/plugs/noice.lua b/nvim/lua/plugs/noice.lua index e15c16a..f31c47b 100644 --- a/nvim/lua/plugs/noice.lua +++ b/nvim/lua/plugs/noice.lua @@ -4,15 +4,6 @@ return { lazy = true, dependencies = { { "MunifTanjim/nui.nvim", lazy = true }, - { - "rcarriga/nvim-notify", - opts = { - background_colour = "#24273a", - fps = 1, - render = "compact", - stages = "static" - } - } }, opts = { lsp = { diff --git a/nvim/lua/plugs/smear_cursor.lua b/nvim/lua/plugs/smear_cursor.lua deleted file mode 100644 index 63984b1..0000000 --- a/nvim/lua/plugs/smear_cursor.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "sphamba/smear-cursor.nvim", - opts = { - smear_between_buffers = true, - - min_horizontal_distance_smear = 3, - min_vertical_distance_smear = 2, - - scroll_buffer_space = true, - smear_insert_mode = false, - - cursor_color = "#FFCC66", - transparent_bg_fallback_color = "#303030", - - stiffness = 0.85, - trailing_stiffness = 0.7, - distance_stop_animating = 0.5, - }, -}