From 6af7634075acb065ec488b005ed04e007c2f320f Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Sun, 5 May 2024 19:02:07 +0200 Subject: [PATCH] making some pkgs x86 only cuz why would anyone properly support arm platforms? --- flake.lock | 66 ++++++++++++------------- home/modules/home-pkgs.nix | 6 +-- home/modules/wm.nix | 3 +- hosts/aarch64-linux/alastor/default.nix | 1 - hosts/x86_64-linux/beleth/default.nix | 56 ++++++++++----------- hosts/x86_64-linux/beleth/uptime.nix | 5 +- 6 files changed, 69 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index dcfba37..6fe8eea 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1714338754, - "narHash": "sha256-tAc80Zc8TwE222DEBxKcYAZPxxsrUHU4zwnuErUOnyk=", + "lastModified": 1714881816, + "narHash": "sha256-RRl1dRNYQf44sMhoDYZgCxIUOsnsToouIfLc00LKUu0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "e8514896746fc667f2cf326c9c0c4c1e823d5e9f", + "rev": "0f9e3fa02a77158755a76689a4e7e849c7a3e6e8", "type": "gitlab" }, "original": { @@ -116,11 +116,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1714430505, - "narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=", + "lastModified": 1714900398, + "narHash": "sha256-H7XYHpjk1G6dkA3AnbYrKtaTFjcCE7ul6nUVlVQxtsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d", + "rev": "fdaaf543bad047639ef0b356ea2e6caec2f1215c", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1714343445, - "narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { @@ -285,11 +285,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1714165257, - "narHash": "sha256-/pZwLN3ATpmvTvGVV70mYU0ifRCmALLqvrt8cRbty1A=", + "lastModified": 1714905986, + "narHash": "sha256-Vj7iFkLrd7MDeeMVVol5uHTcaLwDq4a3vNx+6Sy1FLU=", "owner": "viperML", "repo": "nh", - "rev": "9589dea0e74a819c296c591123f6af37c3f0bce3", + "rev": "127a23c82aa41091e97466092d2547c08c2a9a9d", "type": "github" }, "original": { @@ -321,11 +321,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1714465198, - "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=", + "lastModified": 1714885415, + "narHash": "sha256-LG+2IVqVi1fy724rSDAkgqae+f47fGGko4cJhtkN8PE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4", + "rev": "753176b57b3fcddb140c1c012868e62c025120bd", "type": "github" }, "original": { @@ -353,11 +353,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1714470024, - "narHash": "sha256-xfcdk7MP9T2jLIRh7vYNNPkk3JzthvLXfDqoCz6QGaI=", + "lastModified": 1714912968, + "narHash": "sha256-ekBeglfIEZFqQVt3BnMm5lXfJ0ilCiJA52TWV6GuH0k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cc549772d12d0e3aceafa2eef2fd6b44fd1eafe", + "rev": "49e47cde90f6ad1df8527a2c2eda9f5c3c8fae56", "type": "github" }, "original": { @@ -385,11 +385,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711668574, - "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", + "lastModified": 1714409183, + "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "rev": "576ecd43d3b864966b4423a853412d6177775e8b", "type": "github" }, "original": { @@ -401,11 +401,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1714763106, + "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d", "type": "github" }, "original": { @@ -444,11 +444,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1714461919, - "narHash": "sha256-Tnx6aSRw+pSsPIoS6cj2ISde7/cre6Fbd5t68Gwhu98=", + "lastModified": 1714730761, + "narHash": "sha256-TjxlzjUl+wf3xw1+NKJSMZ/yWO+HE7X8aP1Qey77R2o=", "owner": "nix-community", "repo": "nixvim", - "rev": "892caa9b40793bf1a1648d76d89a92ffa0693248", + "rev": "c05fba47c733445098847399b61ddfd81ecbde55", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1713954846, - "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=", + "lastModified": 1714478972, + "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f", + "rev": "2849da033884f54822af194400f8dff435ada242", "type": "github" }, "original": { diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index fb41059..5aff8d9 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -11,6 +11,8 @@ pkgs.protonup-qt pkgs.via pkgs.telegram-desktop + pkgs.anki + pkgs.yubioath-flutter # pkgs.spotify ] else []; @@ -30,8 +32,6 @@ in { pkgs.moodle-dl - pkgs.anki - pkgs.obsidian pkgs.syncthingtray @@ -71,8 +71,6 @@ in { pkgs.ripgrep - pkgs.yubioath-flutter - pkgs.sayonara pkgs.mpv pkgs.jellyfin-media-player diff --git a/home/modules/wm.nix b/home/modules/wm.nix index 4521424..8c7756c 100644 --- a/home/modules/wm.nix +++ b/home/modules/wm.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, inputs, ... }: { @@ -14,7 +15,7 @@ extraConfig = builtins.readFile ../config-files/hyprland.conf; }; - programs.waybar = { + programs.waybar = lib.mkIf (pkgs.system == "x86_64-linux") { enable = true; settings = { mainBar = { diff --git a/hosts/aarch64-linux/alastor/default.nix b/hosts/aarch64-linux/alastor/default.nix index afbd30e..a120217 100644 --- a/hosts/aarch64-linux/alastor/default.nix +++ b/hosts/aarch64-linux/alastor/default.nix @@ -113,7 +113,6 @@ wl-clipboard xclip - sway swaylock-effects wmenu foot diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix index 141b396..6735696 100644 --- a/hosts/x86_64-linux/beleth/default.nix +++ b/hosts/x86_64-linux/beleth/default.nix @@ -22,35 +22,35 @@ with lib; { enable = true; email = "xqtc@tutanota.com"; configFile = pkgs.writeText "Caddyfile" '' - heroin.trade { - root * /var/www/website/public/ - handle_errors { - rewrite * /404.html - file_server -} - file_server - } - syncthing.heroin.trade { - reverse_proxy http://localhost:8384 { - header_up Some-Header "localhost" + heroin.trade { + root * /var/www/website/public/ + handle_errors { + rewrite * /404.html + file_server } - } - demos.heroin.trade { - root * /var/www/demos/ - file_server browse - } - jellyfin.heroin.trade { - reverse_proxy http://127.0.0.1:8096 - } - calibre.heroin.trade { - reverse_proxy http://localhost:3000 - } - grafana.heroin.trade { - reverse_proxy http://127.0.0.1:2342 - } - uptime.heroin.trade { - reverse_proxy 127.0.0.1:3001 - } + file_server + } + syncthing.heroin.trade { + reverse_proxy http://localhost:8384 { + header_up Some-Header "localhost" + } + } + demos.heroin.trade { + root * /var/www/demos/ + file_server browse + } + jellyfin.heroin.trade { + reverse_proxy http://127.0.0.1:8096 + } + calibre.heroin.trade { + reverse_proxy http://localhost:3000 + } + grafana.heroin.trade { + reverse_proxy http://127.0.0.1:2342 + } + uptime.heroin.trade { + reverse_proxy 127.0.0.1:3001 + } ''; }; diff --git a/hosts/x86_64-linux/beleth/uptime.nix b/hosts/x86_64-linux/beleth/uptime.nix index 1cc3d53..b92c5a6 100644 --- a/hosts/x86_64-linux/beleth/uptime.nix +++ b/hosts/x86_64-linux/beleth/uptime.nix @@ -1,5 +1,8 @@ -{config, lib, ...}: { + config, + lib, + ... +}: { services.uptime-kuma = { enable = true; };