hosts/randolph/home.nix

@@ -42,6 +42,8 @@ in {
   # Install packages
   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 { };
       highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
@@ -50,20 +52,20 @@ in {
     [ marksman nil ] ++ # Language servers except those installed through package sections
     [ texliveFull texlab ] ++ # LaTeX
     [ typst typstyle tinymist ] ++ # Typst
-    # (with ocamlPackages; [
-    #   ocaml
-    #   opam
-    #   dune_3
-    #   dune-release
-    #   merlin
-    #   ocaml-lsp
-    #   odoc
-    #   ocamlformat
-    #   utop
-    # ]) ++ # OCaml
-    # [ rustup ] ++ # Rust
-    # [ go gopls ] ++ # Golang
-    # (with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++
+    (with ocamlPackages; [
+      ocaml
+      opam
+      dune_3
+      dune-release
+      merlin
+      ocaml-lsp
+      odoc
+      ocamlformat
+      utop
+    ]) ++ # OCaml
+    [ rustup ] ++ # Rust
+    [ go gopls ] ++ # Golang
+    (with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++
     [ python3 ] ++ # I guess.....
     [
       kak-lsp
@@ -71,14 +73,19 @@ in {
       grim
       slurp
       wl-clipboard
+      jq
+      xdg-terminal-exec
       blueman
       upower
-      glib # provides trash and mount (latter may supplant udisks2?)
+      proselint # for prose lint
+      glib
     ] ++ # Basic utilities
     [ bitwarden-cli htop snore hledger hledger-ui clifm ]
     ++ # Personalized selection of command-line (CLI/TUI) apps
     [ terminal ] ++ # Terminal emulator
     [
+      qutebrowser
+      zathura
       evince
       imv
       vlc
@@ -100,9 +107,8 @@ in {
       filezilla
       bitwarden
       josm
-      activate-linux
     ] ++ # Personalized selection of graphical apps
-    [ olympus shticker-book-unwritten ] ++ # Games
+    [ mons shticker-book-unwritten ] ++ # Games
     [ swaybg bemenu j4-dmenu-desktop ] ++ # Sway- and Wayland-related packages
     [
       noto-fonts
@@ -119,7 +125,7 @@ in {
     ] ++ # Fonts
     # [ papirus-icon-theme ] ++ # Icons
     # [ vanilla-dmz ] ++ # Cursor
-    [ ] ++ # Temp
+    [ activate-linux android-studio olympus ] ++ # Temp
     [ ];
 
   programs.home-manager.enable = true;
@@ -153,10 +159,13 @@ in {
     }];
   };
 
-  # Fixes electron apps
+  # Fixes electron apps and also nnn
   home.sessionVariables =
-  {
+    let detachedtext = pkgs.writeShellScript "detachedtext"
+      (builtins.readFile "${scripts}/detachedtext.sh");
+  in {
     NIXOS_OZONE_WL = "1";
+    VISUAL = detachedtext;
   };
 
   # configure fonts correctly
@@ -164,9 +173,16 @@ in {
   xdg.configFile."fontconfig/conf.d/20-default.fonts.conf".source =
     "${extra}/20-default-fonts.conf";
 
+  # fix nemo terminal integration
+  # dconf.settings."org/cinnamon/desktop/applications/terminal".exec =
+  #   "${pkgs.lib.getExe terminal}";
+  # dconf.settings."org/cinnamon/desktop/applications/terminal".exec-arg = "-e --cwd %F";
+
   # terminal emulator
   programs.alacritty.enable = true;
 
+  # programs.neovim = import ./programs/neovim.nix;
+
   programs.kakoune = import ../../programs/kakoune.nix pkgs;
   xdg.configFile."kak-lsp/kak-lsp.toml".source =
     ../../programs/kakoune/kak-lsp.toml;
@@ -198,9 +214,31 @@ in {
     categories = [ "Utility" "TextEditor" ];
   };
 
-  programs.zathura = {
+  programs.nnn = {
     enable = true;
+    plugins = {
+      src = pkgs.fetchFromGitHub {
+        owner = "jarun";
+        repo = "nnn";
+        rev = "v4.9";
+        hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU=";
       };
+    };
+  };
+  xdg.desktopEntries.nnn = {
+    name = "nnn";
+    genericName = "File Manager";
+    comment = "Terminal file manager";
+    exec = "env NNN_TRASH=2 nnn -Adex";
+    terminal = true;
+    mimeType = [ "inode/directory" ];
+    categories = [ "System" "FileTools" "FileManager" "ConsoleOnly" ];
+    settings.Keywords = "File;Manager;Management;Explorer;Launcher";
+  };
+
+  # programs.zathura = {
+  #   enable = true;
+  # };
 
   programs.pandoc = { enable = true; };