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 # update flake repos
flakeup: 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) fallthrough true)
(defsrc (defsrc
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del
grv 1 2 3 4 5 6 7 8 9 0 - = \ del f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc KeyHome
tab q w e r t y u i o p [ ] bspc f14 tab q w e r t y u i o p [ ] \ KeyEnd
caps a s d f g h j k l ; ' ret f15 caps a s d f g h j k l ; ' ret pgup
lsft z x c v b n m , . / rsft f16 lsft z x c v b n m , . / rsft pgdn
lctl slck lmet lalt spc ralt rmet rctrl) f17 lctl slck lmet lalt spc ralt rmet rctrl)
(defalias (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-lsft (tap-hold-next-release 200 \( lsft)
sp-rsft (tap-hold-next-release 200 \) lsft) sp-rsft (tap-hold-next-release 200 \) lsft)
hypr C-A-M-S) hypr C-A-M-S)
(deflayer qwerty (deflayer qwerty
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del
grv 1 2 3 4 5 6 7 8 9 0 - = \ del f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc KeyHome
tab q w e r t y u i o p [ ] bspc f14 tab q w e r t y u i o p [ ] \ KeyEnd
@ctrlesc a s d f g h j k l ; ' ret f15 @supesc a s d f g h j k l ; ' ret pgup
@sp-lsft z x c v b n m , . / @sp-rsft f16 @sp-lsft z x c v b n m , . / @sp-rsft pgdn
@hypr lctl lalt lmet spc rmet ralt rctrl) 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.enable_kitty_keyboard = true
config.keys = { 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', key = 'Enter',
mods = 'SUPER', mods = 'CTRL',
action = act.SplitVertical { domain = 'CurrentPaneDomain' }, action = act.SplitVertical { domain = 'CurrentPaneDomain' },
}, },
{ {
key = 'Enter', key = 'Enter',
mods = 'SUPER|SHIFT', mods = 'CTRL|SHIFT',
action = act.SplitHorizontal { domain = 'CurrentPaneDomain' }, action = act.SplitHorizontal { domain = 'CurrentPaneDomain' },
}, },
{
key = 'w',
mods = 'CTRL',
action = wezterm.action.CloseCurrentTab { confirm = true },
},
{ {
key = 'k', key = 'k',
mods = 'SUPER', mods = 'CTRL',
action = act.Multiple { action = act.Multiple {
act.ClearScrollback 'ScrollbackAndViewport', act.ClearScrollback 'ScrollbackAndViewport',
act.SendKey { key = 'L', mods = 'CTRL' }, 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='t', mods='CTRL', action=act { SpawnCommandInNewTab = { cwd = wezterm.home_dir } } },
{key="DownArrow", mods="SUPER|META", action=act.ActivatePaneDirection("Next")},
{ key='h', mods='SUPER|META', action=wezterm.action{ActivatePaneDirection="Left"} }, {key="LeftArrow", mods="CTRL|META", action=act.ActivateTabRelative(-1)},
{ key='l', mods='SUPER|META', action=wezterm.action{ActivatePaneDirection="Right"} }, {key="RightArrow", mods="CTRL|META", action=act.ActivateTabRelative(1)},
{ key='j', mods='SUPER|META', action=wezterm.action{ActivatePaneDirection="Up"} },
{ key='k', mods='SUPER|META', action=wezterm.action{ActivatePaneDirection="Down"} }, {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 = { local barconfig = {

12
flake.lock generated
View file

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

2
home/home.nix
View file

@ -67,6 +67,7 @@
janet janet
jpm jpm
python3 python3
ruff
python311Packages.pip python311Packages.pip
sbcl sbcl
nodejs_18 nodejs_18
@ -375,6 +376,7 @@
"com.heroicgameslauncher.hgl" "com.heroicgameslauncher.hgl"
"io.github.dyegoaurelio.simple-wireplumber-gui" "io.github.dyegoaurelio.simple-wireplumber-gui"
"io.github.dgsasha.Remembrance" "io.github.dgsasha.Remembrance"
"nl.hjdskes.gcolor3"
]; ];
home.file.".npmrc".source = ../dotfiles/dot_npmrc; 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 # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ nixos-hardware, config, pkgs, musnix, ... }: { nixos-hardware, config, pkgs, musnix, lib, ... }:
{ {
imports = 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 = { musnix = {
enable = true; enable = true;
alsaSeq.enable = true; alsaSeq.enable = true;