remove and edit local bins

home/bin/executable_arch-install-cad

@@ -1,15 +0,0 @@
-#!/bin/bash
-# https://github.com/starr-dusT/dotfiles
-
-# Install cadquery
-sudo pacman -S python python-pip
-pip install cadquery --break-system-packages
-curl -LO https://github.com/CadQuery/CQ-editor/releases/download/nightly/CQ-editor-master-Linux-x86_64.sh
-sh CQ-editor-master-Linux-x86_64.sh
-rm CQ-editor-master-Linux-x86_64.sh
-
-# Install dependencies for Simplify3d
-sudo pacman -S fontconfig 
-sudo pacman -S $(pacman -Ssq xcb)
-sudo pacman -S $(pacman -Ssq xorg)
-echo "The joys of using proprietary software... you need to install Simplify3d with the script from their website (https://cloud.simplify3d.com/account/downloads)"

home/bin/executable_linux-app-launcher

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# https://gist.github.com/nicedreams/f8d0a6373949f6d9b9583e7e1634a1c3
-
-bmenu() {
-launchapp=$(IFS=':'; \
-  for p in ${PATH}; \
-  do find -L "${p}" -type f -executable -print 2> /dev/null; done \
-  | fzf --header="Select application to launch from PATH:" \
-    --multi=0 \
-    --exact \
-    --height="50%" \
-    --preview-window="down:wrap:3")
-  if [[ "${launchapp}" ]]; then
-    setsid -f "${launchapp}" &> /dev/null &
-    sleep .1
-  fi
-}
-
-bmenu "$@"

home/bin/executable_linux-clean-home

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-tmp_dir="$HOME/tmp/$(date +'%Y%m%dT%H%M%S')"
-
-mkdir -p $tmp_dir
-ls -p ~ | grep -v '^\.' \
-        | grep -v 'bin' \
-        | grep -v 'Desktop' \
-        | grep -v 'devel' \
-        | grep -v 'documents' \
-        | grep -v 'media' \
-        | grep -v 'mnt' \
-        | grep -v 'Screenshots' \
-        | grep -v 'sync' \
-        | grep -v 'tmp' \
-        | xargs -I {} mv ~/{} $tmp_dir

home/dot_config/private_user-dirs.dirs

@@ -1,17 +0,0 @@
-# This file is written by xdg-user-dirs-update
-# If you want to change or add directories, just edit the line you're
-# interested in. All local changes will be retained on the next run.
-# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
-# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
-# absolute path. No other format is supported.
-# 
-XDG_TMP_DIR="$HOME/tmp"
-XDG_SCREENSHOTS_DIR="$HOME/media/pictures/screenshots"
-#XDG_DESKTOP_DIR="$HOME/Desktop"
-#XDG_DOWNLOAD_DIR="$HOME/Downloads"
-#XDG_TEMPLATES_DIR="$HOME/Templates"
-#XDG_PUBLICSHARE_DIR="$HOME/Public"
-#XDG_DOCUMENTS_DIR="$HOME/Documents"
-#XDG_PICTURES_DIR="$HOME/Pictures"
-#XDG_VIDEOS_DIR="$HOME/Videos"
-#XDG_MUSIC_DIR="$HOME"

home/dot_config/user-dirs.dirs

@@ -0,0 +1,9 @@
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+#XDG_TEMPLATES_DIR="$HOME/Templates"
+#XDG_PUBLICSHARE_DIR="$HOME/Public"
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+#XDG_PICTURES_DIR="$HOME/Pictures"
+#XDG_VIDEOS_DIR="$HOME/Videos"
+#XDG_MUSIC_DIR="$HOME/Music"
+XDG_SCREENSHOTS_DIR="$HOME/Screenshots"

home/dot_local/bin/executable_linux-mount-engi

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-engi_path="$HOME/mnt/engi"
+engi_path="/mnt/engi"
 
 if mountpoint -q "$engi_path"; then
     echo "engi already mounted"
     exit 0
 else
-    sudo mount -t cifs -o rw,uid=$(id -u $(whoami)),gid=$(id -g $(whoami)),vers=3.0,credentials=/home/tstarr/.smb //torus/private ~/mnt/engi 2>/dev/null
+    sudo mount -t cifs -o rw,uid=$(id -u $(whoami)),gid=$(id -g $(whoami)),vers=3.0,credentials=/home/tstarr/.smb //torus/private "$engi_path" 2>/dev/null
 fi
 
 # Check drive mounted correctly

home/dot_path

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 # https://github.com/starr-dusT/dotfiles
 
-# Add `~/bin` to the `$PATH`
-export PATH="$HOME/bin:$PATH";
-
 if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]; then 
     PATH="$HOME/.local/bin:$HOME/bin:$PATH"; 
 fi

justfile

@@ -3,6 +3,7 @@ update:
     cd ~/.local/share/chezmoi/provision
     sudo nixos-rebuild switch --impure --flake .#$(hostname)
 
+[working-directory: 'provision']
 build-wsl:
     cd ~/.local/share/chezmoi/provision
     sudo nix run .#nixosConfigurations.wsl.config.system.build.tarballBuilder

provision/hosts.json

@@ -21,7 +21,7 @@
   },
   "wsl": {
     "role": "wsl",
-    "user": "user"
+    "user": "dev"
   },
   "htpc-bako": {
     "role": "htpc",

provision/hosts/htpc/configuration.nix

@@ -10,7 +10,7 @@
 
   # Modules 
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     desktop = {
       enable = true;
       gnome.enable = true;

provision/hosts/kestrel/configuration.nix

@@ -32,7 +32,7 @@
 
   # Modules 
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     desktop = {
       enable = true;
       gnome.enable = true;

provision/hosts/osprey/configuration.nix

@@ -28,7 +28,7 @@
 
   # Modules 
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     desktop = {
       enable = true;
       gnome.enable = true;

provision/hosts/shivan/configuration.nix

@@ -14,7 +14,7 @@
   
   # Modules
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     desktop = {
       enable = true;
       gnome.enable = true;

provision/hosts/torus/configuration.nix

@@ -92,7 +92,7 @@
 
   # Modules
   modules = {
-    extra.enable = true;
+    base-plus.enable = true;
     services = {
       ssh.enable = true;
       syncthing = {

provision/hosts/wsl/configuration.nix

@@ -57,8 +57,10 @@ in
 
   # Modules 
   modules = {
+    devel.programming.enable = true;
     programs = {
       git.keys = false;
     };
+    services.ssh.enable = true;
   };
 }

provision/modules/base/default.nix

@@ -2,6 +2,7 @@
 {
   imports = [
     ./terminal.nix
+    ./plus
     ../programs/chezmoi.nix
     ../programs/git.nix
     ../programs/nvim.nix

provision/modules/base/plus/default.nix

@@ -0,0 +1,9 @@
+{ lib, ... }:
+{
+  imports = [
+    ../../programs/beancount.nix
+    ../../programs/borg.nix
+    ../../programs/yt-dlp.nix
+  ];
+  options.modules.base-plus.enable = lib.mkEnableOption "base-plus";
+}

provision/modules/default.nix

@@ -4,7 +4,6 @@
     ./base
     ./desktop 
     ./devel 
-    ./extra
     ./gaming 
     ./programs 
     ./services

provision/modules/desktop/gnome.nix

@@ -63,6 +63,7 @@ in {
 
     # Enable sound and handle conflict (https://github.com/Jovian-Experiments/Jovian-NixOS/issues/99)
     services.pulseaudio.enable = lib.mkForce false;
+    services.gvfs.enable = true;
 
     xdg.mime = {
       enable = true;

provision/modules/extra/default.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-{
-  imports = [
-    ../programs/beancount.nix
-    ../programs/borg.nix
-    ../programs/yt-dlp.nix
-  ];
-  options.modules.extra.enable = lib.mkEnableOption "extra";
-}

provision/modules/programs/beancount.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, user, ... }:
 
-let cfg = config.modules.extra;
+let cfg = config.modules.base-plus;
 in {
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ 

provision/modules/programs/borg.nix

@@ -1,6 +1,6 @@
 { config, pkgs, user, lib, ... }:
 
-let cfg = config.modules.extra;
+let cfg = config.modules.base-plus;
 in {
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

provision/modules/programs/yt-dlp.nix

@@ -1,12 +1,16 @@
 { config, lib, pkgs, user, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    yt-dlp # Command-line tool to download videos
-    (pkgs.writeScriptBin "ytd_audio" ''
-      #!/usr/bin/env bash
-      yt-dlp -x \
-      -ciw -o "%(title)s.%(ext)s" \
-      --embed-thumbnail -S acodec:m4a "$1"
-    '')
-  ];
+
+let cfg = config.modules.base-plus;
+in {
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      yt-dlp # Command-line tool to download videos
+      (pkgs.writeScriptBin "ytd_audio" ''
+        #!/usr/bin/env bash
+        yt-dlp -x \
+        -ciw -o "%(title)s.%(ext)s" \
+        --embed-thumbnail -S acodec:m4a "$1"
+      '')
+    ];
+  };
 }