diff --git a/flake.lock b/flake.lock index 43087cb..1951fa4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1747864449, - "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", + "lastModified": 1745357003, + "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", + "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1748359092, - "narHash": "sha256-bfQVlnTe1PZ3DfulcHUwJzh6qcir0n1F8B0xYUV+Vu0=", + "lastModified": 1747838296, + "narHash": "sha256-+o+cq1xVgWwHAtympYIsu9dJ+nNBnNEEJt9uaaBb8eM=", "owner": "helix-editor", "repo": "helix", - "rev": "2bd7452fe0309e273d06280d15caad6943034377", + "rev": "76029e58405759fa40e5d38ecdd52cc1c520f0c1", "type": "github" }, "original": { @@ -393,11 +393,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1748374007, - "narHash": "sha256-7PSKzswfo+jdXSLAaQmiKGz4+xwLs/wr5tihaMv76tQ=", + "lastModified": 1747863861, + "narHash": "sha256-CR4/UmMfg5airc53B4QtHEZlX76NFJQbkUDXx8bLPTo=", "owner": "hyprwm", "repo": "hyprland", - "rev": "9b327ddfd1ad4cfef7a04a178e9f0aed16e95e0a", + "rev": "185c96849ef59da3e101116662d942dea16b468a", "type": "github" }, "original": { @@ -515,11 +515,11 @@ ] }, "locked": { - "lastModified": 1747484975, - "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", + "lastModified": 1746655412, + "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "163c83b3db48a17c113729c220a60b94596c9291", + "rev": "557241780c179cf7ef224df392f8e67dab6cef83", "type": "github" }, "original": { @@ -565,11 +565,11 @@ ] }, "locked": { - "lastModified": 1747584298, - "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -709,11 +709,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -795,11 +795,11 @@ ] }, "locked": { - "lastModified": 1748389389, - "narHash": "sha256-laB14zbx0zqsRMvBq8Ct4c7eAZNIe2Sj/bZDdWRhXmM=", + "lastModified": 1747638064, + "narHash": "sha256-juEWrS6mOnlU5hva6sewhlRxTFc3cV8bV2Tt3xyTlcg=", "ref": "refs/heads/master", - "rev": "cb195d4b2a090a61f2eca5953f25df8333c881f5", - "revCount": 555, + "rev": "02e06ea5774eeb3af982a483e5c7e949d276eafc", + "revCount": 535, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index 115ad8d..cf0502c 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -64,7 +64,6 @@ in { nvidia.enable = true; }; }; - desktops.niri.enable = true; desktops.hyprland.enable = true; theming = { diff --git a/modules/wms/wayland/niri/config.kdl b/modules/wms/wayland/niri/config.kdl deleted file mode 100644 index 3bbf88a..0000000 --- a/modules/wms/wayland/niri/config.kdl +++ /dev/null @@ -1,18 +0,0 @@ -// Laptop -output "eDP-1" { - mode "1920x1080@59.999" - scale 1 - position x=0 y=0 -} - -// PC -output "DP-2" { - mode "1920x1080@59.999" - scale 1 - position x=0 y=0 -} -output "HDMI-A-1" { - mode "1920x1080@59.999" - scale 1 - position x=1920 y=0 -} diff --git a/modules/wms/wayland/niri/module.nix b/modules/wms/wayland/niri/module.nix deleted file mode 100644 index 5754e76..0000000 --- a/modules/wms/wayland/niri/module.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit (lib.modules) mkForce mkIf; - inherit (lib.options) mkEnableOption; - - cfg = config.modules.desktops.niri; - - niri-config = { - }; - - toKDL = import ./toKDL.nix lib; -in { - options.modules.desktops.niri.enable = mkEnableOption "Niri, a scolling tiling wayland compositor"; - config = mkIf cfg.enable { - programs.niri = { - enable = true; - package = pkgs.niri; - }; - # The niri module auto enables the gnome keyring, - # which is something I direly want to avoid. - services.gnome.gnome-keyring.enable = mkForce false; - - # set niri's config location to /etc/niri/config.kdl. - environment.etc."niri/config.kdl".source = ./config.kdl; - }; -} diff --git a/packages/helix/default.nix b/packages/helix/default.nix index f10b663..1d1e8a0 100644 --- a/packages/helix/default.nix +++ b/packages/helix/default.nix @@ -9,15 +9,13 @@ clippy, cmake-format, cmake-language-server, - deadnix, deno, dprint, formats, gdb, golangci-lint-langserver, + deadnix, gopls, - kdePackages, - kdlfmt, lazygit, lib, lldb_19, @@ -28,12 +26,13 @@ rustfmt, shellcheck, shfmt, - simple-completion-language-server, superhtml, + kdePackages, taplo, tinymist, typescript-language-server, vscode-langservers-extracted, + simple-completion-language-server, zls, helix, ... @@ -143,8 +142,6 @@ # typst lsp vscode-langservers-extracted - kdlfmt - deadnix # zig language server zls