From 3c3e28d1cdd41139fbe240b38b5cc0d99295fce5 Mon Sep 17 00:00:00 2001 From: Jack Mechem Date: Sat, 23 May 2026 18:47:30 -0700 Subject: [PATCH] Merged local changes and fixed merge conflict --- flake.lock | 76 +++++++++----------------- flake.nix | 7 +-- hosts/dellserv/configuration.nix | 12 ++++ modules/home-manager/shell-aliases.nix | 47 ++++++++++------ 4 files changed, 69 insertions(+), 73 deletions(-) diff --git a/flake.lock b/flake.lock index d4d65fa..aeeeaf5 100644 --- a/flake.lock +++ b/flake.lock @@ -175,24 +175,6 @@ "type": "github" } }, - "flake-utils_7": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gtkapps": { "inputs": { "flake-utils": "flake-utils_2", @@ -391,10 +373,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1779357205, + "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", "owner": "NixOS", "repo": "nixpkgs", +<<<<<<< Updated upstream "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, @@ -412,6 +395,9 @@ "owner": "NixOS", "repo": "nixpkgs", "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", +======= + "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -431,8 +417,7 @@ "hyprmwh": "hyprmwh", "nixpkgs": "nixpkgs_6", "rust-app-menu": "rust-app-menu", - "server-dash": "server-dash", - "server-dash-api": "server-dash-api", + "server-dash-mono": "server-dash-mono", "zen-browser": "zen-browser" } }, @@ -504,16 +489,16 @@ "rust-overlay_3": { "inputs": { "nixpkgs": [ - "server-dash-api", + "server-dash-mono", "nixpkgs" ] }, "locked": { - "lastModified": 1774667365, - "narHash": "sha256-+JamhonkPyti+oqfl1ySAyF2L02adhCEcdZOzpSukq8=", + "lastModified": 1779506148, + "narHash": "sha256-OffE5yuMrSW71zIJNLvtl9MCO6WTAHEjlFPUCvkd/QM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "98caaa8cd1fbcc45913d1bb2b7fbabcf3e8d967a", + "rev": "d9973e2ab49747fada06ebbe26cda27eb0220cf1", "type": "github" }, "original": { @@ -522,9 +507,10 @@ "type": "github" } }, - "server-dash": { + "server-dash-mono": { "inputs": { "flake-utils": "flake-utils_6", +<<<<<<< Updated upstream "nixpkgs": "nixpkgs_7" }, "locked": { @@ -545,20 +531,23 @@ "inputs": { "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_8", +======= + "nixpkgs": "nixpkgs_6", +>>>>>>> Stashed changes "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1777670098, - "narHash": "sha256-WWObAxZIrpLa0oB9g3vcHYWr3mOdPglqjrR6uYkfruQ=", - "owner": "JackMechem", - "repo": "server-dash-api", - "rev": "56c555d699dc692e2c58e6fcede8dda2c503c7fc", - "type": "github" + "lastModified": 1779530119, + "narHash": "sha256-gxbpi0EWtqr/B94l92FH7oI1hStiwBCmytAmOsUnNPc=", + "ref": "refs/heads/main", + "rev": "4cea6512b11ae0d11fd10ea215ca7a55f35828f7", + "revCount": 4, + "type": "git", + "url": "ssh://forgejo@gitssh.jackmechem.dev:443/jackmechem/server-dash-mono-repo.git" }, "original": { - "owner": "JackMechem", - "repo": "server-dash-api", - "type": "github" + "type": "git", + "url": "ssh://forgejo@gitssh.jackmechem.dev:443/jackmechem/server-dash-mono-repo.git" } }, "systems": { @@ -651,21 +640,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", diff --git a/flake.nix b/flake.nix index 1a6484e..de0f47f 100755 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,7 @@ rust-app-menu.url = "github:JackMechem/rust-app-menu"; rust-app-menu.inputs.nixpkgs.follows = "nixpkgs"; - server-dash.url = "github:JackMechem/server-dash"; - server-dash-api.url = "github:JackMechem/server-dash-api"; + server-dash-mono.url = "git+ssh://forgejo@gitssh.jackmechem.dev:443/jackmechem/server-dash-mono-repo.git"; claude-code.url = "github:sadjow/claude-code-nix"; }; @@ -54,8 +53,8 @@ modules = [ ./hosts/dellserv/configuration.nix inputs.home-manager.nixosModules.default - inputs.server-dash.nixosModules.default - inputs.server-dash-api.nixosModules.default + inputs.server-dash-mono.nixosModules.frontend + inputs.server-dash-mono.nixosModules.api ]; }; }; diff --git a/hosts/dellserv/configuration.nix b/hosts/dellserv/configuration.nix index 9aedd07..13a1cb8 100644 --- a/hosts/dellserv/configuration.nix +++ b/hosts/dellserv/configuration.nix @@ -54,6 +54,12 @@ nixpkgs.config.allowUnfree = true; + programs.ssh.extraConfig = '' + Host gitssh.jackmechem.dev + IdentityFile /home/jack/.ssh/id_ed25519 + User forgejo + ''; + services.openssh.enable = true; services.openssh.settings = { @@ -171,6 +177,12 @@ reverse_proxy localhost:3003 ''; }; + virtualHosts."test.jackmechem.dev" = { + extraConfig = '' + bind 127.0.0.1 + reverse_proxy localhost:3099 + ''; + }; }; services.server-dash = { diff --git a/modules/home-manager/shell-aliases.nix b/modules/home-manager/shell-aliases.nix index 59acf8a..0adc8b6 100644 --- a/modules/home-manager/shell-aliases.nix +++ b/modules/home-manager/shell-aliases.nix @@ -54,7 +54,7 @@ let } { name = "tm"; - cmd = ''tmuxinator''; + cmd = "tmuxinator"; desc = "Short for tmuxinator. tm-save saves locally with provided session Other Usage: tm-save ; smae for tm-dup"; } { @@ -79,24 +79,35 @@ in }; programs.zsh.initContent = '' - ZSH_AUTOSUGGEST_USE_ASYNC=false - fastfetch -c examples/11 - if [[ -n "$IN_NIX_SHELL" ]]; then - PROMPT="%F{blue}[nix-shell]%f $PROMPT" - fi - nix() { - if [[ "$1" == "develop" ]]; then - command nix develop -c zsh "''${@:2}" - else - command nix "$@" + unsetopt INTERACTIVE_COMMENTS + ZSH_AUTOSUGGEST_USE_ASYNC=false + set -o promptsubst + fastfetch -c examples/11 + if [[ -n "$NIX_DEV_SHELL" ]]; then + PROMPT=$'%F{blue} dev#$NIX_DEV_SHELL%f\n'"$PROMPT" + elif [[ -n "$IN_NIX_SHELL" ]]; then + PROMPT=$'%F{blue} shell%f\n'"$PROMPT" fi - } - tm-save() { - tmuxinator new "$1" "$2" --local - } - tm-dup() { - tmuxinator new "$1" "$1" --local - } + nix() { + if [[ "$1" == "develop" ]]; then + command nix develop "''${@:2}" -c zsh + else + command nix "$@" + fi + } + nix-shell() { + if [[ "$1" == "-p" ]]; then + command nix-shell -p "''${@:2}" -c zsh + else + command nix "$@" + fi + } + tm-save() { + tmuxinator new "$1" "$2" --local + } + tm-dup() { + tmuxinator new "$1" "$1" --local + } ''; }