From 5ccd556ae43f3a0f538c338ab288d12e9b654cf4 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 01:36:36 -0600 Subject: [PATCH 1/7] remove matrix --- sys/platforms/vps/srv/default.nix | 1 - sys/platforms/vps/srv/matrix.nix | 58 ------------------------------- 2 files changed, 59 deletions(-) delete mode 100644 sys/platforms/vps/srv/matrix.nix diff --git a/sys/platforms/vps/srv/default.nix b/sys/platforms/vps/srv/default.nix index 3216ccb..cf7adb0 100644 --- a/sys/platforms/vps/srv/default.nix +++ b/sys/platforms/vps/srv/default.nix @@ -10,7 +10,6 @@ with lib; { ./net.nix ./mediawiki.nix # ./jitsi.nix - # ./matrix.nix currently not being used ./forgejo.nix ./vaultwarden.nix # ./bepasty.nix diff --git a/sys/platforms/vps/srv/matrix.nix b/sys/platforms/vps/srv/matrix.nix deleted file mode 100644 index 44644fd..0000000 --- a/sys/platforms/vps/srv/matrix.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - pkgs, - config, - flakes, - ... -}: -with lib; let - subdomain = "matrix.posixlycorrect.com"; - baseUrl = "https://${subdomain}"; -in { - # ver https://nixos.org/manual/nixos/stable/#module-services-matrix - services = { - matrix-conduit = { - enable = true; - package = flakes.conduwuit.packages.${pkgs.system}.default; - settings.global = { - address = "::1"; - port = 6167; - allow_encryption = true; - allow_federation = true; - allow_registration = false; - database_backend = "rocksdb"; - server_name = "posixlycorrect.com"; - allow_check_for_updates = true; - new_user_displayname_suffix = ""; - }; - }; - - nginx.virtualHosts = let - clientConfig."m.homeserver".base_url = baseUrl; - serverConfig."m.server" = "${subdomain}:443"; - mkWellKnown = data: '' - default_type application/json; - add_header Access-Control-Allow-Origin *; - return 200 '${builtins.toJSON data}'; - ''; - in { - "posixlycorrect.com" = { - locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig; - locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig; - }; - "${subdomain}" = { - enableACME = true; - forceSSL = true; - extraConfig = '' - proxy_headers_hash_max_size 512; - proxy_headers_hash_bucket_size 128; - ''; - locations."/".extraConfig = '' - return 403; - ''; - locations."/_matrix".proxyPass = "http://[::1]:6167"; - locations."/_synapse/client".proxyPass = "http://[::1]:6167"; - }; - }; - }; -} From dd202a0c99834deafecdfee94af5eadf280011b7 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 01:37:36 -0600 Subject: [PATCH 2/7] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'authentik-nix': 'github:nix-community/authentik-nix/9d9c0a3a94a91cfed654a18239e27cf56970daa4?narHash=sha256-P2VVlzRGKBNsiHsN1yMZcSMXpwtIx9ysMFZAqKFJ14o%3D' (2024-11-21) → 'github:nix-community/authentik-nix/5db6f7711a28abd4b6bbe152c8a7de9d00b1e30d?narHash=sha256-a/sqKV5GvqEcQEGfUGQkhWaUnqIRi8oiDAHbBG1oFZg%3D' (2025-01-04) • Updated input 'authentik-nix/authentik-src': 'github:goauthentik/authentik/527e584699abc93712114b05f70f59c5187caa66?narHash=sha256-4Pv35cnZGiTxe6j2O0F9L9sHzxVIC1SazeAUD5kWeBs%3D' (2024-11-21) → 'github:goauthentik/authentik/e87a17fd8169d3fa92bcc47eb2743928df83bc95?narHash=sha256-CkUmsVKzAQ/VWIhtxWxlcGtrWVa8hxqsMqvfcsG5ktA%3D' (2024-12-23) • Updated input 'authentik-nix/poetry2nix': 'github:nix-community/poetry2nix/43a898b4d76f7f3f70df77a2cc2d40096bc9d75e?narHash=sha256-eHYcKVLIRRv3J1vjmxurS6HVdGphB53qxUeAkylYrZY%3D' (2024-10-30) → 'github:nix-community/poetry2nix/1fb01e90771f762655be7e0e805516cd7fa4d58e?narHash=sha256-DaWy%2Bvo3c4TQ93tfLjUgcpPaSoDw4qV4t76Y3Mhu84I%3D' (2024-12-25) • Updated input 'conduwuit/nixpkgs': 'github:NixOS/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03) → 'github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9?narHash=sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y%3D' (2024-07-12) • Updated input 'home-manager': 'github:nix-community/home-manager/f3111f62a23451114433888902a55cf0692b408d?narHash=sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c%3D' (2024-11-24) → 'github:nix-community/home-manager/613691f285dad87694c2ba1c9e6298d04736292d?narHash=sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM%3D' (2024-12-28) • Updated input 'impermanence': 'github:nix-community/impermanence/3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a?narHash=sha256-B3C3JLbGw0FtLSWCjBxU961gLNv%2BBOOBC6WvstKLYMw%3D' (2024-11-10) → 'github:nix-community/impermanence/d000479f4f41390ff7cf9204979660ad5dd16176?narHash=sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY%3D' (2024-12-23) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9?narHash=sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ%2BCtTRyY%3D' (2024-11-28) → 'github:nixos/nixpkgs/d29ab98cd4a70a387b8ceea3e930b3340d41ac5a?narHash=sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw%3D' (2025-01-03) • Updated input 'nur': 'github:nix-community/NUR/d711073b26533360c2bc595b4e6a824b873f8e22?narHash=sha256-d/wq3j57flyYQ1F3s/B2f0bHCaOKF6d7JTxzfMCGRmw%3D' (2024-12-01) → 'github:nix-community/NUR/c069281f9ef15582d5c1c59995e9d6cf2c0ed1b6?narHash=sha256-E2pP/HI/adDIzDhYR25xlTQpvMnssZPhozHbTg66H/E%3D' (2025-01-05) • Added input 'nur/flake-parts': 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04) • Added input 'nur/flake-parts/nixpkgs-lib': follows 'nur/nixpkgs' • Added input 'nur/nixpkgs': 'github:nixos/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02) • Added input 'nur/treefmt-nix': 'github:numtide/treefmt-nix/49717b5af6f80172275d47a418c9719a31a78b53?narHash=sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM%3D' (2024-12-03) • Added input 'nur/treefmt-nix/nixpkgs': follows 'nur/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28) → 'github:nixos/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02) • Updated input 'vpsadminos': 'github:vpsfreecz/vpsadminos/adea302cd4033be844cd033d30bc552270025331?narHash=sha256-n1JQ6x5nh7/sgKKe8uWWdrw2pz2tkJm6IRpI5%2BI1chI%3D' (2024-11-30) → 'github:vpsfreecz/vpsadminos/83ddccf4462f155f12596af773e9291d7ebc37a3?narHash=sha256-xZEbuwAAbxwujrGtuydDNBjzMLnE9YOcuLv3hdudZe4%3D' (2024-12-17) --- flake.lock | 162 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 118 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index e55e8d0..f2cfffb 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1732215451, - "narHash": "sha256-P2VVlzRGKBNsiHsN1yMZcSMXpwtIx9ysMFZAqKFJ14o=", + "lastModified": 1736005916, + "narHash": "sha256-a/sqKV5GvqEcQEGfUGQkhWaUnqIRi8oiDAHbBG1oFZg=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "9d9c0a3a94a91cfed654a18239e27cf56970daa4", + "rev": "5db6f7711a28abd4b6bbe152c8a7de9d00b1e30d", "type": "github" }, "original": { @@ -53,16 +53,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1732213300, - "narHash": "sha256-4Pv35cnZGiTxe6j2O0F9L9sHzxVIC1SazeAUD5kWeBs=", + "lastModified": 1734959339, + "narHash": "sha256-CkUmsVKzAQ/VWIhtxWxlcGtrWVa8hxqsMqvfcsG5ktA=", "owner": "goauthentik", "repo": "authentik", - "rev": "527e584699abc93712114b05f70f59c5187caa66", + "rev": "e87a17fd8169d3fa92bcc47eb2743928df83bc95", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.10.4", + "ref": "version/2024.12.1", "repo": "authentik", "type": "github" } @@ -153,24 +153,19 @@ "flake-utils": "flake-utils_4", "liburing": "liburing", "nix-filter": "nix-filter", - "nixpkgs": [ - "unstable" - ], + "nixpkgs": "nixpkgs_4", "rocksdb": "rocksdb" }, "locked": { "lastModified": 1721105087, "narHash": "sha256-t74TUSswsCkOdZCKjgP74qEHKg78ShKTkP6x9/zqYX4=", - "owner": "girlbossceo", - "repo": "conduwuit", + "path": "/nix/store/sw263a1qb3z8qc6bb78fm4mslsz5ya7i-source", "rev": "c29197b3f457cf72197ef5251f9815107b2526d7", - "type": "github" + "type": "path" }, "original": { - "owner": "girlbossceo", - "ref": "v0.4.5", - "repo": "conduwuit", - "type": "github" + "id": "conduwuit", + "type": "indirect" } }, "crane": { @@ -424,6 +419,27 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -593,11 +609,11 @@ ] }, "locked": { - "lastModified": 1732466619, - "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3111f62a23451114433888902a55cf0692b408d", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -610,7 +626,7 @@ "homepage": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1732147487, @@ -629,11 +645,11 @@ }, "impermanence": { "locked": { - "lastModified": 1731242966, - "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", + "lastModified": 1734945620, + "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", "owner": "nix-community", "repo": "impermanence", - "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", + "rev": "d000479f4f41390ff7cf9204979660ad5dd16176", "type": "github" }, "original": { @@ -797,7 +813,7 @@ "nixGL": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1713543440, @@ -969,6 +985,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1719426051, "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", @@ -981,7 +1013,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -996,13 +1028,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1732824227, - "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", + "lastModified": 1735922141, + "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", + "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", "type": "github" }, "original": { @@ -1012,13 +1044,34 @@ "type": "github" } }, - "nur": { + "nixpkgs_8": { "locked": { - "lastModified": 1733015936, - "narHash": "sha256-d/wq3j57flyYQ1F3s/B2f0bHCaOKF6d7JTxzfMCGRmw=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_8", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1736062223, + "narHash": "sha256-E2pP/HI/adDIzDhYR25xlTQpvMnssZPhozHbTg66H/E=", "owner": "nix-community", "repo": "NUR", - "rev": "d711073b26533360c2bc595b4e6a824b873f8e22", + "rev": "c069281f9ef15582d5c1c59995e9d6cf2c0ed1b6", "type": "github" }, "original": { @@ -1045,11 +1098,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730284601, - "narHash": "sha256-eHYcKVLIRRv3J1vjmxurS6HVdGphB53qxUeAkylYrZY=", + "lastModified": 1735164664, + "narHash": "sha256-DaWy+vo3c4TQ93tfLjUgcpPaSoDw4qV4t76Y3Mhu84I=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "43a898b4d76f7f3f70df77a2cc2d40096bc9d75e", + "rev": "1fb01e90771f762655be7e0e805516cd7fa4d58e", "type": "github" }, "original": { @@ -1138,7 +1191,7 @@ "impermanence": "impermanence", "mediawikiSkinCitizen": "mediawikiSkinCitizen", "nixGL": "nixGL", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nur": "nur", "unstable": "unstable", "vpsadminos": "vpsadminos" @@ -1258,13 +1311,34 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -1276,11 +1350,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1732972373, - "narHash": "sha256-n1JQ6x5nh7/sgKKe8uWWdrw2pz2tkJm6IRpI5+I1chI=", + "lastModified": 1734458258, + "narHash": "sha256-xZEbuwAAbxwujrGtuydDNBjzMLnE9YOcuLv3hdudZe4=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "adea302cd4033be844cd033d30bc552270025331", + "rev": "83ddccf4462f155f12596af773e9291d7ebc37a3", "type": "github" }, "original": { From b5cd20b71bd6019a05a0f32da30afa1ad67c90d3 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 01:37:58 -0600 Subject: [PATCH 3/7] remove conduit --- flake.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/flake.nix b/flake.nix index 1a053f5..419164c 100644 --- a/flake.nix +++ b/flake.nix @@ -17,12 +17,6 @@ homepage.url = "git+https://git.posixlycorrect.com/fabian/homepage.git?ref=master"; - conduwuit = { - url = "github:girlbossceo/conduwuit?ref=v0.4.5"; - #FIXME: Podrá volver a "nixpkgs" una vez que rocksdb.enableLiburing llegue a stable - inputs.nixpkgs.follows = "unstable"; - }; - authentik-nix = { url = "github:nix-community/authentik-nix"; inputs.nixpkgs.follows = "nixpkgs"; From 3803a1e1b948a155d1a69358845db0ffdab042fb Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 01:45:40 -0600 Subject: [PATCH 4/7] add dark theme to everything --- home/modules/gui/default.nix | 19 +++++++++++++++++++ home/modules/gui/i3.nix | 6 ++++-- sys/modules/users.nix | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix index 9dcf14c..1df22bd 100644 --- a/home/modules/gui/default.nix +++ b/home/modules/gui/default.nix @@ -112,5 +112,24 @@ in { polybar.enable = true; picom.enable = true; }; + + gtk = { + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + gtk3.extraConfig = { + gtk-application-prefer-dark-theme = 1; + }; + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = 1; + }; + }; + + qt = { + enable = true; + style.name = "bb10dark"; + platformTheme.name = "gtk3"; + }; }; } diff --git a/home/modules/gui/i3.nix b/home/modules/gui/i3.nix index 50f19d1..527f462 100644 --- a/home/modules/gui/i3.nix +++ b/home/modules/gui/i3.nix @@ -68,10 +68,12 @@ with lib; { notification = false; always = true; } - { #todo: move this to browsers module + { + #todo: move this to browsers module command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 1; exec ${pkgs.firefox}/bin/firefox'"; } - { #todo: move this to telegram module + { + #todo: move this to telegram module command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 2; exec ${pkgs.tdesktop}/bin/telegram-desktop'"; } #{ diff --git a/sys/modules/users.nix b/sys/modules/users.nix index 4711909..9925e76 100644 --- a/sys/modules/users.nix +++ b/sys/modules/users.nix @@ -66,7 +66,7 @@ in { shell = pkgs.zsh; extraGroups = ["users" "networkmanager"] - ++ optionals (v.admin) ["wheel" "libvirtd" "dialout" "adbusers" ]; + ++ optionals (v.admin) ["wheel" "libvirtd" "dialout" "adbusers"]; openssh.authorizedKeys.keyFiles = v.sshKeyPublicFile; }) enabledUsers; From 4c33c15c113653df08ee138f130f0ec3a3b5bd5d Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 01:47:55 -0600 Subject: [PATCH 5/7] replace nur.overlay with nur.overlays.default --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 419164c..1293ed2 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ config = import ./pkgs/config nixpkgs.lib; overlays = [ self.overlays.default - nur.overlay + nur.overlays.default nixGL.overlay ]; }; From 03952d8198de47277915d4c0a9e63ecbd973d261 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 01:55:46 -0600 Subject: [PATCH 6/7] posixlycorrect: add gajim --- home/platforms/fabian@posixlycorrect/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index 32aaad4..47824ca 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -70,6 +70,7 @@ packages = with pkgs; [ darktable deluge + gajim gnucash kdenlive virt-manager From 5bfbb7ebe565a799c336b124a398f0b92e122e57 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 02:07:48 -0600 Subject: [PATCH 7/7] even more dark theme --- home/modules/gui/default.nix | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix index 1df22bd..1e8196e 100644 --- a/home/modules/gui/default.nix +++ b/home/modules/gui/default.nix @@ -114,10 +114,23 @@ in { }; gtk = { + enable = true; + iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; }; + theme = { + package = pkgs.materia-theme; + name = "Materia-dark"; + }; + + gtk2.extraConfig = '' + gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ + gtk-menu-images=1 + gtk-button-images=1 + ''; + gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; }; @@ -129,7 +142,17 @@ in { qt = { enable = true; style.name = "bb10dark"; - platformTheme.name = "gtk3"; + platformTheme.name = "gtk"; + }; + + home.sessionVariables = { + # Use gtk in jvm apps + _JAVA_OPTIONS = concatStringsSep " " [ + "-Dawt.useSystemAAFontSettings=on" + "-Dswing.aatext=true" + "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" + "-Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" + ]; }; }; }