Setup upgrade and python setup I guess

dotfiles/neovim/.luarc.json

@@ -0,0 +1,3 @@
+{
+    "workspace.checkThirdParty": false
+}

dotfiles/neovim/.neoconf.json

@@ -1,7 +1,7 @@
 {
   "neoconf": {
     "plugins": {
-      "sumneko_lua": {
+      "lua_ls": {
         "enabled": true
       }
     }

dotfiles/neovim/README.md

@@ -23,7 +23,7 @@ I feel like macro recording is a rare thing, so I moved it to `yq/yQ`. This free
 | [d          | Previous [d]iagnostic                            |         |
 | d]          | Next [d]iagnostic                                |         |
 | J           | Hover over diagnostic                            |         |
-| qJ          | Merge with next line                             |         |
+| yq          | Merge with next line                             |         |
 | \<leader>D  | [D]iagnostic loclist                             |         |
 | _jk_        | Exit insert mode                                 |         |
 | _jo_        | Save file                                        |         |

dotfiles/neovim/lazy-lock.json

@@ -1,69 +1,70 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "9bff06b570df29434a88f9c6a9cea3b21ca17208" },
+  "LuaSnip": { "branch": "master", "commit": "a835e3d680c5940b61780c6af07885db95382478" },
   "abbreinder.nvim": { "branch": "main", "commit": "5b2b5ff08a9ada42238d733aeebc6d3d96314d77" },
   "abbremand.nvim": { "branch": "main", "commit": "d633341f632b0b2666dfc6dfe6b9842ba1610a1d" },
-  "catppuccin": { "branch": "main", "commit": "c3697149f825ff73665491223b5df1efae28f687" },
+  "catppuccin": { "branch": "main", "commit": "128af65c3a23c94b324dc8d7f02a34feee8722d4" },
   "clipboard-image.nvim": { "branch": "main", "commit": "d1550dc26729b7954f95269952e90471b838fa25" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
+  "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" },
   "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "dashboard-nvim": { "branch": "master", "commit": "da6c650cff69cea1f35485b73411be2b6d639255" },
+  "dashboard-nvim": { "branch": "master", "commit": "6e0a35343fc37a2a2ca5ab1734d60fcc06c4cf01" },
   "dhall-vim": { "branch": "master", "commit": "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae" },
-  "dressing.nvim": { "branch": "master", "commit": "db716a0f1279f79a886c0e0b6ab3c3d5ffdb42fe" },
+  "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" },
-  "fidget.nvim": { "branch": "main", "commit": "9dc6d15fdb877b2fb09ea0ba2dfde9beccb5965a" },
+  "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" },
-  "firenvim": { "branch": "master", "commit": "35b34ba566d9d9f6761cde3574f668d505c5137f" },
+  "firenvim": { "branch": "master", "commit": "12003d9727bc5074ccb405b3d80e691c72d4859b" },
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
-  "glow.nvim": { "branch": "main", "commit": "c87b1120b618577e64d910a7493a26829044a8a2" },
+  "glow.nvim": { "branch": "main", "commit": "5a8ccfb1876b1b2e29ea32c63221be6df45870d1" },
   "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
   "idris2-nvim": { "branch": "main", "commit": "dd850c1c67bcacd2395121b0898374fe9cdd228f" },
   "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" },
-  "iron.nvim": { "branch": "master", "commit": "f4131638454aeb96cbd92652dd8c396e48eb4118" },
+  "iron.nvim": { "branch": "master", "commit": "aa7aecc4410d475a62efff54896bd021501338f0" },
+  "jupytext.vim": { "branch": "master", "commit": "32c1e37b2edf63a7e38d0deb92cc3f1462cc4dcd" },
   "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" },
   "knap": { "branch": "main", "commit": "8c083d333b8a82421a521539eb1c450b06c90eb6" },
   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
-  "lazy.nvim": { "branch": "main", "commit": "c734d941b47312baafe3e0429a5fecd25da95f5f" },
+  "lazy.nvim": { "branch": "main", "commit": "887eb75591520a01548134c4623617b639289d0b" },
-  "leap": { "branch": "main", "commit": "f565a9c4d92245d8b619235bebeaa73cc38aa40e" },
+  "leap": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" },
   "live-command.nvim": { "branch": "main", "commit": "ce4b104ce702c7bb9fdff863059af6d47107ca61" },
   "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
-  "lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" },
+  "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
   "magma-nvim": { "branch": "main", "commit": "395b48e2e202d82fca76c15d2dcd8785c125d686" },
   "mind.nvim": { "branch": "master", "commit": "e59c52758c399caceb549c698cfa2d65e6bbb9f9" },
-  "neoconf.nvim": { "branch": "main", "commit": "f67013cf18d9db5cc6c3ce2d5a4051bad75fe628" },
+  "neoconf.nvim": { "branch": "main", "commit": "bc531ca41ba55d87416b4b3ade606ff81236389b" },
-  "neodev.nvim": { "branch": "main", "commit": "6a2310ef6386e7a5ad5bdc56c844410bf5de8225" },
+  "neodev.nvim": { "branch": "main", "commit": "0a8e312923671e78499b2e204f0f678379ba92c1" },
-  "neogit": { "branch": "master", "commit": "089d388876a535032ac6a3f80e19420f09e4ddda" },
+  "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" },
-  "nui.nvim": { "branch": "main", "commit": "d147222a1300901656f3ebd5b95f91732785a329" },
+  "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" },
-  "null-ls.nvim": { "branch": "main", "commit": "60b4a7167c79c7d04d1ff48b55f2235bf58158a7" },
+  "null-ls.nvim": { "branch": "main", "commit": "13dd1fc13063681ca7e039436c88f6eca7e3e937" },
-  "nvim-autopairs": { "branch": "master", "commit": "45ae3122a4c7744db41298b41f9f5a3f092123e6" },
+  "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" },
-  "nvim-cmp": { "branch": "main", "commit": "cfafe0a1ca8933f7b7968a287d39904156f2c57d" },
+  "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
   "nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" },
-  "nvim-lspconfig": { "branch": "master", "commit": "aeb76066212b09c7c01a3abb42fe82f0130ef402" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0f94c5fded29c0024254259f3d8a0284bfb507ea" },
-  "nvim-tree.lua": { "branch": "master", "commit": "02fdc262eba188198a7deb2117b3b996e6763d65" },
+  "nvim-tree.lua": { "branch": "master", "commit": "a50723e35f57f89fb67019127a16d90f16edfef8" },
-  "nvim-treesitter": { "branch": "master", "commit": "f6df07be122de665fb363476cc3680c90f5bdf05" },
+  "nvim-treesitter": { "branch": "master", "commit": "25b656a4b771ee7d440e506280b9ae546d6f7233" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ebf16f4fe7255550ec924af160b1fc08ba9e681" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "582cbb5a4cb50f6161cac8cc01f55aeaff6d836a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "ade34ca7d19543904b28b903e606be8930fb9ee3" },
+  "nvim-web-devicons": { "branch": "master", "commit": "074e13f21f52bb45d654069bdadbcb6d7c2b65d0" },
-  "nvim_context_vt": { "branch": "master", "commit": "31436f34f3f95e4e70853cd653fdf78246cb0e85" },
+  "nvim_context_vt": { "branch": "master", "commit": "e592a9142fbfe0878ce886cd0d745963604c61d2" },
   "paperplanes.nvim": { "branch": "master", "commit": "d704b2e1e594b32d454cc7e0c5f2cf9b391e3cc1" },
-  "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" },
+  "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
   "rasi.vim": { "branch": "main", "commit": "eac9969cf935cd4380987dc99bfa10d69d3f34a6" },
-  "rose-pine": { "branch": "main", "commit": "845a6ad5443e3559dde42910c4523a5835c9233b" },
+  "rose-pine": { "branch": "main", "commit": "69f015b9522b468b320fbd56eb4ae72af4d5074f" },
   "scrap.nvim": { "branch": "main", "commit": "16db44ae9403ec9c4b140394f294475d1af80a18" },
-  "smart-splits.nvim": { "branch": "master", "commit": "fdd158ce7554dc830fb86e0fe952cd9476cdf726" },
+  "smart-splits.nvim": { "branch": "master", "commit": "52b521618511b3a874255c8a717ace7155fd5f21" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "304508fb7bea78e3c0eeddd88c4837501e403ae8" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "94fe37a1ea217dd2f90d91222bc1531521146ac3" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
   "telescope.nvim": { "branch": "master", "commit": "e960efa60e97df58e089b00270f09d60f27202c8" },
   "venn.nvim": { "branch": "main", "commit": "c114563960b8fb1197695d42798d1f3e7190b798" },
-  "vim-abolish": { "branch": "master", "commit": "d55c90d6c9995ccb79d2152564a4939cd84d73e9" },
+  "vim-abolish": { "branch": "master", "commit": "880a562ff9176773897930b5a26a496f68e5a985" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-teal": { "branch": "master", "commit": "d2aa107b257879e774680792a2aebaf9cd5742e0" },
   "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" },
-  "vim-wakatime": { "branch": "master", "commit": "ee4ab57adf62a309aeef383a2da23b6e48e5ae50" },
+  "vim-wakatime": { "branch": "master", "commit": "3b3d7f3d0fb4a476a7d1ef4d6f41e31050bdf52a" },
   "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" },
-  "which-key.nvim": { "branch": "main", "commit": "684e96c5e8477f1ee9b3f2e9a12d802fd12c5531" },
+  "which-key.nvim": { "branch": "main", "commit": "d1afcd48f309af58fdb43adc4581bf4b5684768b" },
   "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }
 }

dotfiles/neovim/lua/my/keymaps.lua

@@ -79,14 +79,14 @@ function M.setup()
     vim.paste({ "", "" }, -1)
   end, { desc = "Insert newline without continuing the current comment" })
   -- }}}
-  -- {{{ Allow quiting basic buffers with "q"
+  -- {{{ Allow quiting basic buffers with "qq"
   vim.api.nvim_create_autocmd("FileType", {
     pattern = { "help" },
     group = vim.api.nvim_create_augroup("BasicBufferQuitting", {}),
     callback = function(event)
       vim.keymap.set(
         "n",
-        "q",
+        "qq",
         "<cmd>close<cr>",
         { buffer = event.buf, silent = true, desc = "[q]uit current buffer" }
       )

dotfiles/neovim/lua/my/lazy.lua

@@ -17,7 +17,7 @@ function M.setup()
       -- install missing plugins on startup. This doesn't increase startup time.
       missing = true,
       -- try to load one of these colorschemes when starting an installation during startup
-      colorscheme = { "catpuccin" },
+      colorscheme = { "rose-pine", "catpuccin" },
     },
     change_detection = {
       enabled = false,

dotfiles/neovim/lua/my/plugins/init.lua

@@ -199,6 +199,57 @@ return {
     config = function()
       require("presence"):setup()
     end,
-    lazy = false,
+    event = "VeryLazy",
-  }
+  },
+
+  -- Live command preview for stuff like :norm
+  {
+    "smjonas/live-command.nvim",
+    opts = {
+      commands = {
+        Norm = { cmd = "norm" },
+      },
+    },
+    event = "VeryLazy",
+    cond = false,
+  },
+
+  {
+    "goerz/jupytext.vim",
+    lazy = false, -- Otherwise I can't get this to work with nvim *.ipynb
+    cond = env.vscode.not_active(),
+    config = function()
+      -- Use %% as cell delimiter
+      vim.g.jupytext_fmt = "py:percent"
+      -- vim.opt.foldmarker = "%%,%%"
+    end,
+    init = function()
+      vim.cmd([[
+        function GetJupytextFold(linenum)
+            if getline(a:linenum) =~ "^#\\s%%"
+                " start fold
+                return ">1"
+            elseif getline(a:linenum + 1) =~ "^#\\s%%"
+                return "<1"
+            else
+                return "-1"
+            endif
+        endfunction
+      ]])
+
+      -- Set the correct foldexpr
+      vim.api.nvim_create_autocmd("BufEnter", {
+        pattern = { "*.ipynb" },
+        group = vim.api.nvim_create_augroup("JupytextFoldExpr", {}),
+        callback = function()
+          vim.cmd([[
+            setlocal foldexpr=GetJupytextFold(v:lnum)
+            setlocal foldmethod=expr
+            " Deletes and pastes all text. Used to refresh folds.
+            :norm ggVGdpggdd
+          ]])
+        end,
+      })
+    end,
+  },
 }

dotfiles/neovim/lua/my/plugins/lspconfig.lua

@@ -127,11 +127,19 @@ local servers = {
   },
   -- }}}
   -- {{{ Lua
-  sumneko_lua = {
+  lua_ls = {
     cmd = {
       "lua-language-server",
       "--logpath=/home/adrielus/.local/share/lua-language-server/log",
     },
+    settings = {
+      Lua = {
+        -- Do not send telemetry data containing a randomized but unique identifier
+        telemetry = {
+          enable = false,
+        },
+      },
+    },
   },
   -- }}}
   -- {{{ Latex
@@ -161,6 +169,8 @@ local servers = {
   jsonls = {},
   rust_analyzer = {},
   dhall_lsp_server = {},
+  -- pylsp = {},
+  -- pyright = {},
 }
 -- }}}
 -- {{{ Capabilities

dotfiles/neovim/lua/my/plugins/neogit.lua

@@ -6,7 +6,7 @@ local M = {
   -- dependencies = { "plenary.nvim" },
 
   cmd = "Neogit",
-  enabled = env.firenvim.not_active() and env.vscode.not_active(),
+  cond = env.firenvim.not_active() and env.vscode.not_active(),
   init = function()
     vim.keymap.set("n", "<C-g>", "<cmd>Neogit<cr>", { desc = "Open neo[g]it" })
   end,

dotfiles/neovim/lua/my/plugins/null-ls.lua

@@ -12,10 +12,25 @@ function M.config()
   local null_ls = require("null-ls")
 
   local sources = {
-    null_ls.builtins.formatting.prettier.with({ extra_filetypes = {} }), -- format ts files
+    -- {{{ Typescript formatting
-    -- null_ls.builtins.formatting.prettierd.with({ extra_filetypes = {} }), -- format ts files
+    -- null_ls.builtins.formatting.prettierd, -- format ts files
-    null_ls.builtins.formatting.stylua.with({}), -- format lua code
+    null_ls.builtins.formatting.prettier, -- format ts files
-    -- null_ls.builtins.formatting.lua_format.with({}), -- format lua code
+    -- }}}
+    -- {{{ Lua formatting
+    -- null_ls.builtins.formatting, -- format lua code
+    null_ls.builtins.formatting.stylua, -- format lua code
+    -- }}}
+    -- {{{ Python
+    -- Formatting:
+    -- null_ls.builtins.formatting.black,
+    -- null_ls.builtins.formatting.isort,
+    null_ls.builtins.formatting.yapf.with({
+      extra_args = { [[--style="{ indent_width: 2 }"]] },
+    }),
+    -- Diagnostics
+    null_ls.builtins.diagnostics.ruff, -- Linting
+    -- null_ls.builtins.diagnostics.mypy, -- Type checking
+    -- }}}
   }
 
   null_ls.setup({

dotfiles/neovim/lua/my/plugins/treesitter.lua

@@ -33,6 +33,7 @@ local M = {
           "vim",
           "yaml",
           "nix",
+          "lua"
         },
         sync_install = false,
         --}}}

flake.lock

@@ -324,6 +324,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1679172431,
+        "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1659102345,
@@ -366,6 +382,7 @@
         "impermanence": "impermanence",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "rosepine-base16": "rosepine-base16",
         "slambda": "slambda",

flake.nix

@@ -5,6 +5,9 @@
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
 
+    # Nixpkgs-unstable
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
     # NUR
     nur.url = "github:nix-community/NUR";
 
@@ -64,9 +67,6 @@
 
       specialArgs = {
         inherit inputs outputs;
-
-        # colorscheme = "${inputs.catppuccin-base16}/base16/latte.yaml";
-        # colorscheme = "${inputs.catppuccin-base16}/base16/frappe.yaml";
       };
     in
     rec {

home/adrielus/features/cli/default.nix

@@ -24,7 +24,8 @@
     httpie # Better curl
     mkpasswd # Hash passwords
     neofetch # Display system information
-    unzip # For working with .zip files
+    zip # Zipping files
+    unzip # Unzipping files
     unrar # For extracting shit from rars
     sloc # Useless but fun line of code counter
   ];

home/adrielus/features/neovim/default.nix

@@ -1,36 +1,50 @@
-{ pkgs, lib, config, paths, ... }:
+{ pkgs, lib, config, paths, inputs, ... }:
 let
   # {{{ extraPackages
   extraPackages = with pkgs; [
     # Language servers
     nodePackages.typescript-language-server # typescript
     nodePackages_latest.purescript-language-server # purescript
-    sumneko-lua-language-server # lua
+    inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.lua-language-server # lua
     rnix-lsp # nix
     haskell-language-server # haskell
     tectonic # something related to latex (?)
     texlab # latex
-    nodePackages_latest.vscode-langservers-extracted
+    nodePackages_latest.vscode-langservers-extracted # Web stuff
+    python310Packages.python-lsp-server # Python
+    pyright # Python
 
     # Formatters
     luaformatter # Lua
     stylua # Lua
     ormolu # Haskell
+    black # Python
+    yapf # Python
+    isort # Reorder python imports
     nodePackages_latest.purs-tidy # Purescript
     nodePackages_latest.prettier # Js & friends
     nodePackages_latest.prettier_d_slim # Js & friends
 
-    # Others
+    # Linters
+    ruff # Python linter
+    mypy # Python typechecking
+
+    # Languages
     nodePackages.typescript # typescript
+    lua # For repls and whatnot
     wakatime # time tracking
+
+    # Others
     fd # file finder
     ripgrep # Grep rewrite
     update-nix-fetchgit # Useful for nix stuff
     tree-sitter # Syntax highlighting
     libstdcxx5 # Required by treesitter aparently
+    python310Packages.jupytext # Convert between jupyter notebooks and python files
+
+    # Preview
     zathura # Pdf reader
     xdotool # For zathura reverse search or whatever it's called
-    lua # For repls and whatnot
     glow #Mmd preview in terminal
     pandoc # Md processing
     libsForQt5.falkon # Aparently needed for md preview
@@ -38,6 +52,11 @@ let
     texlive.combined.scheme-full # Latex stuff
     python38Packages.pygments # required for latex syntax highlighting
 
+    # required for the telescope fzf extension
+    gnumake
+    cmake
+    gcc
+
     # Required by magma-nvim:
     # python310Packages.pynvim
     # python310Packages.jupyter

home/adrielus/global/default.nix

@@ -14,7 +14,7 @@ let
 
   # Extra overlays to add
   overlays = [
-    inputs.neovim-nightly-overlay.overlay
+    # inputs.neovim-nightly-overlay.overlay
     inputs.agenix.overlay
   ];
 in

hosts/nixos/common/optional/slambda.nix

@@ -60,13 +60,13 @@ in
     enable = true;
 
     keyboards.keychronK6 = {
-      delay = 25;
+      delay = 30;
       device = "/dev/input/by-id/usb-Keychron_Keychron_K6-event-kbd";
       chords = commonChords;
     };
 
     keyboards.tethysLaptop = {
-      delay = 25;
+      delay = 30;
       device = "/dev/input/by-path/platform-i8042-serio-0-event-kbd";
       chords = commonChords;
     };