From 04dc801925fe4d609f0949f11579198de08df40a Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Thu, 27 Apr 2023 14:58:10 +0530 Subject: [PATCH] hosts/satori: disable iwd Signed-off-by: Amneesh Singh --- flake.lock | 138 ++++++++++++++++++------------------ hosts/modules/nvim/init.lua | 10 +-- hosts/satori/networking.nix | 5 +- 3 files changed, 76 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index 8fe712f..9206ed6 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1677523399, - "narHash": "sha256-NdHq1p6ENj+cI2oB8sEttnJBzFgj1f9p4Xr3AcUOFWo=", + "lastModified": 1682564884, + "narHash": "sha256-2Rq+qvKjg7ceLUN+C4VGZtFMJ2tAbDSNt7QjxSYoj0M=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e489ac3f5f94c71b759c5b6bbde15be29d873b7c", + "rev": "b9f58617837bb55201c526a8c37976d0ff25aebd", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "type": "github" }, "original": { @@ -116,12 +116,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -134,15 +137,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1677509389, - "narHash": "sha256-ry4dkSjIO0WuEbIDpTFV0W2iq2S26kWCv7EX2vKOWEI=", + "lastModified": 1682535786, + "narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab7c8f4a8427bfcaf01a46bab974298cc27bc1f5", + "rev": "d82c9af8175878a461a0fdf914e67cc446664570", "type": "github" }, "original": { @@ -161,11 +163,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1677527262, - "narHash": "sha256-CjUQtuLsz3VkSbV1eM1UwcWzruNgvK8ekZrIUevH72o=", + "lastModified": 1682548480, + "narHash": "sha256-aycGKS+Vv/lQQFaYJNpK054leLKIapfUobgzt8fohFA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "18229043fa85bdf96a9d829c1e61d0f524a1966a", + "rev": "72d2f33b34951b7f5be6cdbc302b1c6a33cbf60f", "type": "github" }, "original": { @@ -181,11 +183,11 @@ ] }, "locked": { - "lastModified": 1677504916, - "narHash": "sha256-lcmVUaGt+h2QVBSqW3sBPkaEPUHpDzivr7YoKbeI+7I=", + "lastModified": 1679036674, + "narHash": "sha256-2s3Hfq56jL8ePyc3+calPT34FNMK2zksqwPhIxAq20o=", "owner": "hyprwm", "repo": "contrib", - "rev": "d5c0c94d61ac600687382b2e0959864d6fbc84b8", + "rev": "1af47a008e850c595aeddc83bb3f04fd81935caa", "type": "github" }, "original": { @@ -202,11 +204,11 @@ ] }, "locked": { - "lastModified": 1671839510, - "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", + "lastModified": 1681065697, + "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", + "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "type": "github" }, "original": { @@ -223,7 +225,7 @@ "nixpkgs" ], "nixpkgs-22_11": "nixpkgs-22_11", - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1671738303, @@ -244,14 +246,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_3" + "utils": "utils_2" }, "locked": { - "lastModified": 1677433142, - "narHash": "sha256-351eG11Cl4CjKxRoiVvjWAD9nQWLlCxLlltcJWvXGa0=", + "lastModified": 1682244572, + "narHash": "sha256-6XufGqQfPX+5QN1fz4HGdHASXY6TCe8GTYW1AxBWJgY=", "owner": "nbfc-linux", "repo": "nbfc-linux", - "rev": "7954b30531593849fc3b11c760930baf891f5ad1", + "rev": "706066a1415fa0498f23336e628152e90d776e0a", "type": "github" }, "original": { @@ -270,11 +272,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1677463842, - "narHash": "sha256-MgUEDPza573qKV59nRqrykLblPKBZu+DAIUqg9Pl5wU=", + "lastModified": 1682581904, + "narHash": "sha256-9P4T2erXXrPxXTTLgD29U/IdKCOYqP4xbwdYswtVBA8=", "owner": "neovim", "repo": "neovim", - "rev": "2c9fbe34b20266ef5ab54f6ed14fb38eef60430d", + "rev": "d321deb4a9b05e9d81b79ac166274f4a6e7981bf", "type": "github" }, "original": { @@ -289,11 +291,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1677507556, - "narHash": "sha256-ILX2jRfb8hNW/xNf2ZVvUX5B5yfAZFr1C5ky7hD/b4I=", + "lastModified": 1682298303, + "narHash": "sha256-DOgXWL3p42JfP256fjlBOfZfey8B8r1ir3E6P1YpCxc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "d08381e6d37b008dad4a94e7b863ea0aef1eb223", + "rev": "ca90d38d85ffe678a648d6d4dbd89a574c140526", "type": "github" }, "original": { @@ -336,11 +338,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { @@ -353,11 +355,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1675614288, - "narHash": "sha256-i3Rc/ENnz62BcrSloeVmAyPicEh4WsrEEYR+INs9TYw=", + "lastModified": 1681753173, + "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d25de6654a34d99dceb02e71e6db516b3b545be6", + "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125", "type": "github" }, "original": { @@ -369,11 +371,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1677413016, - "narHash": "sha256-dwvL0VK5iyxXPQzJOPzYmuVinh/R9hwRu7eYq6Bf6ag=", + "lastModified": 1682535835, + "narHash": "sha256-DrCcsZId29H+mr7yviOfCZeJOnJ51MIWLX3qSwwSpLI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "84e33aea0f7a8375c92458c5b6cad75fa1dd561b", + "rev": "d12fa94d29856187b1c80db4edf4588df986d217", "type": "github" }, "original": { @@ -406,11 +408,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1677485761, - "narHash": "sha256-C04OWgNrCxPGUiT7Px/vZd42vfwRY6/EjHwHNUSHv7g=", + "lastModified": 1682583188, + "narHash": "sha256-CqXxDWqRLc7liA8cwafV4TQ5ggxx3PTlvDs8CUuF5HY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "aad4d8be05012055861b097b8019311fe62635bf", + "rev": "c57746e2b9e3b42c0be9d9fd1d765f245c3827b7", "type": "github" }, "original": { @@ -443,11 +445,11 @@ ] }, "locked": { - "lastModified": 1677465082, - "narHash": "sha256-b82PmPWkt0pAsxmc477Yowq1Ez1VyjA5wnxE+yoIOWg=", + "lastModified": 1682561982, + "narHash": "sha256-x0LtoiGT9gQ7Sn8SvjV3CIUqGu/GLDBDAoa5lXyef/8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2924bfce2fadc1ded4a2b8cfce7f2fd4ef41c36f", + "rev": "cc85c38ed6f7ecb9d7eb3d71be3c6f01b87e92f9", "type": "github" }, "original": { @@ -458,11 +460,11 @@ }, "stable": { "locked": { - "lastModified": 1677480869, - "narHash": "sha256-JqSHh8zE2ztj185hYYYx7+ML9DVNjDVMinTDbYP/iq0=", + "lastModified": 1682584936, + "narHash": "sha256-WM3Ww2o/86MBaPvWTCaAKlfZsgPc2onD/BIpCW3ecG0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02aa9854e20363b33932b5a9d4e87bc3c37ce820", + "rev": "e190995db93b479d4b8f2a5b115f7a60214e7215", "type": "github" }, "original": { @@ -472,22 +474,22 @@ "type": "github" } }, - "utils": { + "systems": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "utils_2": { + "utils": { "locked": { "lastModified": 1605370193, "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", @@ -502,7 +504,7 @@ "type": "github" } }, - "utils_3": { + "utils_2": { "locked": { "lastModified": 1623875721, "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", @@ -521,11 +523,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1675374853, - "narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=", + "lastModified": 1682436395, + "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", "owner": "wlroots", "repo": "wlroots", - "rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58", + "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", "type": "gitlab" }, "original": { @@ -547,11 +549,11 @@ ] }, "locked": { - "lastModified": 1673116118, - "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", + "lastModified": 1682439384, + "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", + "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", "type": "github" }, "original": { diff --git a/hosts/modules/nvim/init.lua b/hosts/modules/nvim/init.lua index 4902de2..bed6444 100644 --- a/hosts/modules/nvim/init.lua +++ b/hosts/modules/nvim/init.lua @@ -3,9 +3,6 @@ vim.api.nvim_set_option("termguicolors", true) local bind = vim.keymap.set -function hi(hi_var, hi_value) - vim.cmd("hi " .. hi_var .. " " .. hi_value) -end --SETTINGS vim.o.cmdheight = 1 vim.o.modifiable = true @@ -90,7 +87,7 @@ function _G.CompileRun() ['typescript']= 'tsc ' .. file .. ' && node ' .. noext .. '.js && rm ' .. noext .. '.js' } filetype = vim.api.nvim_buf_get_option(0, "filetype") - if commandMap[filetype] ~= nil then vim("FloatermNew --autoclose=0 " .. commandMap[filetype]) end + if commandMap[filetype] ~= nil then vim.cmd("FloatermNew --autoclose=0 " .. commandMap[filetype]) end end function _G.Repl() @@ -172,7 +169,6 @@ vim.g.floaterm_keymap_prev = '' vim.g.floaterm_keymap_new = '' vim.g.floaterm_gitcommit='floaterm' vim.g.floaterm_autoinsert=1 -vim.g.floaterm_shell="/usr/bin/env zsh" vim.g.floaterm_position="bottom" vim.g.floaterm_width=0.99 vim.g.floaterm_height=0.6 @@ -356,6 +352,10 @@ require("catppuccin").setup({ vim.cmd("colorscheme catppuccin") +function hi(hi_var, hi_value) + vim.cmd("hi " .. hi_var .. " " .. hi_value) +end + local colors = require("catppuccin.palettes").get_palette "latte" hi("Light", "guibg=" .. colors.text .. " guifg=" .. colors.crust) hi("Misc", "guibg=" .. colors.pink .. " guifg=" .. colors.base) diff --git a/hosts/satori/networking.nix b/hosts/satori/networking.nix index 59a2884..3facea8 100644 --- a/hosts/satori/networking.nix +++ b/hosts/satori/networking.nix @@ -6,10 +6,7 @@ hostId = "beca3df0"; networkmanager = { enable = true; - wifi = { - powersave = true; - backend = "iwd"; - }; + wifi.powersave = true; }; firewall = {