Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

configuration.nix

@@ -6,25 +6,22 @@
 
     ./system-modules/adb.nix
     ./system-modules/auto-mount.nix
+    ./system-modules/boot.nix
+    ./system-modules/boot.nix 
     ./system-modules/calendar.nix
-    ./system-modules/hardware-configuration.nix
-    ./system-modules/fuse.nix
-    ./system-modules/games.nix
-    ./system-modules/nvidia.nix 
-    ./system-modules/users.nix
-    ./system-modules/sound.nix
-    ./system-modules/fonts.nix
-    ./system-modules/boot.nix 
-    ./system-modules/gc.nix
-    ./system-modules/boot.nix
     ./system-modules/dm.nix
     ./system-modules/docker.nix
     ./system-modules/fcitx5.nix
     ./system-modules/fonts.nix
+    ./system-modules/fonts.nix
     ./system-modules/fuse.nix
+    ./system-modules/fuse.nix
+    ./system-modules/games.nix
+    ./system-modules/gc.nix
     ./system-modules/gc.nix
     ./system-modules/gpg.nix
     ./system-modules/hardware-configuration.nix
+    ./system-modules/hardware-configuration.nix
     ./system-modules/health_reminder.nix
     ./system-modules/hsmw.nix
     ./system-modules/kanata.nix
@@ -32,13 +29,17 @@
     ./system-modules/networking.nix
     ./system-modules/nixd.nix
     ./system-modules/nvidia.nix 
+    ./system-modules/nvidia.nix 
     ./system-modules/ollama.nix
     ./system-modules/qmk.nix
     ./system-modules/scanning.nix
     ./system-modules/sops.nix
     ./system-modules/sound.nix
+    ./system-modules/sound.nix
     ./system-modules/sshd.nix
     ./system-modules/syncthing.nix
+    ./system-modules/tuda.nix
+    ./system-modules/users.nix
     ./system-modules/users.nix
     ./system-modules/virtualisation.nix
     ./system-modules/ydotool.nix
@@ -60,7 +61,8 @@
     ./system-modules/calendar-lec.nix
     ./system-modules/calendar-lr.nix
     ./system-modules/calendar-dicos.nix
-  ] else []);
+  ] else [
+  ]);
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";

flake-modules/colors.json

@@ -1,13 +1,13 @@
 {
     "base": {
-        "foreground": "#dbd2f8",
+        "foreground": "#fecccc",
-        "background": "#0f062c"
+        "background": "#330000"
     },
     "to_alter": {
-        "accent": "#724ce5",
+        "accent": "#ff3232",
-        "secondary": "#ff3271",
+        "secondary": "#ff3232",
-        "tertiary": "#ffc932",
+        "tertiary": "#ff3232",
-        "special": "#bfe54b",
+        "special": "#31feff",
-        "weird": "#e54b8b"
+        "weird": "#baff31"
     }
 }

flake.nix

@@ -38,11 +38,17 @@
       latest   = import nixpkgs-latest   { inherit system config; };
       version  = "25.05";
     };
+    pkgs64 = let
+      system = "aarch64-linux";
+    in import nixpkgs { inherit system config; } // {
+      unstable = import nixpkgs-unstable { inherit system config; };
+      latest =   import nixpkgs-latest   { inherit system config; };
+      version =  "24.05";
+    };
 
     nvidia-base = import ./flake-modules/nvidia.nix;
     secrets     = import ./git-crypt/secrets.nix;
     rice        = import ./flake-modules/rice.nix pkgs;
-
   in {
     nixosConfigurations = let
       make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem { 
@@ -61,9 +67,12 @@
       NxXPS = make-nixos-system "NxXPS" { enable = true; prime = true; }; 
       NxNORTH = make-nixos-system "NxNORTH" { enable = true; prime = false; }; 
       NxACE = make-nixos-system "NxACE" { enable = false; };
-
       NxWSL = make-nixos-wsl-system "NxWSL";
     };
+    nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
+      pkgs = pkgs64;
+      modules = [ ./nix-on-droid.nix ];
+    };
 
     homeConfigurations = let 
       make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {

home-modules/chatterino.nix

@@ -193,7 +193,7 @@ in {
             "external": {
                 "streamlink": {
                   "quality": "",
-                  "options": "--config /home/${hyper.user}/.config/streamlink/config"
+                  "options": "--config ${hyper.home}/.config/streamlink/config"
                 }
             }
           }

home-modules/hyprland.nix

@@ -4,15 +4,27 @@ let
   transparency = builtins.toString rice.transparency;
   terminal = "ghostty";
   terminal-exec = "ghostty --command=";
-  monitors = {
+  monitors = let
+    docked = false;
+  in {
     xps = {
-      main = {
+      main = if docked then {
+        name = "DP-5";
+        resolution = "1920x1080";
+        position = "1920x0";
+        scale = "1.0";
+      } else {
         name = "eDP-1";
         resolution = "1920x1200";
         position = "0x1080";
         scale = "1.0";
       };
-      second = {
+      second = if docked then {
+        name = "DP-6";
+        resolution = "1920x1080";
+        position = "0x0";
+        scale = "1.0";
+      } else {
         name = "DP-3";
         resolution = "1920x1080";
         position = "0x0";

home-modules/pkgs-list/shell.nix

@@ -6,6 +6,7 @@
     cmake
     dig
     du-dust
+    dysk
     exiftool
     eza
     ffmpeg

nix-on-droid.nix

@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+{
+  # Simply install just the packages
+  environment.packages = with pkgs; [
+    helix
+    git
+    lazygit
+    yazi
+  ];
+
+  # Backup etc files instead of failing to activate generation if a file already exists in /etc
+  environment.etcBackupExtension = ".bak";
+
+  # Read the changelog before changing this value
+  system.stateVersion = pkgs.version;
+
+  # Set up nix for flakes
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+
+  # Set your time zone
+  time.timeZone = "Europe/Berlin";
+}

system-modules/calendar-lr.nix

@@ -25,13 +25,17 @@ import requests
 def filter_events(events):
     return [event for event in events if ("LR" in event.name) or ("TBD" in event.name)]
 
-def fetch_and_save_ical_events(ical_url, save_path):
+def fetch_and_save_ical_events(ical_urls, save_path):
     """
     Fetch events from an iCal URL and save them as a single combined calendar.
     """
     try:
+        # Create a new combined calendar
+        combined_calendar = Calendar()
+
+        for url in ical_urls:
             # Fetch the iCal data
-        response = requests.get(ical_url)
+            response = requests.get(url)
             response.raise_for_status()
 
             # Parse the iCal data
@@ -40,8 +44,6 @@ def fetch_and_save_ical_events(ical_url, save_path):
             # Adjust events
             adjusted_events = filter_events(list(calendar.events))
 
-        # Create a new combined calendar
-        combined_calendar = Calendar()
             for event in adjusted_events:
                 combined_calendar.events.add(event)
 
@@ -58,10 +60,13 @@ def fetch_and_save_ical_events(ical_url, save_path):
 
 if __name__ == "__main__":
     # Replace with your iCal URL and target file path
-    ICAL_URL = "https://zlypher.github.io/lol-events/cal/league-of-legends-nlc.ical"
+    ICAL_URLS = [
+        "https://zlypher.github.io/lol-events/cal/league-of-legends-nlc.ical",
+        "https://zlypher.github.io/lol-events/cal/league-of-legends-emea-masters.ical"
+    ]
     SAVE_PATH = "${config.services.nginx.virtualHosts."${hyper.domain}".root}/lr.ics"
 
-    fetch_and_save_ical_events(ICAL_URL, SAVE_PATH)
+    fetch_and_save_ical_events(ICAL_URLS, SAVE_PATH)
 '');
     in ''
       ${nx_cal_lr}/bin/nx_cal_lr

system-modules/sshd.nix

@@ -16,6 +16,7 @@
     ports = [ secrets.ssh.port ];
     settings = {
       PasswordAuthentication = false;
+      PrintLastLog = false; 
     };
   };
 }