From 70cb08d21b1e341f7f4802f621c9b4abec6edc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 28 Dec 2025 17:22:04 +0100 Subject: [PATCH 1/4] npins: update sources --- npins/sources.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 97cac2be..c3f6319c 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -114,9 +114,9 @@ }, "branch": "release-25.11", "submodules": false, - "revision": "7df150f0d3857cf68dae443813b27acfb201b2d8", - "url": "https://github.com/nix-community/home-manager/archive/7df150f0d3857cf68dae443813b27acfb201b2d8.tar.gz", - "hash": "00hzbqdayq8zjrw5rfzb0909nw2b1gmy6czv2c1hfjj63z94xpic" + "revision": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e", + "url": "https://github.com/nix-community/home-manager/archive/0999ed8f965bbbd991437ad9c5ed3434cecbc30e.tar.gz", + "hash": "1rzgy9qmrvh9l3jrcjv14kva8sj3imzrpm2vmwcfzp40bk9wdfb5" }, "infuse": { "type": "GitRelease", @@ -187,9 +187,9 @@ }, "branch": "master", "submodules": false, - "revision": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", - "url": "https://github.com/NixOS/nixos-hardware/archive/9154f4569b6cdfd3c595851a6ba51bfaa472d9f3.tar.gz", - "hash": "1vmlcda7864ya2byxivnpzkqf41cavj9ms5hjh6i0h8anls56lk6" + "revision": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "url": "https://github.com/NixOS/nixos-hardware/archive/c5db9569ac9cc70929c268ac461f4003e3e5ca80.tar.gz", + "hash": "16p1m6avlp4iyw7cfzwwjfm421mns9ab9a1kkg59rvn3pqvnsxai" }, "nixpkgs": { "type": "Git", @@ -200,9 +200,9 @@ }, "branch": "nixos-25.11-small", "submodules": false, - "revision": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", - "url": "https://github.com/nixos/nixpkgs/archive/c6f52ebd45e5925c188d1a20119978aa4ffd5ef6.tar.gz", - "hash": "0gwxhs3j1nglyymbaqyqg8miz0rk84n4ijag5s4bx6yfb6vrd4lv" + "revision": "bc805d6053df597d14851e919dd22137abf33e44", + "url": "https://github.com/nixos/nixpkgs/archive/bc805d6053df597d14851e919dd22137abf33e44.tar.gz", + "hash": "0m78vibcry1lkj9zfglvp11ld3wvarsl92d99fcsc6322z1nd520" }, "nur": { "type": "Git", @@ -213,9 +213,9 @@ }, "branch": "main", "submodules": false, - "revision": "c5bc6e626bb2cf01b9e65572ca4b44ccdcc1dfc9", - "url": "https://github.com/nix-community/nur/archive/c5bc6e626bb2cf01b9e65572ca4b44ccdcc1dfc9.tar.gz", - "hash": "1fdqlpqsidqis2jzc6iwbafi82916jsnrl46k9gfdp9bxhcrmbvf" + "revision": "6580345ce88dd3b98aaaefc253ea3c0c712e0dc2", + "url": "https://github.com/nix-community/nur/archive/6580345ce88dd3b98aaaefc253ea3c0c712e0dc2.tar.gz", + "hash": "1xbman6fy7r355wzmf0h95ryij2wir902zpc68nn3b9vw5xj1f7l" }, "pin-emacs28": { "type": "Git", @@ -338,9 +338,9 @@ }, "branch": "mistress", "submodules": false, - "revision": "96af6b75a3605043141db6bf80ad60866c10c827", - "url": "https://github.com/AgathaSorceress/url-eater/archive/96af6b75a3605043141db6bf80ad60866c10c827.tar.gz", - "hash": "0lfq1hxdc7y1n00h1hl9ckxb7969nck0x654af77axvw1v3hamj0" + "revision": "d617007eba79f9760db084aefda6c02c80ad7971", + "url": "https://github.com/AgathaSorceress/url-eater/archive/d617007eba79f9760db084aefda6c02c80ad7971.tar.gz", + "hash": "0dir077j5gy6yzbhsr85z7kbiwi135ns59gwrycbpvihzzp4qbwm" }, "wallpapers": { "type": "Git", @@ -352,9 +352,9 @@ }, "branch": "mistress", "submodules": false, - "revision": "377fc66de1961687bf81bd0182c5d385c1dfadb2", - "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/377fc66de1961687bf81bd0182c5d385c1dfadb2.tar.gz", - "hash": "1j6mnb1n0wjlm69dfngi4jjrr76zf3kfmqm0wkbgjvm93cbg1p7j" + "revision": "ee12113e53e1b9b80638b6963a5b7075c3b81e93", + "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/ee12113e53e1b9b80638b6963a5b7075c3b81e93.tar.gz", + "hash": "1pv17pvc60jkr8y7j8g3q0wmy5qgsjxsq1gv23yb3gf52g4z98sk" }, "wired-notify": { "type": "Git", @@ -378,9 +378,9 @@ }, "branch": "main", "submodules": false, - "revision": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56", - "url": "https://github.com/0xc000022070/zen-browser-flake/archive/bc7dfff92cb7919dfb213ea78c11ea0a4d265a56.tar.gz", - "hash": "0nqhwk7gbp9frh9k98yafdnm3d5kdc9d94vpwqalr49cblcmiyy9" + "revision": "fe8d1a61a904b336f453d7ab5ae7d691a21c5cbf", + "url": "https://github.com/0xc000022070/zen-browser-flake/archive/fe8d1a61a904b336f453d7ab5ae7d691a21c5cbf.tar.gz", + "hash": "1wh060savyr2v4kb9c1b01ylhz955qzflxsfq8a7c82y1l74cgcq" } }, "version": 5 From 01e50baa5c0ae74e9aa7a04306c8ba4cc06530d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 28 Dec 2025 19:14:45 +0100 Subject: [PATCH 2/4] Revert "vanadium/connectivity: block youtube for a while" This reverts commit bf09e7c07def8f38f57c361207919ccd9792f963. --- nix/configurations/vanadium/nixos/connectivity.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix index e4906268..c484540f 100644 --- a/nix/configurations/vanadium/nixos/connectivity.nix +++ b/nix/configurations/vanadium/nixos/connectivity.nix @@ -67,9 +67,6 @@ 0.0.0.0 instagram.com 0.0.0.0 www.instagram.com - 0.0.0.0 youtube.com - 0.0.0.0 www.youtube.com - # The "people who you viewed can see you" thing is weird af 0.0.0.0 linkedin.com 0.0.0.0 www.linkedin.com From 39369888981c32f9de30f66ebe20378a029e3f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 28 Dec 2025 20:09:38 +0100 Subject: [PATCH 3/4] tree-wide: stop passing hostname around --- nix/configurations/hetzner_benchmark.nix | 7 +------ nix/configurations/hydrogen.nix | 7 +------ nix/configurations/vanadium.nix | 7 +------ nix/nixosModules/common/network.nix | 3 --- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/nix/configurations/hetzner_benchmark.nix b/nix/configurations/hetzner_benchmark.nix index 6201e6f1..38d0d479 100644 --- a/nix/configurations/hetzner_benchmark.nix +++ b/nix/configurations/hetzner_benchmark.nix @@ -25,7 +25,7 @@ in # # hostname # - { _module.args = { inherit hostname; }; } + { networking.hostName = hostname; } # # nixpkgs @@ -86,11 +86,6 @@ in }; hm.imports = [ - # - # hostname - # - { _module.args = { inherit hostname; }; } - # # home modules # diff --git a/nix/configurations/hydrogen.nix b/nix/configurations/hydrogen.nix index 5a303423..42554878 100644 --- a/nix/configurations/hydrogen.nix +++ b/nix/configurations/hydrogen.nix @@ -28,7 +28,7 @@ in # # hostname # - { _module.args = { inherit hostname; }; } + { networking.hostName = hostname; } # # nixpkgs @@ -97,11 +97,6 @@ in }; hm.imports = [ - # - # hostname - # - { _module.args = { inherit hostname; }; } - # # home modules # diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 105dd10b..7ee11888 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -25,7 +25,7 @@ in # # hostname # - { _module.args = { inherit hostname; }; } + { networking.hostName = hostname; } # # nixpkgs @@ -147,11 +147,6 @@ in }; hm.imports = [ - # - # hostname - # - { _module.args = { inherit hostname; }; } - # # home modules # diff --git a/nix/nixosModules/common/network.nix b/nix/nixosModules/common/network.nix index 6d36fbfb..61785574 100644 --- a/nix/nixosModules/common/network.nix +++ b/nix/nixosModules/common/network.nix @@ -1,7 +1,4 @@ -{ hostname, ... }: { - networking.hostName = hostname; - services.openssh = { enable = true; settings = { From cc4d58aab9ab8107b278fb57233e31f1d35e1127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 28 Dec 2025 20:42:42 +0100 Subject: [PATCH 4/4] vanadium/display: new display "acacia" --- nix/configurations/vanadium/nixos/display.nix | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/nix/configurations/vanadium/nixos/display.nix b/nix/configurations/vanadium/nixos/display.nix index 43e9f953..710a61ed 100644 --- a/nix/configurations/vanadium/nixos/display.nix +++ b/nix/configurations/vanadium/nixos/display.nix @@ -46,6 +46,9 @@ orchid = device: singleton device "00ffffffffffff0004699a24642900002416010380341d782a2ac5a4564f9e280f5054b7ef00714f814081809500b300d1c081c08100023a801871382d40582c450009252100001e000000ff0043394c4d54463031303539360a000000fd00324b185311000a202020202020000000fc00415355532056533234370a20200173020322714f0102031112130414050e0f1d1e1f10230917078301000065030c0010008c0ad08a20e02d10103e9600092521000018011d007251d01e206e28550009252100001e011d00bc52d01e20b828554009252100001e8c0ad090204031200c4055000925210000180000000000000000000000000000000000000000005d"; + acacia = + device: + singleton device "00ffffffffffff000469a42693b7000018130103803722782acbd0a35a49a024135054bfef00714f0101814081809500b30001010101283c80a070b023403020360026542100001a000000ff0039364c4d54463034363939350a000000fd00324b1e5511000a202020202020000000fc0041535553205657323636480a2001f5020322714f1f1404130211061501100503120716230907078301000065030c0010008c0ad08a20e02d10103e9600c48e21000018011d007251d01e206e285500c48e2100001e011d00bc52d01e20b8285540c48e2100001e8c0ad090204031200c405500c48e210000188c0aa02051201810187e2300c48e210000980000004a"; }; devices = rec { @@ -130,6 +133,15 @@ rate = "60.00"; }; }; + enableAcacia = name: { + ${name} = { + enable = true; + primary = true; + crtc = 1; + mode = "1920x1200"; + rate = "59.95"; + }; + }; }; frameworkBuiltin = { @@ -141,6 +153,7 @@ hooks.postswitch = switches.setDPI { dpi = 150; }; }; + # Tyler's mkAmethyst = name: { fingerprint = lib.mkMerge [ fingerprints.built-in @@ -167,6 +180,7 @@ ]; }; + # Pei's mkOrchid = name: { fingerprint = lib.mkMerge [ fingerprints.built-in @@ -185,11 +199,35 @@ }) ]; }; + + # Thomas' + mkAcacia = name: { + fingerprint = lib.mkMerge [ + fingerprints.built-in + (fingerprints.acacia name) + ]; + config = lib.mkMerge [ + configs.allOff + (configs.enableAcacia name) + ]; + hooks.postswitch = lib.mkMerge [ + (switches.setDPI { dpi = 100; }) + (switches.setDDCBrightness { + modelName = "ASUS VW266H"; + brightness = 0; + }) + (switches.setDDCContrast { + modelName = "ASUS VW266H"; + contrast = 0.5; + }) + ]; + }; in lib.mkMerge [ { default = frameworkBuiltin; } (lib.genAttrs' devices.extern (name: lib.nameValuePair "amethyst-${name}" (mkAmethyst name))) (lib.genAttrs' devices.extern (name: lib.nameValuePair "orchid-${name}" (mkOrchid name))) + (lib.genAttrs' devices.extern (name: lib.nameValuePair "acacia-${name}" (mkAcacia name))) ]; }; }