diff --git a/hosts/common.nix b/hosts/common.nix index e2b3ab9..94824a7 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -27,6 +27,7 @@ in { linuxHeaders neofetch microfetch + mprocs nmap polkit ripgrep diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index 6906c02..fa5f5ea 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -36,6 +36,8 @@ in { udisks2.enable = true; }; + virtualisation.docker.enable = true; + meta = { mainUser.gitSigningKey = ""; }; @@ -47,7 +49,7 @@ in { }; programs = { editors = { - emacs.enable = true; + emacs.enable = false; # only emacs for me, right now. neovim.enable = true; # sadly just not advanced enough, yet. @@ -72,6 +74,10 @@ in { }; desktops.hyprland.enable = true; + theming = { + gtk.enable = true; + }; + services = { locate.enable = true; media.mpd = { @@ -89,6 +95,5 @@ in { btop.enable = true; nh.enable = true; }; - # style.colorScheme.name = "Black Metal Venom"; }; } diff --git a/modules/other/users.nix b/modules/other/users.nix index 57d6960..75d41a9 100644 --- a/modules/other/users.nix +++ b/modules/other/users.nix @@ -18,6 +18,7 @@ in { "networkmanager" "audio" "nix" + "docker" ]; shell = self.packages.${pkgs.stdenv.system}.fish; # hashedPasswordFile = "/etc/passwords/cr"; diff --git a/modules/services/kanata/main.kbd b/modules/services/kanata/main.kbd new file mode 100644 index 0000000..0b4dbc5 --- /dev/null +++ b/modules/services/kanata/main.kbd @@ -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) +) diff --git a/modules/services/kanata/module.nix b/modules/services/kanata/module.nix new file mode 100644 index 0000000..8b3c748 --- /dev/null +++ b/modules/services/kanata/module.nix @@ -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"); + }; + }; +} diff --git a/modules/style/theming.nix b/modules/style/theming.nix index 8402b8d..ce272d4 100644 --- a/modules/style/theming.nix +++ b/modules/style/theming.nix @@ -6,9 +6,9 @@ }: let inherit (lib.modules) mkMerge mkIf; inherit (lib.options) mkEnableOption; - cfg = config.modules.usrEnv.theming; + cfg = config.modules.theming; in { - options.modules.usrEnv.theming = { + options.modules.theming = { gtk.enable = mkEnableOption "gtk theming"; qt.enable = mkEnableOption "qt theming"; }; diff --git a/modules/wms/wayland/hyprland/settings.nix b/modules/wms/wayland/hyprland/settings.nix index fa515e9..f0484ac 100644 --- a/modules/wms/wayland/hyprland/settings.nix +++ b/modules/wms/wayland/hyprland/settings.nix @@ -32,9 +32,9 @@ in { # Input settings input = { - kb_layout = "us,ru,de"; - kb_variant = ",phonetic_winkeys,"; - kb_options = "grp:rctrl_rshift_toggle, caps:escape, compose:102"; + kb_layout = "us,ru"; + kb_variant = ",phonetic_winkeys"; + kb_options = "grp:rctrl_rshift_toggle,"; follow_mouse = true; diff --git a/packages/helix.nix b/packages/helix.nix index be236e1..137600e 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -143,27 +143,6 @@ } { 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"; @@ -202,6 +181,13 @@ args = ["start"]; }; + rust-analyzer = { + config = { + check.command = "clippy"; + cargo.features = "all"; + }; + }; + clangd = { command = "${clang-tools}/bin/clangd"; clangd.fallbackFlags = ["-std=c++2b"];