WIP: Add kak-tree-sitter

flake.lock

@@ -55,6 +55,22 @@
         "type": "github"
       }
     },
+    "blobs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1604995301,
+        "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "type": "gitlab"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -289,6 +305,22 @@
         "type": "github"
       }
     },
+    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1668681692,
+        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -360,7 +392,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -378,7 +410,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -396,7 +428,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -414,7 +446,7 @@
     },
     "flake-utils_7": {
       "inputs": {
-        "systems": "systems_9"
+        "systems": "systems_10"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -432,7 +464,7 @@
     },
     "flake-utils_8": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_11"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -476,11 +508,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709764752,
+        "lastModified": 1710532761,
-        "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
+        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
+        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
         "type": "github"
       },
       "original": {
@@ -489,23 +521,50 @@
         "type": "github"
       }
     },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": "hyprlang",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710257359,
+        "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
     "hyprland": {
       "inputs": {
+        "hyprcursor": "hyprcursor",
         "hyprland-protocols": "hyprland-protocols",
-        "hyprlang": "hyprlang",
+        "hyprlang": "hyprlang_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_4",
+        "systems": "systems_5",
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1709818078,
+        "lastModified": 1710538160,
-        "narHash": "sha256-U/o8d5E+0GlTUFNkAzt56wHlUHfoIg3sZPer+GywDFQ=",
+        "narHash": "sha256-p5Wkl2rXjFftd+Nugiq71BgGAl4E9byYxKV0ahLTo+U=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "6c4e2489a0a153ac2a92744ecb2985280c97fc89",
+        "rev": "2a2da6082e5f1501731004b755d35a8dbb605fde",
         "type": "github"
       },
       "original": {
@@ -540,6 +599,29 @@
       }
     },
     "hyprlang": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "hyprcursor",
+          "nixpkgs"
+        ],
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1709914708,
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprlang_2": {
       "inputs": {
         "nixpkgs": [
           "hyprland",
@@ -551,11 +633,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709775675,
+        "lastModified": 1709914708,
-        "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=",
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
         "type": "github"
       },
       "original": {
@@ -626,11 +708,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709708644,
+        "lastModified": 1710120787,
-        "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=",
+        "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b",
+        "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
         "type": "github"
       },
       "original": {
@@ -678,6 +760,32 @@
         "type": "github"
       }
     },
+    "nixos-mailserver": {
+      "inputs": {
+        "blobs": "blobs",
+        "flake-compat": "flake-compat_5",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-23_05": "nixpkgs-23_05",
+        "nixpkgs-23_11": "nixpkgs-23_11",
+        "utils": "utils_2"
+      },
+      "locked": {
+        "lastModified": 1706219574,
+        "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "nixos-mailserver",
+        "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "ref": "nixos-23.11",
+        "repo": "nixos-mailserver",
+        "type": "gitlab"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1702539185,
@@ -693,6 +801,36 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-23_05": {
+      "locked": {
+        "lastModified": 1704290814,
+        "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.05",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-23_11": {
+      "locked": {
+        "lastModified": 1706098335,
+        "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.11",
+        "type": "indirect"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1692638711,
@@ -727,11 +865,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1709703039,
+        "lastModified": 1710451336,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {
@@ -786,6 +924,7 @@
         "nix-index-database": "nix-index-database",
         "nix-software-center": "nix-software-center",
         "nixos-conf-editor": "nixos-conf-editor",
+        "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs_4",
         "plymouth-themes": "plymouth-themes",
         "ranger-icons": "ranger-icons",
@@ -917,6 +1056,21 @@
         "type": "github"
       }
     },
+    "systems_11": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -964,16 +1118,16 @@
     },
     "systems_5": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1689347949,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -1060,7 +1214,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -1076,6 +1230,21 @@
         "type": "github"
       }
     },
+    "utils_2": {
+      "locked": {
+        "lastModified": 1605370193,
+        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "wl-crosshair": {
       "inputs": {
         "flake-utils": "flake-utils_8",
@@ -1101,18 +1270,18 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1708558866,
+        "lastModified": 1709983277,
-        "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
+        "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.freedesktop.org",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
         "type": "gitlab"
       }
     },

overlays/default.nix

@@ -52,6 +52,14 @@
       patches = old.patches
         ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
     });
+    mangohud = prev.mangohud.overrideAttrs (o: {
+      patches = o.patches ++ [
+        (prev.fetchpatch {
+          url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
+          hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
+        })
+      ];
+    });
   });
 
   variables = (final: prev: {

pkgs/default.nix

@@ -5,4 +5,5 @@
   cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
   lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; };
   emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
+  kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { };
 }

pkgs/kak-tree-sitter.nix

@@ -0,0 +1,33 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "kak-tree-sitter";
+  version = "0.5.4";
+  src = fetchFromGitHub {
+    owner = "hadronized";
+    repo = pname;
+    rev = "${pname}-v${version}";
+    hash = "sha256-ZJQE3Xx1Vo7G3uLP9eiZV6Gdsiij1WL/NqkUKSm7I/o=";
+  };
+  cargoHash = "sha256-IwdO+PNPLd0j6gwLzA5ojeGT9o/w9dswIQRGR6DbeAE=";
+
+  GIT_HEAD = version;
+  prePatch = ''
+    rm kak-tree-sitter/build.rs
+    rm ktsctl/build.rs
+  '';
+
+  cargoBuildFlags = [ "--package" pname ];
+
+  dontPatchELF = true;
+
+  meta = with lib; {
+    description = "A server that interfaces tree-sitter with kakoune";
+    homepage = "https://github.com/hadronized/kak-tree-sitter";
+    license = with licenses; [ mit ];
+  };
+}
+

system/media-packages.nix

@@ -16,7 +16,7 @@ in {
       gimp
       inkscape
       krita
-      kdenlive
+      kdePackages.kdenlive
       pitivi
       blender-hip
       libreoffice

user/fish/default.nix

@@ -69,7 +69,6 @@ in {
     programs = {
       zoxide.enable = true;
       eza.enable = true;
-      eza.enableAliases = true;
       direnv.enable = true;
       direnv.nix-direnv.enable = true;
     };

user/gnome.nix

@@ -36,6 +36,8 @@
 
     libsForQt5.qt5ct
     libsForQt5.qtstyleplugin-kvantum
+    qt6Packages.qt6ct
+    qt6Packages.qtstyleplugin-kvantum
   ];
 
   home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; };

user/gpg.nix

@@ -4,7 +4,7 @@
       enable = true;
       defaultCacheTtl = 604800;
       maxCacheTtl = 604800;
-      pinentryFlavor = "qt";
+      pinentryPackage = pkgs.pinentry-curses;
       extraConfig = ''
         allow-preset-passphrase
       '';

user/kakoune/kak-lsp.toml

@@ -69,11 +69,11 @@ roots = ["package.json"]
 command = "vscode-json-languageserver"
 args = ["--stdio"]
 
-[language_server.rnix-lsp]
+[language_server.nil]
 filetypes = ["nix"]
 command = "nil"
 roots = ["flake.nix", "shell.nix", ".git"]
-[language.nix.settings.nil]
+[language_server.nil.settings.nil]
 formatting.command = [ "nixpkgs-fmt" ]
 
 [language_server.intelephense]

user/sway/theme.nix

@@ -33,12 +33,10 @@ lib.mkIf (desktop == "sway")
     in
     { gtk4 = shared; gtk3 = shared; }
   );
-  # qt = {
+  qt = {
-  #   enable = true;
+    enable = true;
-  #   platformTheme = "gtk";
+    platformTheme = "qtct";
-  #   # style.package = pkgs.libsForQt5.qtstyleplugins;
+  };
-  #   # style.name = "gtk2";
-  # };
 
   dconf.settings = {
     "org/gnome/desktop/interface" = {
@@ -79,10 +77,11 @@ lib.mkIf (desktop == "sway")
     };
   };
 
-  home.sessionVariables = { QT_QPA_PLATFORMTHEME = "gtk3"; };
   home.packages = with pkgs; [
     libsForQt5.qt5ct
     libsForQt5.qtstyleplugin-kvantum
+    qt6Packages.qt6ct
+    qt6Packages.qtstyleplugin-kvantum
 
     pkgs.bibata-cursors
     pkgs.orchis_theme_compact

user/syncthing.nix

@@ -1,8 +1,9 @@
-{ config, pkgs, lib, inputs, ... }:
+{ ... }: {
-let inherit (pkgs.uservars) key theme color accent font;
-in {
   services.syncthing = {
     enable = true;
-    # tray.enable = true;
+    tray = {
+      enable = true;
+      command = "syncthingtray --wait";
+    };
   };
 }