feat: changed stuff

config/devices/config/synology.nix

@@ -11,7 +11,7 @@
   user0Name = "Nick";
   user1Name = "Garnet";
   synologyName = "synology";
-  synologyIP = "192.168.50.210";
+  synologyIP = "192.168.50.209";
 in {
   label = "Synology";
   sync = "MWRGX2V-F5XKE5E-REP6ECT-OOPFBMF-22NHSMW-YFBU6MB-PLFUN63-R3MW2QX";

flake.lock

@@ -361,6 +361,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable_3": {
+      "locked": {
+        "lastModified": 1733506555,
+        "narHash": "sha256-2LC74TJ4jh0oGkNRaiLfKvTttjBtBIT7lr9/OJBeb1g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f11c13edc4ad2bd863c7275a4aa792230bc668f6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1731139594,
@@ -549,9 +565,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": [
+        "nixpkgs-stable": "nixpkgs-stable_3"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1731364708,

home/default.nix

@@ -44,6 +44,7 @@ in {
           misc-android
           misc-desktop
           misc-internet
+          misc-tracking
           ;
       };
     };

home/modules/firefox/config/bookmarks/config/development.nix

@@ -11,6 +11,18 @@ in {
       tags = ["discord" "development" "portal" "bot"];
       keyword = "Discord";
     }
+    {
+      name = "Elm-UI";
+      url = "https://package.elm-lang.org/packages/mdgriffith/elm-ui/latest/";
+      tags = ["elm-ui" "elm" "ui"];
+      keyword = "Elm";
+    }
+    {
+      name = "Elm Examples";
+      url = "https://elm-lang.org/examples";
+      tags = ["elm" "elm" "examples"];
+      keyword = "Elm";
+    }
     {
       name = "GitHub";
       url = "https://github.com/BRBWaffles";

home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix

@@ -12,6 +12,12 @@ in {
   name = "Self Hosted";
   toolbar = false;
   bookmarks = [
+    {
+      name = "Elm-Land Server";
+      url = "http://localhost:1234";
+      tags = ["elm-land" "elm" "land"];
+      keyword = "Website";
+    }
     {
       name = instances.forgejo.label;
       url = "https://${instances.forgejo.subdomain}.${instances.web.domains.url0}";
@@ -56,7 +62,7 @@ in {
     }
     {
       name = "${instances.ollama.label} (Server)";
-      url = "https://${instances.ollama.subdomain}.${instances.web.domains.url1}";
+      url = "https://${instances.ollama.subdomain}.${instances.web.domains.url0}";
       tags = ollamaTags;
       keyword = instances.ollama.label;
     }

home/modules/firefox/config/bookmarks/config/shopping.nix

@@ -14,6 +14,12 @@
       tags = ["doordash" "door" "dash" "food"];
       keyword = "Amazon";
     }
+    {
+      name = "Fiverr";
+      url = "https://www.fiverr.com";
+      tags = ["fiverr" "graphic" "design"];
+      keyword = "Five";
+    }
     {
       name = "FTY Supplies";
       url = "https://fytsupplies.ca";

home/modules/firefox/default.nix

@@ -6,21 +6,30 @@
 }: let
   inherit (flake.config.people) user0;
 in {
-  programs.firefox = {
+  programs.firefox = let
+    configPath = ./config;
+  in {
     enable = true;
     package = pkgs.firefox;
     profiles = {
-      ${user0} = let
+      ${user0} =
-        configPath = ./config;
-      in
         {
           isDefault = true;
+          id = 0;
         }
         // (import (configPath + /bookmarks) {inherit flake;})
         // (import (configPath + /extensions) {inherit nur;})
         // (import (configPath + /search) {inherit flake;})
         // (import (configPath + /settings))
         // (import (configPath + /themes));
+      testing =
+        {
+          isDefault = false;
+          id = 1;
+        }
+        // (import (configPath + /bookmarks) {inherit flake;})
+        // (import (configPath + /search) {inherit flake;})
+        // (import (configPath + /themes));
     };
   };
 }

home/modules/helix/config/settings.nix

@@ -3,6 +3,7 @@
     editor = {
       mouse = true;
       auto-format = true;
+      soft-wrap = true;
       auto-save = true;
       line-number = "relative";
       lsp = {

home/modules/misc/internet.nix

@@ -17,6 +17,7 @@
       protonvpn-gui
       qbittorrent
       tor-browser
+      nicotine-plus
       ;
   };
 }

home/modules/vscode/config/keybindings.nix

@@ -15,5 +15,10 @@
       command = "editor.action.formatDocument";
       when = "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor";
     }
+    {
+      key = "ctrl+shift+tab";
+      command = "editor.action.indentationToSpaces";
+      when = "textInputFocus";
+    }
   ];
 }

home/modules/vscode/config/userSettings.nix

@@ -19,5 +19,6 @@
     "editor.multiCursorLimit" = 700000;
     "elmLS.disableElmLSDiagnostics" = true;
     "elmLS.elmReviewDiagnostics" = "warning";
+    "editor.wordWrap" = true;
   };
 }

nixos/default.nix

@@ -61,6 +61,7 @@ in {
           (modules)
           syncthing
           ollama
+          edgedb
           ;
       };
     };

nixos/modules/edgedb.nix

@@ -0,0 +1,80 @@
+{
+  #   inputs,
+  #   lib,
+  #   pkgs,
+  #   ...
+  # }: let
+  #   bootstrap-server = pkgs.writeText "bootstrap.edgesql" ''
+  #     ALTER ROLE edgedb SET password := "test";
+  #   '';
+
+  #   edgedb-server = inputs.edgedb.packages."x86_64-linux".edgedb-server-5_0_beta;
+  #   working-dir = "/var/lib/edgedb";
+  # in {
+  #   environment.systemPackages = [
+  #     pkgs.edgedb
+  #   ];
+
+  #   # system.activationScripts = {
+  #   #   edgedb-data-dir = {
+  #   #     text = ''
+  #   #       install -d -m 0750 -o edgedb -g edgedb ${working-dir}
+  #   #     '';
+  #   #   };
+  #   # };
+
+  #   systemd.services = {
+  #     "edgedb@" = {
+  #       enable = true;
+  #       after = ["network.target" "syslog.target"];
+  #       description = "EdgeDB Database Service, instance %i";
+  #       documentation = ["https://edgedb.com"];
+  #       path = [edgedb-server];
+  #       reload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+  #       script = ''
+  #         ${lib.getExe' edgedb-server "edgedb-server"} \
+  #         --data-dir=${working-dir}/$1 \
+  #         --disable-dynamic-system-config \
+  #         --emit-server-status=${working-dir}/$1/status.json \
+  #         --instance-name=$1 \
+  #         --security=insecure_dev_mode \
+  #         --tls-cert-mode=generate_self_signed \
+  #         --admin-ui=enabled
+  #       '';
+  #       scriptArgs = "%i";
+  #       serviceConfig = {
+  #         Type = "simple";
+  #         User = "edgedb";
+  #         Group = "edgedb";
+  #         KillMode = "mixed";
+  #         TimeoutSec = 0;
+  #         ExecStartPre = ''
+  #           ${lib.getExe' edgedb-server "edgedb-server"} \
+  #           --data-dir=${working-dir}/%i \
+  #           --instance-name=%i \
+  #           --disable-dynamic-system-config \
+  #           --bootstrap-only \
+  #           --bootstrap-command-file=${bootstrap-server}
+  #         '';
+  #       };
+  #     };
+  #     "edgedb@test" = {
+  #       enable = true;
+  #       environment = {
+  #         EDGEDB_DEBUG_HTTP_INJECT_CORS = "1";
+  #       };
+  #       overrideStrategy = "asDropin";
+  #     };
+  #   };
+
+  #   users.groups.edgedb = {};
+
+  #   users.users.edgedb = {
+  #     group = "edgedb";
+  #     description = "EdgeDB Server";
+  #     isSystemUser = true;
+  #     packages = [
+  #       edgedb-server
+  #     ];
+  #   };
+}

nixos/modules/nix.nix

@@ -3,7 +3,7 @@
     config = {
       allowUnfree = true;
       permittedInsecurePackages = [
-        "electron"
+        "electron-unwrapped-33.0.2"
       ];
     };
   };

systems/desktop/config/networking.nix

@@ -17,6 +17,7 @@ in {
         4333 # Feishin
         2234 # Soulseek
         3131 # Deskreen
+        55473
       ];
     };
   };