24.05: Buildable

hm/common.nix

@@ -7,10 +7,7 @@
     home-manager.enable = true;
     bat = {
       enable = true;
-      config = {
-        theme = "base16";
-        style = "full";
-      };
+      config.style = "full";
     };
     bash.shellAliases = {
       # Replacement commands

hm/desktop/default.nix

@@ -137,7 +137,7 @@
         freefilesync
 
         # misc
-        gnome.gedit
+        gedit
         xfce.thunar
         nomacs
         feh

hm/dev/common.nix

@@ -63,7 +63,7 @@
       phpactor.enable = config.frogeye.dev.php; # PHP
       nixd = {
         enable = true;
-        settings.formatting.command = "nixpkgs-fmt";
+        settings.formatting.command = [ "nixpkgs-fmt" ];
       };
       # TODO Something for SQL. sqls is deprecated, sqlls is not in Nixpkgs. Probably needs a DB connection configured anyways?
       yamlls.enable = true; # YAML

hm/dev/prose.nix

@@ -29,7 +29,7 @@
       plugins.none-ls = {
         enable = true;
         sources = {
-          code_actions.ltrs.enable = true;
+          # LanguageTool
           diagnostics.ltrs.enable = true;
         };
       };

hm/gaming/default.nix

@@ -7,12 +7,12 @@
       packages = with pkgs; [
         # gaming
         dolphin-emu
-        yuzu-mainline
-        minecraft
+        ryujinx
+        prismlauncher
         # TODO factorio
 
         steam # Common pitfall: https://github.com/NixOS/nixpkgs/issues/86506#issuecomment-623746883
-        itch
+        # itch # butler-15.21.0 is broken
         (pkgs.python3Packages.ds4drv.overrideAttrs (old: {
           src = fetchFromGitHub {
             owner = "TheDrHax";

hm/gpg/default.nix

@@ -37,7 +37,7 @@
     services.gpg-agent = rec {
       enableBashIntegration = true;
       enableZshIntegration = true;
-      pinentryFlavor = "gnome3";
+      pinentryPackage = pkgs.pinentry-gnome3;
       # gnome3 is nicer, but requires gcr as a dbus package.
       # Which is in my NixOS config, and on non-NixOS too.
       # It will fall back to ncurses when running in non-graphics mode.

hm/vim/completion.nix

@@ -19,33 +19,29 @@
         };
 
         # Completion
-        nvim-cmp = {
+        cmp = {
           enable = true;
-          mapping = {
-            # Proposed example, since there's no default
-            "<C-Space>" = "cmp.mapping.complete()";
-            "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-            "<C-e>" = "cmp.mapping.close()";
-            "<C-f>" = "cmp.mapping.scroll_docs(4)";
-            "<CR>" = "cmp.mapping.confirm({ select = true })";
-            "<S-Tab>" = {
-              action = "nvim_cmp_stab";
-              modes = [ "i" "s" ];
-            };
-            "<Tab>" = {
-              action = "nvim_cmp_tab";
-              modes = [ "i" "s" ];
+          settings = {
+            mapping = {
+              # Proposed example, since there's no default
+              "<C-Space>" = "cmp.mapping.complete()";
+              "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+              "<C-e>" = "cmp.mapping.close()";
+              "<C-f>" = "cmp.mapping.scroll_docs(4)";
+              "<CR>" = "cmp.mapping.confirm({ select = true })";
+              "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+              "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
             };
+            sources = [
+              # Respective plugins will get installed automatically
+              { name = "buffer"; }
+              { name = "calc"; }
+              { name = "nvim_lsp"; }
+              { name = "path"; }
+              { name = "luasnip"; }
+            ];
+            snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
           };
-          sources = [
-            # Respective plugins will get installed automatically
-            { name = "buffer"; }
-            { name = "calc"; }
-            { name = "nvim_lsp"; }
-            { name = "path"; }
-            { name = "luasnip"; }
-          ];
-          snippet.expand = "luasnip";
         };
         lspkind.enable = true; # Add icons to LSP completions
       };

hm/vim/default.nix

@@ -12,9 +12,7 @@
       vim = "nvim";
     };
     programs.nixvim = {
-      # Required, otherwise light mode becomes a default dark theme.
-      colorschemes.base16.colorscheme = "solarized-${config.stylix.polarity}";
-
+      colorschemes.base16.setUpBar = false; # We want the custom theme for lualine, probably
       options = {
         ignorecase = true;
         smartcase = true;

hm/vim/lsp.nix

@@ -68,7 +68,7 @@
         nvim-lightbulb = {
           # Shows a lightbulb whenever a codeAction is available under the cursor
           enable = true;
-          autocmd.enabled = true;
+          settings.autocmd.enabled = true;
         };
       };
     };