From 2ab5eff59981e0a700a65133f16e972f803dac98 Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Mon, 23 Mar 2026 08:24:07 -0500 Subject: [PATCH] push --- .stfolder/syncthing-folder-a0745f.txt | 2 +- flake.nix | 5 +++++ modules/hosts/box.nix | 4 +++- modules/hosts/nix.nix | 2 ++ modules/software/utilities/sshuttle.nix | 10 ++++++++++ modules/software/utilities/utilities.nix | 4 ++-- modules/vm.nix | 20 ++++++++++---------- 7 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 modules/software/utilities/sshuttle.nix diff --git a/.stfolder/syncthing-folder-a0745f.txt b/.stfolder/syncthing-folder-a0745f.txt index b3ae570..2f6a7df 100644 --- a/.stfolder/syncthing-folder-a0745f.txt +++ b/.stfolder/syncthing-folder-a0745f.txt @@ -2,4 +2,4 @@ # Do not delete. folderID: nix -created: 2026-01-29T23:05:44-06:00 +created: 2026-01-29T23:06:32-06:00 diff --git a/flake.nix b/flake.nix index d3368a9..db4c786 100644 --- a/flake.nix +++ b/flake.nix @@ -52,5 +52,10 @@ # hytale-launcher.url = "github:JPyke3/hytale-launcher-nix"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; + + omnisearch = { + url = "git+https://git.bwaaa.monster/omnisearch"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/modules/hosts/box.nix b/modules/hosts/box.nix index 131f31c..dc67d7d 100644 --- a/modules/hosts/box.nix +++ b/modules/hosts/box.nix @@ -22,11 +22,13 @@ janitor ]; - nixos = { + nixos = { pkgs, ...}: { networking.hostName = "box"; # den.tunnels = [ "tvtun" ]; + environment.systemPackages = [ pkgs.python3 ]; + users.users.levi = { isNormalUser = true; description = "levi"; diff --git a/modules/hosts/nix.nix b/modules/hosts/nix.nix index b1c58d5..fa6804a 100644 --- a/modules/hosts/nix.nix +++ b/modules/hosts/nix.nix @@ -10,6 +10,8 @@ janitor ollama + + alc897 ]; nixos = { diff --git a/modules/software/utilities/sshuttle.nix b/modules/software/utilities/sshuttle.nix new file mode 100644 index 0000000..8c1d057 --- /dev/null +++ b/modules/software/utilities/sshuttle.nix @@ -0,0 +1,10 @@ +{ ... }: { + den.aspects.sshuttle = { + nixos = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + python + sshuttle + ]; + }; + }; +} diff --git a/modules/software/utilities/utilities.nix b/modules/software/utilities/utilities.nix index db680a5..5454edf 100644 --- a/modules/software/utilities/utilities.nix +++ b/modules/software/utilities/utilities.nix @@ -1,5 +1,5 @@ { den, ... }: { den.aspects.utilities = { - includes = with den.aspects; [ system-utils desktop-utils fonts ]; + includes = with den.aspects; [ system-utils desktop-utils fonts sshuttle ]; }; -} \ No newline at end of file +} diff --git a/modules/vm.nix b/modules/vm.nix index 7eb1a59..a431418 100644 --- a/modules/vm.nix +++ b/modules/vm.nix @@ -1,16 +1,16 @@ # nix run .#vm { inputs, den, ... }: { - den.aspects.nix.includes = [ (den.provides.tty-autologin "bug") ]; + den.aspects.nix.includes = [ (den.provides.tty-autologin "bug") ]; - perSystem = { pkgs, ... }: { - packages.vm = pkgs.writeShellApplication { - name = "vm"; - text = let - host = inputs.self.nixosConfigurations.nix.config; - in '' - ${host.system.build.vm}/bin/run-${host.networking.hostName}-vm "$@" - ''; - }; + perSystem = { pkgs, ... }: { + packages.vm = pkgs.writeShellApplication { + name = "vm"; + text = let + host = inputs.self.nixosConfigurations.nix.config; + in '' + ${host.system.build.vm}/bin/run-${host.networking.hostName}-vm "$@" + ''; }; + }; }