diff --git a/flake.lock b/flake.lock index 9888e5c..82feffa 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1748512354, - "narHash": "sha256-t2NakedcQrHpt1+wAf9kOCdHqB6WfNIw6yDfF/CDv7k=", + "lastModified": 1748596091, + "narHash": "sha256-WwiOYZY5E9wfQrUz2XnvIOW4ZrK1Kog9I29/W/Dee64=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8a6d70fbe08c7be6b1832a1c4614d5f71e8ccf82", + "rev": "5140763f6b06268375e06698636796fa063b944c", "type": "github" }, "original": { @@ -185,11 +185,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -291,15 +291,14 @@ "inputs": { "flake-compat": "flake-compat_4", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -376,11 +375,11 @@ ] }, "locked": { - "lastModified": 1748529677, - "narHash": "sha256-MJEX3Skt5EAIs/aGHD8/aXXZPcceMMHheyIGSjvxZN0=", + "lastModified": 1748618795, + "narHash": "sha256-XrNoXAbUenzde4NKMsuCYdmW8t+2/Ks+vcFrlwRh4K4=", "owner": "nix-community", "repo": "home-manager", - "rev": "da282034f4d30e787b8a10722431e8b650a907ef", + "rev": "214f9bd3a693bbc8cc6d705d01421787e04eaacd", "type": "github" }, "original": { @@ -702,11 +701,11 @@ "kitty-themes-src": { "flake": false, "locked": { - "lastModified": 1678282211, - "narHash": "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=", + "lastModified": 1747968735, + "narHash": "sha256-QQiRdyOL8svPxQ3/D0CjstBMDJ5Xapm6zfDSoo31GME=", "owner": "kovidgoyal", "repo": "kitty-themes", - "rev": "c01fcbd694353507c3cc7f657179bad1f32140a7", + "rev": "e23ccc1b1f23d404950bc3a0900ee4856448c111", "type": "github" }, "original": { @@ -785,11 +784,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748489570, - "narHash": "sha256-WNi6WihM7/6HBEfXGOkGLl47LfexAlbaG/Nu1vUn5Oo=", + "lastModified": 1748609405, + "narHash": "sha256-tuhbZf+oQ6lvBRN7iySy9ZeY9sMVtlAzQvDBBrvwEsk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0bc438fcd9fbbc3159b883d846daa718a72f5c98", + "rev": "73bcebf1ac79a9a31e29ffd08bcd982c7301d8fc", "type": "github" }, "original": { @@ -893,11 +892,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1729607649, - "narHash": "sha256-H0cr8kohjo+fJIKIpcLZwtmRUGH01Gyld0ulhfqe/Rw=", + "lastModified": 1748538518, + "narHash": "sha256-fEUmBnAD9hRKM2RtwKq6whMme1uQQngrXp7aMPKMAl4=", "owner": "bertof", "repo": "nix-rice", - "rev": "91c9dc46b80ecd7295e9accff4728f4efc9a291e", + "rev": "3a31c56b1bcd48a894442631b056e8aaeaf76834", "type": "github" }, "original": { @@ -930,11 +929,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748613622, + "narHash": "sha256-SLB2MV138ujdjw0ETEakNt/o2O+d/QtvNLlwaBZSWKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "b9d69212b5e65620e7d5b08df818db656f7fefb3", "type": "github" }, "original": { @@ -961,23 +960,26 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1729386149, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1748135671, + "narHash": "sha256-PIkcBpddXRAGWstWV7zTwRZ9EAPqgzFNssux17p1NTg=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", + "rev": "6194ba204e5b188965da97ebb16e05191e560427", "type": "github" }, "original": { @@ -988,11 +990,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1748421225, + "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", "type": "github" }, "original": { @@ -1004,11 +1006,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { @@ -1020,27 +1022,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1748421225, + "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", "type": "github" }, "original": { @@ -1084,11 +1070,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", "type": "github" }, "original": { @@ -1100,11 +1086,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -1234,7 +1220,7 @@ "nixarr": "nixarr", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_4", + "nixpkgs-stable": "nixpkgs-stable_3", "sops-nix": "sops-nix", "waybar": "waybar", "wezterm": "wezterm", @@ -1638,11 +1624,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1748436537, - "narHash": "sha256-z+dh1lO6lvStlv58mi5T/cxYdewo2+5bRSO7naVcHMs=", + "lastModified": 1748602200, + "narHash": "sha256-fAeGooJNFgFZi02eC6P9iCfSV0jhP5ZIZQGUVDmlG+Q=", "owner": "sxyazi", "repo": "yazi", - "rev": "5cb6e1f2245dd876838fa6de9c463d7b8cfc80d3", + "rev": "4076e35a2f8d0027fe99c7dfd59f29c48ea5e389", "type": "github" }, "original": { @@ -1659,11 +1645,11 @@ ] }, "locked": { - "lastModified": 1748528362, - "narHash": "sha256-uayZJ24xKabzAZH9XSfsle7Vnevj1J9P5Gb3Ntb9x9g=", + "lastModified": 1748574694, + "narHash": "sha256-VZFWDs3sBj9tXJsSAVJplzfzGYya7HVdOrzyMH/zPPo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3528ac8fa3603ac8105648349865346f503cd599", + "rev": "52cda0df1e094cbd8b0699d1cb6386beaffb4863", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index b7e0c4a..ab270f2 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -26,19 +26,7 @@ inputs.emacs-overlay.overlays.default inputs.nix-rice.overlays.default inputs.nh.overlays.default - # inputs.emacs-lsp-booster.overlays.default - - # (final: prev: { - # termusic-patched = pkgs.termusic.overrideAttrs (old: { - # src = pkgs.fetchFromGithub { - # owner = ""; - # repo = ""; - # rev = ""; - # hash = ""; - # }; - # patches = old.patches ++ [ ../../patches/termusic-503.patch ]; - # }); - # }) + inputs.emacs-lsp-booster.overlays.default (final: prev: { wineWowPackages.stagingFull = pkgs-stable.wineWowPackages.stagingFull.overrideAttrs @@ -463,6 +451,11 @@ programs.ssh.startAgent = true; + programs.coolercontrol = { + enable = true; + nvidiaSupport = true; + }; + programs.npm = { enable = true; npmrc = "prefix=~/.npm-packages"; diff --git a/modules/home/mpd.nix b/modules/home/mpd.nix index 550181d..8b41e89 100644 --- a/modules/home/mpd.nix +++ b/modules/home/mpd.nix @@ -5,7 +5,7 @@ mpc nix-config.packages.x86_64-linux.rmpc-latest # termusic-patched - termusic + termusic-git ]; services = { diff --git a/modules/home/shell-conf/wezterm/wezterm.lua b/modules/home/shell-conf/wezterm/wezterm.lua index 1fc8bf6..53c9a52 100644 --- a/modules/home/shell-conf/wezterm/wezterm.lua +++ b/modules/home/shell-conf/wezterm/wezterm.lua @@ -178,6 +178,15 @@ config.keys = { } } +for i = 1, 8 do + -- CTRL + number to activate that tab + table.insert(config.keys, { + key = tostring(i), + mods = 'CTRL', + action = act.ActivateTab(i - 1), + }) +end + tabline.setup({ options = { theme_overrides = { diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index 6ee32e5..422711c 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -10,6 +10,8 @@ let (defalias supesc (tap-hold-press $tap-timeout $hold-timeout esc lmet) + hyper (multi lsft lctl lalt lmet) + ;; ctrl return ctrl-ret (tap-hold-press $tap-timeout $hold-timeout ret lctl) @@ -22,8 +24,8 @@ let ;; home-row mods a (tap-hold $tap-timeout $hold-timeout a lshift) - s (tap-hold $tap-timeout $hold-timeout s lctrl) - d (tap-hold $tap-timeout $hold-timeout d lalt) + s (tap-hold $tap-timeout $hold-timeout s lalt) + d (tap-hold $tap-timeout $hold-timeout d lctrl) ;; f (tap-hold-press $tap-timeout $hold-timeout f ) ) ''; @@ -77,14 +79,14 @@ ${shared-alias} tab q w e r t y u i o p [ ] \ @supesc @a @s @d f g h j k l ; ' ret @sp-lsft z x c v b n m , . / @sp-rsft - lmet @controls lalt lctrl @spcnav @spcnav rctrl ralt @controls menu rmet - ret del del bspc) + @supesc @controls lalt lctrl @spcnav @spcnav rctrl ralt @controls @hyper @supesc + bspc ret ret del) (deflayer navigation grv f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 bspc tab q w e r t home pgdn pgup end p [ ] prtsc _ @a @s @d f g left down up right ; ' ret - @sp-lsft z x c v b n m , . / up + _ z x c v b n m , . / up _ _ _ _ _ _ _ _ left down right _ _ _ _) @@ -92,61 +94,10 @@ ${shared-alias} grv VolumeMute VolumeDown VolumeUp f4 MediaTrackPrevious MediaPlayPause MediaTrackNext f8 f9 f10 f11 f12 bspc tab q w e r t home pgdn pgup end p [ ] \ _ @a @s @d f g MediaTrackPrevious VolumeDown VolumeUp MediaTrackNext MediaPlayPause ' ret - @sp-lsft z x c v b n m , . / _ + _ z x c v b n m , . / _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _) -''; - }; - sinc = { - devices = [ "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd" - "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-if02" - "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-if02-event-joystick" ]; - extraDefCfg = '' -process-unmapped-keys yes -concurrent-tap-hold yes -allow-hardware-repeat false -''; - - config = '' -(defsrc - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc - grv 1 2 3 4 5 6 7 8 9 0 - = \ del home - tab q w e r t y u i o p [ ] bspc end - caps a s d f g h j k l ; ' ret pgup - lsft z x c v b n m , . / rsft up pgdn - lctl slck lmet lalt spc ralt rmet rctrl left down right) - -${k-vars} - -${shared-alias} - -(defalias - controls (layer-while-held media-controls)) - -(deflayer qwerty - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc - grv 1 2 3 4 5 6 7 8 9 0 - = \ del home - tab q w e r t y u i o p [ ] bspc end - @supesc @a @s @d f g h j k l ; ' ret pgup - @sp-lsft z x c v b n m , . / @sp-rsft up pgdn - lmet @controls lalt lctrl @spcnav rctrl ralt rmet left down right) - -(deflayer navigation - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc - grv 1 2 3 4 5 6 7 8 9 0 - = \ del home - tab q w e r t home pgdn pgup end p [ ] bspc end - caps _ _ _ f g left down up right ; ' ret pgup - @sp-lsft z x c v b n m , . / @sp-rsft up pgdn - lmet @controls lalt lctrl _ rctrl ralt rmet left down right) - -(deflayer media-controls - esc VolumeMute VolumeDown VolumeUp f4 MediaTrackPrevious MediaPlayPause MediaTrackNext f8 f9 f10 f11 f12 prtsc - grv 1 2 3 4 5 6 7 8 9 0 - = \ del home - tab q w e r t y u i o p [ ] bspc end - @supesc _ _ _ f g MediaTrackPrevious VolumeDown VolumeUp MediaTrackNext MediaPlayPause ' ret pgup - @sp-lsft z x c v b n VolumeMute , . / @sp-rsft pgup _ - lmet lmet lalt lctrl _ rctrl ralt rmet home pgdn end) ''; }; @@ -175,14 +126,14 @@ ${shared-alias} tab q w e r t y u i o p [ ] \ @supesc @a @s @d f g h j k l ; ' ret @sp-lsft z x c v b n m , . / @sp-rsft - lmet lalt @ctrl-ret @spcnav @ctrl-ret ralt) + @supesc lalt @ctrl-ret @spcnav @ctrl-ret ralt) (deflayer navigation grv 1 2 3 4 5 6 7 8 9 0 - = bspc tab q w e r t home pgdn pgup end p [ ] \ _ _ _ _ _ _ left down up right ; ' ret @sp-lsft z x c v b n m , . / @sp-rsft - lmet lalt @ctrl-ret _ rctrl ralt) + _ _ _ _ _ _) ''; }; }; diff --git a/overlays/termusic.nix b/overlays/termusic.nix new file mode 100644 index 0000000..3fb7546 --- /dev/null +++ b/overlays/termusic.nix @@ -0,0 +1,17 @@ +final: prev: { + termusic-git = prev.termusic.overrideAttrs (old: rec { + version = "HEAD"; + + src = prev.fetchFromGitHub { + owner = "tramhao"; + repo = "termusic"; + rev = "HEAD"; + hash = "sha256-l95vSxVfS0Fkhrfopzz/J5SXVPRAvT8qx899rBqor8A="; + }; + + cargoDeps = final.rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-q8rfB57sSmzvuY+QomBY8boOADLSYQnt1aRVi6fz1bY="; + }; + }); +}