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

flake-modules/colors.json

@@ -1,13 +1,13 @@
 {
     "base": {
-        "foreground": "#feccd2",
+        "foreground": "#eedce1",
-        "background": "#190003"
+        "background": "#11080a"
     },
     "to_alter": {
-        "accent": "#fd344d",
+        "accent": "#bb768a",
-        "secondary": "#ff32c6",
+        "secondary": "#b5ff32",
-        "tertiary": "#b935fc",
+        "tertiary": "#918ea3",
-        "special": "#33fde4",
+        "special": "#76bba7",
-        "weird": "#d3fd33"
+        "weird": "#b7bb76"
     }
 }

home-modules/email.nix

@@ -136,36 +136,22 @@ lib.mkIf (hyper.host != "NxACE")
         settings = OAuth2Settings; 
       };
     };
-
+    # pnx-nix = {
-    # hsmw = with secrets.email.hsmw; {
+    #   address = secrets.email.pnx.mail;
-    #   address = "${un}@hs-mittweida.de";
-    #   userName = "${un}@hs-mittweida.de";
     #   realName = "Lennart J. Kurzweg";
-    #   imap = {
+    #   flavor = "outlook.office365.com";
-    #     port = 993;
-    #     host = "xc.hs-mittweida.de";
-    #   };
-    #   smtp = {
-    #     port = 587;
-    #     host = "xc.hs-mittweida.de";
-    #     tls.useStartTls = true;
-    #   };
     #   signature = {
     #     text = ''
-    #       MatNr: ${mnr}
+    #       Phönix Metallbau GmbH
-    #       SemGr: ${semgr}
+    #       Tel: 036374 2270
-    #       About Me: https://nx2.site/about-me
-    #       Contact: https://nx2.site/contact
-    #       GPG: https://nx2.site/gpg
     #     '';
     #     showSignature = "append";
     #   };
-    #   thunderbird = {
+    #   thunderbird = mkIf config.thunderbird.enable {
     #     enable = true;
     #     profiles = [ "nx2" ];
-    #     settings = id: {
+    #     # The id given as argument is an automatically generated account identifier.
-    #       "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent";
+    #     # settings = OAuth2Settings; 
-    #     };
     #   };
     # };
     tuda = with secrets.email.tuda; {
@@ -205,3 +191,35 @@ lib.mkIf (hyper.host != "NxACE")
 
 
 
+
+# hsmw = with secrets.email.hsmw; {
+#   address = "${un}@hs-mittweida.de";
+#   userName = "${un}@hs-mittweida.de";
+#   realName = "Lennart J. Kurzweg";
+#   imap = {
+#     port = 993;
+#     host = "xc.hs-mittweida.de";
+#   };
+#   smtp = {
+#     port = 587;
+#     host = "xc.hs-mittweida.de";
+#     tls.useStartTls = true;
+#   };
+#   signature = {
+#     text = ''
+#       MatNr: ${mnr}
+#       SemGr: ${semgr}
+#       About Me: https://nx2.site/about-me
+#       Contact: https://nx2.site/contact
+#       GPG: https://nx2.site/gpg
+#     '';
+#     showSignature = "append";
+#   };
+#   thunderbird = {
+#     enable = true;
+#     profiles = [ "nx2" ];
+#     settings = id: {
+#       "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent";
+#     };
+#   };
+# };

home-modules/firefox/userContent.nix

@@ -122,7 +122,7 @@ in /* css */ ''
       background-color: transparent !important;
     }
     header, footer {
-      background-color: rgba(0,0,0,1) !important; 
+      background-color: rgba(0,0,0,0.5) !important; 
       backdrop-filter: blur(100px);
       border-radius: ${builtins.toString rice.rounding}px;
     }

home-modules/gpg.nix

@@ -1,5 +1,10 @@
 { pkgs, ... }@all: with all; {
-  home.packages = with pkgs; [ pinentry-all ];
+  home.packages = with pkgs; [
+    # pinentry-all
+    # pinentry-curses
+    pinentry-gtk2
+    # pinentry-tty
+  ];
   programs.gpg = {
     enable = true;
     package = pkgs.gnupg;

home-modules/mpv.nix

@@ -36,6 +36,7 @@
     ];
     bindings = {
       "O"           = ''no-osd cycle-values glsl-shaders "~~/shaders/invert.glsl" ""; show-text "Invert Shader"'';
+      "F5"          = ''set contrast 0;set brightness 0;set gamma 0;set saturation 0;set hue 0;set sub-pos 100;set sub-scale 1;set panscan 0;set zoom 0;show-text default'';
       # "tab"         = ''script-binding uosc/toggle-ui'';
       # "space"       = ''cycle pause; script-binding uosc/flash-pause-indicator'';
       # "right"       = ''seek  5'';

home-modules/pkgs-list/programs.nix

@@ -18,5 +18,6 @@
     inkscape
     audacity
     gemini-cli
+    libreoffice
   ] else []);
 }

home-modules/programming/python.nix

@@ -4,7 +4,7 @@
     python-with-packages = pkgs.python3.withPackages (pp: with pp; [
       ipython
       requests
-      debugpy
+      # debugpy
       black
     ]);
   in {

home.nix

@@ -34,7 +34,7 @@
     ./home-modules/nvidia.nix
     ./home-modules/nxgs.nix
     ./home-modules/obs.nix
-    ./home-modules/office.nix
+    # ./home-modules/office.nix
     ./home-modules/ollama.nix
     ./home-modules/opencode.nix
     ./home-modules/pandoc.nix

system-modules/fcitx5.nix

@@ -6,7 +6,7 @@
       waylandFrontend = true;
       addons = with pkgs; [
         fcitx5-gtk        
-        qt6Packages.fcitx5-chinese-addons  
+        kdePackages.fcitx5-chinese-addons  
         fcitx5-nord        
       ];
     };

system-modules/nx2site/gitea.nix

@@ -26,7 +26,7 @@ let git-user = "git"; in
     user = git-user; 
     appName = "NxGit";
     stateDir = "/var/lib/gitea"; # default
-    useWizard = false; # default
+    # useWizard = false; # default
     # camoHmacKeyFile = ;
     database = {
       createDatabase = false; # default

system-modules/nx2site/proxy.nix

@@ -50,7 +50,7 @@
     defaultSSLListenPort = 443;
     enableQuicBPF = true;
     enableReload = true;
-    package = pkgs.nginxQuic;
+    package = pkgs.nginx;
     proxyResolveWhileRunning = false;
     proxyTimeout = "20s";
     recommendedBrotliSettings = true;
@@ -58,7 +58,7 @@
     recommendedOptimisation = true;
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
-    recommendedZstdSettings = true;
+    # recommendedZstdSettings = true;
     serverTokens = false;
     sslDhparam = config.sops.secrets."nx2site/dhparams.pem".path;
     sslProtocols = "TLSv1.2 TLSv1.3";