From 7639bed3fef9da035b27e4dfde1ed010e851752b Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 9 Oct 2024 23:32:39 +0200 Subject: [PATCH 01/32] tts --- home-modules/tts.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 home-modules/tts.nix diff --git a/home-modules/tts.nix b/home-modules/tts.nix new file mode 100755 index 0000000..ebd8755 --- /dev/null +++ b/home-modules/tts.nix @@ -0,0 +1,18 @@ +{ pkgs, lib, user, ... }: +lib.mkIf (user != "tv") +{ + home.packages = with pkgs; [ + (writeShellApplication { + name = "ttss"; + text = let + cmd = inp: "piper -m /home/nx2/tts/en_GB-cori-high.onnx --output_raw ${inp} | ffmpeg -hide_banner -loglevel error -f s16le -ar 22050 -ac 1 -i - -f wav - | mpv -"; + in /* bash */ '' + if [ -p /dev/stdin ]; then + ${cmd " Date: Wed, 9 Oct 2024 23:35:03 +0200 Subject: [PATCH 02/32] tuda email --- git-crypt/secrets.nix | Bin 3012 -> 3134 bytes home-modules/email.nix | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index c3dfb15b123fe2c84870f3b00038b29b7eb3ff44..c6f0ad4cfb8d3016a42a0cf8a7610443d4a5d5aa 100755 GIT binary patch literal 3134 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 M1Mm6&yidan0M{n)EC2ui diff --git a/home-modules/email.nix b/home-modules/email.nix index 49b6d58..b2a227c 100755 --- a/home-modules/email.nix +++ b/home-modules/email.nix @@ -143,6 +143,38 @@ lib.mkIf (host != "NxACE") }; }; }; + tuda = with secrets.email.tuda; { + address = "${un}@stud.tu-darmstadt.de"; + userName = tuid; + realName = "Lennart J. Kurzweg"; + imap = { + port = 993; + host = "imap.stud.tu-darmstadt.de"; + }; + smtp = { + port = 465; + host = "smtp.tu-darmstadt.de"; + tls.enable = true; + }; + signature = { + text = '' + Field: MSc. AI/ML + MNr: ${mnr} + TU-ID: ${tuid} + 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"; + }; + }; + }; }; } From c6f7d73f8928369898a428467f7e74e8d1735418 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 9 Oct 2024 23:35:20 +0200 Subject: [PATCH 03/32] tuda eduroam (untested) --- sops-secrets.yaml | 5 ++-- system-modules/networking.nix | 51 +++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/sops-secrets.yaml b/sops-secrets.yaml index 24b0b7d..3446bc3 100644 --- a/sops-secrets.yaml +++ b/sops-secrets.yaml @@ -30,6 +30,7 @@ eduroam: client-cert: ENC[AES256_GCM,data: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,iv:OzC+2Ghg3tso297TLDLKGaUf/KzXQ/ks/qkD114WhUU=,tag:uGYDmPG/z8dkpKKAmr+f6g==,type:str] client-key: ENC[AES256_GCM,data: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,iv:elOnzTpyIwv49ErwOZRINMSXryBwiwP8Kus83+tAzks=,tag:QN3WdC+TUB01X2p76+ng3w==,type:str] root-ca: ENC[AES256_GCM,data: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,iv:8UyU8fVq8YaSsurOOgsKGIAelaxWR7+AITwwf7ts4qk=,tag:K/zGiCthB6Vyh0ijRDxM6w==,type:str] + nxxpspw: ENC[AES256_GCM,data:JANZ4+70xZWr0KrkkQgm+0oN0esZ6xIPBIzJTeF+MA==,iv:zVAQZXN+3QXImHIDPQcKmHnDiQvzQRGwSxFJZZZtfH4=,tag:HfH0J0b4Nu3RrZtrAaJmKQ==,type:str] hsmw-vpn-secret: ENC[AES256_GCM,data:3bKxRGTQcbhRjzARSpYBW5ekQW/U/ixzNiFmO36gw0NKyDMLlbVbJBqXvi71M0GXgmo/FA==,iv:7bVDA8u9apDNXFY/vEMbz/0HywG5Pyrl5JfZrcNCr8w=,tag:xz4j7cEc5hvLwrItWjkx0Q==,type:str] sops: kms: [] @@ -73,8 +74,8 @@ sops: SHJLR3lvdlFiRmJuU25RUHFFTmpjamMKbzycdDvQBAuOiRROTZEQSnaXoPapz73L yVS9EUP25FSx/sGqRqaCefbeaybuM1aso6LDnlomv4Bib7zjugWKSw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-07-28T15:38:03Z" - mac: ENC[AES256_GCM,data:/ZQ0QX/nqGWHkIOvJxKxl8HHlK1bxEdog0Ee/N5CnU6aw4l8IoX3BwpZBFP78+/EO1flH4S9zyJfRE1U9NoIqXPXs+r0dgGiJm0FHwGiHi1oGRmxfggi0Kes4WQa3rIgxuyeIjwXWc4LNPLkCyNPGNdnE0wZ4ab31O/ZbIME1NY=,iv:r7RZGBdXJnk6261LE7IwmojWYC6JoqVJFwekGbhuFXY=,tag:FWaAoJ8FRZJitAp8F3cK2Q==,type:str] + lastmodified: "2024-10-09T21:28:13Z" + mac: ENC[AES256_GCM,data:EGpSDaYbOeupFjAmTgymLIYnEZnvZ9XzbNc+3wZemWYojtlnZX5bWn8aN7KEPactIeKcRg2Qx3FFaz24cLQiS58iM1Ig7QmChLlQFe/4JdGpuNJLcrXwGDjCvOZWEVvNcm51t0Ky+TTXQccluEwr2yPQZkLYbbJJQhmH5KQZ7lM=,iv:w8QF1TkWph2zBFzYBWPxpZDvCXl64aPcpLeTjT5JQNg=,tag:0Vcd0+nfeMo+MB/j1gPOxA==,type:str] pgp: - created_at: "2024-06-09T19:44:41Z" enc: |- diff --git a/system-modules/networking.nix b/system-modules/networking.nix index bef3ad6..2564862 100755 --- a/system-modules/networking.nix +++ b/system-modules/networking.nix @@ -1,18 +1,41 @@ - -{ config, pkgs, host, ... }: -let -in +{ config, lib, host, secrets, ... }: { - networking.nameservers = [ - "1.1.1.1" - "8.8.8.8" - ]; - - networking.hostName = host; - - networking.networkmanager = { - enable = true; + sops.secrets = { + "wireless-networking.env" = {}; }; - networking.enableIPv6 = false; + networking = { + nameservers = [ + "1.1.1.1" + "8.8.8.8" + ]; + hostName = host; + networking.networkmanager = { + enable = true; + }; + enableIPv6 = false; + firewall.allowedTCPPorts = [ + 80 + 443 + ]; + wireless = { + enable = true; + environmentFile = config.sops.secrets."wireless-networking.env"; + networks = { + eduroam = lib.mkIf (host == "NxXPS") { + auth = '' + ssid="eduroam" + key_mgmt=WPA-EAP + eap=PEAP + identity=${secrets.email.tuda.tuid}lan01@tu-darmstadt.de + password="@NXXPSEDUROAMPW@" + domain_suffix_match="radius.hrz.tu-darmstadt.de" + anonymous_identity="eduroam@tu-darmstadt.de" + phase2="auth=MSCHAPV2" + ca_cert="/etc/ssl/certs/ca-bundle.crt" + ''; + }; + }; + }; + }; } From f32d77f7ff34319499c9dae71dd7e7ad60ab7830 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 9 Oct 2024 23:35:49 +0200 Subject: [PATCH 04/32] rice change --- flake-modules/rice.nix | 2 +- home-modules/wallpaper-to-colors.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 2641551..66cb5ea 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -2,7 +2,7 @@ pkgs: rec { lib = import ../nxlib/ricelib.nix pkgs.lib; - transparency = 0.9; + transparency = 0.8; rounding = 10; gap-size = 10; border-width = 3; diff --git a/home-modules/wallpaper-to-colors.nix b/home-modules/wallpaper-to-colors.nix index ef5220d..aee8831 100644 --- a/home-modules/wallpaper-to-colors.nix +++ b/home-modules/wallpaper-to-colors.nix @@ -68,7 +68,7 @@ class Palette: def ensure_color(c: Color, alter_sat: bool) -> list[int]: hue, lum, sat = c.hls if alter_sat: - new_sat = min(sat**0.5, 1) + new_sat = min((sat**0.5) + 0.4, 1) else: new_sat = sat new_lum = max(lum, 0.5) From 24bb3136cfeb02cda524020d1012221848d06765 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 9 Oct 2024 23:36:33 +0200 Subject: [PATCH 05/32] reflex and better latex in hx --- home-modules/helix.nix | 10 +++++----- home.nix | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/home-modules/helix.nix b/home-modules/helix.nix index 035e3c5..9543f6a 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -72,10 +72,10 @@ }; languages = { language = [ - # { - # name = "latex"; - # language-servers = ["texlab" "spellchek"]; - # } + { + name = "latex"; + language-servers = ["texlab" "language-tool"]; + } { name = "markdown"; # language-servers = [ "marksman" "style-check" "language-tool" ]; @@ -232,7 +232,7 @@ }; "ui.cursor.match" = { # Matching bracket etc. "bg" = green.dark; - "modifiers" = [ "reversed" ]; + "modifiers" = [ ]; }; "ui.gutter" = { "bg" = black.base; diff --git a/home.nix b/home.nix index 1d60de8..e87cac1 100755 --- a/home.nix +++ b/home.nix @@ -42,6 +42,7 @@ ./home-modules/sops.nix ./home-modules/ssh.nix ./home-modules/starship.nix + ./home-modules/tts.nix ./home-modules/vale.nix ./home-modules/virt-manager.nix ./home-modules/vscode.nix @@ -74,6 +75,7 @@ sssnake pipes dig screen + reflex gnumake cmake From 2fcdf3294488de5539f34e9171e130ed1c89e80e Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 9 Oct 2024 23:38:03 +0200 Subject: [PATCH 06/32] no open ports from docker module --- system-modules/docker.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/system-modules/docker.nix b/system-modules/docker.nix index 18c7dd1..ba03984 100755 --- a/system-modules/docker.nix +++ b/system-modules/docker.nix @@ -13,8 +13,4 @@ # }; }; users.users."${user}".extraGroups = [ "docker" ]; - networking.firewall.allowedTCPPorts = [ - 80 - 8384 - ]; } From 2b873c8b8127a04677ff11ece6a63faab86a9fb6 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sat, 12 Oct 2024 19:50:25 +0200 Subject: [PATCH 07/32] no networking.wireless with nm --- system-modules/networking.nix | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/system-modules/networking.nix b/system-modules/networking.nix index 2564862..0248d66 100755 --- a/system-modules/networking.nix +++ b/system-modules/networking.nix @@ -1,8 +1,8 @@ { config, lib, host, secrets, ... }: { - sops.secrets = { - "wireless-networking.env" = {}; - }; + # sops.secrets = { + # "wireless-networking.env" = {}; + # }; networking = { nameservers = [ @@ -10,7 +10,7 @@ "8.8.8.8" ]; hostName = host; - networking.networkmanager = { + networkmanager = { enable = true; }; enableIPv6 = false; @@ -18,24 +18,24 @@ 80 443 ]; - wireless = { - enable = true; - environmentFile = config.sops.secrets."wireless-networking.env"; - networks = { - eduroam = lib.mkIf (host == "NxXPS") { - auth = '' - ssid="eduroam" - key_mgmt=WPA-EAP - eap=PEAP - identity=${secrets.email.tuda.tuid}lan01@tu-darmstadt.de - password="@NXXPSEDUROAMPW@" - domain_suffix_match="radius.hrz.tu-darmstadt.de" - anonymous_identity="eduroam@tu-darmstadt.de" - phase2="auth=MSCHAPV2" - ca_cert="/etc/ssl/certs/ca-bundle.crt" - ''; - }; - }; - }; + # wireless = { + # enable = true; + # environmentFile = config.sops.secrets."wireless-networking.env"; + # networks = { + # eduroam = lib.mkIf (host == "NxXPS") { + # auth = '' + # ssid="eduroam" + # key_mgmt=WPA-EAP + # eap=PEAP + # identity=${secrets.email.tuda.tuid}lan01@tu-darmstadt.de + # password="@NXXPSEDUROAMPW@" + # domain_suffix_match="radius.hrz.tu-darmstadt.de" + # anonymous_identity="eduroam@tu-darmstadt.de" + # phase2="auth=MSCHAPV2" + # ca_cert="/etc/ssl/certs/ca-bundle.crt" + # ''; + # }; + # }; + # }; }; } From dbeb5524a07c8e07ddabd4880fff810f3673ab3e Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 17 Oct 2024 14:39:12 +0200 Subject: [PATCH 08/32] note for ff transparency --- home-modules/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index df567da..903b0b9 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -1,5 +1,6 @@ # { pkgs-unstable, secrets, user, system, inputs, ...}: { rice, user, ... }: +# browser.tabs.allow_transparent_browser { home.file = with rice.color; let blur = builtins.toString 20; From 8b96d1205b6b087a0e628f71d6e61c7aedcbe978 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 17 Oct 2024 14:39:25 +0200 Subject: [PATCH 09/32] flake bump --- flake.lock | 279 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 175 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index 6a10b44..fef8f2b 100755 --- a/flake.lock +++ b/flake.lock @@ -4,14 +4,15 @@ "inputs": { "hyprland": [ "hyprland" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1726437584, - "narHash": "sha256-lMIFDORuyMYHtUPrRWU5WjGcS+ZMrR4/wBSO+sgUVSY=", + "lastModified": 1728710667, + "narHash": "sha256-9HR9EePhzweUAUPUccByNYxKQzfFAnxfu2BXTLqOLZQ=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "8f14fa2e10d24742d713f04c278bc7651037b74b", + "rev": "e8406a7708bceb3b5bedf56b67490dbe3d27e6f8", "type": "github" }, "original": { @@ -40,11 +41,11 @@ ] }, "locked": { - "lastModified": 1727261104, - "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", + "lastModified": 1728902391, + "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b82fdaff917582a9d568969e15e61b398c71e990", + "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", "type": "github" }, "original": { @@ -87,6 +88,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -107,11 +124,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -143,7 +160,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -161,7 +178,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -178,6 +195,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -236,11 +275,11 @@ ] }, "locked": { - "lastModified": 1722623071, - "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -258,15 +297,16 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", - "systems": "systems", + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1727451329, - "narHash": "sha256-ysRNFO8X0qE3/+xWcYMY+v94WurNvvdDKlGVLT/aKmA=", + "lastModified": 1729113795, + "narHash": "sha256-tV6aeQZ1wvAVDi+JW+IpXH9xQjZX+ZNFsuQCfWj2zWs=", "ref": "refs/heads/main", - "rev": "58669fef77ac17ea205ce3570f48e17de736111f", - "revCount": 5272, + "rev": "b57086aa4362117c1f1025246f618d760e44b026", + "revCount": 5349, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -294,11 +334,11 @@ ] }, "locked": { - "lastModified": 1727258890, - "narHash": "sha256-/55TVManE/J19LSzXtUNhHUpeouRqZxM08ZdWvJrNoA=", + "lastModified": 1728383680, + "narHash": "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4fcb465c9d771f4ae1f451e8d953250d16eead70", + "rev": "d05eb1ffba2ebffb5b4e1b407f134a4dcb411a88", "type": "github" }, "original": { @@ -319,38 +359,11 @@ ] }, "locked": { - "lastModified": 1727451107, - "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", "type": "github" }, "original": { @@ -375,11 +388,11 @@ ] }, "locked": { - "lastModified": 1725997860, - "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -420,11 +433,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -461,7 +474,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_3", @@ -485,11 +498,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -501,11 +514,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1727466185, - "narHash": "sha256-03DlXkzcRrsjz/VorCFey0pDxBsnAmerC6LxY32T3DY=", + "lastModified": 1729121138, + "narHash": "sha256-YwgV6ORMYDj32ucAIDjUY+6vV7Sv5RNbnnsQx4+QNw8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ca03f3df8c81598656de3d955a4353111ae2e0c", + "rev": "f67841950fe8e33ae6597cc2dac1bc179c3c2627", "type": "github" }, "original": { @@ -517,17 +530,33 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -543,13 +572,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -561,11 +590,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -607,11 +636,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -638,11 +667,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -652,6 +681,30 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -662,12 +715,12 @@ "lanzaboote", "flake-utils" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1681413034, @@ -751,14 +804,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1727423009, - "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "127a96f49ddc377be6ba76964411bab11ae27803", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -784,16 +837,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -812,9 +865,27 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols_2", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" @@ -837,11 +908,11 @@ ] }, "locked": { - "lastModified": 1727109343, - "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=", + "lastModified": 1728166987, + "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea", + "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", "type": "github" }, "original": { @@ -857,11 +928,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1727455294, - "narHash": "sha256-WSSLsNJw4ABnaXjs/lVcCea1d/YF6ko+OZ3TElIEg+E=", + "lastModified": 1729081599, + "narHash": "sha256-TE8h7u3b39yMgtboXMxaZ+I5hfa1jpTP/MXxLPZhLew=", "owner": "sxyazi", "repo": "yazi", - "rev": "3e4973dbbfa7d34a95b6005822db84db51ebddb7", + "rev": "a6c9c93d586422fbb212707bfb09c9039585b40b", "type": "github" }, "original": { @@ -875,11 +946,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1727287465, - "narHash": "sha256-XQAf5M593WmxgaXagtkci/H9DA3jSVx1TJk6F3X5VQo=", + "lastModified": 1727721329, + "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=", "owner": "MarceColl", "repo": "zen-browser-flake", - "rev": "96f1b5d80bf7360cb77c9b521f388324f18383a0", + "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc", "type": "github" }, "original": { From 8f3b04c191e6b871f05d207508272239f1d033af Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 17 Oct 2024 17:17:51 +0200 Subject: [PATCH 10/32] spotify grey screen fix --- home.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home.nix b/home.nix index e87cac1..99ecbcf 100755 --- a/home.nix +++ b/home.nix @@ -24,6 +24,7 @@ ./home-modules/latex.nix ./home-modules/mako.nix # ./home-modules/matrix.nix + # ./home-modules/nm.nix ./home-modules/nh.nix ./home-modules/nvidia.nix ./home-modules/nx-gcal-event.nix @@ -60,7 +61,7 @@ zathura xfce.thunar - spotify + # spotify spicetify-cli swww playerctl @@ -93,6 +94,7 @@ ] ++ (with pkgs-unstable; [ obsidian firefox + spotify ]) ++ (if host != "NxACE" then (with pkgs; [ signal-desktop zoom-us From d93ae4a78ba3e8d2c5fb9011c9d904dd81b587ca Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 17 Oct 2024 17:18:07 +0200 Subject: [PATCH 11/32] tuda eduroam --- sops-secrets.yaml | 5 ++- system-modules/networking.nix | 77 ++++++++++++++++++++++++++--------- 2 files changed, 61 insertions(+), 21 deletions(-) diff --git a/sops-secrets.yaml b/sops-secrets.yaml index 3446bc3..b441604 100644 --- a/sops-secrets.yaml +++ b/sops-secrets.yaml @@ -31,6 +31,7 @@ eduroam: client-key: ENC[AES256_GCM,data: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,iv:elOnzTpyIwv49ErwOZRINMSXryBwiwP8Kus83+tAzks=,tag:QN3WdC+TUB01X2p76+ng3w==,type:str] root-ca: ENC[AES256_GCM,data:FZrNXRgqHVkPcH1QYc+UGRANki2syD4mSvdx3LN5A3aSoQe2x8NxaNv9t6FB9DRTtwY9jM4i4uIWS/0n2j67LrdB/4ftpX1o2CoTQ6K72XzwU4wUlkqIIJSoaB11olJL0yRjTRHihjjswJoEGVfEpnMqYSEplj7cuMHlLJTJq6vNJDJRD769aVK7eFHmbhfZxj58g5kCSrknGcBfJkFH1nR9ONhib/C7CzcJz2vU46XmhHuVOpKojHQzLn9RF8FN61QxinrXmI+tZmmccc63y1HiqOMWj0SuXlpXcNY0/RHS7Zl1oajNTlJ73NC8Nc6yuvvlTgaCM+DrecumHhlK82rmwihWyEmrWJq1Xi+Pw1wjxp+2dW3+w1shqf+rqDUCSwNWHmnVdJOkwCY5e3QX69YHFeS5Aq3rckjNPyN9Nyyhq9bXweMLd74GohMHORVvvklgqn1k0pmLS27+MAUIpiRMjNSqTzqYfBICoYQaIqMV1Y1XfskmWtcpv8B26vrZxTZCl9SEQzuKO19zaJelYd86C9+q3YbB1w682qOw/4frM8Y6ohjfDjquELeqRLVZNPs0RAA4eCqWsEUGgjisT4MaepOSxSug6nhxVX4a7skqiarV9WWaiSIrvSP7O/NKcZgyVYqsj3818Ut7ZmzobUapdiwpojdxYeaofMWDcq+OLVAGBGktq1HoVNO5z+KEbBjhpPzyNvtfHvCsd7GetQ3Nk4pkj6ENL8MA4m7gZvwdZG/u+3rAqhMVxBLGzPl686Mbln7MVhpEos9LNmHOFdEk4d1sdXHzxcgsjUmvFoc0RlcD/wkO2ImvZJZN/hXnEC8hWiUen0bXECVzZql+OXF79ZekmES8XqjddhQ47/8OxgszAPPMtNL1NgK5nQDS31LH9/Q7jDGjdRj4TDSQmHyQuhVTGBC9BBlO4rRvwbndfO5Vv8fo7oRn2kJMKtEoB0PkVKFBReDW4XSkgibWfy4wqpUNoQ8kHkINZM79qdx6zaAQ+6KOawVObd3+WgC0IUKYxNxQCvJOdYyCuGgDgH2iPJIaR2GaUNwFHEwBtGbD/nPelM7Je3xhqfTPUPAsoUWM3sQGo/1Li272RhR/2qZtHIVpyKkJcHa/bcuvByOB8W0V/TlP6FFMPXRk+X/blpDrZiRW/5yTgfDVL+orGQd1LVJojRORPtvNwMJAqN9ZsTO3/bdcUd1bKn5X+wSbepH7pqH9hPcsTHIO7O3T3Bs5YMFUT6zpeu/SDi8vf/KjQwH3sa45PHxQSr8r68onYrsHJl8l65e7RifzsPhSbc1nvHv42b7S8874EuBWjTrQcibM1prxJONg+yJQy7adf4cV5GHZozirMulSxEPAOZ5WqyYgrOkwyVSupT9xhGphT4FYYya0OkNLIl1XmHyb36/qP68fVVHQ37CQpXTqqzvSoWkjFQXb9XF+3erKLQPYNa5wK9RFtffbMrZsDLufR/FXaRPQ/nxN50yxLnjKkGMqM3t10fbztocXIE9Xc+W7qqIwvjstWt8n2p5QjyditH9kFka50HH99G2xO+5jeiY30ffqg69glWrfkys2TT29vIbVd9ljbA4zZwYZ5KyZZSZN47EOBtOe7CCaPJws0zyq+z1JQCYiupKDqRBKv6IJSRY4g+5GS1o7srYng0Llx7XqhGoWXyScP4LElF5sFGvouV8KV/P0P133mxLaAjmHmBxno/16Q+lbIQ0ytgph8OUfLK/lybLCasH07AnPPwAnNfULTKIs5aBS9hOGz//HyNFuoKaOzMPoFxwToIdF7+EvaY0dnsUrvCvxq4lGLwkGfO4ptt6y2FfTUzoKDAZFfd76EVLSQq1gTZ+lXxXK+sYgRT5gZ/EPcZE8sjgINKsOcj1AqcVZm2KvdSS1HE6fUQVm87cgVtEHOT7B5zMnJrFFrdRMSAbxUx4KBv4AzLUEhMyxfKLQm5NH5srvxPsKqhKl71Hestd8cWvJV+SmnU98m18A9Ck1MnjcSsQshuGHPWQGx0s/tkkeScIm/t7D4tbfKWdvN44KTnpeJCAmxO/vI5BOzTerYta0ViiV/bR2a5JtGVLC9yP3Zurk4lfcXNAMYKqf/CjBXRfNUNXVw+k/LdxKLYQCt8F+HBTpqGDdsO8RGofvfFJqM0PQcwf4GbbXFWBq5BsstonXAl/vsnAdcPcKr9KuArr6BHdRvY0HMlpSPMmGeEW94gA7Hg9IFJLTZrwOekg54xAe5KfNfkJZGb6oBU9f8D98zhw0KciHO993gNXeONuQMxVB/n33polT4vBjYOu9FuQQeJ6de94rnObIgpiKhaOCht2HF7s9kdOSN3/h6PfRJ8xI2e/9tolP6g==,iv:8UyU8fVq8YaSsurOOgsKGIAelaxWR7+AITwwf7ts4qk=,tag:K/zGiCthB6Vyh0ijRDxM6w==,type:str] nxxpspw: ENC[AES256_GCM,data:JANZ4+70xZWr0KrkkQgm+0oN0esZ6xIPBIzJTeF+MA==,iv:zVAQZXN+3QXImHIDPQcKmHnDiQvzQRGwSxFJZZZtfH4=,tag:HfH0J0b4Nu3RrZtrAaJmKQ==,type:str] + tuda_nmconnection: ENC[AES256_GCM,data:s+hA090pX8V8ateI4KtR2+wLvo4lH8Vih9dbpi6/EVLf7EKPMTSfBXbdmY9c2XWDDYmVEw+k1NjnkXk/+2Ch+RqBT4l9D+h19EPf6UwK/s7WP3ymDxpXexBb99JOw+jAEe677UcCxOsnPawXH03bI/vYtM/MdyRIIz8wdayB4IVIklCTIp9FqQUR2HsMAV+dS1ihqy0DMSlAJ0JyW2/5FcDFupGyhg4TT8d6QNYzT8goS2Wdq0pnJ+2fCL9XK4dhWtsvL5qwKd7MLu2YZDvM2H2r2r36Liz55bugR97+RXZ+xmwZAWJ+unMAeOG+bpOJoKgtMLjkHjtLmrxiJysCjCSsAkJc4zBy+YTkwk/SQxq+vbmQyefE/ARvsRINyUhFjVeOkRyVzUgIPiSf5cSB1b4lnAkODDLL3bH589i4YAIwR3RiLl5tZO8dHd02Ba7ufBMJ4szV+cUABbfKiYwhS8eQKfQnxf16Gizo11cOOyWU+3Qlw9TRPOcMO8jo/mYw3CF/ZQu+1+uM47Bzia5Xm7xIQ7hVyqjPtdYc9cSSc30hUQlS9CspCvhrA+ePnRnuXp7glX5V+9cP5pqeu5L2idbyaxVXv6DJvJ4rT14kiuLLtvg1+/Q=,iv:4iXVSvYMzppxYqCPH84cTfai6BdKRHD4BUF0BI9JYHc=,tag:DgAP7HZ38XgD1SYIMw0tYg==,type:str] hsmw-vpn-secret: ENC[AES256_GCM,data:3bKxRGTQcbhRjzARSpYBW5ekQW/U/ixzNiFmO36gw0NKyDMLlbVbJBqXvi71M0GXgmo/FA==,iv:7bVDA8u9apDNXFY/vEMbz/0HywG5Pyrl5JfZrcNCr8w=,tag:xz4j7cEc5hvLwrItWjkx0Q==,type:str] sops: kms: [] @@ -74,8 +75,8 @@ sops: SHJLR3lvdlFiRmJuU25RUHFFTmpjamMKbzycdDvQBAuOiRROTZEQSnaXoPapz73L yVS9EUP25FSx/sGqRqaCefbeaybuM1aso6LDnlomv4Bib7zjugWKSw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-09T21:28:13Z" - mac: ENC[AES256_GCM,data:EGpSDaYbOeupFjAmTgymLIYnEZnvZ9XzbNc+3wZemWYojtlnZX5bWn8aN7KEPactIeKcRg2Qx3FFaz24cLQiS58iM1Ig7QmChLlQFe/4JdGpuNJLcrXwGDjCvOZWEVvNcm51t0Ky+TTXQccluEwr2yPQZkLYbbJJQhmH5KQZ7lM=,iv:w8QF1TkWph2zBFzYBWPxpZDvCXl64aPcpLeTjT5JQNg=,tag:0Vcd0+nfeMo+MB/j1gPOxA==,type:str] + lastmodified: "2024-10-17T14:47:27Z" + mac: ENC[AES256_GCM,data:J3JGkxl3ifg054bvjRsWnAdkpJ/Ne1S1em5oTTM8eJ4vveFTBsmQgZFn9Z9Dj0mCgX1nd8VWebS2ABrZn44O1t+4L1bdYDjUS03JbN6wK/QXmLjuJeHl9qMdnPO8X2aLLS+Ej4PKlTFBDu/OEavhFmiUcW7wdEssl/D+ExV76zs=,iv:CEzRAmvu32vQ3CkyS0w90jEwlFzrKiH219zhTvM7INA=,tag:nYZ3lUGgvgRoPLA/l/4YDQ==,type:str] pgp: - created_at: "2024-06-09T19:44:41Z" enc: |- diff --git a/system-modules/networking.nix b/system-modules/networking.nix index 0248d66..f962e2f 100755 --- a/system-modules/networking.nix +++ b/system-modules/networking.nix @@ -1,4 +1,4 @@ -{ config, lib, host, secrets, ... }: +{ pkgs, lib, host, secrets, ... }: { # sops.secrets = { # "wireless-networking.env" = {}; @@ -18,24 +18,63 @@ 80 443 ]; - # wireless = { - # enable = true; - # environmentFile = config.sops.secrets."wireless-networking.env"; - # networks = { - # eduroam = lib.mkIf (host == "NxXPS") { - # auth = '' - # ssid="eduroam" - # key_mgmt=WPA-EAP - # eap=PEAP - # identity=${secrets.email.tuda.tuid}lan01@tu-darmstadt.de - # password="@NXXPSEDUROAMPW@" - # domain_suffix_match="radius.hrz.tu-darmstadt.de" - # anonymous_identity="eduroam@tu-darmstadt.de" - # phase2="auth=MSCHAPV2" - # ca_cert="/etc/ssl/certs/ca-bundle.crt" - # ''; - # }; - # }; + }; + + + # Eduroam + + environment.etc = { + "ssl/certs/tuda-eduroam-root.crt".source = "${pkgs.cacert.unbundled}/etc/ssl/certs/T-TeleSec_GlobalRoot_Class_2:1.crt"; + + # this comment blow is just for people reading my config + # I use sops-nix to place the actual file there (read below). + # identity and password have been replaced with "<...>" in the comment + # There the "email" and the password from the IDM portal of the HRZ should go + # Notice the toda-eduroam-root.crt that I am using (specified above) + # The method im using means that the password for the network is accessable locally as root user + # an even more secure way is for example using something like this https://wiki.archlinux.org/title/NetworkManager#Encrypted_Wi-Fi_passwords + + # "NetworkManager/system-connections/eduroam.nmconnection" = { + # text = '' + # [connection] + # id=eduroam + # uuid=09ce7f02-0c1d-4e11-9f69-e91031176d9d + # type=wifi + # permissions=user:nx2:; + + # [wifi] + # mode=infrastructure + # ssid=eduroam + + # [wifi-security] + # key-mgmt=wpa-eap + + # [802-1x] + # anonymous-identity=eduroam@tu-darmstadt.de + # ca-cert=/etc/ssl/certs/tuda-eduroam-root.crt + # domain=radius.hrz.tu-darmstadt.de + # eap=peap; + # identity=<...>@tu-darmstadt.de + # password=<...> + # phase2-auth=mschapv2 + + # [ipv4] + # method=auto + + # [ipv6] + # addr-gen-mode=stable-privacy + # ip6-privacy=2 + # method=auto + # ''; + # mode = "0600"; # }; }; + + sops.secrets = { + "eduroam/tuda_nmconnection" = { + mode = "0600"; + owner = "root"; + path = "/etc/NetworkManager/system-connections/eduroam.nmconnection"; + }; + }; } From a32d8ad3ceb49df8d1064ed812245d3f14a855df Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 22 Oct 2024 22:59:31 +0200 Subject: [PATCH 12/32] better curk --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 51b5acd..50de93d 100755 --- a/configuration.nix +++ b/configuration.nix @@ -80,7 +80,7 @@ git-crypt lazygit # home-manager module is bugged wget - curl + curlHTTP3 zip unzip p7zip From 89ed2c07482b113022dbff9de52a2caebf7b2993 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 22 Oct 2024 22:59:43 +0200 Subject: [PATCH 13/32] gs --- home.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home.nix b/home.nix index 99ecbcf..5d4b1a6 100755 --- a/home.nix +++ b/home.nix @@ -88,7 +88,8 @@ wl-clipboard xclip xournal - + ghostscript + inputs.zen-browser.packages."${system}".default ] ++ (with pkgs-unstable; [ From fb082f76eda41b81c27898bbde17abe511e03d46 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 22 Oct 2024 23:00:18 +0200 Subject: [PATCH 14/32] new sync version vesktop --- home-modules/discord.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home-modules/discord.nix b/home-modules/discord.nix index e08eec0..6134473 100755 --- a/home-modules/discord.nix +++ b/home-modules/discord.nix @@ -6,7 +6,9 @@ lib.mkIf (host != "NxACE") vesktop ]; - file.".config/vesktop/settings/settings.json".text = /* json */ ''{ + file.".config/vesktop/settings/settings.json".text = let + settingsSyncVersion = "1729179678715"; + in /* json */ ''{ "notifyAboutUpdates": true, "autoUpdate": false, "autoUpdateNotification": true, @@ -188,7 +190,7 @@ lib.mkIf (host != "NxACE") "authenticated": false, "url": "https://api.vencord.dev/", "settingsSync": false, - "settingsSyncVersion": 1725386648445 + "settingsSyncVersion": ${settingsSyncVersion} } } ''; From 085d593ce14ec4171a08e2bb968718963d1fab25 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 22 Oct 2024 23:00:30 +0200 Subject: [PATCH 15/32] new ssh --- home-modules/ssh.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix index 5ad6d55..656fb7b 100755 --- a/home-modules/ssh.nix +++ b/home-modules/ssh.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, system, user, allowed, secrets, ... }: +{ pkgs, lib, user, ... }: lib.mkIf (user != "tv") { @@ -9,7 +9,7 @@ lib.mkIf (user != "tv") home.file.".ssh/config".text = '' HOST nxace - HostName nx2.site + HostName ssh.nx2.site User nx2 Port 50022 @@ -18,18 +18,13 @@ lib.mkIf (user != "tv") User nx2 Port 50022 - HOST nxrpi - HostName nx2.site - User pi - Port 50023 - HOST nxrpil HostName 192.168.178.31 - User pi - Port 50023 + User nx2 + Port 22 HOST nxgit - HostName git.nx2.site + HostName ssh.nx2.site User git Port 20022 ''; From 0c92fcd68651dd52fc6769697f7058011c1bd0f4 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 23 Oct 2024 00:16:28 +0200 Subject: [PATCH 16/32] lzg theeme --- home-modules/git.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/home-modules/git.nix b/home-modules/git.nix index 2622e48..3d10803 100755 --- a/home-modules/git.nix +++ b/home-modules/git.nix @@ -56,13 +56,19 @@ lib.mkIf (user != "tv") windowSize = "normal"; gui.theme = with rice.color; { lightTheme = false; - activeBorderColor = [ border "bold"]; - inactiveBorderColor = [ black.bright ]; - optionsTextColor = [ blue.base ]; - selectedLineBgColor = [ foreground ]; - selectedRangeByColor = [ magenta.bright ]; + activeBorderColor = [ foreground "bold" ]; + inactiveBorderColor = [ border ]; + optionsTextColor = [ tertiary.base ]; + selectedLineBgColor = [ secondary.base ]; + selectedRangeByColor = [ weird.bright ]; showRandomTip = true; animateExplosion = true; + cherryPickedCommitFgColor = [ accent.base ]; # Foreground color of copied commit + cherryPickedCommitBgColor = [ secondary.dark ]; # Background color of copied commit + markedBaseCommitFgColor = [ accent.base ]; # Foreground color of marked base commit (for rebase) + markedBaseCommitBgColor = [ secondary.dark ]; # Background color of marked base commit (for rebase) + unstagedChangesColor = [ negative.base ]; # Color for file with unstaged changes + defaultFgColor = [ "default" ]; # Default text color }; }; }; From 14df46a6311bc94365f39b2d837a8145710d5bb8 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 23 Oct 2024 00:16:39 +0200 Subject: [PATCH 17/32] flake bump --- flake.lock | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index fef8f2b..25a9b70 100755 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729113795, - "narHash": "sha256-tV6aeQZ1wvAVDi+JW+IpXH9xQjZX+ZNFsuQCfWj2zWs=", + "lastModified": 1729629261, + "narHash": "sha256-IJtor2qFpsZkCm4UMnCHOSosW9GXKZVOm7DILtJJgoM=", "ref": "refs/heads/main", - "rev": "b57086aa4362117c1f1025246f618d760e44b026", - "revCount": 5349, + "rev": "29997ef4ba8ef0a80390e80199998d1390177454", + "revCount": 5366, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1728383680, - "narHash": "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=", + "lastModified": 1729596320, + "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "d05eb1ffba2ebffb5b4e1b407f134a4dcb411a88", + "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219", "type": "github" }, "original": { @@ -514,11 +514,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1729121138, - "narHash": "sha256-YwgV6ORMYDj32ucAIDjUY+6vV7Sv5RNbnnsQx4+QNw8=", + "lastModified": 1729631290, + "narHash": "sha256-zVL79jvDihxcnq9FKkAoILYWxGmxCw1DGdBnpv/B+3s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f67841950fe8e33ae6597cc2dac1bc179c3c2627", + "rev": "1f9d2cf67508efd9b5e81cdf7af556bbbfe02377", "type": "github" }, "original": { @@ -574,11 +574,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { @@ -590,11 +590,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -636,11 +636,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728909085, - "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", + "lastModified": 1729449015, + "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", + "rev": "89172919243df199fe237ba0f776c3e3e3d72367", "type": "github" }, "original": { @@ -651,11 +651,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722415718, - "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -785,17 +785,16 @@ ] }, "locked": { - "lastModified": 1721441897, - "narHash": "sha256-gYGX9/22tPNeF7dR6bWN5rsrpU4d06GnQNNgZ6ZiXz0=", + "lastModified": 1729391507, + "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b7996075da11a2d441cfbf4e77c2939ce51506fd", + "rev": "784981a9feeba406de38c1c9a3decf966d853cca", "type": "github" }, "original": { "owner": "oxalica", "repo": "rust-overlay", - "rev": "b7996075da11a2d441cfbf4e77c2939ce51506fd", "type": "github" } }, @@ -807,11 +806,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729587807, + "narHash": "sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM+enIFoveNTCz4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "26642e8f193f547e72d38cd4c0c4e45b49236d27", "type": "github" }, "original": { @@ -928,11 +927,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1729081599, - "narHash": "sha256-TE8h7u3b39yMgtboXMxaZ+I5hfa1jpTP/MXxLPZhLew=", + "lastModified": 1729473414, + "narHash": "sha256-ffiEVFCUMnShcSa4hvCbT1EQeu7c2lVOk6OdaxjiUmU=", "owner": "sxyazi", "repo": "yazi", - "rev": "a6c9c93d586422fbb212707bfb09c9039585b40b", + "rev": "0e118b5b3a5baacf7fe62971e2bfe2b0ad972bab", "type": "github" }, "original": { From 115a6d3c8347f74502e1eb739efdfa16f3d25d7d Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 23 Oct 2024 12:58:02 +0200 Subject: [PATCH 18/32] fcitx not working wip --- system-modules/fcitx5.nix | 105 +++++++++++++++++++++++++++++--------- 1 file changed, 82 insertions(+), 23 deletions(-) diff --git a/system-modules/fcitx5.nix b/system-modules/fcitx5.nix index d254a9a..48fe697 100644 --- a/system-modules/fcitx5.nix +++ b/system-modules/fcitx5.nix @@ -1,28 +1,87 @@ -{ pkgs-unstable, ... }: +{ pkgs, pkgs-unstable, ... }: { + # i18n.inputMethod = { + # type = "fcitx5"; + # enable = true; + # fcitx5.addons = with pkgs; [ + # fcitx5-gtk # alternatively, kdePackages.fcitx5-qt + # fcitx5-chinese-addons # table input method support + # fcitx5-nord # a color theme + # ]; + # }; i18n.inputMethod = { enabled = "fcitx5"; - # type = "fcitx5"; # for later than 24.05 - # enable = true; - fcitx5 = { - waylandFrontend = true; - addons = with pkgs-unstable; [ - rime-data - fcitx5-rime - fcitx5-gtk - fcitx5-chinese-addons - fcitx5-catppuccin - ]; - }; - }; - services.xserver.desktopManager.runXdgAutostartIfNone = true; - environment.variables = { - GLFW_IM_MODULE = "fcitx"; - GTK_IM_MODULE = "fcitx"; - INPUT_METHOD = "fcitx"; - XMODIFIERS = "@im=fcitx"; - IMSETTINGS_MODULE = "fcitx"; - QT_IM_MODULE = "fcitx"; - SDL_IM_MODULE = "fcitx"; + fcitx5.waylandFrontend = true; + fcitx5.addons = with pkgs; [ + fcitx5-gtk # alternatively, kdePackages.fcitx5-qt + fcitx5-chinese-addons # table input method support + fcitx5-nord # a color theme + ]; }; + # i18n.inputMethod = { + # enabled = "fcitx5"; + # ignoreUserConfig = true; + # waylandFrontend = true; + # fcitx5 = { + # addons = with pkgs-unstable; [ + # rime-data + # fcitx5-rime + + # # Chinese + # fcitx5-chinese-addons + # fcitx5-table-extra + # fcitx5-pinyin-moegirl + # fcitx5-pinyin-zhwiki + + # # Japanese + # # fcitx5-mozc + # ]; + # settings = { + # globalOptions = { + # Hotkey = { + # # Enumerate when press trigger key repeatedly + # EnumerateWithTriggerKeys = "True"; + # # Skip first input method while enumerating + # EnumerateSkipFirst = "False"; + # }; + # "Hotkey/EnumerateForwardKeys" = { "0" = "Control+space"; }; + # "Hotkey/EnumerateBackwardKeys" = { "0" = "Control+Shift+space"; }; + # "Hotkey/PrevPage" = { "0" = "Up"; }; + # "Hotkey/NextPage" = { "0" = "Down"; }; + # "Hotkey/PrevCandidate" = { "0" = "Shift+Tab"; }; + # "Hotkey/NextCandidate" = { "0" = "Tab"; }; + # Behavior = { + # ActiveByDefault = "False"; # Active By Default + # ShareInputState = "No"; # Share Input State + # PreeditEnabledByDefault = "True"; # Show preedit in application + # ShowInputMethodInformation = "True"; # Show Input Method Information when switch input method + # showInputMethodInformationWhenFocusIn = "False"; # Show Input Method Information when changing focus + # CompactInputMethodInformation = "True"; # Show compact input method information + # ShowFirstInputMethodInformation = "True"; # Show first input method information + # DefaultPageSize = "5"; # Default page size + # OverrideXkbOption = "False"; # Override Xkb Option + # PreloadInputMethod = "True"; # Preload input method to be used by default + # }; + # }; + # inputMethod = { + # "Groups/0" = { + # "Name" = "Default"; + # "Default Layout" = "us"; + # "DefaultIM" = "mozc"; + # }; + # "Groups/0/Items/0" = { + # "Name" = "keyboard-us"; + # "Layout" = null; + # }; + # "Groups/0/Items/1" = { + # "Name" = "mozc"; + # "Layout" = null; + # }; + # "GroupOrder" = { + # "0" = "Default"; + # }; + # }; + # }; + # }; + # }; } From e3e52fb656b0b27f277ba881d296fac93d4220c2 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 24 Oct 2024 13:02:22 +0200 Subject: [PATCH 19/32] themed Zathura --- home-modules/zathura.nix | 32 ++++++++++++++++++++++++++++++++ home.nix | 6 ++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 home-modules/zathura.nix diff --git a/home-modules/zathura.nix b/home-modules/zathura.nix new file mode 100644 index 0000000..e303a54 --- /dev/null +++ b/home-modules/zathura.nix @@ -0,0 +1,32 @@ +{ pkgs, rice, ... }: +{ + programs.zathura = { + enable = true; + options = with rice.color; { + completion-bg = background; + completion-fg = foreground; + completion-highlight-bg = background; + completion-highlight-fg = accent.base; + # default-bg = background; + # default-fg = foreground; + highlight-active-color = accent.base; + highlight-color = secondary.base; + index-active-bg = background; + inputbar-bg = background; + inputbar-fg = foreground; + notification-bg = background; + notification-error-bg = background; + notification-error-fg = foreground; + notification-fg = foreground; + notification-warning-bg = background; + notification-warning-fg = foreground; + recolor = false; + recolor-darkcolor = foreground; + recolor-keephue = true; + recolor-lightcolor = background; + selection-clipboard = "clipboard"; + statusbar-bg = background; + statusbar-fg = foreground; + }; + }; +} diff --git a/home.nix b/home.nix index 5d4b1a6..b295bec 100755 --- a/home.nix +++ b/home.nix @@ -51,14 +51,16 @@ ./home-modules/waybar.nix ./home-modules/wlogout.nix ./home-modules/yazi.nix - ./home-modules/zoxide.nix ]; + ./home-modules/zathura.nix + ./home-modules/zoxide.nix + ]; home.username = user; home.homeDirectory = "/home/${user}"; home.stateVersion = "24.05"; home.packages = with pkgs; [ chromium - zathura + # zathura xfce.thunar # spotify From abd5b60ffa4f94519764158458df330c83fc4d71 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Fri, 25 Oct 2024 02:12:52 +0200 Subject: [PATCH 20/32] nixd --- configuration.nix | 1 + home-modules/helix.nix | 19 ++++++++++++++----- home-modules/nixd.nix | 6 ++++++ home.nix | 3 ++- system-modules/nixd.nix | 4 ++++ 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 home-modules/nixd.nix create mode 100644 system-modules/nixd.nix diff --git a/configuration.nix b/configuration.nix index 50de93d..03c45e4 100755 --- a/configuration.nix +++ b/configuration.nix @@ -25,6 +25,7 @@ ./system-modules/kanata.nix ./system-modules/kodi.nix ./system-modules/networking.nix + ./system-modules/nixd.nix ./system-modules/nvidia.nix ./system-modules/nx2site.nix ./system-modules/ollama.nix diff --git a/home-modules/helix.nix b/home-modules/helix.nix index 9543f6a..56f3477 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -2,8 +2,9 @@ { home = { packages = with pkgs; [ - nixfmt-classic # nix formater - nil # nix language server + # nixfmt-classic # nix formater + # nil # nix language server + # nixd # specified in nixd.nix python311Packages.python-lsp-server ruff ruff-lsp @@ -13,7 +14,8 @@ marksman # markdown vale-ls # style-checker lsp (needs vale) ltex-ls # Ltex (language tool) - ] ++ (with pkgs-unstable; [ + ] ++ (with pkgs-unstable; [ + bash-language-server helix ]); sessionVariables = { @@ -60,7 +62,7 @@ }; }; keys.normal = { - "C-g" = [":new" ":insert-output lazygit" ":buffer-close!" ":redraw"]; + "C-g" = [ ":new" ":insert-output lazygit" ":buffer-close!" ":redraw" ]; "A-`" = [ "no_op" ]; "`" = [ "no_op" ]; }; @@ -72,9 +74,13 @@ }; languages = { language = [ + { + name = "nix"; + language-servers = [ "nixd" "nil" ]; + } { name = "latex"; - language-servers = ["texlab" "language-tool"]; + language-servers = [ "texlab" "language-tool" ]; } { name = "markdown"; @@ -118,6 +124,9 @@ } ]; language-server = { + "nixd" = { + command = "nixd"; + }; "style-check" = { command = lib.getExe pkgs.vale-ls; }; diff --git a/home-modules/nixd.nix b/home-modules/nixd.nix new file mode 100644 index 0000000..f2ac5e3 --- /dev/null +++ b/home-modules/nixd.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + nixd + ]; +} diff --git a/home.nix b/home.nix index 5d4b1a6..548a09c 100755 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable, lib, host, user, inputs, ... }: +{ pkgs, pkgs-unstable, host, user, inputs, ... }: { imports = [ ./home-modules/auto-mount.nix @@ -26,6 +26,7 @@ # ./home-modules/matrix.nix # ./home-modules/nm.nix ./home-modules/nh.nix + ./home-modules/nixd.nix ./home-modules/nvidia.nix ./home-modules/nx-gcal-event.nix ./home-modules/obs.nix diff --git a/system-modules/nixd.nix b/system-modules/nixd.nix new file mode 100644 index 0000000..78cad0b --- /dev/null +++ b/system-modules/nixd.nix @@ -0,0 +1,4 @@ +{ inputs, ... }: +{ + nix.nixPath = [ "nixpgs=${inputs.nixpkgs}" ]; +} From b3d3c983c2275ee13c2995d91fcfd6949637c41c Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 28 Oct 2024 13:43:22 +0100 Subject: [PATCH 21/32] nixd spelling --- system-modules/nixd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-modules/nixd.nix b/system-modules/nixd.nix index 78cad0b..f40fb89 100644 --- a/system-modules/nixd.nix +++ b/system-modules/nixd.nix @@ -1,4 +1,4 @@ { inputs, ... }: { - nix.nixPath = [ "nixpgs=${inputs.nixpkgs}" ]; + nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; } From 340c514a99c78151f4c9935adb68c51404f8e5ae Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 28 Oct 2024 16:10:02 +0100 Subject: [PATCH 22/32] more fuse (still sucks) --- system-modules/fuse.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/system-modules/fuse.nix b/system-modules/fuse.nix index 3ca7c52..2cd4b24 100755 --- a/system-modules/fuse.nix +++ b/system-modules/fuse.nix @@ -1,7 +1,12 @@ { config, pkgs, ...}: { - environment.systemPackages = with pkgs; [ - jmtpfs - ]; -} \ No newline at end of file + environment = { + systemPackages = with pkgs; [ + jmtpfs + simple-mtpfs + android-file-transfer + ]; + }; + programs.fuse.userAllowOther = true; +} From 97f33c7b8dbd26293a0ba2e4120e03a999b8c4a3 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 30 Oct 2024 00:55:16 +0100 Subject: [PATCH 23/32] diffrent rice --- flake-modules/rice.nix | 6 +++--- home-modules/hyprland.nix | 3 ++- home-modules/wallpaper-to-colors.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 66cb5ea..30cd6f7 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -3,9 +3,9 @@ pkgs: rec { lib = import ../nxlib/ricelib.nix pkgs.lib; transparency = 0.8; - rounding = 10; - gap-size = 10; - border-width = 3; + rounding = 3; + gap-size = 5; + border-width = 2; color = let dark = (-0.5); diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 5e9661f..18b78f7 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -230,7 +230,7 @@ lib.mkIf (user != "tv") dwindle = { preserve_split = true; # you probably want this - no_gaps_when_only = false; + no_gaps_when_only = true; }; # master = { @@ -332,6 +332,7 @@ lib.mkIf (user != "tv") "SUPER, F5, exec, nx_gcal_event force-lookup" "SUPER SHIFT, F5, exec, nx_gcal_event reauthenticate" "SUPER, F6, exec, kitty -e 'htop'" + "SUPER, F7, exec, kitty -e 'nmtui'" ''SUPER, F8, exec, find ~/Pictures/wallpapers/* -type f -not -path "~/Pictures/wallpapers/.git/*" | sort -R | head -n 1 | xargs swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120'' ''SUPER, F9, exec, kitty -e sh -c 'change_colors_json $(swww query | sed -n 1p | sed -e "s-.*image: --g") && nh home switch && firefox /home/${user}/.config/color-pallete.html' '' ''SUPER SHIFT, F9, exec, firefox /home/${user}/.config/color-pallete.html '' diff --git a/home-modules/wallpaper-to-colors.nix b/home-modules/wallpaper-to-colors.nix index aee8831..414e66d 100644 --- a/home-modules/wallpaper-to-colors.nix +++ b/home-modules/wallpaper-to-colors.nix @@ -123,7 +123,7 @@ if __name__ == "__main__": accent = ensure_color(c=palette[0], alter_sat=False) secondary = ensure_color(c=palette[1], alter_sat=True) tertiary = ensure_color(c=palette[2], alter_sat=False) - weird = alter_hue(ilist=secondary, hue=180) + weird = alter_hue(ilist=accent, hue=80) special = alter_hue(ilist=accent, hue=180) foreground = alter_l(accent, 0.9) background = alter_l(accent, 0.1) From 169d6eda11cf7c0542704868252447510436125c Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 30 Oct 2024 00:55:44 +0100 Subject: [PATCH 24/32] ~/shared ownwership fix --- system-modules/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-modules/hardware-configuration.nix b/system-modules/hardware-configuration.nix index c484495..4e01f1b 100755 --- a/system-modules/hardware-configuration.nix +++ b/system-modules/hardware-configuration.nix @@ -16,7 +16,7 @@ fileSystems = if host != "NxACE" then { "/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; }; "/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; }; - "/home/${user}/shared" = { device = "/dev/disk/by-label/shared"; fsType = "ntfs"; options = [ "uid:1000" "gid:100" ]; }; + "/home/${user}/shared" = { device = "/dev/disk/by-label/shared"; fsType = "ntfs"; options = [ "uid=1000" "gid=100" ]; }; } else { "/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; }; "/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; }; From f9d4921726ffddb3fb136b38eaf4e5daf55c5dfb Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 6 Nov 2024 13:42:04 +0100 Subject: [PATCH 25/32] userChrome mynixos.com --- home-modules/firefox.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index 903b0b9..e9850fe 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -177,6 +177,16 @@ } } + @-moz-document domain(mynixos.com) { + body, html { + background-color: transparent !important; + } + header, footer { + background-color: rgba(0,0,0,0.5) !important; + border-radius: ${builtins.toString rice.rounding}px; + } + } + @-moz-document domain(nx2.site) { html { background: radial-gradient(rgba(255, 255, 255, 0.8) 5%, transparent 5%) !important; From 148bd4c4814620d67b7a3d4e7b3f673786d5d634 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 6 Nov 2024 13:42:44 +0100 Subject: [PATCH 26/32] accent is the always visible border --- home-modules/hyprland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 18b78f7..3ea3f72 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -164,8 +164,8 @@ lib.mkIf (user != "tv") gaps_in = builtins.div rice.gap-size 2; gaps_out = rice.gap-size; border_size = rice.border-width; - "col.active_border" = "rgba(${rice.lib.nohash rice.color.border}ff) rgba(${rice.lib.nohash rice.color.border2}ff) 90deg"; - "col.inactive_border" = "rgba(${rice.lib.nohash rice.color.background}ff) rgba(${rice.lib.nohash rice.color.border2}ff) 90deg"; + "col.active_border" = "rgba(${rice.lib.nohash rice.color.border2}ff) rgba(${rice.lib.nohash rice.color.border}ff) 90deg"; + "col.inactive_border" = "rgba(${rice.lib.nohash rice.color.background}ff) rgba(${rice.lib.nohash rice.color.border}ff) 90deg"; # cursor_inactive_timeout = 10; From 096f31d81afa50e31710daee932c16080a593b75 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 6 Nov 2024 13:52:43 +0100 Subject: [PATCH 27/32] all nixd paths --- system-modules/nixd.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system-modules/nixd.nix b/system-modules/nixd.nix index f40fb89..bd33819 100644 --- a/system-modules/nixd.nix +++ b/system-modules/nixd.nix @@ -1,4 +1,8 @@ { inputs, ... }: { - nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; + nix.nixPath = [ + "nixpkgs=${inputs.nixpkgs}" + "nixpkgs-unstable=${inputs.nixpkgs-unstable}" + "nixpkgs-latest=${inputs.nixpkgs-latest}" + ]; } From 1814068cfeff145941337f044468d3703ddd2d28 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 6 Nov 2024 13:52:53 +0100 Subject: [PATCH 28/32] better zathura rice --- home-modules/hyprland.nix | 2 +- home-modules/zathura.nix | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 18b78f7..ece8753 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -270,7 +270,7 @@ lib.mkIf (user != "tv") "opacity ${transparency}, sent" "opacity ${transparency}, neovide" "opacity ${transparency}, obsidian" - "opacity ${transparency}, zathura" + # "opacity ${transparency}, zathura" # "bordercolor rgba(${rice.lib.nohash rice.color.foreground}ff) rgba(${rice.lib.nohash rice.color.background}${rice.lib.float-to-drune rice.transparency}), Alacritty" # "bordercolor rgba(${rice.lib.nohash rice.color.foreground}ff) rgba(${rice.lib.nohash rice.color.background}${rice.lib.float-to-drune rice.transparency}), Kitty" "opacity ${transparency}, discord" diff --git a/home-modules/zathura.nix b/home-modules/zathura.nix index e303a54..2351fe0 100644 --- a/home-modules/zathura.nix +++ b/home-modules/zathura.nix @@ -7,10 +7,11 @@ completion-fg = foreground; completion-highlight-bg = background; completion-highlight-fg = accent.base; - # default-bg = background; - # default-fg = foreground; - highlight-active-color = accent.base; - highlight-color = secondary.base; + default-bg = "rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency})"; + default-fg = foreground; + highlight-active-color = "rgba(${rice.lib.hex-to-rgb-comma-string accent.base},0.5)"; + highlight-color = "rgba(${rice.lib.hex-to-rgb-comma-string secondary.base},0.5)"; + highlight-fg = "rgba(${rice.lib.hex-to-rgb-comma-string secondary.base},0.5)"; index-active-bg = background; inputbar-bg = background; inputbar-fg = foreground; @@ -20,13 +21,16 @@ notification-fg = foreground; notification-warning-bg = background; notification-warning-fg = foreground; - recolor = false; + recolor = true; recolor-darkcolor = foreground; recolor-keephue = true; recolor-lightcolor = background; selection-clipboard = "clipboard"; - statusbar-bg = background; + statusbar-bg = black.base; statusbar-fg = foreground; + + n-completion-items = 9999999999999; + exec-command = "open"; }; }; } From 06a630319d16e6af2a31d8d8bef1383b521838d2 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 6 Nov 2024 13:53:19 +0100 Subject: [PATCH 29/32] prettier code --- home-modules/gpg.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/home-modules/gpg.nix b/home-modules/gpg.nix index 48dc298..04ffaa5 100644 --- a/home-modules/gpg.nix +++ b/home-modules/gpg.nix @@ -1,16 +1,15 @@ { pkgs, pkgs-unstable, ... }: { # there also is a system module - home.packages = with pkgs; [ + home.packages = (with pkgs; [ gnupg gpg-tui - ] ++ ( with pkgs-unstable; [ + ]) ++ ( with pkgs-unstable; [ pinentry-all ]); # services.pcscd.enable = true; - services.gpg-agent = - let + services.gpg-agent = let min2sec = min: (min * 60); in { enable = true; From c426029a255262591bcc531287c3c70c7c973585 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 7 Nov 2024 16:33:56 +0100 Subject: [PATCH 30/32] adb --- configuration.nix | 1 + system-modules/adb.nix | 7 +++++++ system-modules/users.nix | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 system-modules/adb.nix diff --git a/configuration.nix b/configuration.nix index 03c45e4..4088645 100755 --- a/configuration.nix +++ b/configuration.nix @@ -2,6 +2,7 @@ { imports = [ inputs.sops-nix.nixosModules.sops + ./system-modules/adb.nix ./system-modules/auto-mount.nix ./system-modules/hardware-configuration.nix ./system-modules/fuse.nix diff --git a/system-modules/adb.nix b/system-modules/adb.nix new file mode 100644 index 0000000..d19df86 --- /dev/null +++ b/system-modules/adb.nix @@ -0,0 +1,7 @@ +{ host, lib, ... }: +lib.mkIf (host != "NxACE") +{ + programs.adb = { + enable = true; + }; +} diff --git a/system-modules/users.nix b/system-modules/users.nix index cec112b..ad973ee 100755 --- a/system-modules/users.nix +++ b/system-modules/users.nix @@ -5,7 +5,7 @@ users.users."${user}" = { isNormalUser = true; - extraGroups = [ "networkmanager" "wheel" "audio" "video" "docker" "libvirtd" "uinput" "input" "ydotool" ]; + extraGroups = [ "networkmanager" "wheel" "audio" "video" "docker" "libvirtd" "uinput" "input" "ydotool" "adbusers" ]; useDefaultShell = true; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID1RPCcS8DtIf75a2FEW4d8X6WTVeLlmretoLqppvZlJ" # From [A] GPG Sub Key From 5f9c6dd0a3bb0624fa1128cbb545c15b508aa98e Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 7 Nov 2024 16:34:01 +0100 Subject: [PATCH 31/32] yazi more rice --- home-modules/yazi.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index b7a9709..a765360 100755 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -169,12 +169,12 @@ lib.mkIf (user != "tv") hovered = { underline = true; }; }; which = { - mask = { bg = "#3c3836"; }; - cand = { fg = "#83a598"; }; - rest = { fg = "#928374"; }; - desc = { fg = "#fe8019"; }; + mask = { bg = black.base; }; + cand = { fg = accent.base; }; + rest = { fg = secondary.base; }; + desc = { fg = tertiary.base; }; separator = "  "; - separator_style = { fg = "#504945"; }; + separator_style = { fg = foreground; }; }; help = { on = { fg = "#fe8019"; }; From 6abff56bbd3b52ec20215172ca2edc31d577a507 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Fri, 8 Nov 2024 13:42:49 +0100 Subject: [PATCH 32/32] tuda-moodle-rice --- home-modules/firefox.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index e9850fe..5b9954a 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -187,6 +187,15 @@ } } + @-moz-document domain(moodle.informatik.tu-darmstadt.de) { + body, html , .main-inner, .main-inner * { + background-color: transparent !important; + } + .bg-primary { + background-color: rgba(${rice.lib.hex-to-rgb-comma-string accent.base}, 0.5) !important! + } + } + @-moz-document domain(nx2.site) { html { background: radial-gradient(rgba(255, 255, 255, 0.8) 5%, transparent 5%) !important;