my nix stuff!

flake.lock

@@ -927,11 +927,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1752480373,
+        "lastModified": 1755615617,
-        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
         "type": "github"
       },
       "original": {

hosts/default/configuration.nix

@@ -3,44 +3,17 @@
 {
 
 	imports = [
-		../../modules/nixos/nixpkgs.nix
+		../../modules/force.nix
-		../../modules/nixos/bootloader.nix
-		../../modules/nixos/hardware.nix
-		../../modules/nixos/nvidia.nix
-		../../modules/nixos/i18n.nix
 		../../modules/nixos/main-user.nix
-		../../modules/nixos/network.nix
-		../../modules/nixos/programs.nix
 		../../modules/home-manager/main.nix
 		./packages.nix
 		# ../../modules/home-manager/hyprpanel.nix
 		./other/activate.nix
 		# ./apps/ancs.nix
-		inputs.nvf.nixosModules.default	
 	];
 
 	services.displayManager.gdm.enable = true;
 
-	programs.nvf = {
-		enable = true;
-		defaultEditor = true;
-		# withLua = true;
-
-		settings.vim = {
-			viAlias = true;
-			vimAlias = true;
-			statusline.lualine.enable = true;
-			languages = {
-				enableLSP = true;
-				enableTreesitter = true;
-
-				nix.enable = true;
-				ts.enable = true;
-				# qml.enable = true;
-			};
-		};
-	};
-
 	programs.steam = {
 		enable = true;
 		remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
@@ -118,22 +91,6 @@
 		portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
 	};
 
-	programs.zsh = {
-		enable = true;
-		autosuggestions.enable = true;
-		zsh-autoenv.enable = true;
-		syntaxHighlighting.enable = true;
-		ohMyZsh = {
-			enable = true;
-			plugins = [ "git" "direnv" ];
-			theme = "robbyrussell";
-		};
-		shellAliases = {
-			nixrebuild = "sudo nixos-rebuild switch --flake .#default --impure --cores 4 -L --upgrade";
-			neofetch = "fastfetch";
-		};
-	};
-
 	virtualisation.docker.enable = true;
 
 	main-user.packages = with pkgs; [

hosts/default/packages.nix

@@ -106,6 +106,7 @@
 		swappy
 		slurp
 		grim
+		wayland-utils
 		wl-clipboard
 		github-cli
 		cliphist

hosts/server/configuration.nix

@@ -3,22 +3,25 @@
 {
 	imports = [
 		./modules/atproto-pds.nix
-		../../modules/nixos/bootloader.nix
+		./modules/cloudflare.nix
-		../../modules/nixos/network.nix
+		../../modules/force.nix
-		../../modules/nixos/hardware.nix
-		../../modules/nixos/nixpkgs.nix
 	];
 
-	environment.systemPackages = with pkgs; [
+	# gcc. shit breaks. wtf
-		gh
+	environment.sessionVariables.LD_LIBRARY_PATH = "${pkgs.gcc15}/lib";
-	];
 
 	services.openssh.enable = lib.mkForce true;
 
+	environment.systemPackages = with pkgs; [
+		fastfetch
+		hyfetch
+	]
+
 	users.users.ocbwoy3 = {
 		initialPassword = "thisisapassword42069!"; # not the type passwords i use
 		isNormalUser = true;
 		extraGroups = [ "wheel" "networkmanager" ];
+		shell = pkgs.zsh;
 	};
 
 	virtualisation.docker.enable = true;

hosts/server/modules/atproto-pds.nix

@@ -14,11 +14,11 @@
 			PDS_CRAWLERS = "https://bsky.network";
 			LOG_ENABLED = "true";
 			PDS_HOSTNAME = "pds.darktru.win";
-			PDS_VERSION = "I'm an ATProto PDS!";
+			PDS_VERSION = "i use nix btw";
 			PDS_DID_PLC_URL = "https://plc.directory";
 			PDS_CONTACT_EMAIL_ADDRESS = "ocbwoy3@ocbwoy3.dev";
 			PDS_PRIVACY_POLICY_URL = "https://ocbwoy3.dev";
-			PDS_TERMS_OF_SERVICE_URL = "https://discord.gg/cQDvPtv3Dt";
+			PDS_TERMS_OF_SERVICE_URL = "https://ocbwoy3.dev";
 			PDS_ACCEPTING_REPO_IMPORTS = "true";
 		};
 

hosts/server/modules/cloudflare.nix

@@ -0,0 +1,33 @@
+{ config, inputs, pkgs, ... }:
+
+{
+
+	environment.systemPackages = with pkgs; [
+		cloudflared
+	];
+	
+	# lib.mkIf (isOCbwoy3 == true)
+	services.cloudflared = {
+		enable = true;
+		certificateFile = "/private/cloudflared.pem"
+		tunnels = {
+			"selfhost" = {
+				# 2f83f704-e9f7-49fb-a6c4-d4a8f85d87e4
+				default = "http_status:404";
+				credentialsFile = "/private/cloudflared/selfhost.json";
+				ingress = {
+					"api.ocbwoy3.dev" = {
+						service = "http://localhost:8080";
+					};
+					"remx-staging.darktru.win" = {
+						service = "http://localhost:3000";
+					};
+					"pds.darktru.win" = {
+						service = "http://localhost:80";
+					};
+				};
+			};
+		};
+	};
+
+}

modules/force.nix

@@ -0,0 +1,37 @@
+{ config, pkgs, ... }:
+
+{
+	imports = [
+		./nixos/bootloader.nix
+		./nixos/hardware.nix
+		./nixos/i18n.nix
+		./nixos/network.nix
+		./nixos/nixpkgs.nix
+		./nixos/nvidia.nix
+		./nixos/programs.nix
+		./stuff/nvim.nix
+		./stuff/zsh.nix
+	];
+
+	environment.systemPackages = with pkgs; [
+		gh
+		file
+		glib
+		openssl
+		nss
+		glibc
+		nixfmt-rfc-style
+		killall
+		deno
+		bun
+		imagemagick
+		unzip
+		libwebp
+		nix-direnv
+		htop
+		nixpkgs-fmt
+		nixd
+		ffmpeg-full
+		gnupg
+	];
+}

modules/nixos/programs.nix

@@ -18,13 +18,6 @@
 
 	# services.displayManager.defaultSession = "hyprland";
 
-	programs.zsh.enable = true;
-
-	programs.direnv = {
-		enable = true;
-		enableZshIntegration = true;
-	};
-
 	programs.gamemode.enable = true;
 	programs.gamemode.settings.general.renice = 0;
 	programs.gamemode.settings.general.ioprio = 0;

modules/stuff/nvim.nix

@@ -0,0 +1,27 @@
+{ config, inputs, pkgs, lib, ... }:
+
+{
+	imports = [
+		inputs.nvf.nixosModules.default
+	];
+
+	programs.nvf = {
+		enable = true;
+		defaultEditor = true;
+		# withLua = true;
+
+		settings.vim = {
+			viAlias = true;
+			vimAlias = true;
+			statusline.lualine.enable = true;
+			languages = {
+				enableLSP = true;
+				enableTreesitter = true;
+
+				nix.enable = true;
+				ts.enable = true;
+				# qml.enable = true;
+			};
+		};
+	};
+}

modules/stuff/zsh.nix

@@ -0,0 +1,27 @@
+{ config, inputs, pkgs, lib, ... }:
+
+{
+
+	programs.direnv = {
+		enable = true;
+		enableZshIntegration = true;
+	};
+
+	programs.zsh = {
+		enable = true;
+		autosuggestions.enable = true;
+		zsh-autoenv.enable = true;
+		syntaxHighlighting.enable = true;
+		ohMyZsh = {
+			enable = true;
+			plugins = [ "git" "direnv" ];
+			theme = "robbyrussell";
+		};
+		shellAliases = {
+			nixrebuild = "sudo nixos-rebuild switch --flake .#default --impure --cores 4 -L --upgrade";
+			dangerous-nixrebuild-server = "sudo nixos-rebuild switch --flake .#server --impure --cores 4 -L --upgrade";
+			neofetch = "fastfetch";
+		};
+	};
+
+}