Compare commits

...

7 commits

8 changed files with 83 additions and 28 deletions

View file

@ -27,6 +27,7 @@ in {
linuxHeaders linuxHeaders
neofetch neofetch
microfetch microfetch
mprocs
nmap nmap
polkit polkit
ripgrep ripgrep

View file

@ -36,6 +36,8 @@ in {
udisks2.enable = true; udisks2.enable = true;
}; };
virtualisation.docker.enable = true;
meta = { meta = {
mainUser.gitSigningKey = ""; mainUser.gitSigningKey = "";
}; };
@ -47,7 +49,7 @@ in {
}; };
programs = { programs = {
editors = { editors = {
emacs.enable = true; emacs.enable = false;
# only emacs for me, right now. # only emacs for me, right now.
neovim.enable = true; neovim.enable = true;
# sadly just not advanced enough, yet. # sadly just not advanced enough, yet.
@ -72,6 +74,10 @@ in {
}; };
desktops.hyprland.enable = true; desktops.hyprland.enable = true;
theming = {
gtk.enable = true;
};
services = { services = {
locate.enable = true; locate.enable = true;
media.mpd = { media.mpd = {
@ -89,6 +95,5 @@ in {
btop.enable = true; btop.enable = true;
nh.enable = true; nh.enable = true;
}; };
# style.colorScheme.name = "Black Metal Venom";
}; };
} }

View file

@ -18,6 +18,7 @@ in {
"networkmanager" "networkmanager"
"audio" "audio"
"nix" "nix"
"docker"
]; ];
shell = self.packages.${pkgs.stdenv.system}.fish; shell = self.packages.${pkgs.stdenv.system}.fish;
# hashedPasswordFile = "/etc/passwords/cr"; # hashedPasswordFile = "/etc/passwords/cr";

View file

@ -0,0 +1,49 @@
(defsrc
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ]
caps a s d f g h j k l ; ' \ ret
lsft < z x c v b n m , . / rsft
lctl lmet lalt spc ralt rmet comp rctl
)
(deflayer qwerty
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ]
@esc a s d f g h j k l ; ' \ ret
lsft < z x c v b n m , . / rsft
@lay lmet lalt spc ralt rmet comp rctl
)
(deflayer graphite
Backquote 1 2 3 4 5 6 7 8 9 0 [ ] bspc
tab b l d w z ' f o u j ; =
@esc n r t s g y h a e i , \ ret
lsft < q x m c v k p . - / rsft
@lay lmet lalt spc ralt rmet comp rctl
)
;; (deflayer graphite-2
;; grv ! @ # $ % ^ & * S-9 S-0 { } bspc
;; tab B L D W Z _ F O U J : +
;; caps N R T S G Y H A E I ? | ret
;; lsft < Q X M C V K P > apo < rsft
;; lctl lmet lalt spc ralt rmet comp rctl
;; )
(deflayer layouts
_ _ _ _ _ _ _ _ _ _ _ _ _ _
_ @qwe _ _ _ _ _ _ _ _ _ _ _
caps _ _ _ _ @gra _ _ _ _ _ _ _ _
_ _ _ _ _ _ _ _ _ _ _ _ _
_ _ _ _ _ _ _ _
)
(defalias
esc (tap-hold-release 200 200 esc lctl)
;; spc (tap-hold-release 200 200 spc @sym)
qwe (layer-switch qwerty)
gra (layer-switch graphite)
;; la1 (layer-toggle graphite-2)
lay (layer-toggle layouts)
)

View file

@ -0,0 +1,13 @@
{
...
}:
{
services.kanata = {
enable = true;
keyboards.daskeyboard = {
devices = ["/dev/input/by-id/usb-Metadot_-_Das_Keyboard_Das_Keyboard-event-kbd"];
config = builtins.readFile (./. + "/main.kbd");
};
};
}

View file

@ -6,9 +6,9 @@
}: let }: let
inherit (lib.modules) mkMerge mkIf; inherit (lib.modules) mkMerge mkIf;
inherit (lib.options) mkEnableOption; inherit (lib.options) mkEnableOption;
cfg = config.modules.usrEnv.theming; cfg = config.modules.theming;
in { in {
options.modules.usrEnv.theming = { options.modules.theming = {
gtk.enable = mkEnableOption "gtk theming"; gtk.enable = mkEnableOption "gtk theming";
qt.enable = mkEnableOption "qt theming"; qt.enable = mkEnableOption "qt theming";
}; };

View file

@ -32,9 +32,9 @@ in {
# Input settings # Input settings
input = { input = {
kb_layout = "us,ru,de"; kb_layout = "us,ru";
kb_variant = ",phonetic_winkeys,"; kb_variant = ",phonetic_winkeys";
kb_options = "grp:rctrl_rshift_toggle, caps:escape, compose:102"; kb_options = "grp:rctrl_rshift_toggle,";
follow_mouse = true; follow_mouse = true;

View file

@ -143,27 +143,6 @@
} }
{ {
name = "rust"; name = "rust";
debugger = {
command = "${lldb_19}/bin/lldb-dap";
name = "lldb";
transport = "stdio";
templates = [
{
name = "binary";
request = "launch";
completion = [
{
name = "binary";
completion = "filename";
}
];
args = {
program = "{0}";
runInTerminal = true;
};
}
];
};
} }
{ {
name = "c"; name = "c";
@ -202,6 +181,13 @@
args = ["start"]; args = ["start"];
}; };
rust-analyzer = {
config = {
check.command = "clippy";
cargo.features = "all";
};
};
clangd = { clangd = {
command = "${clang-tools}/bin/clangd"; command = "${clang-tools}/bin/clangd";
clangd.fallbackFlags = ["-std=c++2b"]; clangd.fallbackFlags = ["-std=c++2b"];