diff --git a/modules/core/desktop/niri.nix b/modules/core/desktop/niri.nix index 610eccf..69570af 100644 --- a/modules/core/desktop/niri.nix +++ b/modules/core/desktop/niri.nix @@ -112,7 +112,7 @@ ]; binds = { - "Mod+T".action.spawn = "cosmic-term"; + "Mod+T".action.spawn = "ghostty"; "Mod+E".action.spawn = "cosmic-files"; "Mod+B".action.spawn = "librewolf"; diff --git a/modules/hosts/box.nix b/modules/hosts/box.nix index 8c0b35f..23ffb59 100644 --- a/modules/hosts/box.nix +++ b/modules/hosts/box.nix @@ -23,12 +23,14 @@ catppuccin janitor + + mpd ]; nixos = { pkgs, ...}: { networking.hostName = "box"; - # den.tunnels = [ "tvtun" ]; + den.tunnels = [ "mpd" ]; environment.systemPackages = [ pkgs.python3 ]; diff --git a/modules/hosts/defaults.nix b/modules/hosts/defaults.nix index 891afee..90d4fe4 100644 --- a/modules/hosts/defaults.nix +++ b/modules/hosts/defaults.nix @@ -12,6 +12,8 @@ tailscale openvpn + #beszel + fish fetch diff --git a/modules/services/beszel.nix b/modules/services/beszel.nix index 4ccaa8e..1873f0c 100644 --- a/modules/services/beszel.nix +++ b/modules/services/beszel.nix @@ -1,11 +1,18 @@ { ... }: { den.aspects.beszel = { host, ... }: { + den.tunnels = + if host.name == "box" + then [ "fleet" ] + else []; + nixos = { lib, ... }: { services.beszel.agent = { enable = true; environment = { - HUB_URL = "https://box.bug.tools"; + KEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMlX8zdofzg+vV0H6H5U54YIbTY/z0iPfD9LXupBY2jX"; + TOKEN = "30949ab5-3ed3-46c1-b606-4e4e66b847f9"; + HUB_URL = "https://fleet.bug.tools"; SYSTEM_NAME = host.name; }; diff --git a/modules/services/copyparty.nix b/modules/services/copyparty.nix index d4b3ed7..f96040b 100644 --- a/modules/services/copyparty.nix +++ b/modules/services/copyparty.nix @@ -72,20 +72,12 @@ }; }; - "/box" = { - path = "/"; - - access = { - rwda = [ "bug" ]; - }; - }; - "/Music" = { path = "/home/bug/Music/"; access = { r = "*"; - rwda = [ "bug" ]; + rwdma = [ "bug" ]; }; flags = { diff --git a/modules/services/ports.nix b/modules/services/ports.nix index ae15414..86793b4 100644 --- a/modules/services/ports.nix +++ b/modules/services/ports.nix @@ -21,6 +21,8 @@ llama = 8080; api-tv = 8789; seek = 8089; + fleet = 8090; + mpd = 6600; }; }; } diff --git a/modules/software/music/player.nix b/modules/software/music/player.nix index 93ce2ea..44e5273 100644 --- a/modules/software/music/player.nix +++ b/modules/software/music/player.nix @@ -4,6 +4,7 @@ users.users.bug.packages = with pkgs; [ euphonica rhythmbox + kew ]; services.flatpak.packages = [ diff --git a/modules/software/utilities/ghostty.nix b/modules/software/utilities/ghostty.nix new file mode 100644 index 0000000..fe13ddf --- /dev/null +++ b/modules/software/utilities/ghostty.nix @@ -0,0 +1,15 @@ +{ inputs, ... }: { + den.aspects.fetch = { + nixos = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + ghostty + ]; + }; + + homeManager = { ... }: { + programs.ghostty.settings = { + window-decoration = "none"; + }; + }; + }; +} diff --git a/modules/software/utilities/utilities.nix b/modules/software/utilities/utilities.nix index 776bb95..3543d12 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 sshuttle torrent cad ]; + includes = with den.aspects; [ system-utils desktop-utils fonts sshuttle torrent cad ghostty ]; }; }