nvim: Update theme configuration

config/nvim/init.fnl

@@ -64,6 +64,9 @@
                     :paste {:+ :pbpaste :* :pbpaste}
                     :cache_enabled 0})
   (o.clipboard:prepend :unnamedplus)
+  ;; Theme
+  (let [theme (require :nifoc.theme)]
+    (theme.setup))
   ;; Plugins
   (set g.did_load_filetypes 1) ; Lua filetype detection
   (set g.do_filetype_lua 1)
@@ -86,12 +89,9 @@
   (set g.loaded_getscriptPlugin 1)
   (set g.loaded_logipat 1)
   (set g.loaded_tutor_mode_plugin 1)
-  (let [diagnostics (require :nifoc.diagnostic)]
+  (let [diagnostic (require :nifoc.diagnostic)]
-    (diagnostics.setup))
+    (diagnostic.setup))
   (require :configuration.plugins)
-  ;; Theme
-  (set o.background :dark)
-  (vim.cmd "colorscheme dracula")
   ;; Keymap
   (let [keymap (require :nifoc.keymap)]
     (keymap.setup))

config/nvim/nifoc/theme.fnl

@@ -0,0 +1,11 @@
+(let [mod {}
+      o vim.opt
+      g vim.g
+      cmd vim.cmd]
+  (fn mod.setup []
+    (set g.dracula_show_end_of_buffer false)
+    (set g.dracula_italic_comment true)
+    (set o.background :dark)
+    (cmd "colorscheme dracula"))
+
+  mod)

config/nvim/plugins/dracula.fnl

@@ -1,3 +0,0 @@
-(let [g vim.g
-      cmd vim.cmd]
-  (set g.dracula_show_end_of_buffer false))

flake.lock

@@ -73,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649984295,
+        "lastModified": 1650059391,
-        "narHash": "sha256-55dgKGs7W8eC3s9GYewll9y4IlP/KAlSinjQwshNpxM=",
+        "narHash": "sha256-2kYYStLpPCcYToW+uZTP0jxmdR95URCret/vfpzJn4s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d49d68f4196d32c5039cb9e91d730cee894f6f14",
+        "rev": "7add9ce2e5c517fcc4b25b3ed13e7e28cd325034",
         "type": "github"
       },
       "original": {
@@ -96,11 +96,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1649884316,
+        "lastModified": 1650074328,
-        "narHash": "sha256-3Kw4IeTr4RtAJjdS6jrrfTVQrC/mTv1x4IP6iXO2CRA=",
+        "narHash": "sha256-CzcPEg3uUuyiVNAAw7u30pQBAYuR6a7YVo+7GhQ5BpI=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "8486c87e58beb4c88957398db1890e0836a0c75e",
+        "rev": "3f2e9298bdd971a4d2baa298aff7c6f2c2c1ad1a",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649924456,
+        "lastModified": 1650096904,
-        "narHash": "sha256-Psn9b0ujKGld/rY9dDOwwkcNyWFQSxlLF0XpvN9AIO4=",
+        "narHash": "sha256-mSnDYhZCnw13vApIApeZMIYvuYnrd+Bal4aWbD3xzOc=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "b3cde03ebb2250cfee42830bd023864927bfc723",
+        "rev": "ae9ee8abdce8256822879916d386550bb55f5b6c",
         "type": "github"
       },
       "original": {
@@ -154,11 +154,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1649961138,
+        "lastModified": 1650109093,
-        "narHash": "sha256-8ZCPrazs+qd2V8Elw84lIWuk0kKfVQ8Ei/19gahURhM=",
+        "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d08394e7cd5c7431a1e8f53b7f581e74ee909548",
+        "rev": "faad370edcb37162401be50d45526f52bb16a713",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649983175,
+        "lastModified": 1650069516,
-        "narHash": "sha256-7TUy8tF/Kgebozx0gnwmHUQz9bWk9UrMsdxdgMtUvCs=",
+        "narHash": "sha256-mxBUTEY62dCst2a7oWYyNzNhhYZd0GTBK2NCwiRoRo4=",
         "owner": "arqv",
         "repo": "zig-overlay",
-        "rev": "40b26de1698b2b1734c127b22db2beaa043fd1ee",
+        "rev": "e1fb92a3644dc7cbadb9192f144e1a62636810d7",
         "type": "github"
       },
       "original": {

programs/nvim/default.nix

@@ -98,11 +98,7 @@ in
       }
 
       # Themes
-      {
+      dracula-nvim
-        plugin = dracula-nvim;
-        config = builtins.readFile ../../config/nvim/plugins/dracula.fnl;
-        type = "fennel";
-      }
 
       # Syntax
       {

programs/nvim/plugins.nix

@@ -39,12 +39,12 @@
   };
   legendary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "legendary.nvim";
-    version = "1650043687";
+    version = "1650060314";
     src = pkgs.fetchFromGitHub {
       owner = "mrjones2014";
       repo = "legendary.nvim";
-      rev = "8ab6ba601a5ff2baa54e44d3e81bd31413bf63d6";
+      rev = "460ce7c6408fb11690423d363e72e9fdbfb557b9";
-      sha256 = "EWewlioREzNJ9gvueqjlorrLM3dIy3Ex1vEBNUuS66Q=";
+      sha256 = "0dOJ5T5g71NUK4dEMRTLZ3571iHywfd2h5kcV2AqouY=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim";
@@ -87,12 +87,12 @@
   };
   leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "leap.nvim";
-    version = "1649931691";
+    version = "1650142695";
     src = pkgs.fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "bfdcae6daf34bd49be8d24bbbff35beee31450cd";
+      rev = "3d008846d9b33f9601b361d1a4941b0b3a67e756";
-      sha256 = "Wdyzd6DDJt8b3Eg5s9tHFA9sIYrBh2KkSZwjq83h9iE=";
+      sha256 = "b7wmfCX1ZGdpH+HIT9PHf532Hg61TIpmKz30O1FjPOg=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim";
@@ -111,12 +111,12 @@
   };
   nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "1650041891";
+    version = "1650144199";
     src = pkgs.fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "d9cc414e693b6421c8e0d79835e7d30d835338bd";
+      rev = "4542402e34568eb607059e3ff6a3594aaca850fd";
-      sha256 = "TuaQ/zeKvfIr7cRQfiEBWuUyo45/Qdj49CnOthAhrGA=";
+      sha256 = "PXxc9pr4/ymCj3fokV9VloFncS/u5sBNwo0Mkm5Jw44=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter";
@@ -202,12 +202,12 @@
   };
   null-ls-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "1649615103";
+    version = "1650144148";
     src = pkgs.fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "82be4bf6ee7b1c2605758b06d918c9dcf6f8e3f2";
+      rev = "a887bd6c1bb992ccf48e673b40e061c3e816204f";
-      sha256 = "txR7LcvRNX3suwwhSVEC3kp56QYMQTBZhHA/PAnWubE=";
+      sha256 = "gbo5sMd+mT/U1nQYAci2pdYNEOg/qFrpVfv6gVawLtY=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim";
@@ -394,12 +394,12 @@
   };
   nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "1649745697";
+    version = "1650062917";
     src = pkgs.fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "8af3045c2703248b58d8ee3ee3b18399525bd5d6";
+      rev = "29c5e9effe53f19f250e3a88d1427b35031bc90d";
-      sha256 = "ytUiBTIyVsvqg4xs/PFdpdMVo0uYrdalb5SjoeRpLS8=";
+      sha256 = "bIsie9TkSk7LMMQq98StmViXPaZBWS60i5xd7EB7dyU=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects";
@@ -430,12 +430,12 @@
   };
   bufferline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "bufferline.nvim";
-    version = "1649951114";
+    version = "1650105928";
     src = pkgs.fetchFromGitHub {
       owner = "akinsho";
       repo = "bufferline.nvim";
-      rev = "7634b89bb513dffb70e0a41a060a94239d6db2db";
+      rev = "0a83c615a8ab49718d9b4cdc60127003307829b2";
-      sha256 = "6fLoUTr4VerdJjfk/jJM9njVkTuwsqTUwIn3piBd4sE=";
+      sha256 = "RhAaRFGDoHZAr8SLgbtLtuQ2J9z5hbvMH14FDhHOLXU=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/akinsho/bufferline.nvim";
@@ -478,12 +478,12 @@
   };
   gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "gitsigns.nvim";
-    version = "1650039181";
+    version = "1650054200";
     src = pkgs.fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "e899189c362d856b9229aaa339a48549dd0cef39";
+      rev = "9e0cc25cbe399e0d1732ae1177dd537c462a40d1";
-      sha256 = "xf47/cEsWk6sYPRHc7Y9MCH4OKLN8I7Y9pEBbQYDwj8=";
+      sha256 = "p/zFJNQ5kvJJgt995B6SJ3LyJqwmOlu0Bjcl+djlwvw=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";