From 9bfa850bc3935fdc21c457f8325325cb28298f7f Mon Sep 17 00:00:00 2001 From: "Frankie B." Date: Wed, 29 May 2024 14:39:33 +0100 Subject: Update packages --- homes/floppydisk/default.nix | 2 +- homes/floppydisk/neovim-flake.nix | 252 ------------------------------------- homes/floppydisk/nvf.nix | 253 ++++++++++++++++++++++++++++++++++++++ homes/floppydisk/packages.nix | 3 - 4 files changed, 254 insertions(+), 256 deletions(-) delete mode 100644 homes/floppydisk/neovim-flake.nix create mode 100644 homes/floppydisk/nvf.nix (limited to 'homes') diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix index 3220997..bf680a8 100644 --- a/homes/floppydisk/default.nix +++ b/homes/floppydisk/default.nix @@ -5,7 +5,7 @@ }: { imports = [ ./packages.nix # home.packages and similar stuff - ./neovim-flake.nix + ./nvf.nix ./ssh.nix ./git.nix ]; diff --git a/homes/floppydisk/neovim-flake.nix b/homes/floppydisk/neovim-flake.nix deleted file mode 100644 index f4246d0..0000000 --- a/homes/floppydisk/neovim-flake.nix +++ /dev/null @@ -1,252 +0,0 @@ -{ - inputs, - pkgs, - ... -}: { - imports = [ - inputs.neovim-flake.homeManagerModules.default - ]; - - programs.neovim-flake = { - enable = true; - settings = { - vim = { - viAlias = true; - vimAlias = true; - debugMode = { - enable = false; - level = 20; - logFile = "/tmp/nvim.log"; - }; - }; - - vim.lsp = { - formatOnSave = true; - lspkind.enable = false; - lightbulb.enable = true; - lspsaga.enable = false; - nvimCodeActionMenu.enable = true; - trouble.enable = true; - lspSignature.enable = true; - }; - - vim.languages = { - enableLSP = true; - enableFormat = true; - enableTreesitter = true; - enableExtraDiagnostics = true; - - nix.enable = true; - html.enable = true; - clang.enable = false; - sql.enable = false; - rust = { - enable = false; - crates.enable = false; - }; - ts.enable = true; - go.enable = true; - zig.enable = false; - python.enable = false; - dart.enable = false; - elixir.enable = false; - }; - - vim.visuals = { - enable = true; - nvimWebDevicons.enable = true; - scrollBar.enable = true; - smoothScroll.enable = true; - cellularAutomaton.enable = true; - fidget-nvim.enable = true; - indentBlankline = { - enable = true; - fillChar = null; - eolChar = null; - scope.enabled = true; - }; - cursorline = { - enable = true; - lineTimeout = 0; - }; - }; - - vim.statusline = { - lualine = { - enable = true; - theme = "onedark"; - }; - }; - - vim.theme = { - enable = true; - name = "onedark"; - style = "dark"; - transparent = false; - }; - vim.autopairs.enable = true; - - vim.autocomplete = { - enable = true; - type = "nvim-cmp"; - }; - - vim.filetree = { - nvimTree = { - enable = true; - openOnSetup = true; - disableNetrw = true; - - hijackUnnamedBufferWhenOpening = true; - hijackCursor = true; - hijackDirectories = { - enable = true; - autoOpen = true; - }; - - git = { - enable = true; - showOnDirs = false; - timeout = 100; - }; - - view = { - preserveWindowProportions = false; - cursorline = false; - width = { - min = 35; - max = -1; - padding = 1; - }; - }; - - renderer = { - indentMarkers.enable = true; - rootFolderLabel = false; - - icons = { - modifiedPlacement = "after"; - gitPlacement = "after"; - show.git = true; - show.modified = true; - }; - }; - - diagnostics.enable = true; - - modified = { - enable = true; - showOnDirs = false; - showOnOpenDirs = true; - }; - - mappings = { - toggle = ""; - }; - }; - }; - - vim.tabline = { - nvimBufferline.enable = true; - }; - - vim.treesitter.context.enable = true; - - vim.binds = { - whichKey.enable = true; - cheatsheet.enable = true; - }; - - vim.telescope.enable = true; - - vim.git = { - enable = true; - gitsigns.enable = true; - gitsigns.codeActions = false; - }; - - vim.minimap = { - minimap-vim.enable = false; - codewindow.enable = true; # lighter, faster, and uses lua for configuration - }; - - vim.dashboard = { - dashboard-nvim.enable = false; - alpha.enable = true; - }; - - vim.notify = { - nvim-notify.enable = true; - }; - - vim.projects = { - project-nvim.enable = true; - }; - - vim.utility = { - ccc.enable = true; - icon-picker.enable = true; - diffview-nvim.enable = true; - motion = { - hop.enable = true; - leap.enable = false; - }; - vim-wakatime = { - enable = true; - cli-package = pkgs.wakatime; - }; - }; - - vim.notes = { - mind-nvim.enable = true; - todo-comments.enable = true; - }; - - vim.terminal = { - toggleterm.enable = true; - }; - - vim.ui = { - noice.enable = true; - smartcolumn = { - enable = true; - columnAt.languages = { - nix = 150; - ruby = 110; - java = 120; - go = [110 150]; - }; - }; - }; - - vim.assistant = { - copilot.enable = true; - }; - - vim.session = { - nvim-session-manager.enable = true; - }; - - vim.gestures = { - gesture-nvim.enable = false; - }; - - vim.comments = { - comment-nvim.enable = true; - }; - - #vim.presence = { - # presence-nvim = { - # enable = true; - # auto_update = true; - # image_text = "The Superior Text Editor"; - # client_id = "793271441293967371"; - # main_image = "neovim"; - # rich_presence = { - # editing_text = "Editing %s"; - # }; - # }; - #}; - }; - }; -} diff --git a/homes/floppydisk/nvf.nix b/homes/floppydisk/nvf.nix new file mode 100644 index 0000000..a8fb245 --- /dev/null +++ b/homes/floppydisk/nvf.nix @@ -0,0 +1,253 @@ +{ + inputs, + pkgs, + ... +}: { + imports = [ + inputs.nvf.homeManagerModules.default + ]; + + programs.nvf = { + enable = true; + settings = { + vim = { + viAlias = true; + vimAlias = true; + debugMode = { + enable = false; + level = 20; + logFile = "/tmp/nvim.log"; + }; + }; + + vim.lsp = { + formatOnSave = true; + lspkind.enable = false; + lightbulb.enable = true; + lspsaga.enable = false; + nvimCodeActionMenu.enable = true; + trouble.enable = true; + lspSignature.enable = true; + }; + + vim.languages = { + enableLSP = true; + enableFormat = true; + enableTreesitter = true; + enableExtraDiagnostics = true; + + nix.enable = true; + html.enable = true; + clang.enable = false; + sql.enable = false; + rust = { + enable = false; + crates.enable = false; + }; + ts.enable = true; + go.enable = true; + zig.enable = false; + python.enable = false; + dart.enable = false; + elixir.enable = false; + }; + + vim.visuals = { + enable = true; + nvimWebDevicons.enable = true; + scrollBar.enable = true; + smoothScroll.enable = true; + cellularAutomaton.enable = true; + fidget-nvim.enable = true; + indentBlankline = { + enable = true; + fillChar = null; + eolChar = null; + scope.enabled = true; + }; + cursorline = { + enable = true; + lineTimeout = 0; + }; + }; + + vim.statusline = { + lualine = { + enable = true; + theme = "onedark"; + }; + }; + + vim.theme = { + enable = true; + name = "onedark"; + style = "dark"; + transparent = false; + }; + vim.autopairs.enable = true; + + vim.autocomplete = { + enable = true; + type = "nvim-cmp"; + }; + + vim.filetree = { + nvimTree = { + enable = true; + openOnSetup = true; + setupOpts = { + disable_netrw = true; + + hijack_unnamed_buffer_when_opening = true; + hijack_cursor = true; + hijack_directories = { + enable = true; + autoOpen = true; + }; + + git = { + enable = true; + showOnDirs = false; + timeout = 100; + }; + + view = { + cursorline = false; + width = { + min = 35; + max = -1; + padding = 1; + }; + }; + + renderer = { + indent_markers.enable = true; + root_folder_label = false; + + icons = { + modified_placement = "after"; + git_placement = "after"; + show.git = true; + show.modified = true; + }; + }; + + diagnostics.enable = true; + + modified = { + enable = true; + show_on_dirs = false; + show_on_open_dirs = true; + }; + }; + + mappings = { + toggle = ""; + }; + }; + }; + + vim.tabline = { + nvimBufferline.enable = true; + }; + + vim.treesitter.context.enable = true; + + vim.binds = { + whichKey.enable = true; + cheatsheet.enable = true; + }; + + vim.telescope.enable = true; + + vim.git = { + enable = true; + gitsigns.enable = true; + gitsigns.codeActions.enable = false; + }; + + vim.minimap = { + minimap-vim.enable = false; + codewindow.enable = true; # lighter, faster, and uses lua for configuration + }; + + vim.dashboard = { + dashboard-nvim.enable = false; + alpha.enable = true; + }; + + vim.notify = { + nvim-notify.enable = true; + }; + + vim.projects = { + project-nvim.enable = true; + }; + + vim.utility = { + ccc.enable = true; + icon-picker.enable = true; + diffview-nvim.enable = true; + motion = { + hop.enable = true; + leap.enable = false; + }; + vim-wakatime = { + enable = true; + cli-package = pkgs.wakatime; + }; + }; + + vim.notes = { + mind-nvim.enable = true; + todo-comments.enable = true; + }; + + vim.terminal = { + toggleterm.enable = true; + }; + + vim.ui = { + noice.enable = true; + smartcolumn = { + enable = true; + setupOpts.custom_colorcolumn = { + nix = 150; + ruby = 110; + java = 120; + go = [110 150]; + }; + }; + }; + + vim.assistant = { + copilot.enable = true; + }; + + vim.session = { + nvim-session-manager.enable = true; + }; + + vim.gestures = { + gesture-nvim.enable = false; + }; + + vim.comments = { + comment-nvim.enable = true; + }; + + #vim.presence = { + # presence-nvim = { + # enable = true; + # auto_update = true; + # image_text = "The Superior Text Editor"; + # client_id = "793271441293967371"; + # main_image = "neovim"; + # rich_presence = { + # editing_text = "Editing %s"; + # }; + # }; + #}; + }; + }; +} diff --git a/homes/floppydisk/packages.nix b/homes/floppydisk/packages.nix index 8ccae80..1dd29d2 100644 --- a/homes/floppydisk/packages.nix +++ b/homes/floppydisk/packages.nix @@ -9,7 +9,6 @@ yt-dlp _1password-gui _1password - git-credential-1password firefox-devedition rdesktop _3llo @@ -63,7 +62,6 @@ jetbrains.rider jetbrains.phpstorm jetbrains.idea-ultimate - jetbrains.webstorm lazygit wakatime mongodb-compass @@ -105,7 +103,6 @@ pcsx2 steam gzdoom - minecraft dolphin-emu prismlauncher fceux -- cgit v1.2.3-54-g00ecf