refactor

flake.lock

@@ -31,11 +31,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1722597419,
-        "narHash": "sha256-YbMzll0Dh2ln/TryDP+S3IGm8nRHkzcSQIubI4ZEOAw=",
+        "lastModified": 1726360516,
+        "narHash": "sha256-PcnbNb6SFg/y1zE36vRdhuWd50nLM4Hu2DKmtsrLHmA=",
         "owner": "oddlama",
         "repo": "agenix-rekey",
-        "rev": "126b4a5133eb361cbf5bf90e44c71b6f830845ec",
+        "rev": "524425f44b1f9717bfabf483ec9c990c3712e6df",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723059122,
-        "narHash": "sha256-sbfMRAe3SgRrPtkbsDzyA1voSUCmlQo52+DuUyLDrJA=",
+        "lastModified": 1724087918,
+        "narHash": "sha256-aRBnAwJAQUPAGoPijHavx5ML5VJJh9+ub3v2+ebaUSQ=",
         "ref": "refs/heads/main",
-        "rev": "77bbc1bdd5aac087d061500f3660fa1abe5e77be",
-        "revCount": 15,
+        "rev": "6b6338280dce0c183c0d3ea964cd981e6bf10734",
+        "revCount": 20,
         "type": "git",
         "url": "https://codeberg.org/kampka/nix-flake-crowdsec.git"
       },
@@ -394,11 +394,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "lastModified": 1726592409,
+        "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
         "type": "github"
       },
       "original": {
@@ -432,11 +432,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1719091691,
-        "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
+        "lastModified": 1725690722,
+        "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
+        "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5",
         "type": "github"
       },
       "original": {
@@ -474,11 +474,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1723253776,
-        "narHash": "sha256-EIChmYD+Wp2558uJLoQw3dFNRAYmS0u/r1KPlNagpWw=",
+        "lastModified": 1726623680,
+        "narHash": "sha256-Bs2e9TTkAyxvKGczPEYZpujdW1WtASenB/y4ML6OsRs=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "3b93cd39408aaef0ce9db7261f779e021fb95aae",
+        "rev": "8777196210cdd759a05eefee3f6ec27a2a784403",
         "type": "github"
       },
       "original": {
@@ -533,11 +533,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1723175592,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "lastModified": 1726463316,
+        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
         "type": "github"
       },
       "original": {
@@ -565,11 +565,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1722987190,
-        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
+        "lastModified": 1726447378,
+        "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
+        "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
         "type": "github"
       },
       "original": {

home-manager/sajenim/features/cli/default.nix

@@ -1,14 +1,10 @@
-{pkgs, ...}: {
+{...}: {
   imports = [
     ./git.nix
     ./nvim.nix
     ./zsh.nix
   ];
 
-  home.packages = with pkgs; [
-    lazygit
-  ];
-
   programs.ssh = {
     enable = true;
     matchBlocks."viridian" = {

home-manager/sajenim/features/cli/git.nix

@@ -1,8 +1,4 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    lazygit
-  ];
-
+{...}: {
   programs.git = {
     enable = true;
     userName = "jasmine";

home-manager/sajenim/features/desktop/default.nix

@@ -5,19 +5,19 @@
 }: {
   imports = [
     ./discord
+    ./dunst
+    ./email
+    ./irc
+    ./mpd
+    ./picom
     ./rofi
     ./wezterm
-
-    ./email.nix
-    ./irc.nix
-    ./mpd.nix
-    ./picom.nix
   ];
 
   home.packages = with pkgs; [
     feh
-    xmobar
-    xmonad
+    xmobar # custom build using xmobar-config
+    xmonad # custom build using xmonad-config
   ];
 
   home.file = {

home-manager/sajenim/features/desktop/dunst/default.nix

@@ -0,0 +1,31 @@
+{...}: {
+  services.dunst = {
+    enable = true;
+    settings = {
+      global = {
+        width = 300;
+        height = 300;
+        origin = "top-right";
+        offset = "20x20";
+        frame_width = 5;
+        frame_color = "#282828";
+        corner_radius = 10;
+      };
+
+      urgency_low = {
+        background = "#1d2021";
+        foreground = "#d4be98";
+      };
+
+      urgency_normal = {
+        background = "#1d2021";
+        foreground = "#d4be98";
+      };
+
+      urgency_critical = {
+        background = "#1d2021";
+        foreground = "#d4be98";
+      };
+    };
+  };
+}

home-manager/sajenim/features/desktop/wezterm/default.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  home.packages = with pkgs.unstable; [
+  home.packages = with pkgs; [
     wezterm
   ];
 

home-manager/sajenim/features/desktop/xinitrc

@@ -6,6 +6,9 @@ xrandr --output HDMI-A-0 --mode 1920x1080 --output DisplayPort-0 --mode 2560x144
 # Apply our wallpaper
 feh --bg-center ~/.repositories/dotfiles.nix/assets/chinatown.png
 
+# Start our notification daemon
+dunst &
+
 # Enable our compositor
 picom -b
 

home-manager/sajenim/features/games/default.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   imports = [
-    ./mangohud.nix
+    ./mangohud
   ];
 
   home = {

home-manager/sajenim/features/printing/default.nix

@@ -1,11 +1,11 @@
 {pkgs, ...}: {
   home = {
     packages = with pkgs; [
-      blender
-      freecad
-      kicad
-      openscad
-      unstable.prusa-slicer
+      unstable.blender
+      freecad # https://discourse.nixos.org/t/error-hash-mismatch-in-fixed-output-derivation/52353
+      unstable.kicad
+      unstable.openscad
+      prusa-slicer # Some error idk fix this later
     ];
   };
 }

nixos/common/global/secrets/rekeyed/viridian/6a42b0ee68528ea2bb7263365d822efd-paperless-ngx.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 KTkZog kwtoXue2ljAqDtAytalA3SPoVfzGmnB7dkyKOTKr1jI
+NtMmHhdpuCcsfeq2IyUmMBgyKid8qn+y3DPh0ykGq0c
+-> b#-grease NK 6\>t2sl 1OA
+ythv/6KoFWwpe2Wpj9MKcdhtdlq43V+lEiG2QF6gE1rj+k38jev00MuQUHfTS9bw
+Xc6ZydroPWPjqnQkvN4u4kzf4X8
+--- /HrB0xueHcV6Vc3dOdMaGnkMBFIwHSd7E0W2QPVTsKM
+ùÖ{^?{m’iÑ…ýÑ9<C391>–Y墓ÊHYr¢7º§ÌT=”ÿ*0wð)î1C°+ÓÖ

nixos/fuchsia/configuration.nix

@@ -2,15 +2,23 @@
   imports = [
     # Global configuartion for all our systems
     ../common/global
+
     # Our user configuration and optional user units
     ../common/users/sajenim
     ../common/users/sajenim/samba
     ../common/users/sajenim/steam
+
     # Optional components
-    ../common/optional/key.nix
-    # Programs and services
-    ./programs
-    ./services
+    ../common/optional/yubikey.nix
+
+    # Services
+    ./services/amdgpu-clocks
+    ./services/flatpak
+    ./services/libinput
+    ./services/printers
+    ./services/udev
+    ./services/xserver
+
     # Setup our hardware
     ./hardware-configuration.nix
   ];
@@ -21,7 +29,22 @@
     networkmanager.enable = true;
   };
 
-  # Use docker instead of podman for our containers.
+  # Configure programs
+  programs = {
+    zsh.enable = true;
+    # Load and unload environment variables.
+    direnv.enable = true;
+    # Android debug bridge: communicate with devices.
+    adb.enable = true;
+  };
+
+  # Configure services
+  services = {
+    # Access smart cards using SCard API
+    pcscd.enable = true;
+  };
+
+  # Manage linux containers
   virtualisation.docker = {
     enable = true;
     liveRestore = false;

nixos/fuchsia/programs/default.nix

@@ -1,9 +0,0 @@
-{...}: {
-  programs = {
-    zsh.enable = true;
-    # Load and unload environment variables.
-    direnv.enable = true;
-    # Android debug bridge: communicate with devices.
-    adb.enable = true;
-  };
-}

nixos/fuchsia/services/default.nix

@@ -1,15 +0,0 @@
-{...}: {
-  imports = [
-    ./printer
-    ./amdgpu-clocks.nix
-    ./flatpak.nix
-    ./libinput.nix
-    ./udev.nix
-    ./xserver.nix
-  ];
-
-  # Enable a few extra services.
-  services = {
-    pcscd.enable = true;
-  };
-}

nixos/viridian/configuration.nix

@@ -2,13 +2,37 @@
   imports = [
     # Global configuration for all our systems
     ../common/global
+
     # Our user configuration and optional user units
     ../common/users/sajenim
     ../common/users/spectre
-    # Programs and services
-    ./programs
-    ./services
-    ./containers
+
+    # Containers
+    ./containers/jellyfin
+    ./containers/jellyseerr
+    ./containers/lidarr
+    ./containers/mealie
+    ./containers/microbin
+    ./containers/prowlarr
+    ./containers/qbittorrent
+    ./containers/radarr
+    ./containers/recyclarr
+    ./containers/sonarr
+
+    # Services
+    ./services/borgbackup
+    ./services/crowdsec
+    ./services/forgejo
+    ./services/grafana
+    ./services/lighttpd
+    ./services/minecraft
+    ./services/mpd
+    ./services/mysql
+    ./services/paperless-ngx
+    ./services/prometheus
+    ./services/samba
+    ./services/traefik
+
     # Setup our hardware
     ./hardware-configuration.nix
   ];
@@ -21,26 +45,26 @@
       enable = true;
       allowPing = true;
       allowedTCPPorts = [
-        53 # adguardhome (DNS)
-        80 # traefik     (HTTP)
-        443 # traefik     (HTTPS)
-        32372 # qbittorrent
-        6600 # mpd
-      ];
-      allowedUDPPorts = [
-        53 # adguardhome (DNS)
-        80 # traefik     (HTTP)
-        443 # traefik     (HTTPS)
-        32372 # qbittorrent
-        6600 # mpd
+        80
+        443
+        6600
       ];
     };
   };
 
-  # Use docker instead of podman for our containers.
-  virtualisation.docker = {
-    enable = true;
-    liveRestore = false;
+  # Configure programs
+  programs = {
+    zsh.enable = true;
+  };
+
+  # Manage linux containers
+  virtualisation = {
+    docker = {
+      enable = true;
+      liveRestore = false;
+    };
+    # Implementation to use for containers
+    oci-containers.backend = "docker";
   };
 
   # Required for smooth remote deployments

nixos/viridian/containers/default.nix

@@ -1,15 +0,0 @@
-{...}: {
-  imports = [
-    ./jellyfin.nix
-    ./jellyseerr.nix
-    ./lidarr.nix
-    ./prowlarr.nix
-    ./qbittorrent.nix
-    ./radarr.nix
-    ./recyclarr.nix
-    ./sonarr.nix
-    ./mealie.nix
-    ./microbin
-  ];
-  virtualisation.oci-containers.backend = "docker";
-}

nixos/viridian/programs/default.nix

@@ -1,5 +0,0 @@
-{...}: {
-  programs = {
-    zsh.enable = true;
-  };
-}

nixos/viridian/services/default.nix

@@ -1,15 +0,0 @@
-{...}: {
-  imports = [
-    ./traefik
-    ./crowdsec
-    ./minecraft
-    ./borgbackup.nix
-    ./forgejo.nix
-    ./lighttpd.nix
-    ./mpd.nix
-    ./samba.nix
-    ./grafana.nix
-    ./mysql.nix
-    ./prometheus.nix
-  ];
-}

nixos/viridian/services/paperless-ngx/default.nix

@@ -0,0 +1,37 @@
+{config, ...}: let
+  dir = "/srv/services/paperless-ngx";
+in {
+  age.secrets.paperless-ngx = {
+    rekeyFile = ./password.age;
+  };
+
+  services.paperless = {
+    enable = true;
+    port = 28981;
+    dataDir = "${dir}";
+    mediaDir = "${dir}/media";
+    settings = {
+      PAPERLESS_ADMIN_USER = "sajenim";
+    };
+    passwordFile = config.age.secrets.paperless-ngx.path;
+  };
+
+  services.traefik.dynamicConfigOptions.http.routers = {
+    paperless-ngx = {
+      rule = "Host(`docs.kanto.dev`)";
+      entryPoints = [
+        "websecure"
+      ];
+      middlewares = [
+        "internal"
+      ];
+      service = "paperless-ngx";
+    };
+  };
+
+  services.traefik.dynamicConfigOptions.http.services = {
+    paperless-ngx.loadBalancer.servers = [
+      {url = "http://127.0.0.1:${toString config.services.paperless.port}";}
+    ];
+  };
+}

nixos/viridian/services/paperless-ngx/password.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> piv-p256 hdSnGw A4P0oT5qK/bG8ieEixFW/SCouhantxg3dSjiGG1MEuns
+cDorIZ44RmsUsiiybnr1y8WZtv/3kFPi86QkpGURqTY
+-> FNP4c-grease
+LThbpY1sc7XzQgputWt3ULuLwemBilYrOEZMTAj+/xkxyQg5HwSIhBS1XYzvMc2K
+ld/o3JfDaXVLEz0Vk59TClXeOGITp7Ki
+--- 572BrDug9qmAG7G0mC5bOZ/h1UD4y2m1ceDhy1qQh3U
+/›¬vØ‘k)Ùë­h’Œ ˆ™æûËÇx^QyAeK}låÆg~¯k> l*p