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

configuration.nix

@@ -24,6 +24,7 @@
     ./system-modules/ollama.nix
     ./system-modules/nx2site.nix
     ./system-modules/kodi.nix
+    ./system-modules/qmk.nix
   ];
 
 

flake.nix

@@ -71,9 +71,32 @@
       };
       allowed = {
         unfree-packages = [
-          "spotify"
-          "cudatoolkit-12.2.2"
+          "cudatoolkit"
+          "cuda-merged"
+          "cuda_cuobjdump"
+          "cuda_gdb"
+          "cuda_nvcc"
+          "cuda_nvdisasm"
+          "cuda_nvprune"
+          "cuda_cccl"
+          "cuda_cudart"
+          "cuda_cupti"
+          "cuda_cuxxfilt"
+          "cuda_nvml_dev"
+          "cuda_nvrtc"
+          "cuda_nvtx"
+          "cuda_profiler_api"
+          "cuda_sanitizer_api"
+          "libcublas"
+          "libcufft"
+          "libcurand"
+          "libcusolver"
+          "libnvjitlink"
+          "libcusparse"
+          "libnpp"
+
           "discord"
+          "spotify"
           "obsidian"
           "zoom-us"
           "zoom"

home-modules/matrix.nix

@@ -1,7 +1,87 @@
-{ pkgs, ... }:
+{ pkgs, host, ... }:
 {
   home.packages = with pkgs; [
     # cinny-desktop
-    weechat
+    (weechat.override {
+      configure = { availablePlugins, ... }: {
+        scripts = with pkgs.weechatScripts; [
+          weechat-matrix
+        ];
+      };
+    })
   ];
+  sops.secrets."weechat/passphrase" = { path = "%r/secrets/weechat/passphrase"; };
+
+  home.file = {
+    ".config/weechat/sec.conf".text = ''
+      [crypt]
+      cipher = aes256
+      hash_algo = sha256
+      passphrase_command = "cat $XDG_RUNTIME_DIR/secrets/weechat/passphrase"
+      salt = on
+
+      [data]
+      __passphrase__ = on
+      matrix_nx2site_password = "AD1FDBA557C3C2BA41A0BAAD43FBE91E35830A7779A82DE4C3C34204133459512B2008E83A5FDDA9C1209F9DEF833819DF5E9726AEB01162B421864DD3F08F4F9900DADB"
+    '';
+    ".config/weechat/matrix.conf".text = ''
+      [network]
+      autoreconnect_delay_growing = 2
+      autoreconnect_delay_max = 600
+      debug_buffer = off
+      debug_category = all
+      debug_level = error
+      fetch_backlog_on_pgup = on
+      lag_min_show = 500
+      lag_reconnect = 90
+      lazy_load_room_users = off
+      max_backlog_sync_events = 10
+      max_initial_sync_events = 30
+      max_nicklist_users = 5000
+      print_unconfirmed_messages = on
+      read_markers_conditions = "''${markers_enabled}"
+      resending_ignores_devices = on
+      typing_notice_conditions = "''${typing_enabled}"
+
+      [look]
+      bar_item_typing_notice_prefix = "Typing: "
+      busy_sign = "⏳"
+      code_block_margin = 2
+      code_blocks = on
+      disconnect_sign = "❌"
+      encrypted_room_sign = "🔐"
+      encryption_warning_sign = "⚠️ "
+      human_buffer_names = off
+      markdown_input = on
+      max_typing_notice_item_length = 50
+      new_channel_position = none
+      pygments_style = "native"
+      quote_wrap = 67
+      redactions = strikethrough
+      server_buffer = merge_with_core
+
+      [color]
+      error_message_bg = default
+      error_message_fg = darkgray
+      nick_prefixes = "admin=lightgreen;mod=lightgreen;power=yellow"
+      quote_bg = default
+      quote_fg = lightgreen
+      unconfirmed_message_bg = default
+      unconfirmed_message_fg = darkgray
+      untagged_code_bg = default
+      untagged_code_fg = blue
+
+      [server]
+      nx2site.autoconnect = off
+      nx2site.address = "nx2.site"
+      nx2site.port = 443
+      nx2site.proxy = ""
+      nx2site.ssl_verify = on
+      nx2site.username = "nx2"
+      nx2site.password = "''${sec.data.matrix_nx2site_password}"
+      nx2site.device_name = "Weechat@${host}"
+      nx2site.autoreconnect_delay = 10
+      nx2site.sso_helper_listening_port = 0
+    '';
+  };
 }

home-modules/nvidia.nix

@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      nvtopPackages.full
+    ];
+    sessionVariables = {
+      NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland
+      WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia.
+
+      XDG_CURRENT_DESKTOP = "Hyprland";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP = "Hyprland";
+
+      GBM_BACKEND = "nvidia-drm";
+      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+      LIBVA_DRIVER_NAME = "nvidia";
+      __GL_GSYNC_ALLOWED = "1";
+      __GL_VRR_ALLOWED = "0"; 
+      WLR_DRM_NO_ATOMIC = "1";
+
+      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+      QT_QPA_PLATFORM = "wayland";
+      QT_QPA_PLATFORMTHEME = "qt5ct";
+
+      GDK_SCALE = "2";
+
+      ELECTRON_OZONE_PLATFORM_HINT = "auto";
+
+      NVD_BACKEND = "direct";
+    };
+  };
+}

home.nix

@@ -1,7 +1,9 @@
 { config, pkgs, pkgs-unstable, lib, system, inputs, host, user, rice, allowed, secrets, ... }:
 {
   imports = [
+
     ./home-modules/vscode.nix
+    ./home-modules/nvidia.nix
     # ./home-modules/firefox.nix
     ./home-modules/discord.nix
     ./home-modules/matrix.nix

sops-secrets.yaml

@@ -17,6 +17,8 @@ syncthing:
     NxACE:
         cert.pem: ENC[AES256_GCM,data:EOa6EesESj1WPD7NYhNkMF9OsT+QeWNG6r4X3d6BO+ztWCel+UQUiWd2OnNbX9dDh6eNwK1pWa/T8hnj81UG+0iRuDGafGteB9XmzOUsnpd8tlGczkXV54MYDEnxSArZQSfZ/e3enLMb9C6z/iT0ldOFukW9nIjowtmTWLCZQlGE3YGlOmrW0Os+eFfZc33uBBTaqjCWEB/0wGJVQAg8cnHlUU0HPj6rpWJumkeQ/29b/J4yBNAI2qmXPAMVOHccJKzLY25yAdgIQ1gMz20DrUe/I0OlbP0bMmrkISkzERg4dpyGCJ1r50Q8P6+h4eCpBqi7RfWvY8sfsWtanzI1binszSNjtVS1Em4izF3z6LVcSmYN1pXCsC0AHxDveDwYEgVsSPCz4m0/LSUhfHoi6csk4mAwKJm1vCJZLv66q77fh1pKWbrbc0/F+sSQWuLcFF6EC7SD4lH371QVTp4xxWIQ5zTTS0BRcHq0DeZ3jVHqu3SxuJaJNwLSYKdrQMt5+FBmVrmgvO8TI5h6tXdTXvqR21qQhzlYmkU1VAzn12zMk6Zl7OWBD73GF2gQ+jgdG+4Rk2fLBzExKDPD0gbh4ybmNErq1UPKbK+2vivxxRuD0XUlYWWopqAOs9QKyhSjK5uUA+12MFFE5uiU5x1MLvzll/CgawVMdgXgPls/+Ut0LxbIzp4/H/6XOX1GtqpFLda3taDHLoYKyDMbWdUPZFQwn84adUk83h+Tgb0WaAA3bXw/vZlcGtaFt20k2z/iRc8LGflg73Bg0TX5Wghwr7Yu0t4K15it2pNtkmAzyEcZHKVSW9DQNHtv3E1djFhJuaA5qaL6fwb7M78f1///qtOIR4KJ9BAmtkLd0bWmsLDpFiea2WMwAaL3uKqLwB4K0WjBNvG0CkerZSPyUKbsRIgEkUAOJRWPbsx7rlvVxWziTBoUoH+vdLXhLAxKl9+CI9aTIyZlF7G7uBivYWGcgzBlUvqpyNOfVDryn+8L9LZM+o55dqPJT1rl27G0sPZRMdXqhG4IZqAfsYmSkufjIgLkcTjh/tJI93I=,iv:z7UMsU4VhWLJJZPP+hmqaOSaNy4k1PQhm5kJh6DrduA=,tag:h3sOf8TG0GNeCpPFpPXfSg==,type:str]
         key.pem: ENC[AES256_GCM,data:zFgSrZelmXgTAm0Zl0HSTp+M4tLOQzksdYnA1NZPeu4R+mxMylilEtHzMp9zE7urz5gadjUEiguDBkfTOIzFeSLeUlXBDBWJhXf5JPZ403HES11qlIFdW8BPkzVC3X0N0KyydLdfhM0MAhZdyrRxn1ATc0ppvyqTpeN1rxNYMHTezRH9WMmKC9VS506rCIZrfOtEsuBpsxP6tTjOQ9AxuWV1z6/DRjv55U2EojZ/viM6sjGSsuDAYZQJBA7VQcNsw4PZu49OfA0czo7FbE6Gh6+TJ9PdMOUuo2/syH4yPBC7vqMECIBN4MHzhyoOTqcyZHIV5iJsZqTIbTN+CP72pPPrhs/a5K0GkyT0PPHVem+dGhyAJWQglSAlcK8kXWDP,iv:pzQOoQvFqoC3nIuGLNx97cCE7qO+PHCVw9G4K1mX2nk=,tag:zXUch/o/B97TlgHhAYUveA==,type:str]
+weechat:
+    passphrase: ENC[AES256_GCM,data:3NVhMouf3wwMJTZCvIjbi5fjHJHxe25Q+wRo,iv:W8cShdM3iUyEiRCPNupMin3gfF+cqGxslD18CAvUW4c=,tag:DXBATGEhHjhXqy+J9BNVwg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -59,8 +61,8 @@ sops:
             SHJLR3lvdlFiRmJuU25RUHFFTmpjamMKbzycdDvQBAuOiRROTZEQSnaXoPapz73L
             yVS9EUP25FSx/sGqRqaCefbeaybuM1aso6LDnlomv4Bib7zjugWKSw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-03T19:04:51Z"
-    mac: ENC[AES256_GCM,data:4oE9N4llvpXW15FhQLJ4vl+9FQQoNF1BK/DrX9jymrUxc5QVqASLLWRMZqwfoYofn2JqXIuNpFgW+NpoRQjqzTaFNt2OSGWYMmT10t2yteM40fhfZrRAU+hwOm8QhnbJrVgUunO2S6USGqkyr+nhafQkGPmqIiqPeW8bQROSSwc=,iv:NWEuLtamkQIS84mEZNByYA6vBLVkfCsuNtkT1OmtqFE=,tag:O06xDZT+Tqd66H4s+JMf+w==,type:str]
+    lastmodified: "2024-07-04T15:28:58Z"
+    mac: ENC[AES256_GCM,data:KTUyPeMc1OTQKJAMTGMnSWc44nkqRzvMk00o5LCiCVK9cq8Q5s3mtQave5ZsPyP8E5fJKp2wBikNJ6nbgrfLfHJhz0A5BdKkaELAQl3So7yDEl0oE3W4lS6Q5kIhpwBEabMzEU5E74FZ+9PcsUazb9MBU/Ngm3a+t6L5AIbiCE8=,iv:5p6eI2F5tqsfRE/0m8wP27HMsDky2cbV+D3syjq2aqU=,tag:8h+t7sKjX7uuo+IvilwAhg==,type:str]
     pgp:
         - created_at: "2024-06-09T19:44:41Z"
           enc: |-

system-modules/boot.nix

@@ -107,7 +107,7 @@ in
       };
       extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
       kernelModules = [ "v4l2loopback" ];
-      extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1'';
+      extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1'';
     };
   } else { # NxACE
     boot = {

system-modules/nvidia.nix

@@ -1,11 +1,8 @@
 { config, pkgs, pkgs-unstable, lib, nvidia, ... }:
-let
-in
 {
   config = lib.mkIf nvidia.enable {
     environment.systemPackages = with pkgs; [
       lshw
-      nvtopPackages.full
       glxinfo
       (pkgs.writeShellScriptBin "nvidia-offload" ''
         export __NV_PRIME_RENDER_OFFLOAD=1

system-modules/qmk.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  hardware.keyboard.qmk.enable = true;
+
+  # home.packages = with pkgs; [
+  #   via
+  # ];
+  environment.systemPackages = with pkgs; [
+    via
+  ];
+  services.udev.packages = [ pkgs.via ];
+}