cleanup

hosts/local-packages.nix

@@ -140,5 +140,6 @@ in {
     ollama
     tree-sitter
     luajitPackages.jsregexp
+    tailscale
   ];
 }

modules/audio.nix

@@ -15,6 +15,5 @@
   environment.systemPackages = with pkgs; [
     cava
     pulseaudio
-    ffmpeg
   ];
 }

modules/bluetooth.nix

@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   hardware.bluetooth = {
     enable = true;
     powerOnBoot = true;

modules/boot.nix

@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   # Bootloader
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -13,9 +10,13 @@
     deps = [];
     text = ''
       mkdir -p /bin
-      ln -sf ${pkgs.bash}/bin/bash /bin/bash
+      if [ ! -e /bin/bash ]; then
+        ln -sf ${pkgs.bash}/bin/bash /bin/bash
+      fi
       mkdir -p /usr/bin
-      ln -sf ${pkgs.coreutils}/bin/env /usr/bin/env
+      if [ ! -e /usr/bin/env ]; then
+        ln -sf ${pkgs.coreutils}/bin/env /usr/bin/env
+      fi
     '';
   };
 }

modules/default.nix

@@ -18,6 +18,7 @@
     ./timezone.nix
     ./user.nix
     ./python.nix
+    ./tailscale.nix
   ];
 
   # Enable CUPS to print documents.

modules/docker.nix

@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   virtualisation.docker = {
     enable = true;
     enableOnBoot = true;

modules/env.nix

@@ -13,7 +13,6 @@
     EDITOR = "nvim";
     VISUAL = "nvim";
     TERM = "ghostty";
-    GTK_THEME = lib.mkDefault "Adwaita:dark";
     CC = "${pkgs.gcc}/bin/gcc";
     PKG_CONFIG_PATH = lib.makeSearchPath "lib/pkgconfig" [
       pkgs.openssl.dev
@@ -27,7 +26,6 @@
     "/bin"
   ];
 
-  # Enable direnv with nix integration
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;

modules/fonts.nix

@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: let
+{pkgs, ...}: let
   clear-sans = pkgs.stdenv.mkDerivation {
     name = "clear-sans";
     src = pkgs.fetchurl {

modules/home-manager.nix

@@ -1,7 +1,4 @@
-{
-  inputs,
-  ...
-}: {
+{inputs, ...}: {
   imports = [
     inputs.home-manager.nixosModules.home-manager
   ];

modules/i3-xfce.nix

@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: let
+{pkgs, ...}: let
   wallpapers = [
     "${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/backgrounds/nixos/nixos-wallpaper.png"
     "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/backgrounds/gnome/gnome-dark.png"

modules/net.nix

@@ -1,14 +1,11 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     networkmanager_dmenu
     networkmanagerapplet
   ];
 
-  networking.firewall.allowedTCPPorts = [ 57621 ];
-  networking.firewall.allowedUDPPorts = [ 5353 ];
+  networking.firewall.allowedTCPPorts = [57621];
+  networking.firewall.allowedUDPPorts = [5353];
 
   networking.wireless.enable = false; # Enables wireless support via wpa_supplicant.
   networking.hostName = "nixos";

modules/nixos.nix

@@ -1,6 +1,4 @@
-{
-  ...
-}: {
+{...}: {
   nixpkgs.config.allowUnfree = true;
   programs.nix-index.enable = true;
   programs.command-not-found.enable = false;

modules/steam.nix

@@ -1,11 +1,9 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
+    # apparently enabling this makes big picture boot up, does not work on nvidia however
     # gamescopeSession.enable = true;
     extraCompatPackages = [
       pkgs.proton-ge-bin

modules/tailscale.nix

@@ -0,0 +1,10 @@
+{...}: {
+  services.tailscale = {
+    enable = true;
+  };
+
+  networking.firewall = {
+    allowedUDPPorts = [41641];
+    trustedInterfaces = ["tailscale0"];
+  };
+}

modules/timezone.nix

@@ -1,6 +1,4 @@
-{
-  ...
-}: {
+{...}: {
   time.timeZone = "America/Edmonton";
   i18n.defaultLocale = "en_CA.UTF-8";
 }