diff --git a/FUTURE-SERVER.md b/FUTURE-SERVER.md index fba357b..0cbf148 100644 --- a/FUTURE-SERVER.md +++ b/FUTURE-SERVER.md @@ -25,4 +25,3 @@ Steps I would need to take. # Other Considerations - where to setup docker stuff? -- look at this [nix setup](https://github.com/rwiankowski/homeserver-nixos) and look how they use vars and SOPS diff --git a/README.md b/README.md index 569d2d2..3d46cd1 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,15 @@ My test system. - Learn NixOS. - Attempt to make basic media homelab, a la [Yunohost](https://yunohost.org/)[^1]...but declarative, reproducable - Try to avoid Docker -- ~~No flakes~~ +- No flakes ## Tasks -- [ ] ~~ZFS for root file system (removed because I didn't want to deal with initrd and wifi)~~ +- [X] ZFS for root file system - [X] Tailscale - [X] VPS Caddy reverse proxy --> NixOS machine - [X] Setup Jellyfin - [X] Setup calibre-web -- [] Setup Transmission +- [X] Setup Transmission - [ ] Setup Nextcloud - [ ] Setup systemwide auth system - LDAP? OAuth? OR don't do this diff --git a/configuration.nix b/configuration.nix index 5640f3e..c796cbd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,8 +11,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./services/jellyfin.nix - ./services/authentik.nix +# ./services/jellyfin.nix # ./services/calibre-web.nix # ./services/glances.nix # ./services/fail2ban.nix @@ -23,13 +22,11 @@ boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; boot.loader.grub.useOSProber = true; - boot.supportedFilesystems = [ "zfs" ]; - boot.zfs.extraPools = [ "plakias" ]; # Nix settings nix = { settings = { -# experimental-features = [ "nix-command" "flakes" ]; + #experimental-features = [ "nix-command" "flakes" ]; download-buffer-size = "4G"; warn-dirty = false; }; @@ -45,24 +42,12 @@ # Networking networking.hostName = "knossos"; # Define your hostname. networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.hostId = "f8f05846"; networking.wireless.networks = { # SSID with spaces and/or special characters "Suntek_188" = { psk = "0226203850"; }; - "Suntek_288" = { - psk = "0226203850"; - }; - "Pixel_9407" = { - psk = "dieai888"; - }; - "hercules" = { - psk = "0531thewire"; - }; - - }; # Enable networking @@ -101,9 +86,6 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILv96m1nCz3D0lzjzeGa+n4m3krEyl7KZ0tstjIZdTkq elias@bluefin" #acer "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8zlxSVOTCnAgb4U5vkC3ietH3Jd9gLE+FA6UOZp64J elias@arkadi.one" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWN6eeLFbtRJDEebSjoI8FaDOA5bmIzbyTUvX/hPWdh elias@greynix" #asus - greynix - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO/akM7XlILO499DvQhDa2+UnbbwaXB76a+XDxr8Yvdw elias@aspire" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFa3Gk2C2HmniiwMyYQ3HFs9M4W+obz2y3HNsEo6DA0c macbookpro" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINyRtSVEpOZ08QoOhwfMizYXJxLFCJ/jfIlP4FMD1zga elias@bluefin" #framework ]; linger = true; packages = with pkgs; []; @@ -140,7 +122,6 @@ git neovim emacs - vim tmux #like screen wiper #like ncdu @@ -148,7 +129,6 @@ tcpdump #for wireguard test - ncdu ]; # List services that you want to enable: diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 5e20cab..0000000 --- a/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1766622938, - "narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 15a5423..0000000 --- a/flake.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - description = "NixOS configuration"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; - }; - - outputs = inputs@{ nixpkgs, ... }: { - nixosConfigurations = { - knossos = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - - ]; - }; - }; - }; -} diff --git a/nix-upgrade.sh b/nix-upgrade.sh index ce9b4a1..4f07418 100755 --- a/nix-upgrade.sh +++ b/nix-upgrade.sh @@ -1,4 +1,4 @@ #!/run/current-system/sw/bin/bash -sudo nixos-rebuild switch --flake .# --upgrade +sudo nixos-rebuild switch -I nixos-config=/home/elias/nixos-knossos/configuration.nix --upgrade diff --git a/rebuild.sh b/rebuild.sh index 090f590..d8b87db 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -1,4 +1,3 @@ #!/run/current-system/sw/bin/bash -#sudo nixos-rebuild switch -I nixos-config=/home/elias/nixos-knossos/configuration.nix +sudo nixos-rebuild switch -I nixos-config=/home/elias/nixos-config/configuration.nix -sudo nixos-rebuild switch --flake .# diff --git a/services/authentik.nix b/services/authentik.nix deleted file mode 100644 index d25f45a..0000000 --- a/services/authentik.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ config, lib, pkgs, ... }: - - - -{ - - config = { - - systemd.services.authentik = { - - description = "Run Docker Compose for authentik"; - - after = [ "network.target" "docker.service" ]; - - requires = [ "docker.service" ]; - - wantedBy = [ "multi-user.target" ]; - - - - serviceConfig = { - - Type = "exec"; - - - - # Pull the latest image before running - - ExecStartPre = "/run/current-system/sw/bin/docker compose -f /home/nix/docker/authentik/compose.yaml pull"; - - - - # Bring the service up - - ExecStart = "/run/current-system/sw/bin/docker compose -f /home/nix/docker/authentik/compose.yaml up"; - - - - # Take it down gracefully - - ExecStop = "/run/current-system/sw/bin/docker compose -f /home/nix/docker/authentik/compose.yaml down"; - - - - WorkingDirectory = "/home/nix/docker/authentik"; - - Restart = "on-failure"; - - }; - - }; - - }; - -} diff --git a/services/jellyfin-pass.txt b/services/jellyfin-pass.txt deleted file mode 100644 index a2ccd7a..0000000 --- a/services/jellyfin-pass.txt +++ /dev/null @@ -1,2 +0,0 @@ -elias -XWEUt0afZmntvdRCkM7X diff --git a/services/jellyfin.nix b/services/jellyfin.nix index b87d371..18cee76 100644 --- a/services/jellyfin.nix +++ b/services/jellyfin.nix @@ -4,7 +4,7 @@ services.jellyfin = { enable = true; openFirewall = true; - dataDir = "/mnt/plakias/enc/jellyfin"; #default + dataDir = "/var/lib/jellyfin"; #default }; environment.systemPackages = [ @@ -12,4 +12,5 @@ pkgs.jellyfin-web pkgs.jellyfin-ffmpeg ]; + }