Merge branch 'master' of github.com:pagedMov/nixos-config

modules/home/scripts/commands/toolbelt.nix

@@ -59,7 +59,7 @@ pkgs.writeShellScriptBin "toolbelt" ''
       [\"Change System Color Scheme\"]=\"Changes the base16 color scheme used by stylix to color system applications.\"
       [\"Open System Monitor\"]=\"Opens a btop window.\"
       [\"Open Volume Controls\"]=\"Opens alsamixer.\"
-      [\"Open Keyring\"]=\"Opens a fuzzy finder with all of the paths held in ~/.password-store. Selecting one uses pass to copy that password to the clipboard. Password is cleared from clipboard history after 45 seconds.\"
+      [\"Open Keyring\"]=\"Opens a fuzzy finder with all of the paths held in ~/.password-store. Selecting one uses pass to copy that password to the clipboard. Password is cleared from clipboard after 45 seconds, and isn't saved to clipboard history.\"
       [\"View Clipboard History\"]=\"Opens clipboard history. Selecting an item copies it to the clipboard.\"
   ); \
   if [[ -v descriptions[\$cleaned_key] ]]; then \

modules/server/cdn/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, lib, config, ... }:
+
+{
+  imports = [ ./jellyfin.nix ];
+}

modules/server/cdn/jellyfin.nix

@@ -0,0 +1,13 @@
+{ pkgs, lib, config, ... }:
+
+{
+  options = {
+    jellyfinConfig.enable = lib.mkEnableOption "Enables the server's jellyfin config";
+  };
+  config = lib.mkIf config.jellyfinConfig.enable {
+    services.jellyfin = {
+      enable = true;
+      openFirewall = true;
+    };
+  };
+}

modules/server/default.nix

@@ -1,17 +1,11 @@
+{ pkgs, lib, ... }:
+
 {
-  config,
-  inputs,
-  scheme ? {},
-  wallpaper,
-  username,
-  host,
-  ...
-}: {
   imports = [
-    ../sys/software/nixvim
-    ../sys/hardware/bootloader.nix
-    ./services.nix
-    ./home.nix
-    ./packages.nix
+    ./cdn
+    ./glasshaus
   ];
+
+  jellyfinConfig.enable = lib.mkDefault false;
+  caddyConfig.enable = lib.mkDefault false;
 }

modules/server/glasshaus/caddy.nix

@@ -0,0 +1,17 @@
+{ lib, config, pkgs, ... }:
+
+{
+  options = {
+    caddyConfig.enable = lib.mkEnableOption "Enable my caddy config for the glasshaus.info domain name";
+  };
+  config = lib.mkIf config.caddyConfig.enable {
+    services.caddy = {
+      enable = true;
+      configFile = pkgs.writeText "Caddyfile" ''
+        glasshaus.info {
+          reverse_proxy localhost:8096
+        }
+      '';
+    };
+  };
+}

modules/server/glasshaus/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, lib, config, ... }:
+
+{
+  imports = [ ./caddy.nix ];
+}

modules/server/home.nix

@@ -1,31 +0,0 @@
-{ pkgs, inputs, config, host, self, ... }: {
-  imports = [inputs.home-manager.nixosModules.home-manager];
-  home-manager = {
-    useUserPackages = true;
-    useGlobalPkgs = true;
-    backupFileExtension = "backup";
-    extraSpecialArgs = {inherit host self inputs;};
-    users."pagedmov" = {
-      programs.home-manager.enable = true;
-      imports = [
-        ../home/environment/zshell.nix
-        ../home/environment/starship.nix
-        ../home/programs/eza.nix
-        ../home/scripts
-      ];
-      home = {
-        username = "pagedmov";
-        homeDirectory = "/home/pagedmov";
-        stateVersion = "24.05";
-      };
-    };
-  };
-  users.users = {
-    pagedmov = {
-      isNormalUser = true;
-      initialPassword = "1234";
-      extraGroups = ["wheel"];
-    };
-    root.initialPassword = "1234";
-  };
-}

modules/server/packages.nix

@@ -1,51 +0,0 @@
-{ pkgs, ... }:
-let
-  extraFigletFonts = pkgs.fetchFromGitHub {
-    owner = "xero";
-    repo = "figlet-fonts";
-    rev = "master";
-    sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY=";
-  };
-  toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
-
-    installPhase = ''
-      make install PREFIX=$out
-      mkdir -p $out/share/figlet
-      cp -r ${extraFigletFonts}/* $out/share/figlet
-    '';
-  });
-in
-{
-  environment.systemPackages = with pkgs; [
-    toilet-extrafonts
-    gtrash
-    alsa-utils
-    python3
-    fail2ban
-    inetutils
-    lolcat
-    lsof
-    mullvad
-    neofetch
-    nh
-    nix-output-monitor
-    nix-prefetch-scripts
-    nixos-option
-    nix-search-cli
-    openssl
-    p7zip
-    jq
-    git
-    pamixer
-    parted
-    pkg-config
-    socat
-    sox
-    stress
-    tree
-    unrar
-    unzip
-    usbutils
-  ];
-}

modules/server/programs.nix

@@ -1,9 +0,0 @@
-{...}: {
-  programs = {
-    zsh.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-  };
-}

modules/server/services.nix

@@ -1,20 +0,0 @@
-{
-  config,
-  pkgs,
-  username,
-  ...
-}: {
-  systemd.user.tmpfiles.users."${username}".rules = [
-    "d /home/${username}/media 0770 ${username} users -"
-    "d /home/${username}/backup 0770 ${username} users -"
-    "d /home/${username}/cloud 0770 ${username} users -"
-    "d /home/${username}/repositories 0770 ${username} users -"
-    "d /home/${username}/game_servers 0770 ${username} users -"
-    "d /home/${username}/inbox 0770 ${username} users -"
-    "d /home/${username}/outbox 0770 ${username} users -"
-  ];
-  services.openssh = {
-    enable = true;
-    allowSFTP = true;
-  };
-}

modules/sys/hardware/network.nix

@@ -14,6 +14,7 @@
       };
       firewall = {
         enable = true;
+        allowedTCPPorts = [ 443 ];
       };
     };
   };