diff --git a/flake.nix b/flake.nix index 80868de..195e98a 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,7 @@ vinzenz-lpt2 = import ./hosts/vinzenz-lpt2 host-params; vinzenz-pc2 = import ./hosts/vinzenz-pc2 host-params; hetzner-vpn2 = import ./hosts/hetzner-vpn2 host-params; + forgejo-runner-1 = import ./hosts/forgejo-runner-1 host-params; ona-book = import ./hosts/ona-book host-params; }; diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix index d2bca38..6cd8b3a 100644 --- a/home/vinzenz/default.nix +++ b/home/vinzenz/default.nix @@ -39,10 +39,11 @@ inputs@{ pkgs, ... }: wireguard-tools wirelesstools - alejandra # nix formatter - kdiff3 jetbrains-toolbox + + blanket + vlc ]; home.file."policy.json" = { diff --git a/home/vinzenz/zsh.nix b/home/vinzenz/zsh.nix index 9a9f633..13ff561 100644 --- a/home/vinzenz/zsh.nix +++ b/home/vinzenz/zsh.nix @@ -11,8 +11,7 @@ my-apply = "sudo nixos-rebuild boot --flake"; my-switch = "sudo nixos-rebuild switch --flake"; my-update = "sudo nixos-rebuild boot --upgrade --flake"; - my-pull = "git -C ~/Repos/nixos-configuration pull --rebase"; - my-fmt = "alejandra ."; + my-pull = "git -C ~/Repos/nixos-configuration pull --rebase"; my-test = "sudo nixos-rebuild test"; my-direnvallow = "echo \"use nix\" > .envrc && direnv allow"; my-ip4 = "ip addr show | grep 192"; diff --git a/hosts/forgejo-runner-1/default.nix b/hosts/forgejo-runner-1/default.nix new file mode 100644 index 0000000..4c2666e --- /dev/null +++ b/hosts/forgejo-runner-1/default.nix @@ -0,0 +1,28 @@ +{ nixpkgs, common-modules, ... }: +nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = common-modules ++ [ + ./hardware.nix + ../../users/vinzenz.nix + { networking.hostName = "forgejo-runner-1"; } + { + # uncomment for build check on non arm system (requires --impure) + # nixpkgs.buildPlatform = builtins.currentSystem; + } + { + services.tailscale.useRoutingFeatures = "both"; + } + { + users.users = { + root.openssh.authorizedKeys.keys = [ + ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' + ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming'' + ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming'' + ]; + }; + } + { + system.autoUpgrade.allowReboot = true; + } + ]; +} diff --git a/hosts/forgejo-runner-1/hardware.nix b/hosts/forgejo-runner-1/hardware.nix new file mode 100644 index 0000000..f7cb083 --- /dev/null +++ b/hosts/forgejo-runner-1/hardware.nix @@ -0,0 +1,63 @@ +{ lib, modulesPath, ... }: +{ + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; + + config = { + nixpkgs = { + hostPlatform = "aarch64-linux"; + system = "aarch64-linux"; + }; + + boot = { + tmp.cleanOnBoot = true; + kernelParams = [ "console=tty" ]; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + initrd = { + availableKernelModules = [ + "xhci_pci" + "virtio_scsi" + "sr_mod" + "virtio_gpu" + ]; + kernelModules = [ ]; + }; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/47bc77ff-12e1-4d39-bb5c-fb100ccd3aab"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/05F2-8F9A"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/bbd18a70-b0bb-4e1a-b45b-3c1f8ecc0c10"; } + ]; + + networking.useNetworkd = true; + systemd.network = { + enable = true; + networks."10-wan" = { + matchConfig.Name = "enp1s0"; + networkConfig.DHCP = "ipv4"; + address = [ + "2a01:4f8:c013:a524::1/64" + ]; + routes = [ + { Gateway = "fe80::1"; } + ]; + }; + }; + }; +} diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix index cf860e5..b480f67 100644 --- a/modules/desktop-environment.nix +++ b/modules/desktop-environment.nix @@ -99,7 +99,7 @@ fonts = { enableDefaultPackages = true; fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ]; - packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ]; + packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) roboto-mono ]; }; hardware.logitech.wireless = {