From ba4d4bba1bdcf317f2f00a85048effe3c8c7f56e Mon Sep 17 00:00:00 2001 From: Tristan Date: Mon, 3 Nov 2025 15:39:47 +0000 Subject: [PATCH 1/3] zenix: add retroarch and warpinator --- nixos/programs/gamer.nix | 13 ++++++++++++- nixos/programs/personal.nix | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/programs/gamer.nix b/nixos/programs/gamer.nix index e1ddbec..ffd64c0 100644 --- a/nixos/programs/gamer.nix +++ b/nixos/programs/gamer.nix @@ -1,4 +1,4 @@ -{...}: { +{pkgs, ...}: { allowUnfreePkgNames = [ "steam" "steam-unwrapped" @@ -27,4 +27,15 @@ capSysNice = true; }; programs.gamemode.enable = true; + nixpkgs.config.permittedInsecurePackages = [ + "mbedtls-2.28.10" + ]; + services.xserver.desktopManager.retroarch = { + enable = true; + package = pkgs.retroarch.withCores (cores: + with cores; [ + bsnes + beetle-psx-hw + ]); + }; } diff --git a/nixos/programs/personal.nix b/nixos/programs/personal.nix index 2a937b6..40f5cbd 100644 --- a/nixos/programs/personal.nix +++ b/nixos/programs/personal.nix @@ -1,4 +1,4 @@ -{...}: { +{pkgs, ...}: { i18n.supportedLocales = [ "eo/UTF-8" "en_GB.UTF-8/UTF-8" @@ -9,4 +9,8 @@ enable = true; }; }; + environment.systemPackages = with pkgs; [ + warpinator + ]; + networking.firewall.allowedTCPPorts = [42000 42001]; } From c358881432d27c45e3458ce3f8bc4682fe3e3ebd Mon Sep 17 00:00:00 2001 From: Tristan Date: Fri, 2 Jan 2026 14:01:10 +0000 Subject: [PATCH 2/3] zenix: update, switch back to hyprland --- flake.lock | 136 +++++++++++++++--------------- flake.nix | 2 +- hardware/zenix.nix | 40 ++++----- home/desktop/hyprland/default.nix | 7 +- home/programs/graphical.nix | 8 -- nixos/services/prometheus.nix | 14 +-- 6 files changed, 100 insertions(+), 107 deletions(-) diff --git a/flake.lock b/flake.lock index 8a76cc0..1b63c93 100644 --- a/flake.lock +++ b/flake.lock @@ -21,28 +21,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1762776565, - "narHash": "sha256-Trd4uVhg9OggkxBMn3qUv74z9rNZE/s7iT7llTYQ0ZU=", + "lastModified": 1765831383, + "narHash": "sha256-P5F/VPjjGw7s0AOTPb3z3gxqtH0YkAnd/c9P6QdWrEU=", "owner": "HeitorAugustoLN", "repo": "cosmic-manager", - "rev": "f26cdfef90b8db37db913f7c72a609c997700e59", + "rev": "819d4d21fb90460dd11416d81d2cff65a53b8a59", "type": "github" }, "original": { @@ -95,11 +95,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -209,11 +209,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1764736872, - "narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=", + "lastModified": 1767280655, + "narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3366918730bb6b699395a9d237397f1d710a94b3", + "rev": "d49d2543f02dbd789ed032188c84570d929223cb", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764721873, - "narHash": "sha256-EHMH54iI7MYYb7mUBE6JUtbbVhHTF7jtkuZ0Lo1bkBg=", + "lastModified": 1767257541, + "narHash": "sha256-eAZD0o5eC85jES3k8S0e1NlJJv+rTgofhl0QajhFjyM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f3935696628433007c582fc323730ba18f137a1d", + "rev": "0eb70f38f02923ff59743a0978fed88f04c98c7d", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764678181, - "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", + "lastModified": 1767160009, + "narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=", "owner": "YaLTeR", "repo": "niri", - "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", + "rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3", "type": "github" }, "original": { @@ -367,27 +367,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764560356, - "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "lastModified": 1767047869, + "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1767047869, + "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -422,11 +422,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764755396, - "narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=", + "lastModified": 1766849711, + "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=", "owner": "nix-community", "repo": "nixvim", - "rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969", + "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1766894905, + "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764695017, - "narHash": "sha256-hJVPGt8MqRL0WHkNRclT4J1rJMurYsPw7dL8UwlFoaI=", + "lastModified": 1766603740, + "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", "owner": "danth", "repo": "stylix", - "rev": "a1e741dbce6e846129777c2a017e1354bc87b92b", + "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", "type": "github" }, "original": { @@ -633,11 +633,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -649,11 +649,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -665,11 +665,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764721075, - "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", + "lastModified": 1766429945, + "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", + "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1764648680, - "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=", + "lastModified": 1767307876, + "narHash": "sha256-d5EKvUnfr6tdhymIThz0WGG0JHT2cCZzbZK4t2CwYuc=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20", + "rev": "c5bffaf433e6137fe80cd1930584836f11119b26", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dc82f00..f0cb5b8 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ zenix = mkConf { nixos-modules = [ ./hardware/zenix.nix - ./nixos/programs/niri.nix + ./nixos/programs/hyprland.nix ./nixos/programs/gamer.nix ./nixos/programs/personal.nix ./nixos/services/musnix.nix diff --git a/hardware/zenix.nix b/hardware/zenix.nix index 5d950c5..4c8da19 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -81,26 +81,26 @@ home-manager.users.${user}.imports = [ { home.stateVersion = "22.05"; - programs.niri.settings = { - outputs."HP Inc. HP 24x 1CR9500W9Q" = { - mode = { - width = 1920; - height = 1080; - refresh = 143.855; - }; - variable-refresh-rate = true; - scale = 1.0; - }; - outputs."HDMI-A-1" = { - mode = { - width = 3840; - height = 2160; - refresh = 120.0; - }; - variable-refresh-rate = true; - scale = 2.5; - }; - }; + # programs.niri.settings = { + # outputs."HP Inc. HP 24x 1CR9500W9Q" = { + # mode = { + # width = 1920; + # height = 1080; + # refresh = 143.855; + # }; + # variable-refresh-rate = true; + # scale = 1.0; + # }; + # outputs."HDMI-A-1" = { + # mode = { + # width = 3840; + # height = 2160; + # refresh = 120.0; + # }; + # variable-refresh-rate = true; + # scale = 2.5; + # }; + # }; } ]; } diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 81efc71..2bb165c 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -33,11 +33,10 @@ in { scroll_factor = 0.5; }; kb_options = lib.mkDefault "caps:escape"; - kb_layout = lib.mkDefault "gb"; + kb_layout = lib.mkDefault "us"; + kb_variant = lib.mkDefault "dvorak"; numlock_by_default = true; - }; - gestures = { - workspace_swipe = true; + accel_profile = "flat"; }; decoration = { rounding = 0; diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index c21ccd5..78b8460 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -67,12 +67,4 @@ ]; }; - programs.zed-editor = { - enable = true; - extensions = ["tsgo" "nix" "ansible" "helm"]; - userSettings = { - vim_mode = true; - }; - extraPackages = [pkgs.nixd pkgs.vtsls]; - }; } diff --git a/nixos/services/prometheus.nix b/nixos/services/prometheus.nix index bae5c9f..fb29da9 100644 --- a/nixos/services/prometheus.nix +++ b/nixos/services/prometheus.nix @@ -3,7 +3,7 @@ nodes = [ "alpine" "100.106.49.128" # laptop - "100.65.29.110" # gaming pc + "100.78.76.10" # gaming pc ]; addPort = ip: "${ip}:${toString prometheus.exporters.node.port}"; in { @@ -68,11 +68,13 @@ in { configuration = { route = { receiver = "alertmanager-ntfy"; - routes = [{ - matchers = [ - ''node_filesystem_device_error != 0'' - ]; - }]; + routes = [ + { + matchers = [ + ''node_filesystem_device_error != 0'' + ]; + } + ]; }; }; }; From 2e06f18f306487f9d0434829522392637671622f Mon Sep 17 00:00:00 2001 From: Tristan Date: Fri, 2 Jan 2026 14:29:29 +0000 Subject: [PATCH 3/3] alpine: update --- nixos/services/grafana.nix | 2 +- nixos/services/vaultwarden.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/services/grafana.nix b/nixos/services/grafana.nix index 9c8497d..7499aca 100644 --- a/nixos/services/grafana.nix +++ b/nixos/services/grafana.nix @@ -61,7 +61,7 @@ in { { name = "synapse"; url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json"; - sha256 = "sha256:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0"; + sha256 = "sha256:1lhhhzjm1rj25gg6dnmgwaxr05f8p2ndrlygdnjqzam7s6y75db3"; } ]; } diff --git a/nixos/services/vaultwarden.nix b/nixos/services/vaultwarden.nix index dddb0ef..907ebb5 100644 --- a/nixos/services/vaultwarden.nix +++ b/nixos/services/vaultwarden.nix @@ -5,6 +5,10 @@ in { services.vaultwarden = { enable = true; backupDir = "/mnt/storage/backups/vaultwarden"; + config = { + ROCKET_ADDRESS = "::1"; + ROCKET_PORT = 8222; + }; }; services.nginx.virtualHosts.${domain} = { forceSSL = true;