diff --git a/flake.lock b/flake.lock index baaa6e2c..b59152ae 100644 --- a/flake.lock +++ b/flake.lock @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1739103745, - "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", + "lastModified": 1739298463, + "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", + "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", "type": "github" }, "original": { @@ -123,11 +123,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1739541414, - "narHash": "sha256-F3HAp7k9/ZCvD1642D5Q3jbP35jjOmyBAfTli9yc2oU=", + "lastModified": 1740408177, + "narHash": "sha256-baFhGvCncDj3zJlDODJESVE83lV5+tGOrvgwQczzp84=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "946e012ae9ce4d3da5ff51b6e8f7bfbe8864db34", + "rev": "62e2d6c89e4310c7cb56ee5f6bbdc280072dd082", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1739342042, - "narHash": "sha256-oi6joJyRviczLJeN8TEI1XVKVb+E/UCnMTtdIn/6fhg=", + "lastModified": 1740292204, + "narHash": "sha256-ZbptkmqaenRhUKsodSEcVzBw+kXZ8DcZpTGutU1HEiI=", "owner": "nix-community", "repo": "fenix", - "rev": "2d0149540591393c61dfd29f6883ba712d24e04f", + "rev": "93d59130e3fc121f927c03e406142df8d544b901", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1739687593, - "narHash": "sha256-K7+n5+W2OrqEjeVb4422YxwNw1m4lCfnd+QWCnm+Dgs=", + "lastModified": 1740378829, + "narHash": "sha256-cwmm7F73aQFJY6YN1roNibNKwxT6FlfXkG3MEbpSp7Q=", "owner": "nix-community", "repo": "fenix", - "rev": "a712b739a49e10fe73de366a42a43b2714e41bfc", + "rev": "92823f1b0c919d7e2d806956aaf98e90f3761ab7", "type": "github" }, "original": { @@ -494,11 +494,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1739723979, - "narHash": "sha256-EDyRAD8jA5aBX2WZiP89YjNycnXk+S0EilVbWc7M10g=", + "lastModified": 1740498249, + "narHash": "sha256-oY5JvKpNcvdG4ey7WLDAWECFh0mxL9Krw2R8yBpMX5c=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "2e7ed98dfd522f5050bfeba2bbe41b41ca696537", + "rev": "22f3e60dcf04602fbce80426488879fb39c22761", "type": "github" }, "original": { @@ -553,11 +553,11 @@ }, "hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1740387674, + "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", "type": "github" }, "original": { @@ -591,11 +591,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739457098, - "narHash": "sha256-a4zUQTpHagz1Kb3kLxcflsiF05FsHlrzXEuCjbzjAOM=", + "lastModified": 1740441924, + "narHash": "sha256-xEgvzA+upk+2Rn6Rz3T6HqPPJHrtL8zVljVYGgCgU3A=", "owner": "helix-editor", "repo": "helix", - "rev": "7275b7f85014aad7e15d4987ec4f2249572eecfb", + "rev": "35575b0b0f39a5909b061ac5c7ae6bfdd40271fb", "type": "github" }, "original": { @@ -611,11 +611,11 @@ ] }, "locked": { - "lastModified": 1739724290, - "narHash": "sha256-dvByZPuVmBgOBLq8GohBy9hEd0/JXj5goXK2OY1Pvgk=", + "lastModified": 1740494361, + "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ec130e700959ee10b63eedbc87758d20264a9588", + "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", "type": "github" }, "original": { @@ -653,11 +653,11 @@ ] }, "locked": { - "lastModified": 1739381933, - "narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", + "lastModified": 1740318342, + "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", "owner": "nix-community", "repo": "home-manager", - "rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", + "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", "type": "github" }, "original": { @@ -804,11 +804,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1739566202, - "narHash": "sha256-11fAf+hl0+oJYzp6ZumffJJQdhdb+kN98oj8kQd8CEI=", + "lastModified": 1740409549, + "narHash": "sha256-e9qtk//eEoWU3/UqY7oAZcGLxI7HToxuWoxQa07Ha9o=", "owner": "hyprwm", "repo": "hyprland", - "rev": "219de56278ddf940b3d7e901ecd210d242f01f66", + "rev": "e9c9f931ad7965de1345e5ac66437c80653a4e28", "type": "github" }, "original": { @@ -1008,11 +1008,11 @@ ] }, "locked": { - "lastModified": 1739687392, - "narHash": "sha256-x1NU3jIYCpju8QCzIdLmS9bvLh9ATwYlMbA/TYfDsHs=", + "lastModified": 1740265014, + "narHash": "sha256-U+8HOPgfrNkFEadoyB9GXSPPFW/Uytvb3TxyqW3JOw4=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "c4b2175822eaa13f8fd014b4763cdd10a7b69493", + "rev": "e588351d1df57b125fda8d92f5b36a435545bb95", "type": "github" }, "original": { @@ -1071,11 +1071,11 @@ ] }, "locked": { - "lastModified": 1739048933, - "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", + "lastModified": 1739891528, + "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", + "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", "type": "github" }, "original": { @@ -1193,11 +1193,11 @@ ] }, "locked": { - "lastModified": 1739364465, - "narHash": "sha256-LhyeVj5plHO3/3QV7SzOSOnvl0sehOjE4h6LHaiiJqU=", + "lastModified": 1740269380, + "narHash": "sha256-l+zB5a39MJp4Olc4YxP7GChFXmNZIhoXaiSS6QRXa9o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3dab95e02b5eeb9aec44a161bbed2b16b3d03aac", + "rev": "11ba89d13831cb399194310304fffb025081c674", "type": "github" }, "original": { @@ -1216,11 +1216,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1739186342, - "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", + "lastModified": 1740440383, + "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", + "rev": "6321bc060d757c137c1fbae2057c7e941483878f", "type": "github" }, "original": { @@ -1315,11 +1315,11 @@ ] }, "locked": { - "lastModified": 1739670123, - "narHash": "sha256-+idHOsbd0YXNwLG0yWi8p1L9N7OBnHoxV4PzxiCL/+Y=", + "lastModified": 1740361404, + "narHash": "sha256-hKaJ6QDZuxcbwifzcfLyiK9nmlIx1uQqWQwJ45PBn88=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "1e8debf2c71520a210d8c992a24d267a32f1e7e0", + "rev": "1e6dc4b9895602f9459d6ff3a11b0cd144321207", "type": "github" }, "original": { @@ -1477,11 +1477,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -1556,11 +1556,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -1597,11 +1597,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1739708416, - "narHash": "sha256-Tf1go3mHCeSgf75ISQPKffuvBDEhxNmOvhVx5yW63jA=", + "lastModified": 1740423954, + "narHash": "sha256-iMd7ogpbVfYvadf1WjdIObQ1l7w2GhX1G27rBEMn5cc=", "owner": "notashelf", "repo": "nvf", - "rev": "ae26ece1433edb343b74a7c7eba75e93516be730", + "rev": "ae3fd994472a1b95be5bf1ac9f70e2a1cdb1c1d4", "type": "github" }, "original": { @@ -1691,11 +1691,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1739305728, - "narHash": "sha256-ZYZ6xYhvWcVvbIazMFEUPPkJFkjIa0tmdUFlbuZfcOM=", + "lastModified": 1740259966, + "narHash": "sha256-FJU9qiELvmJzNRr7wLFtJUy4bSk1PNqsRB7wOQz6zUE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f63e4761a9f73ddfc04a3e198f77e5e8825d0136", + "rev": "9df88ff0f65f8de9f73684d2bb96e1b62669d083", "type": "github" }, "original": { @@ -1708,11 +1708,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1739512757, - "narHash": "sha256-QfmtsyySvQSEKLuB850AmyqpNQRP+T57vuZnGIpmGD4=", + "lastModified": 1740329432, + "narHash": "sha256-eKQ7aBkNvF5AhUpyJ1cW450jxomZ4gTIaYir5qsNl7Y=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "40e4f9130f4e44f20961a7cf4ade46325126698b", + "rev": "6d68c475c7aaf7534251182662456a4bf4216dfe", "type": "github" }, "original": { @@ -1993,11 +1993,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1739478829, - "narHash": "sha256-zUAt4Ak3NHD3KNJ10ibJoP9zqQF5hdPIeP5mlFyU81o=", + "lastModified": 1740350337, + "narHash": "sha256-Ue+ERNL8y9l/0BTay1/fm1V2zcKFf/dX5H1DHI2TO+w=", "owner": "wez", "repo": "wezterm", - "rev": "ee0c04e735fb94cb5119681f704fb7fa6731e713", + "rev": "fd532a8c2fb3b56593597cf8be1775da1feda0a3", "type": "github" }, "original": { @@ -2056,11 +2056,11 @@ ] }, "locked": { - "lastModified": 1739089743, - "narHash": "sha256-dSl6F0M4TDNRYtwhvLhFMk0W1tStWFk6zlZVuV0n8pU=", + "lastModified": 1740474316, + "narHash": "sha256-Jm2KufnuCQnGxUq9tbdwYWgF+CA8J7fPyXYqmKe0sYc=", "ref": "refs/heads/main", - "rev": "74dc654bf226c24d60afc7ef15f55402eab694eb", - "revCount": 74, + "rev": "10e91175ecff060bdc1d854592cba3d49030ec32", + "revCount": 76, "type": "git", "url": "https://git.sr.ht/~canasta/zen-browser-flake" }, diff --git a/modules/home/programs/helix/languages.nix b/modules/home/programs/helix/languages.nix index 18c3286e..78f964ff 100644 --- a/modules/home/programs/helix/languages.nix +++ b/modules/home/programs/helix/languages.nix @@ -11,7 +11,7 @@ }; prettier = lang: { - command = lib.getExe pkgs.nodePackages.prettier; + command = "prettier"; args = ["--parser" lang]; }; prettierLangs = map (e: { @@ -215,7 +215,7 @@ }; vscode-css-language-server = { - command = "${pkgs.nodePackages.vscode-langservers-extracted}/bin/vscode-css-language-server"; + command = "${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server"; args = ["--stdio"]; config = { provideFormatter = true; diff --git a/modules/nixos/programs/pkgs/default.nix b/modules/nixos/programs/pkgs/default.nix index 31cac8f6..fe3277fd 100644 --- a/modules/nixos/programs/pkgs/default.nix +++ b/modules/nixos/programs/pkgs/default.nix @@ -72,7 +72,7 @@ in { php vscode-langservers-extracted # phpactor - python312Packages.python-lsp-server + python313Packages.python-lsp-server bash-language-server clang-tools marksman @@ -81,9 +81,10 @@ in { # Formatters alejandra stylua - nodePackages_latest.nodejs - nodePackages_latest.fixjson - nodePackages_latest.sql-formatter + nodejs_23 + fixjson + sql-formatter + nodePackages.prettier prettierd # php84Packages.php-cs-fixer shfmt diff --git a/modules/nixos/system/devpkgs/default.nix b/modules/nixos/system/devpkgs/default.nix index 9ea37374..eff6c490 100644 --- a/modules/nixos/system/devpkgs/default.nix +++ b/modules/nixos/system/devpkgs/default.nix @@ -29,7 +29,7 @@ in { php # php84Packages.php-cs-fixer # phpactor - python312Packages.python-lsp-server + # python312Packages.python-lsp-server bash-language-server clang-tools marksman @@ -39,8 +39,8 @@ in { # Formatters alejandra stylua - nodePackages_latest.fixjson - nodePackages_latest.sql-formatter + # nodePackages_latest.fixjson + # nodePackages_latest.sql-formatter prettierd shfmt luaformatter diff --git a/users/cnst/modules/home.nix b/users/cnst/modules/home.nix index 9561b062..8eeeca05 100644 --- a/users/cnst/modules/home.nix +++ b/users/cnst/modules/home.nix @@ -81,7 +81,7 @@ enable = true; }; vscode = { - enable = true; + enable = false; }; waybar = { enable = true;