emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moving to ctrl as main mod[1;2A]

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-10-08 16:48:50 -04:00
parent 1781b9c4ad
commit ed904f2d2b
6 changed files with 59 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dotfiles/dot_config/just/justfile
View file

@ -8,4 +8,4 @@ homeup:
# update flake repos
flakeup:
cd '~/source/nixos-config' && sudo nix flake update
cd '/home/emenel/source/nixos-config' && sudo nix flake update

26
dotfiles/dot_config/kmonad/snap.kbd
View file

@ -4,23 +4,23 @@
fallthrough true)
(defsrc
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12
grv 1 2 3 4 5 6 7 8 9 0 - = \ del
tab q w e r t y u i o p [ ] bspc
caps a s d f g h j k l ; ' ret
lsft z x c v b n m , . / rsft
lctl slck lmet lalt spc ralt rmet rctrl)
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del
f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc KeyHome
f14 tab q w e r t y u i o p [ ] \ KeyEnd
f15 caps a s d f g h j k l ; ' ret pgup
f16 lsft z x c v b n m , . / rsft pgdn
f17 lctl slck lmet lalt spc ralt rmet rctrl)
(defalias
ctrlesc (tap-hold-next-release 200 esc lctrl)
supesc (tap-hold-next-release 200 esc lmet)
sp-lsft (tap-hold-next-release 200 \( lsft)
sp-rsft (tap-hold-next-release 200 \) lsft)
hypr C-A-M-S)
(deflayer qwerty
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12
grv 1 2 3 4 5 6 7 8 9 0 - = \ del
tab q w e r t y u i o p [ ] bspc
@ctrlesc a s d f g h j k l ; ' ret
@sp-lsft z x c v b n m , . / @sp-rsft
@hypr lctl lalt lmet spc rmet ralt rctrl)
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del
f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc KeyHome
f14 tab q w e r t y u i o p [ ] \ KeyEnd
f15 @supesc a s d f g h j k l ; ' ret pgup
f16 @sp-lsft z x c v b n m , . / @sp-rsft pgdn
f17 @hypr lmet lalt lctrl spc rctrl ralt rmet)

43
dotfiles/dot_config/wezterm/wezterm.lua
View file

@ -44,42 +44,47 @@ config.tab_bar_at_bottom = true
config.enable_kitty_keyboard = true
config.keys = {
{
key = ",",
mods = "SUPER",
action = act.SpawnCommandInNewWindow({
cwd = os.getenv("WEZTERM_CONFIG_DIR"),
args = { os.getenv("SHELL"), "-c", "$EDITOR $WEZTERM_CONFIG_FILE" },
}),
},
{
key = 'Enter',
mods = 'SUPER',
mods = 'CTRL',
action = act.SplitVertical { domain = 'CurrentPaneDomain' },
},
{
key = 'Enter',
mods = 'SUPER|SHIFT',
mods = 'CTRL|SHIFT',
action = act.SplitHorizontal { domain = 'CurrentPaneDomain' },
},
{
key = 'w',
mods = 'CTRL',
action = wezterm.action.CloseCurrentTab { confirm = true },
},
{
key = 'k',
mods = 'SUPER',
mods = 'CTRL',
action = act.Multiple {
act.ClearScrollback 'ScrollbackAndViewport',
act.SendKey { key = 'L', mods = 'CTRL' },
},
},
{key="LeftArrow", mods="SUPER|META", action=act.ActivateTabRelative(-1)},
{key="RightArrow", mods="SUPER|META", action=act.ActivateTabRelative(1)},
{
key = 'w',
mods = 'CTRL',
action = wezterm.action.CloseCurrentPane { confirm = true },
},
{key="UpArrow", mods="SUPER|META", action=act.ActivatePaneDirection("Prev")},
{key="DownArrow", mods="SUPER|META", action=act.ActivatePaneDirection("Next")},
{ key='t', mods='CTRL', action=act { SpawnCommandInNewTab = { cwd = wezterm.home_dir } } },
{ key='h', mods='SUPER|META', action=wezterm.action{ActivatePaneDirection="Left"} },
{ key='l', mods='SUPER|META', action=wezterm.action{ActivatePaneDirection="Right"} },
{ key='j', mods='SUPER|META', action=wezterm.action{ActivatePaneDirection="Up"} },
{ key='k', mods='SUPER|META', action=wezterm.action{ActivatePaneDirection="Down"} },
{key="LeftArrow", mods="CTRL|META", action=act.ActivateTabRelative(-1)},
{key="RightArrow", mods="CTRL|META", action=act.ActivateTabRelative(1)},
{key="UpArrow", mods="CTRL|META", action=act.ActivatePaneDirection("Prev")},
{key="DownArrow", mods="CTRL|META", action=act.ActivatePaneDirection("Next")},
{ key='h', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Left"} },
{ key='l', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Right"} },
{ key='j', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Up"} },
{ key='k', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Down"} },
}
local barconfig = {

12
flake.lock generated
View file

@ -215,11 +215,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"lastModified": 1728241625,
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
"type": "github"
},
"original": {
@ -270,11 +270,11 @@
]
},
"locked": {
"lastModified": 1728219351,
"narHash": "sha256-FVXtRvS0IJCvIadkz/ULFKKceNY/d6hhcNZO73E51/A=",
"lastModified": 1728373025,
"narHash": "sha256-5iEV1QH5A74HbTvSR+yrPttqwf6gzlL76JQiXB+P/Q4=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "9463b5d319bc79665db902a1007d1846d4218f62",
"rev": "0a5e8f7bd281e879e9a5fe614d27162261c544d9",
"type": "github"
},
"original": {

2
home/home.nix
View file

@ -67,6 +67,7 @@
janet
jpm
python3
ruff
python311Packages.pip
sbcl
nodejs_18
@ -375,6 +376,7 @@
"com.heroicgameslauncher.hgl"
"io.github.dyegoaurelio.simple-wireplumber-gui"
"io.github.dgsasha.Remembrance"
"nl.hjdskes.gcolor3"
];
home.file.".npmrc".source = ../dotfiles/dot_npmrc;

14
system/eddie/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ nixos-hardware, config, pkgs, musnix, ... }:
{ nixos-hardware, config, pkgs, musnix, lib, ... }:
{
imports =
@ -100,6 +100,18 @@
};
};
specialisation = {
gpupower.configuration = {
system.nixos.tags = [ "gpupower" ];
hardware.nvidia = {
prime.offload.enable = lib.mkForce false;
prime.offload.enableOffloadCmd = lib.mkForce false;
prime.sync.enable = lib.mkForce true;
powerManagement.finegrained = lib.mkForce false;
};
};
};
musnix = {
enable = true;
alsaSeq.enable = true;