diff --git a/flake.lock b/flake.lock index b9c6fe1..460f13d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699995737, - "narHash": "sha256-FoEqoGZuxI/vbpRkwKH1bgj03xT9M382BO4tcawni+8=", + "lastModified": 1700329027, + "narHash": "sha256-zZy1Obdtek9bHbssEjl6EXBY3pFWYyT4Um/oEruG2us=", "owner": "zoriya", "repo": "ags", - "rev": "199f700988d61b568fab41de21a269c9d9716ef4", + "rev": "90eab170202f233e1600154da0beffda2dc9ef7c", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700261686, + "narHash": "sha256-kplQg6hKFNuWKrOyGp9D//G/WH1nHGJ43r2m7fagTYY=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "ecd0a800f716b80a6eac58a7ac34d6d33e6fa5ee", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1699831665, - "narHash": "sha256-hfFVGgLYIIht1MAJb/P8PCOnnJLy2GkOWh22z0wAF5U=", + "lastModified": 1700252687, + "narHash": "sha256-oyjA6uYNotms3rCDjksYcbcf8Utx/9TzNYGU5OXlahQ=", "owner": "neovim", "repo": "neovim", - "rev": "d2983dcdb1ca003b5fd42d7d99fd98310aa1cd56", + "rev": "abac33605fb50d55fc796229f0812c246bf635d2", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1699834167, - "narHash": "sha256-T9SxEnpx2u6abMC4mBLk3sCHsJOUbjJtKeYprF+BHis=", + "lastModified": 1700265958, + "narHash": "sha256-iARSd74kSmyC8EgSKOBIOTbJe/affJqXqpcAtshj0v8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c7a539280a90f5f3dccf9ecd740bcabb3c06e861", + "rev": "2b00ef60f29f3e301326df85d09eba61bc00d086", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699725108, - "narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=", + "lastModified": 1700108881, + "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e", + "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699781429, - "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { diff --git a/modules/dwl/ags/layouts/bar.js b/modules/dwl/ags/layouts/bar.js index c321756..b742d64 100644 --- a/modules/dwl/ags/layouts/bar.js +++ b/modules/dwl/ags/layouts/bar.js @@ -16,7 +16,7 @@ export const Bar = (mon, monId) => exclusive: true, anchor: ["top", "left", "right"], layer: "bottom", - monitor: mon, + gdkmonitor: mon, child: CenterBox({ startWidget: Box({ children: [ diff --git a/modules/dwl/ags/modules/network.js b/modules/dwl/ags/modules/network.js index af944d0..968f48d 100644 --- a/modules/dwl/ags/modules/network.js +++ b/modules/dwl/ags/modules/network.js @@ -85,6 +85,11 @@ export const Selection = (props) => Network, (box) => { box.children = Network.wifi?.accessPoints + .reduce((acc, x) => { + if (!acc[x.bssid]) + acc.push(x) + return acc; + }, []) .map((ap) => Button({ onClicked: () => execAsync(`nmcli device wifi connect ${ap.bssid}`), diff --git a/modules/misc/nvim/lua/plugins/lsp.lua b/modules/misc/nvim/lua/plugins/lsp.lua index 120b04f..6d5a6ea 100644 --- a/modules/misc/nvim/lua/plugins/lsp.lua +++ b/modules/misc/nvim/lua/plugins/lsp.lua @@ -357,7 +357,7 @@ return { { "lf", function() - require("conform").format({ async = true, lsp_fallback = true }) + require("conform").format({ async = true, lsp_fallback = "always" }) end, desc = "Format", mode = { "n", "v" }, @@ -377,8 +377,12 @@ return { css = { { "prettierd", "prettier" } }, html = { { "prettierd", "prettier" } }, sql = { "pg_format" }, + ["*"] = { "injected" } }, - } + }, + init = function() + vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" + end }, {