configuration.nix

@@ -1,45 +1,32 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
 {
-  config,
+  imports =
-  pkgs,
+    [ # Include the results of the hardware scan.
-  ...
+      ./hardware-configuration.nix
-}: {
+    ];
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-  ];
 
-  services.postgresql = {
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    dataDir = "/pool/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
-  };
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
   powerManagement.enable = false;
 
   # Bootloader.
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/sdc";
   boot.loader.grub.useOSProber = true;
-  networking = {
-    hostName = "nixos"; # Define your hostname.
-    # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
-    # Configure network proxy if necessary
+  networking.hostName = "nixos"; # Define your hostname.
-    # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-    # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-    # Enable networking
+  # Configure network proxy if necessary
-    networkmanager.enable = true;
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-    # Open ports in the firewall.
+  # Enable networking
-    firewall.allowedTCPPorts = [80 443];
+  networking.networkmanager.enable = true;
-
-    extraHosts = ''
-      192.168.1.88 nas
-    '';
-  };
 
   # Set your time zone.
   time.timeZone = "Europe/Stockholm";
@@ -107,10 +94,10 @@
   users.users.sondell = {
     isNormalUser = true;
     description = "sondell";
-    extraGroups = ["networkmanager" "wheel"];
+    extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
       firefox
-      #  thunderbird
+    #  thunderbird
     ];
   };
 
@@ -119,14 +106,15 @@
     openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMYGJCpFIiWqzy8YbfWh7+i52XVwyhUu+P0rUglVR5uV gws@nixos"];
   };
 
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    #  wget
+  #  wget
     htop
     cloudflared
     filebrowser
@@ -138,21 +126,18 @@
     nil
     starship
     tailscale
-    alejandra
   ];
-  programs = {
+
-    ssh.startAgent = true;
+  programs.fish= {
-    fish = {
+    enable=true;
-      enable = true;
+    shellInit = "starship init fish | source";
-      shellInit = "starship init fish | source";
+  };
-    };
+  programs.starship.enable = true;
-    starship.enable = true;
+  programs.starship.settings = {
-    starship.settings = {
+    shell = {
-      shell = {
+      disabled = false;
-        disabled = false;
+      fish_indicator = "";
-        fish_indicator = "";
+      bash_indicator = "BASH";
-        bash_indicator = "BASH";
-      };
     };
   };
 
@@ -175,11 +160,14 @@
     defaults = {
       email = "glennpub@proton.me";
       dnsProvider = "cloudflare";
-      #     # location of your CLOUDFLARE_DNS_API_TOKEN=[value]
+  #     # location of your CLOUDFLARE_DNS_API_TOKEN=[value]
-      #     # https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#EnvironmentFile=
+  #     # https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#EnvironmentFile=
       environmentFile = "/etc/nixos/.secrets/cloudflare_dns_tokend";
     };
   };
+
+  # Open ports in the firewall.
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
@@ -192,4 +180,5 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.11"; # Did you read the comment?
+
 }

filebrowser.nix

@@ -12,7 +12,7 @@ in
       After="network-online.target";
     };
     serviceConfig = {
-      ExecStart = "${filebrowser}/bin/filebrowser -r /pool/media/ -d /var/lib/filebrowser/filebrowser.db";
+      ExecStart = "${filebrowser}/bin/filebrowser -r /mnt/movie_drive -d /var/lib/filebrowser/filebrowser.db";
       User= "jellyfin";
       Type= "simple";
     };

flake.lock

@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713880523,
+        "lastModified": 1712745070,
-        "narHash": "sha256-/dMwfs3toYi2SzrItwpTLKWMSIquAptdCClC2FB608Y=",
+        "narHash": "sha256-75kSMjyCD5/IliSPkBcBSBamwPYF30Ddr8Ef2XxDfiE=",
         "ref": "refs/heads/main",
-        "rev": "5e986b284d6a7b81fd437822f6279dd915494c54",
+        "rev": "c2650ecab1c7b9b2e10d690b40e82817d257b53a",
-        "revCount": 29,
+        "revCount": 28,
         "type": "git",
         "url": "https://git.sondell.org/glennwso/home.git"
       },

flake.nix

@@ -30,7 +30,6 @@
         ./tail.nix
         ./matrix.nix
         ./coturn.nix  
-        ./vaultwarden.nix
         (import ./mail.nix {inherit mailserver;})
         (import ./homepage.nix {inherit homepage;})
       ];

forgejo.nix

@@ -7,7 +7,6 @@ in
 {
   services.forgejo = {
     enable = true;
-    stateDir = "/pool/var/lib/forgejo";
     settings = {
       service = {
         # DISABLE_REGISTRATION = true;

hardware-configuration.nix

@@ -21,10 +21,7 @@
     { device = "/dev/disk/by-uuid/f3463885-fde8-4488-9442-37ced2b2c8f3";
       fsType = "ext4";
     };
-  fileSystems."/pool" = {
+
-    device = "/dev/pool1/vol1";
-    fsType = "ext4";
-  };
 
   swapDevices = [ ];
 

nextcloud.nix

@@ -8,27 +8,6 @@ in
   environment.systemPackages = [
     nextcloud
   ];
-  systemd.timers."nextcloud-backup" = {
-    wantedBy = [ "timers.target" ];
-      timerConfig = {
-        # OnBootSec = "5m";
-        # OnUnitActiveSec = "5m";
-        OnCalendar="*-*-* 2:00:00";
-        Unit = "nextcloud-backup.service";
-      };
-  };
-
-  systemd.services."nextcloud-backup" = {
-    script = with pkgs; ''
-      set -eu
-      ${postgresql}/bin/pg_dump "nextcloud" | ${openssh}/bin/ssh -i /etc/nixos/.secrets/tulpan Glenn@nas "cat - > back/nextcloud/dump.sql" 
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      User = "postgres";
-    };
-  };
-  
   services = {
     nginx.virtualHosts = {
       ${domain} = {

vaultwarden.nix

@@ -1,22 +0,0 @@
-{ ... }:
-
-let
-  domain = "pw.sondell.org";
-  port = "8222";
-in
-{
-  # 
-  services.vaultwarden = {
-    enable = true;
-  };
-
-
-  services.nginx.virtualHosts.${domain} = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://localhost:${port}/";
-    };
-  };
-}
-