updates and keyboard updates

This commit is contained in:
Matt Nish-Lapidus 2024-11-28 13:39:35 -05:00
parent 842ea7a681
commit 11c3a4b076
5 changed files with 74 additions and 56 deletions

View file

@ -1,7 +1,7 @@
(defcfg
input (device-file "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd")
output (uinput-sink "kmonad-sinc")
fallthrough true)
input (device-file "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd")
output (uinput-sink "kmonad-sinc")
fallthrough true)
(defsrc
@ -9,21 +9,27 @@
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 pgdn
lctl slck lmet lalt spc ralt rmet rctrl)
lsft z x c v b n m , . / rsft up pgdn
lctl slck lmet lalt spc ralt rmet rctrl left down right)
(defalias
supesc (tap-hold-next-release 200 esc lmet)
sp-lsft (tap-hold-next-release 200 \( lsft)
sp-rsft (tap-hold-next-release 200 \) lsft))
sp-rsft (tap-hold-next-release 200 \) lsft)
controls (layer-toggle controls))
(deflayer qwerty
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 KeyPrint KeyInsert
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 pgdn
lmet lmet lalt lctrl spc rctrl ralt rmet)
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 KeyPrint KeyInsert
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 spc rctrl ralt rmet left down right)
;; (defalias
;; toggle-scratch ())
(deflayer controls
esc KeyMute KeyVolumeDown KeyVolumeUp f4 f5 KeyPlayPause KeyPreviousSong KeyNextSong f9 f10 f11 f12 KeyPrint KeyInsert
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 pgup _
lmet lmet lalt lctrl spc rctrl ralt rmet home pgdn end)

70
flake.lock generated
View file

@ -62,16 +62,16 @@
]
},
"locked": {
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"lastModified": 1732466619,
"narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"rev": "f3111f62a23451114433888902a55cf0692b408d",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
@ -106,11 +106,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1731845570,
"narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=",
"lastModified": 1732450403,
"narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9",
"rev": "c817444fb8a3042c26be57d8640fb744bc1b516c",
"type": "github"
},
"original": {
@ -126,11 +126,11 @@
]
},
"locked": {
"lastModified": 1732139495,
"narHash": "sha256-bsL1CZWp5fMDXP6U0Ipwi/XA1YigK9ON+pC7Cxurgec=",
"lastModified": 1732661062,
"narHash": "sha256-E8mk/P0wUpHXy7tDQqUzbpa9IJoN/DmA1a6iFBuXqgI=",
"owner": "musnix",
"repo": "musnix",
"rev": "996b38613a282299c852eca204a10914c6b0074d",
"rev": "629dcc6010365cfd268702065c2f8149ae19ea02",
"type": "github"
},
"original": {
@ -147,11 +147,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1731682758,
"narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=",
"lastModified": 1732631228,
"narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36",
"rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf",
"type": "github"
},
"original": {
@ -184,11 +184,11 @@
]
},
"locked": {
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"lastModified": 1731952509,
"narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
"type": "github"
},
"original": {
@ -219,11 +219,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1731797098,
"narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
"lastModified": 1732483221,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
"type": "github"
},
"original": {
@ -235,11 +235,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github"
},
"original": {
@ -251,11 +251,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1731805462,
"narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=",
"lastModified": 1732410305,
"narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734",
"rev": "87b6978992e2eb605732fba842cad0a7e14b2047",
"type": "github"
},
"original": {
@ -266,16 +266,16 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1731797254,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"lastModified": 1732350895,
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
@ -290,11 +290,11 @@
]
},
"locked": {
"lastModified": 1732304010,
"narHash": "sha256-UAjxzFJ0kxzXeZGaMqH8qhy9hlBGgxM4W/3n6IusBU0=",
"lastModified": 1732803609,
"narHash": "sha256-k8N4oGnoVP3W4wH2fEIPOw9oGsoUhSUhJ+Si+j5qMTE=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "df3091fb619ee79602768386d25005d5fa038bcd",
"rev": "790e2744814101364d435eee99fe1d0112abc686",
"type": "github"
},
"original": {
@ -305,11 +305,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1730958623,
"narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
"lastModified": 1732238832,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "85f7e662eda4fa3a995556527c87b2524b691933",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"type": "github"
},
"original": {

View file

@ -5,11 +5,11 @@
inputs = {
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};

View file

@ -89,6 +89,7 @@
sbclPackages.cffi
sbclPackages.cffi-object
sbclPackages.cffi-object_dot_ops
# sbclPackages.cl-egl
ccl
racket
@ -197,7 +198,8 @@
newsflash
planify
borgbackup
stirling-pdf
wineWowPackages.stagingFull
wineWowPackages.fonts
winetricks
@ -235,7 +237,6 @@
renoise
yabridge
yabridgectl
ansel
krita
rawtherapee
inkscape
@ -299,10 +300,9 @@
username = "emenel";
homeDirectory = "/home/emenel";
sessionPath = [ "/home/emenel/.config/emacs/bin" "/home/emenel/.npm-packages/bin" "/home/emenel/Applications" "/home/emenel/.local/bin" "/home/emenel/.local/share" ];
sessionPath = [ "/home/emenel/.config/emacs/bin" "/home/emenel/.npm-packages/bin" "/home/emenel/Applications" "/home/emenel/.local/bin" "/home/emenel/.local/share" "/home/emenel/.nix-profile/lib"];
sessionVariables = {
# EDITOR = "emacsclient -tr";
WINEFSYNC = 1;
PKG_CONFIG_PATH = "/home/emenel/.nix-profile/lib/pkgconfig:/home/emenel/.nix-profile/lib64/pkgconfig:/home/emenal/.nix-profile/share/pkgconfig";
GI_TYPELIB_PATH = "/run/current-system/sw/lib/girepository-1.0";
@ -405,6 +405,10 @@
enable = true;
enableFishIntegration = true;
};
broot = {
enable = true;
enableFishIntegration = true;
};
git = {
enable = true;
lfs.enable = true;
@ -488,6 +492,10 @@
package = pkgs.emacs;
startWithUserSession = true;
socketActivation.enable = true;
client = {
enable = true;
arguments = ["-n" "-r"];
};
};
};

View file

@ -36,6 +36,7 @@
freetype
egl-wayland
glfw-wayland
libGL.dev
openssl
];
@ -336,9 +337,12 @@
freetype
gnutls
util-linux
libGL
libGL.dev
egl-wayland
eglexternalplatform
glfw-wayland
glfw
libGLU.dev
libuv.out
libressl.out
];