From b8fbdd67c2ba613e9e50cb50e697df2c5ce92d72 Mon Sep 17 00:00:00 2001
From: Morten Olsen <fbtijfdq@void.black>
Date: Tue, 9 Apr 2024 23:27:20 +0200
Subject: [PATCH] update

---
 os.sh                                         |  2 +-
 user/default.nix                              | 26 ++++++++++++-------
 user/home.nix                                 |  3 ++-
 user/programs/obsidian/default.nix            |  7 -----
 .../terminal/files/shell/rc.d/10-bun.sh       |  5 ++++
 5 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 100644 user/programs/obsidian/default.nix
 create mode 100644 user/programs/terminal/files/shell/rc.d/10-bun.sh

diff --git a/os.sh b/os.sh
index 47ee227..033b697 100755
--- a/os.sh
+++ b/os.sh
@@ -27,7 +27,7 @@ function buildvm() {
 
 function upgrade() {
   if git -C "$LOCATION" diff-index --quiet HEAD --; then
-    nix flake update --commit-lock-file "$LOCATION"
+    nix flake update --commit-lock-file --flake "$LOCATION"
     apply $1
   else
     echo "Error: git working tree is dirty"
diff --git a/user/default.nix b/user/default.nix
index 1d2f8dd..0f56220 100644
--- a/user/default.nix
+++ b/user/default.nix
@@ -3,11 +3,6 @@
 {
   # environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-25.9.0"
-  ];
-  # ^ requested by obsidian
-
   programs.zsh.enable = true;
   users.users.alice = {
     isNormalUser = true;
@@ -16,10 +11,23 @@
     shell = pkgs.zsh;
   };
 
-networking.firewall = {
-  enable = true;
-  allowedTCPPorts = [ 8081 5001 ];
-};
+  users.users."alice".openssh.authorizedKeys.keys = [
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCj8wspkAnOpEmipwB/xd8vpEx9aqNbyjD2xzv0msDJvYMn26ZO3cbtbWbMI9Uns55aHcL0bStdbaJQIcL8ZVzvQtKq+spdZYQpN4cFlN16HXKR/UjBYtJEdHVxb2cwb2DM04aLDuAlCAJGChEAqpIQFpvlByyAaxSPwor5Cy5JHmm5fMkvcJEvPtxQOo4yovY8qW9scWlOCrzNSAYtBwTGG8REcRuTaEW9EJlmn8QZA+T+cE7nFdZOlmm752jW9wBCAIKlg6W5gX0rysSxy+MkKB/2ohpLI+0SeWAM8+CEtZjO7GP6xRPXZgrZJssytzQsJoiMTs6rJM5ovHUMVNPGDLCB6+8lWM7Jk4hh0lIQTOC5AMucH2jRJSyQb2AA3kbPuWOwHDDIlSUnNFsI/xUVs1lfx3ikIZEb9oZcKwWBB2PeL/KT6ca7dsI3PyFL+hC5Wi7ll0Aj5w+dBZOxwW1agSo4ujPKO9oIVwqEA+PqoK/GZtIHAx6t/m3DK8T4HAo2GZMqyzRgcqk1bttaCFzX2h074yW1du8+l4yIqWrooqD474V3MT05HUxkA1+9S5ldEwK4J50WfKlhNuZn5YeiHLngisu8WyIGREYDGlkM+1qxwHiJGohigS20kpmTUkKvyLRXItAcvQYBknCV3qb8B1Kj1bvbN3sCaqQAeVWxDw=="
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFaIAP/ZJ7+7jeR44e1yIJjfQAB6MN351LDKJAXVF62P"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDbZITpz5QrVIxPn9gKVWMPK+3W3YZZGszFOQvO/h7M"
+  ];
+
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 8081 5001 53317 ];
+  };
+
+  services.openssh = {
+    enable = true;
+    settings.PasswordAuthentication = false;
+    #settings.KbdInteractiveAuthentication = false;
+    settings.PermitRootLogin = "no";
+  };
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "1password-gui"
diff --git a/user/home.nix b/user/home.nix
index 3a29bce..447a4ac 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -10,7 +10,6 @@
     ./programs/kitty
     ./programs/firefox
     ./programs/vscode
-    ./programs/obsidian
   ];
 
   home.file = {
@@ -27,6 +26,8 @@
     pkgs.gimp
     pkgs.blender
     pkgs.discord
+    pkgs.bun
+    pkgs.localsend
   ];
 
 
diff --git a/user/programs/obsidian/default.nix b/user/programs/obsidian/default.nix
deleted file mode 100644
index 033f619..0000000
--- a/user/programs/obsidian/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.packages = [
-    pkgs.obsidian
-  ];
-}
diff --git a/user/programs/terminal/files/shell/rc.d/10-bun.sh b/user/programs/terminal/files/shell/rc.d/10-bun.sh
new file mode 100644
index 0000000..5c37bcf
--- /dev/null
+++ b/user/programs/terminal/files/shell/rc.d/10-bun.sh
@@ -0,0 +1,5 @@
+if [ -d  "$HOME/.bun" ]; then
+    export BUN_INSTALL="$HOME/.bun"
+    export PATH="$BUN_INSTALL/bin:$PATH"
+fi
+