diff --git a/flake.lock b/flake.lock index f6adf84..8c9fb05 100644 --- a/flake.lock +++ b/flake.lock @@ -21,16 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -78,11 +79,11 @@ ] }, "locked": { - "lastModified": 1744387566, - "narHash": "sha256-O39zTv7LdRgr4Hw38d+eQG2LYpP75rw2XKqTGV5qzgs=", + "lastModified": 1760299432, + "narHash": "sha256-OEsLiZvC+WOssGIzUx0miuKsODlp7IGax8XVhNCw8wY=", "owner": "HeitorAugustoLN", "repo": "cosmic-manager", - "rev": "52d3fdd080a9dd4639948687682a68282fbf0314", + "rev": "a61b25313a83d32de4769fbb4026d93bde00b256", "type": "github" }, "original": { @@ -115,11 +116,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -136,11 +137,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -228,11 +229,11 @@ ] }, "locked": { - "lastModified": 1756245065, - "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "54b2879ce622d44415e727905925e21b8f833a98", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -256,16 +257,16 @@ ] }, "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "owner": "NuschtOS", "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.8", + "ref": "v0.1.1", "repo": "ixx", "type": "github" } @@ -275,11 +276,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1741303672, - "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", + "lastModified": 1756852730, + "narHash": "sha256-qPere4RBHoZxiEGl8zXU8gjroZg4gkYGEwaAbKmL4vE=", "owner": "musnix", "repo": "musnix", - "rev": "d56a15f30329f304151e4e05fa82264d127da934", + "rev": "7ccc92050e43dc92309396c6f2fe1f542214a242", "type": "github" }, "original": { @@ -300,11 +301,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756451209, - "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=", + "lastModified": 1761187190, + "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cdfffe0b009582f5161dcd030a5549236287767b", + "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c", "type": "github" }, "original": { @@ -316,16 +317,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.08", "repo": "niri", "type": "github" } @@ -333,11 +334,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756448032, - "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=", + "lastModified": 1760940149, + "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", "owner": "YaLTeR", "repo": "niri", - "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b", + "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", "type": "github" }, "original": { @@ -348,11 +349,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -364,11 +365,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1756217674, - "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "type": "github" }, "original": { @@ -380,11 +381,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756469547, - "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=", + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41d292bfc37309790f70f4c120b79280ce40af16", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "type": "github" }, "original": { @@ -395,11 +396,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756386758, - "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -419,11 +420,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1755727480, - "narHash": "sha256-eb9N7XFj1zirk+D2KV+rn/CjmVHDISlxhtZCWZEVpkM=", + "lastModified": 1760795571, + "narHash": "sha256-gi+tWWAknKuTNso3yMeKsT9nj0jx+tuYF7g7nmLUWT8=", "owner": "nix-community", "repo": "nixvim", - "rev": "6df0b97b39baa1c0b3002b051f307aed68e17d1b", + "rev": "6c945865ba5de87fa2d0dd8a0e66ca572ddf9043", "type": "github" }, "original": { @@ -469,11 +470,11 @@ ] }, "locked": { - "lastModified": 1753771532, - "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", + "lastModified": 1760652422, + "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=", "owner": "NuschtOS", "repo": "search", - "rev": "2a65adaf2c0c428efb0f4a2bc406aab466e96a06", + "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726", "type": "github" }, "original": { @@ -502,11 +503,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1760998189, + "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "type": "github" }, "original": { @@ -536,11 +537,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755710103, - "narHash": "sha256-VmheUy4UzWDy/u0TvCCHptgF30peL7wRxkHy7EVpDrQ=", + "lastModified": 1760478648, + "narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=", "owner": "danth", "repo": "stylix", - "rev": "79be65b20d7b8fb7e8f39ba8121cfe41b7f46808", + "rev": "1ec254101285777db13922303cc47ded06e10bb3", "type": "github" }, "original": { @@ -718,11 +719,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1756260173, - "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", + "lastModified": 1761173223, + "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", + "rev": "bf745144acda1343934e9a094cf9458a54d57889", "type": "github" }, "original": { @@ -736,11 +737,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1756526767, - "narHash": "sha256-aMcUT5QOgVghB+x89xf9+Phc/BTIQfoitVIcQ66ZQWk=", + "lastModified": 1761192367, + "narHash": "sha256-HdAtNWms1rrswlfuX5NUR9RYCMLUJHEzF986hQ0tUCw=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "3cef1d4a0b597c1746d399cc46ef98a53af9a732", + "rev": "1ce32754f78d1d7d6bf9cb44a48a06dac8bb6785", "type": "github" }, "original": { diff --git a/hardware/zenix.nix b/hardware/zenix.nix index 8019544..daba723 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -66,6 +66,14 @@ hardware.cpu.amd.updateMicrocode = true; hardware.cpu.x86.msr.enable = true; + hardware.amdgpu = { + opencl.enable = true; + amdvlk = { + enable = true; + support32Bit.enable = true; + }; + }; + networking.hostName = "zenix"; services.openssh.enable = true; @@ -77,8 +85,8 @@ home-manager.users.${user}.imports = [ { home.stateVersion = "22.05"; - programs.niri.settings.outputs = { - "DP-3" = { + programs.niri.settings = { + outputs."HP Inc. HP 24x 1CR9500W9Q" = { mode = { width = 1920; height = 1080; @@ -87,7 +95,7 @@ variable-refresh-rate = true; scale = 1.0; }; - "HDMI-A-1" = { + outputs."HDMI-A-1" = { mode = { width = 3840; height = 2160; diff --git a/home/desktop/niri/default.nix b/home/desktop/niri/default.nix index 0b7e958..40431d5 100644 --- a/home/desktop/niri/default.nix +++ b/home/desktop/niri/default.nix @@ -35,7 +35,7 @@ input.keyboard = { xkb.layout = "us,gb"; xkb.variant = "dvorak,"; - xkb.options = "caps:escape"; + xkb.options = "caps:escape,esperanto:qwerty,lv3:ralt_switch"; }; input.mouse = { accel-profile = "flat"; @@ -47,9 +47,9 @@ dwt = true; # disable when typing }; prefer-no-csd = true; - spawn-at-startup = [ - {command = [(lib.getExe pkgs.xwayland-satellite)];} - ]; + xwayland-satellite = { + path = lib.getExe pkgs.xwayland-satellite; + }; layout = { preset-column-widths = [ {proportion = 1.0;} @@ -58,7 +58,6 @@ }; environment = { NIXOS_OZONE_WL = "1"; - DISPLAY = ":0"; }; binds = with config.lib.niri.actions; { "Mod+Return".action.spawn = [(lib.getExe config.programs.terminal)]; @@ -113,7 +112,7 @@ "Mod+G".action = toggle-window-floating; "Mod+Shift+Ctrl+Alt+Space".action = switch-layout "next"; - "Print".action = screenshot; + "Print".action.screenshot = []; "XF86AudioRaiseVolume".action.spawn = ["raise-volume"]; "XF86AudioLowerVolume".action.spawn = ["lower-volume"]; diff --git a/home/modules/email.nix b/home/modules/email.nix index 6b491c5..ccd0249 100644 --- a/home/modules/email.nix +++ b/home/modules/email.nix @@ -71,7 +71,6 @@ in { sidebar.enable = true; }; programs.mbsync.enable = cfg.terminal; - services.mbsync.enable = cfg.terminal; programs.aerc = { enable = cfg.terminal; diff --git a/home/programs/gamer.nix b/home/programs/gamer.nix index cbfeba7..e58aa94 100644 --- a/home/programs/gamer.nix +++ b/home/programs/gamer.nix @@ -8,7 +8,6 @@ # Helpers heroic - lutris gamescope gamemode mangohud diff --git a/nixos/services/grafana.nix b/nixos/services/grafana.nix index c6790ba..9c8497d 100644 --- a/nixos/services/grafana.nix +++ b/nixos/services/grafana.nix @@ -1,15 +1,27 @@ -{config, lib, pkgs, ...}: let +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.grafana; secrets = config.sops.secrets; - mkDashboards = dashboards: pkgs.symlinkJoin { - name = "dashboards"; - paths = map mkDashboard dashboards; - }; - mkDashboard = {name, url, sha256, patch ? lib.id}: pkgs.writeTextFile { - inherit name; - text = patch (builtins.readFile ( builtins.fetchurl {inherit url sha256;} )); - destination = "/dash/${name}.json"; - }; + mkDashboards = dashboards: + pkgs.symlinkJoin { + name = "dashboards"; + paths = map mkDashboard dashboards; + }; + mkDashboard = { + name, + url, + sha256, + patch ? lib.id, + }: + pkgs.writeTextFile { + inherit name; + text = patch (builtins.readFile (builtins.fetchurl {inherit url sha256;})); + destination = "/dash/${name}.json"; + }; in { sops.secrets."grafana/oidc_client_secret" = { owner = "grafana"; @@ -34,24 +46,26 @@ in { role_attribute_path = "contains(groups[*], 'Grafana Admins') && 'Admin' || contains(groups[*], 'Grafana Editors') && 'Editor' || 'Viewer'"; }; }; - provision.dashboards.settings.providers = [{ - name = "Node Exporter"; - type = "file"; - options.path = mkDashboards [ + provision.dashboards.settings.providers = [ { - name = "node-exporter"; - url = "https://grafana.com/api/dashboards/1860/revisions/37/download"; - sha256 = "sha256:0qza4j8lywrj08bqbww52dgh2p2b9rkhq5p313g72i57lrlkacfl"; - # https://github.com/rfmoz/grafana-dashboards/issues/169 - patch = builtins.replaceStrings ["$__rate_interval"] ["$__range"]; + name = "Node Exporter"; + type = "file"; + options.path = mkDashboards [ + { + name = "node-exporter"; + url = "https://grafana.com/api/dashboards/1860/revisions/37/download"; + sha256 = "sha256:0qza4j8lywrj08bqbww52dgh2p2b9rkhq5p313g72i57lrlkacfl"; + # https://github.com/rfmoz/grafana-dashboards/issues/169 + patch = builtins.replaceStrings ["$__rate_interval"] ["$__range"]; + } + { + name = "synapse"; + url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json"; + sha256 = "sha256:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0"; + } + ]; } - { - name = "synapse"; - url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json"; - sha256 = "sha256:16fl81sx1by0wldw4vda0zr1pvbq1dpih1fikzwlvmk63mpc80kb"; - } - ]; - }]; + ]; }; services.nginx.virtualHosts = { ${cfg.settings.server.domain} = { diff --git a/nixos/services/musnix.nix b/nixos/services/musnix.nix index eeff1e2..c548544 100644 --- a/nixos/services/musnix.nix +++ b/nixos/services/musnix.nix @@ -25,5 +25,22 @@ carla drumgizmo distrho-ports + surge + surge-XT + guitarix + gxplugins-lv2 + airwindows-lv2 + mod-distortion + mod-arpeggiator-lv2 + aether-lv2 + neural-amp-modeler-lv2 + bchoppr + bshapr + chow-tape-model + chow-kick + chow-phaser + chow-centaur + quadrafuzz + fire ]; } diff --git a/nixos/workstation.nix b/nixos/workstation.nix index e898bd8..2ec6432 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -26,10 +26,6 @@ services.gnome.gnome-keyring.enable = true; - programs.kdeconnect.enable = true; - - virtualisation.waydroid.enable = true; - services.displayManager.cosmic-greeter.enable = true; networking.stevenblack = {