Refactored packages slightly to add let-ins instead of clogging up the space

there.
Also moved around some categories.
Installed texlab as an LSP for LaTeX.
Installed Haskell and tools.
Installed fonts rubik and archivo, the latter creating a flake and derivation
for it.
Added a desktop entry for kakoune.
Added a GeoGuessr Join search tool for Firefox.
Changed background to kuwait boat image; kept bord around.
Added dunst notifications toggle key but I don't think it works yet.
Disabled scroll to change volume in waybar volume module.

home.nix

@@ -28,22 +28,28 @@ in
   };
 
   # Install packages
-  home.packages = with pkgs;
+  home.packages =
+  with pkgs;
+  let
+    xdg-terminal-exec = callPackage ./pkgs/xdg-terminal-exec/xdg-terminal-exec.nix {};
+    mons = callPackage ./pkgs/mons/mons.nix {};
+    archivo = callPackage ./pkgs/archivo/archivo.nix {};
+  in
   [ gcc tree-sitter ] ++ # Basic dev tools
-  [ kak-lsp marksman ] ++ # Language servers
+  [ marksman nil ] ++ # Language servers except those installed through package sections
-  [ texliveFull ] ++ # Typesetting
+  [ texliveFull texlab ] ++ # LaTeX
   (with ocamlPackages; [ ocaml opam dune_3 dune-release merlin ocaml-lsp odoc ocamlformat utop ]) ++ # OCaml
+  [ ghc stack cabal-install haskell-language-server ] ++ # Haskell
   [ python3 ] ++ # I guess.....
   [ julia ] ++ # Julia
-  [ nil ] ++ # Nix tools
+  [ kak-lsp brightnessctl grim slurp wl-clipboard jq xdg-terminal-exec blueman ] ++ # Basic utilities
-  [ brightnessctl grim slurp wl-clipboard jq (callPackage ./pkgs/xdg-terminal-exec/xdg-terminal-exec.nix {}) blueman ] ++ # Basic utilities
   [ bitwarden-cli htop snore ] ++ # Personalized selection of command-line (CLI/TUI) apps
   [ terminal ] ++ # Terminal emulator
   [ firefox cinnamon.nemo gnome.file-roller cinnamon.nemo-fileroller evince imv vlc pavucontrol ] ++ # Basic graphical apps
   [ libreoffice signal-desktop element-desktop prismlauncher mumble gimp inkscape deluge-gtk shotwell lorien ] ++ # Personalized selection of graphical apps
-  [ (callPackage ./pkgs/mons/mons.nix {}) ] ++ # Games
+  [ mons ] ++ # Games
   [ swaybg bemenu j4-dmenu-desktop fcitx5-with-addons ] ++ # Sway- and Wayland-related packages
-  [ noto-fonts redhat-official-fonts overpass ibm-plex font-awesome ] ++ # Fonts
+  [ noto-fonts redhat-official-fonts overpass ibm-plex rubik archivo font-awesome ] ++ # Fonts
   # [ papirus-icon-theme ] ++ # Icons
   # [ vanilla-dmz ] ++ # Cursor
   [ ] ++ # Temp
@@ -106,8 +112,22 @@ in
 
   # trying out kakoune
   programs.kakoune = import ./programs/kakoune.nix;
-
   xdg.configFile."kak-lsp/kak-lsp.toml".source = ./programs/kakoune/kak-lsp.toml;
+  xdg.desktopEntries.kakoune = {
+    name = "Kakoune";
+    genericName = "Text Editor";
+    comment = "Edit text files";
+    icon = "kak";
+    exec = "kak %F";
+    terminal = true;
+    mimeType = [
+        "text/english" "text/plain" "text/x-makefile" "text/x-c++hdr"
+        "text/x-c++src" "text/x-chdr" "text/x-csrc" "text/x-java"
+        "text/x-moc" "text/x-pascal" "text/x-tcl" "text/x-tex"
+        "application/x-shellscript" "text/x-c" "text/x-c++"
+    ];
+    categories = ["Utility" "TextEditor"];
+  };
   
   # programs.zathura = {
   #   enable = true;

pkgs/archivo/archivo.nix

@@ -0,0 +1,19 @@
+{ pkgs }:
+    with pkgs;
+    stdenv.mkDerivation rec {
+        name = "archivo";
+        version = "b5d6398";
+        src = fetchFromGitHub {
+            owner = "Omnibus-Type";
+            repo = "Archivo";
+            rev = version;
+            hash = "sha256-kMyHDyslAJW8pAw8SIdbKjQrTbPtmKOCDAtr48LrdNI="; # TODO fix
+        };
+
+        # sourceRoot = "fonts/ttf";
+        
+        installPhase = ''
+          mkdir -p $out/share/fonts/truetype
+          cp -a fonts/ttf/*.ttf $out/share/fonts/truetype
+        '';
+    }

pkgs/archivo/flake.lock

@@ -0,0 +1,25 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1710470187,
+        "narHash": "sha256-l2R47RqhdEUYrMrQjdFKhxtqprkJjIE89qJx3iEVv+U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f242fc768bdfcf91d9094a8a8f66551324bf1a47",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

pkgs/archivo/flake.nix

@@ -0,0 +1,13 @@
+{
+  description = "Flake containing Archivo font";
+
+  outputs = { self, nixpkgs }: {
+
+    packages.x86_64-linux.archivo =
+    let pkgs = import nixpkgs { system = "x86_64-linux"; };
+    in pkgs.callPackage ./archivo.nix {};
+
+    packages.x86_64-linux.default = self.packages.x86_64-linux.archivo;
+
+  };
+}

programs/firefox.nix

@@ -54,6 +54,10 @@
     	      iconUpdateURL = "https://wiki.archlinux.org/favicon.ico";
     	      definedAliases = [ "@aw" ];
 	    };
+	    "GeoGuessr Join" = {
+    	      urls = [{ template = "https://www.geoguessr.com/join/{searchTerms}"; }];
+    	      definedAliases = [ "@ggj" ];
+	    };
 	    "Google".metaData.alias = "@g"; #builtin engines only support specifying one additional alias
 	  };
 	};

programs/sway.nix

@@ -7,7 +7,7 @@ let
   mod = config.wayland.windowManager.sway.config.modifier;
   dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
   shutdownMenu = pkgs.writeShellScript "shutdownmenu" (builtins.readFile "${scripts}/shutdownmenu.sh");
-  backgroundImage = "${extra}/bord.jpg";
+  backgroundImage = "${extra}/kuwaitboat.jpg";
 in {
   enable = true;
   config = rec {
@@ -47,6 +47,7 @@ in {
       "${mod}+XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 0.05+";
       "${mod}+XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 0.05-";
       "${mod}+Shift+e" = null;
+      XF86AudioMedia = "dunstctl set-paused toggle; dunstify -a 'dunst_mute_key' -u low -h string:x-dunst-stack-tag:dunst_mute_key  'Notifications mute toggled'";
       XF86PowerOff = "exec DMENU_COMMAND='${dmenuCommand}' bash ${shutdownMenu}";
     } // {
       "${mod}+space" = "exec fcitx5-remote -t";

programs/waybar.nix

@@ -23,8 +23,8 @@ in
       on-click = "exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
       on-click-right = "exec wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
       on-click-middle = "exec pavucontrol";
-      on-scroll-up = null;
+      on-scroll-up = "";
-      on-scroll-down = null;
+      on-scroll-down = "";
     };
     network = {
       format-wifi = "{essid} ({signalStrength}%) ";