From 0fd351c9cb6ddecead1ec1e3d8acd3744948b7bd Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 6 Dec 2024 21:48:52 -0600 Subject: [PATCH] feat: changed stuff --- config/devices/config/synology.nix | 2 +- flake.lock | 20 ++++- home/default.nix | 1 + .../config/bookmarks/config/development.nix | 12 +++ .../bookmarks/config/flake/selfHosted.nix | 8 +- .../config/bookmarks/config/shopping.nix | 6 ++ home/modules/firefox/default.nix | 17 +++- home/modules/helix/config/settings.nix | 1 + home/modules/misc/internet.nix | 1 + home/modules/vscode/config/keybindings.nix | 5 ++ home/modules/vscode/config/userSettings.nix | 1 + nixos/default.nix | 1 + nixos/modules/edgedb.nix | 80 +++++++++++++++++++ nixos/modules/nix.nix | 2 +- systems/desktop/config/networking.nix | 1 + 15 files changed, 148 insertions(+), 10 deletions(-) create mode 100755 nixos/modules/edgedb.nix diff --git a/config/devices/config/synology.nix b/config/devices/config/synology.nix index 44b2000..94a9c27 100755 --- a/config/devices/config/synology.nix +++ b/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"; diff --git a/flake.lock b/flake.lock index 6506f4b..3064602 100755 --- a/flake.lock +++ b/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" - ] + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1731364708, diff --git a/home/default.nix b/home/default.nix index aa4fb3b..10cdfd6 100755 --- a/home/default.nix +++ b/home/default.nix @@ -44,6 +44,7 @@ in { misc-android misc-desktop misc-internet + misc-tracking ; }; }; diff --git a/home/modules/firefox/config/bookmarks/config/development.nix b/home/modules/firefox/config/bookmarks/config/development.nix index e0f4d25..eddc4df 100755 --- a/home/modules/firefox/config/bookmarks/config/development.nix +++ b/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"; diff --git a/home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix index ea57a06..17383af 100755 --- a/home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix +++ b/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; } diff --git a/home/modules/firefox/config/bookmarks/config/shopping.nix b/home/modules/firefox/config/bookmarks/config/shopping.nix index 00c6e08..ee4cce2 100755 --- a/home/modules/firefox/config/bookmarks/config/shopping.nix +++ b/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"; diff --git a/home/modules/firefox/default.nix b/home/modules/firefox/default.nix index 81004e9..de5ce96 100755 --- a/home/modules/firefox/default.nix +++ b/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 - configPath = ./config; - in + ${user0} = { 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)); }; }; } diff --git a/home/modules/helix/config/settings.nix b/home/modules/helix/config/settings.nix index a279f0a..16a35e5 100755 --- a/home/modules/helix/config/settings.nix +++ b/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 = { diff --git a/home/modules/misc/internet.nix b/home/modules/misc/internet.nix index 5d07585..b48ca8b 100755 --- a/home/modules/misc/internet.nix +++ b/home/modules/misc/internet.nix @@ -17,6 +17,7 @@ protonvpn-gui qbittorrent tor-browser + nicotine-plus ; }; } diff --git a/home/modules/vscode/config/keybindings.nix b/home/modules/vscode/config/keybindings.nix index eb98318..21e17b0 100755 --- a/home/modules/vscode/config/keybindings.nix +++ b/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"; + } ]; } diff --git a/home/modules/vscode/config/userSettings.nix b/home/modules/vscode/config/userSettings.nix index 9c725e8..bcded15 100755 --- a/home/modules/vscode/config/userSettings.nix +++ b/home/modules/vscode/config/userSettings.nix @@ -19,5 +19,6 @@ "editor.multiCursorLimit" = 700000; "elmLS.disableElmLSDiagnostics" = true; "elmLS.elmReviewDiagnostics" = "warning"; + "editor.wordWrap" = true; }; } diff --git a/nixos/default.nix b/nixos/default.nix index b0d14c8..4392b63 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -61,6 +61,7 @@ in { (modules) syncthing ollama + edgedb ; }; }; diff --git a/nixos/modules/edgedb.nix b/nixos/modules/edgedb.nix new file mode 100755 index 0000000..92c1592 --- /dev/null +++ b/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 + # ]; + # }; +} diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 78493aa..5349344 100755 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -3,7 +3,7 @@ config = { allowUnfree = true; permittedInsecurePackages = [ - "electron" + "electron-unwrapped-33.0.2" ]; }; }; diff --git a/systems/desktop/config/networking.nix b/systems/desktop/config/networking.nix index 445f981..2013579 100755 --- a/systems/desktop/config/networking.nix +++ b/systems/desktop/config/networking.nix @@ -17,6 +17,7 @@ in { 4333 # Feishin 2234 # Soulseek 3131 # Deskreen + 55473 ]; }; };