diff --git a/flake.lock b/flake.lock index 16078de..7eb37d9 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1690476848, - "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=", + "lastModified": 1691225770, + "narHash": "sha256-O5slH8nW8msTAqVAS5rkvdHSkjmrO+JauuSDzZCmv2M=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da", + "rev": "0a014a729cdd54d9919ff36b714d047909d7a4c8", "type": "github" }, "original": { @@ -233,11 +233,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "lastModified": 1691186842, + "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", "type": "github" }, "original": { diff --git a/modules/neovim.nix b/modules/neovim.nix index 9dc8d5e..7ac54d4 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -22,13 +22,26 @@ in }; # https://github.com/pupbrained/nix-config/blob/29af4835f21940af51b86313c451fb572a29874a/pkgs/nixvim.nix#L8 - # maps. + maps.normal = { + "ot" = "vs | te"; + "o." = "Telescope file_browser"; + "op" = "NvimTreeToggle"; + }; plugins = { telescope = { enable = true; }; + nvim-tree = { + enable = true; + openOnSetup = true; + }; + + presence-nvim = { + enable = true; + }; + treesitter = { enable = true; folding = true; @@ -88,6 +101,7 @@ in extraConfigLua = builtins.readFile ./../rsrcs/nvim.lua; extraPlugins = with pkgs.vimPlugins; [ + telescope-file-browser-nvim monokai-pro-nvim nvim-lspconfig hop-nvim diff --git a/rsrcs/nvim.lua b/rsrcs/nvim.lua index aa7eab0..0cfc718 100644 --- a/rsrcs/nvim.lua +++ b/rsrcs/nvim.lua @@ -125,7 +125,7 @@ hop.setup { keys = 'etovxqpdygfblzhckisuran', } local directions = require('hop.hint').HintDirection -vim.keymap.set('', '', function() +vim.keymap.set('', 'ff', function() hop.hint_patterns({ multi_windows = true, current_line_only = false }) end, {remap=true}) @@ -178,3 +178,6 @@ require("monokai-pro").setup({ }) vim.cmd.colorscheme "monokai-pro-spectrum" + +require("telescope").load_extension "file_browser" + diff --git a/users/nixolas.nix b/users/nixolas.nix index b613bde..56a8923 100644 --- a/users/nixolas.nix +++ b/users/nixolas.nix @@ -20,7 +20,7 @@ in imports = [ ../modules/discord.nix - ../modules/emacs.nix + #../modules/emacs.nix ../modules/fusuma.nix ../modules/git.nix ../modules/rofi.nix @@ -81,6 +81,7 @@ in flameshot # screenshot utility fontpreview # utility to preview fonts gitui # command line git tui + helvum # audio sink gui control pandoc # utility for converting between document types qmk # QMK utility for compiling qmk firmware nextcloud-client # Nextcloud private syncing