Merge branch 'master' of github.com:johron/nix-dots

config/hosts.nix

@@ -18,6 +18,6 @@ in
     hostname = "moholt";
     dir = "moholt";
     arch = "x86_64-linux";
-    user = users.vaktmester; 
+    user = users.server; 
   };
 }

data/flake/js/monoweb.nix

@@ -20,6 +20,8 @@
             doppler
             docker
             docker-compose
+            prisma-engines
+            prisma
           ];
         };
       });

home/modules/configs/fish/fileme/completions.fish

@@ -11,27 +11,27 @@ complete -c fme -l list -d "List available items for selected mode"
 set -l get_mode_dir "
     set -l cmd (commandline -opc)
     if contains -- -l \$cmd; or contains -- --license \$cmd
-    echo $base_dir/license
+        echo $base_dir/license
     else if contains -- -f \$cmd; or contains -- --flake \$cmd
-    echo $base_dir/flake
+        echo $base_dir/flake
     end
 "
 
 set -l get_ext "
     set -l cmd (commandline -opc)
     if contains -- -l \$cmd; or contains -- --license \$cmd
-    echo txt
+        echo txt
     else if contains -- -f \$cmd; or contains -- --flake \$cmd
-    echo nix
+        echo nix
     end
 "
 
 complete -c fme -n '__fish_is_nth_token 1' -a "(
     set -l dir ($get_mode_dir)
-    if test -n \"\$dir\" -a -d \"\$dir\"
-    for d in \$dir/*/
-        basename \$d
-    end
+        if test -n \"\$dir\" -a -d \"\$dir\"
+        for d in \$dir/*/
+            basename \$d
+        end
     end
 )" -d "Category"
 
@@ -41,10 +41,10 @@ complete -c fme -n '__fish_is_nth_token 2' -a "(
     set -l ext ($get_ext)
     set -l cat \$cmd[-1]
     if test -n \"\$cat\" -a -n \"\$dir\" -a -d \"\$dir/\$cat\"
-    for file in \$dir/\$cat/*.\$ext
-        if test -f \$file
-        basename \$file .\$ext
+        for file in \$dir/\$cat/*.\$ext
+            if test -f \$file
+            basename \$file .\$ext
+            end
         end
     end
-    end
 )" -d "Template"

home/modules/configs/fish/fileme/function.fish

@@ -4,11 +4,11 @@ argparse 'f/flake' 'l/license' 'list' -- $argv
 or return 1
 
 if not set -q _flag_flake; and not set -q _flag_license
-echo "Error: Must specify either --flake (-f) or --license (-l)."
-return 1
+    echo "Error: Must specify either --flake (-f) or --license (-l)."
+    return 1
 else if set -q _flag_flake; and set -q _flag_license
-echo "Error: Cannot specify both --flake and --license at the same time."
-return 1
+    echo "Error: Cannot specify both --flake and --license at the same time."
+    return 1
 end
 
 set -l mode ""
@@ -16,66 +16,72 @@ set -l ext ""
 set -l dest ""
 
 if set -q _flag_flake
-set mode "flake"
-set ext "nix"
-set dest "flake.nix"
+    set mode "flake"
+    set ext "nix"
+    set dest "flake.nix"
 else if set -q _flag_license
-set mode "license"
-set ext "txt"
-set dest "LICENSE"
+    set mode "license"
+    set ext "txt"
+    set dest "LICENSE"
 end
 
 set -l target_base "$base_dir/$mode"
 
 if set -q _flag_list
-if command -q tree
-    tree --noreport -P "*.$ext" --prune "$target_base"
-else
-    for dir in "$target_base"/*/
-    if test -d "$dir"
-        echo (basename "$dir")"/"
-        for file in "$dir"*."$ext"
-        if test -f "$file"
-            echo "  └── "(basename "$file")
+    if command -q tree
+        tree --noreport -P "*.$ext" --prune "$target_base"
+    else
+        for dir in "$target_base"/*/
+        if test -d "$dir"
+            echo (basename "$dir")"/"
+            for file in "$dir"*."$ext"
+            if test -f "$file"
+                echo "  └── "(basename "$file")
+            end
+            end
         end
         end
     end
-    end
-end
-return 0
+    return 0
 end
 
 set -l tool $argv[1]
 set -l name $argv[2]
 
 if test -z "$tool"
-echo "Error: No tool/category specified."
-return 1
+    echo "Error: No tool/category specified."
+    return 1
 end
 
 set -l target_dir "$target_base/$tool"
 
 if not test -d "$target_dir"
-echo "Error: Directory $target_dir does not exist."
-return 1
+    echo "Error: Directory $target_dir does not exist."
+    return 1
 end
 
 set -l target_file ""
 if test -n "$name"
-set target_file "$target_dir/$name.$ext"
+    set target_file "$target_dir/$name.$ext"
 else
-set target_file "$target_dir/default.$ext"
+    set target_file "$target_dir/default.$ext"
 end
 
 if not test -f "$target_file"
-echo "Error: File $target_file does not exist."
-return 1
+    echo "Error: File $target_file does not exist."
+    return 1
 end
 
 echo "Copying $target_file -> ./$dest"
 cp "$target_file" "./$dest"
 
 if set -q _flag_flake
-echo "use flake" > .envrc
-direnv allow
+    echo "use flake" > .envrc
+    echo ".direnv" > .gitignore
+
+    read -l -P "Run `direnv allow`? [y/N]: " confirm
+    switch $confirm
+        case Y y yes Yes
+            direnv allow
+    end
 end

hosts/moholt/home/default.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }:
+
+{
+  
+}

hosts/moholt/nixos/default.nix

@@ -10,11 +10,10 @@ in
     ../../../nixos/modules/system/nixos-base.nix
     ../../../nixos/profiles/server
 
-    ../../../nixos/modules/hardware/networking/server.nix
-
-    ../../../nixos/modules/server/docker
-    ../../../nixos/modules/server/docker/containers/navidrome.nix
-    ../../../nixos/modules/server/docker/containers/gogs.nix
+    ../../../nixos/server-modules/hardware/networking
+    ../../../nixos/server-modules/docker
+    ../../../nixos/server-modules/docker/containers/navidrome.nix
+    ../../../nixos/server-modules/docker/containers/gogs.nix
   ];
 
   interfaces.eth0.ipv4.addresses = [{

nixos/profiles/school/smb4k.nix

@@ -1,20 +0,0 @@
-{ pkgs, lib, ... }: {
-  environment.systemPackages = with pkgs; [
-    smb4k
-    cifs-utils
-  ];
-
-  security.wrappers."mount.cifs" = {
-    program = "mount.cifs";
-    source = "${lib.getBin pkgs.cifs-utils}/bin/mount.cifs";
-    owner = "root";
-    group = "root";
-    setuid = true;
-  };
-
-  services.avahi = {
-    enable = true;
-    publish.enable = true;
-    publish.userServices = true;
-  };
-}

nixos/profiles/workstation/default.nix

@@ -45,9 +45,17 @@
     firefox
     bitwarden-desktop
     brightnessctl
-    samba
+    kdePackages.kio-extras
+    cifs-utils
   ];
 
+  services.samba = {
+    enable = true;
+    openFirewall = true;
+  };
+
+  services.samba-wsdd.enable = true;
+
   programs.appimage = {
     enable = true;
     binfmt = true;