commit 27c63ec76dbd06ef2f0103c966de721c7c545245
parent 93721815ecbc5db950c107cd1aeb78bbb735f8f8
Author: Silas Brack <silasbrack@gmail.com>
Date: Sun, 12 Apr 2026 17:06:13 +0200
fix: lots of fixes
Diffstat:
7 files changed, 13 insertions(+), 97 deletions(-)
diff --git a/.forgejo/workflows/nixos.yaml b/.forgejo/workflows/nixos.yaml
@@ -26,5 +26,5 @@ jobs:
env:
NIX_SSHOPTS: "-i /var/lib/gitea-runner/default/.ssh/id_ed25519 -o UserKnownHostsFile=/var/lib/gitea-runner/default/.ssh/known_hosts"
run: |
- nix run nixpkgs#nixos-rebuild -- --fast --flake .#poseidon --target-host root@188.166.127.72 test
- nix run nixpkgs#nixos-rebuild -- --fast --flake .#helios --target-host root@46.62.150.48 test
+ nix run nixpkgs#nixos-rebuild -- --fast --flake .#poseidon --target-host root@188.166.127.72 switch
+ nix run nixpkgs#nixos-rebuild -- --fast --flake .#helios --target-host root@46.62.150.48 switch
diff --git a/Makefile b/Makefile
@@ -4,10 +4,10 @@
deploy: deploy-poseidon deploy-helios
deploy-poseidon:
- nixos-rebuild test --show-trace --no-reexec --flake .#poseidon --target-host root@188.166.127.72
+ nixos-rebuild switch --show-trace --no-reexec --flake .#poseidon --target-host root@188.166.127.72
deploy-helios:
- nixos-rebuild test --show-trace --no-reexec --flake .#helios --target-host root@46.62.150.48
+ nixos-rebuild switch --show-trace --no-reexec --flake .#helios --target-host root@46.62.150.48
deploy-gaia:
sudo nixos-rebuild switch --flake .#gaia
diff --git a/hosts/gaia/configuration.nix b/hosts/gaia/configuration.nix
@@ -191,6 +191,7 @@ EOF
bitwarden-cli
bitwarden-desktop
# blender
+ btop-rocm
claude-code
# discord
# duckdb
diff --git a/hosts/gaia/home.nix b/hosts/gaia/home.nix
@@ -30,22 +30,11 @@
# firefox.profiles.default.enable = false;
# };
- home.sessionVariables = {
- EDITOR = "vim";
- BROWSER = "firefox";
- TERMINAL = "kitty";
- };
-
home.stateVersion = "24.11";
home.shellAliases = {
paperless-manage = "sudo -u paperless /var/lib/paperless/paperless-manage";
};
- programs.btop = {
- enable = true;
- package = pkgs.btop.override { rocmSupport = true; };
- };
-
programs.firefox = {
enable = true;
profiles = {
@@ -179,14 +168,9 @@
};
};
- programs.bash = {
- enable = true;
- };
-
programs.fzf = {
enable = true;
enableBashIntegration = true;
- # enableFishIntegration = true;
};
programs.zathura = {
@@ -194,47 +178,6 @@
extraConfig = "set selection-clipboard clipboard";
};
- programs.neomutt = {
- enable = true;
- vimKeys = true;
- };
-
- # programs.fish = {
- # enable = true;
- # shellAbbrs = {
- # ls = "ls --hyperlink --color=auto";
- # delta = "delta --hyperlinks --hyperlinks-file-link-format='file://{path}#{line}'";
- # rg = "rg --hyperlink-format=kitty";
- # };
- # interactiveShellInit = ''
- # set fish_greeting
- # '';
- # functions = {
- # loadenv = ''
- # # Load environment variables from a .env file
- # for line in (cat .env)
- # # Skip empty lines and comments
- # if test -z "$line" -o (string sub -s 1 -l 1 -- "$line") = "#"
- # continue
- # end
- #
- # # Split the line on '=' character
- # set parts (string split -m 1 "=" -- "$line" | string trim)
- #
- # # Check if we have both key and value
- # if test (count $parts) -eq 2
- # set key $parts[1]
- # set value $parts[2]
- #
- # # Set the environment variable
- # set -gx $key $value
- # echo "Set $key to $value"
- # end
- # end
- # '';
- # };
- # };
-
programs.git = {
enable = true;
settings = {
@@ -255,32 +198,11 @@
enable = true;
shellIntegration = {
enableBashIntegration = true;
- # enableFishIntegration = true;
};
settings = {
font_family = "Iosevka Nerd Font";
font_size = 16;
};
};
-
- # programs.neovim =
- # let
- # source = builtins.fetchGit {
- # url = "https://github.com/silasbrack/kickstart.nvim.git";
- # rev = "201dd59aff99f696bfa85c40e98856e8158f1328";
- # };
- # in
- # {
- # enable = true;
- # extraLuaConfig = (builtins.readFile "${source}/init.lua");
- # };
-
- # home.file.".config/nvim" = {
- # source = builtins.fetchGit {
- # url = "https://github.com/silasbrack/kickstart.nvim.git";
- # rev = "201dd59aff99f696bfa85c40e98856e8158f1328";
- # };
- # recursive = true;
- # };
};
}
diff --git a/hosts/gaia/vpn.nix b/hosts/gaia/vpn.nix
@@ -7,13 +7,13 @@
};
# networking.firewall.interfaces.wg0.allowedTCPPorts = [ 28982 ];
networking.extraHosts = ''
- 10.100.0.1 server
+ 10.100.0.1 poseidon
10.100.0.2 thinkpad
10.100.0.3 pixel
- 10.100.0.4 desktop
+ 10.100.0.4 gaia
10.100.0.5 ipad
10.100.0.6 macbook
- 10.100.0.7 hetzner
+ 10.100.0.7 helios
10.100.0.8 xps
'';
# networking.interfaces.enp8s0.wakeOnLan = {
diff --git a/hosts/helios.nix b/hosts/helios.nix
@@ -313,7 +313,7 @@
Type = "simple";
DynamicUser = true;
StateDirectory = "mkv";
- ExecStart = "${mkv.packages.${pkgs.system}.default}/bin/mkv serve";
+ ExecStart = "${mkv.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/mkv serve";
Restart = "on-failure";
RestartSec = 5;
};
diff --git a/hosts/poseidon.nix b/hosts/poseidon.nix
@@ -14,16 +14,12 @@
"flakes"
];
services.openssh.enable = true;
- networking.firewall.allowedTCPPorts = [
- 80
- 443
- ];
boot.loader.grub = {
enable = false;
};
fileSystems."/" = {
- device = "/dev/sda1";
+ device = "/dev/vda1";
fsType = "ext4";
};
nix.gc = {
@@ -54,13 +50,10 @@
externalInterface = "eth0";
internalInterfaces = [ "wg0" ];
};
- # Port 53 for DNS, port 51820 for WireGuard
+ # Port 80/443 for HTTP(S), port 53 for DNS, port 51820 for WireGuard
networking.firewall = {
- allowedTCPPorts = [ 53 ];
- allowedUDPPorts = [
- 53
- 51820
- ];
+ allowedTCPPorts = [ 80 443 53 ];
+ allowedUDPPorts = [ 53 51820 ];
};
services.dnsmasq = {
enable = true;
