update/format configuration for jack

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>

hosts/laptop/secrets/default.nix

@@ -1,19 +1,23 @@
 # Those are my secrets, encrypted with sops
 # You shouldn't import this file, unless you edit it
-{ pkgs, inputs, ... }: {
-  imports = [ inputs.sops-nix.homeManagerModules.sops ];
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [inputs.sops-nix.homeManagerModules.sops];
 
   sops = {
     age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
     defaultSopsFile = ./secrets.yaml;
     secrets = {
-      sshconfig = { path = "/home/hadi/.ssh/config"; };
-      github-key = { path = "/home/hadi/.ssh/github"; };
-      gitlab-key = { path = "/home/hadi/.ssh/gitlab"; };
-      jack-key = { path = "/home/hadi/.ssh/jack"; };
-      signing-key = { path = "/home/hadi/.ssh/key"; };
-      signing-pub-key = { path = "/home/hadi/.ssh/key.pub"; };
-      pia = { path = "/home/hadi/.config/pia/pia.ovpn"; };
+      sshconfig = {path = "/home/hadi/.ssh/config";};
+      github-key = {path = "/home/hadi/.ssh/github";};
+      gitlab-key = {path = "/home/hadi/.ssh/gitlab";};
+      jack-key = {path = "/home/hadi/.ssh/jack";};
+      signing-key = {path = "/home/hadi/.ssh/key";};
+      signing-pub-key = {path = "/home/hadi/.ssh/key.pub";};
+      pia = {path = "/home/hadi/.config/pia/pia.ovpn";};
     };
   };
 
@@ -31,9 +35,8 @@
             - *primary
   '';
 
-  systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
-  home.packages = with pkgs; [ sops age ];
+  systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
+  home.packages = with pkgs; [sops age];
 
-  wayland.windowManager.hyprland.settings.exec-once =
-    [ "systemctl --user start sops-nix" ];
+  wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start sops-nix"];
 }

hosts/server/configuration.nix

@@ -1,5 +1,6 @@
 {config, ...}: {
   imports = [
+    # NixOS module
     ../../nixos/home-manager.nix
     ../../nixos/nix.nix
     ../../nixos/systemd-boot.nix
@@ -8,6 +9,7 @@
     ../../nixos/docker.nix
     ../../nixos/tailscale.nix
 
+    # NixOS server modules
     ../../server-modules/ssh.nix
     ../../server-modules/bitwarden.nix
     ../../server-modules/firewall.nix
@@ -15,12 +17,9 @@
     ../../server-modules/nextcloud.nix
     ../../server-modules/glance.nix
     ../../server-modules/adguardhome.nix
-    ../../server-modules/hoarder.nix
     ../../server-modules/arr.nix
     ../../server-modules/mealie.nix
-    # ../../server-modules/meilisearch.nix
     ../../server-modules/search-nixos-api.nix
-    # ../../server-modules/headscale.nix
 
     # You should let those lines as is
     ./hardware-configuration.nix

hosts/server/hardware-configuration.nix

@@ -1,13 +1,18 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }: {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = ["dm-snapshot"];
+  boot.kernelModules = ["kvm-amd"];
+  boot.extraModulePackages = [];
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/350cf109-5380-4982-8a9e-279a9275ee18";
     fsType = "ext4";
@@ -15,9 +20,9 @@
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/DD15-1125";
     fsType = "vfat";
-    options = [ "fmask=0077" "dmask=0077" ];
+    options = ["fmask=0077" "dmask=0077"];
   };
-  swapDevices = [ ];
+  swapDevices = [];
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction

hosts/server/home.nix

@@ -1,5 +1,8 @@
-{ pkgs, config, ... }: {
-
+{
+  pkgs,
+  config,
+  ...
+}: {
   imports = [
     # Mostly user-specific configuration
     ./variables.nix

hosts/server/secrets/default.nix

@@ -23,10 +23,6 @@
         path = "/home/hadi/.ssh/key.pub";
         mode = "0600";
       };
-      cloudflare-dns-token = {path = "/etc/cloudflare/dnskey.txt";};
-      nextcloud-pwd = {path = "/etc/nextcloud/pwd.txt";};
-      adguard-pwd = {};
-      hoarder = {};
     };
   };
 

hosts/server/variables.nix

@@ -1,4 +1,8 @@
-{ config, lib, ... }: {
+{
+  config,
+  lib,
+  ...
+}: {
   imports = [
     # Choose your theme here:
     ../../themes/nixy.nix
@@ -7,7 +11,9 @@
   config.var = {
     hostname = "jack";
     username = "hadi";
-    configDirectory = "/home/" + config.var.username
+    configDirectory =
+      "/home/"
+      + config.var.username
       + "/.config/nixos"; # The path of the nixos configuration directory
 
     keyboardLayout = "fr";
@@ -30,7 +36,7 @@
   options = {
     var = lib.mkOption {
       type = lib.types.attrs;
-      default = { };
+      default = {};
     };
   };
 }