Skip to content
This repository has been archived by the owner on Nov 12, 2024. It is now read-only.

Commit

Permalink
_
Browse files Browse the repository at this point in the history
  • Loading branch information
valeratrades committed Oct 14, 2024
1 parent 5fa72b0 commit d9679f6
Show file tree
Hide file tree
Showing 5 changed files with 230 additions and 32 deletions.
Binary file modified home/v/.config/dconf/user
Binary file not shown.
5 changes: 3 additions & 2 deletions home/v/.config/nvim/after/plugin/dap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ dap_go.setup()
dap.configurations.rust = {
{
type = "lldb",
name = "Run no args",
name = "Debug: No Args",
request = "launch",
program = "${workspaceFolder}/target/debug/${workspaceFolderBasename}",
cwd = "${workspaceFolder}",
Expand All @@ -179,7 +179,7 @@ dap.configurations.rust = {
},
{
type = "lldb",
name = "Gimme args",
name = "Debug: Provide Args",
request = "launch",
program = "${workspaceFolder}/target/debug/${workspaceFolderBasename}",
cwd = "${workspaceFolder}",
Expand All @@ -194,6 +194,7 @@ dap.configurations.rust = {
args = vim.split(args_str, ',')
vim.print(args)
if vim.fn.isdirectory('./tmp') then -- my standard
--? maybe should dump it next to undotree files
local file = io.open('./tmp/dap', 'w')
if file then
file:write(args_str)
Expand Down
2 changes: 2 additions & 0 deletions home/v/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ alias bak="XDG_CONFIG_HOME=/home/v/.dots/home/v/.config"
alias as_term="script -qfc" # don't forget the quotes
alias bluetooth="blueman-manager"
alias wget="aria2c -x16"
alias disable_fan="echo 0 | sudo tee /sys/class/hwmon/hwmon6/pwm1" # until it gets retriggered back on rising temperature
alias enable_fan="echo 2 | sudo tee /sys/class/hwmon/hwmon6/pwm1"


#gpg id = gpg --list-keys --with-colons | awk -F: '/uid/ && /[email protected]/ {getline; print $5}'
Expand Down
197 changes: 192 additions & 5 deletions usr/share/X11/xkb/symbols/ru
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,12 @@ xkb_symbols "common" {
include "kpdl(comma)"
};

partial
partial alphanumeric_keys
xkb_symbols "iso" {
include "ru(common)"

name[Group1] = "Russian ISO";

// Swap Enter and backslash/bar
key <RTRN> { [ backslash, bar ] };
key <RALT> { type="FOUR_LEVEL", [ BackSpace ] };
key <RTRN> { [ backslash, bar ] };
key <BKSL> { [ Return, Return ] };
};

Expand Down Expand Up @@ -1320,3 +1318,192 @@ xkb_symbols "rtu" {

include "level3(ralt_switch)"
};

// Diktor is an ergonomic alternative to the JCUKEN layout (see: ru(winkeys)),
// adapting Dvorak design principles for Russian.
partial alphanumeric_keys
xkb_symbols "diktor" {
name[Group1]= "Russian (Diktor)";

key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] };
key <AE01> { [ 1, Cyrillic_HARDSIGN ] };
key <AE02> { [ 2, Cyrillic_SOFTSIGN ] };
key <AE03> { [ 3, numerosign ] };
key <AE04> { [ 4, percent ] };
key <AE05> { [ 5, colon ] };
key <AE06> { [ 6, semicolon ] };
key <AE07> { [ 7, minus ] };
key <AE08> { [ 8, quotedbl ] };
key <AE09> { [ 9, parenleft ] };
key <AE10> { [ 0, parenright ] };
key <AE11> { [ asterisk, underscore ] };
key <AE12> { [ equal, plus ] };

key <AD01> { [ Cyrillic_tse, Cyrillic_TSE ] };
key <AD02> { [ Cyrillic_softsign, Cyrillic_hardsign ] };
key <AD03> { [ Cyrillic_ya, Cyrillic_YA ] };
key <AD04> { [ comma, question ] };
key <AD05> { [ period, exclam ] };
key <AD06> { [ Cyrillic_ze, Cyrillic_ZE ] };
key <AD07> { [ Cyrillic_ve, Cyrillic_VE ] };
key <AD08> { [ Cyrillic_ka, Cyrillic_KA ] };
key <AD09> { [ Cyrillic_de, Cyrillic_DE ] };
key <AD10> { [ Cyrillic_che, Cyrillic_CHE ] };
key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] };
key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };

key <AC01> { [ Cyrillic_u, Cyrillic_U ] };
key <AC02> { [ Cyrillic_i, Cyrillic_I ] };
key <AC03> { [ Cyrillic_ie, Cyrillic_IE ] };
key <AC04> { [ Cyrillic_o, Cyrillic_O ] };
key <AC05> { [ Cyrillic_a, Cyrillic_A ] };
key <AC06> { [ Cyrillic_el, Cyrillic_EL ] };
key <AC07> { [ Cyrillic_en, Cyrillic_EN ] };
key <AC08> { [ Cyrillic_te, Cyrillic_TE ] };
key <AC09> { [ Cyrillic_es, Cyrillic_ES ] };
key <AC10> { [ Cyrillic_er, Cyrillic_ER ] };
key <AC11> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
key <BKSL> { [ slash, backslash ] };

key <AB01> { [ Cyrillic_ef, Cyrillic_EF ] };
key <AB02> { [ Cyrillic_e, Cyrillic_E ] };
key <AB03> { [ Cyrillic_ha, Cyrillic_HA ] };
key <AB04> { [ Cyrillic_yeru, Cyrillic_YERU ] };
key <AB05> { [ Cyrillic_yu, Cyrillic_YU ] };
key <AB06> { [ Cyrillic_be, Cyrillic_BE ] };
key <AB07> { [ Cyrillic_em, Cyrillic_EM ] };
key <AB08> { [ Cyrillic_pe, Cyrillic_PE ] };
key <AB09> { [ Cyrillic_ghe, Cyrillic_GHE ] };
key <AB10> { [ Cyrillic_zhe, Cyrillic_ZHE ] };
};

// RuIntl cyrillic keyboard layout
// Based on the Russian standard keyboard layout
// Denis Kaliberov <[email protected]>
// Updated 2022-11-04
// Version 1.1
partial alphanumeric_keys
xkb_symbols "ruintl_ru" {

name[Group1]= "Russian (international, RU)";

include "ru(common)"

key <TLDE> { [ NoSymbol, NoSymbol, grave, U0301 ] };
key <AE01> { [ NoSymbol, exclam, U20BD, onesuperior ] };
key <AE02> { [ NoSymbol, quotedbl, at, twosuperior ] };
key <AE03> { [ NoSymbol, numbersign, numerosign, threesuperior ] };
key <AE04> { [ NoSymbol, semicolon, dollar, currency ] };
key <AE05> { [ NoSymbol, percent, EuroSign, sterling ] };
key <AE06> { [ NoSymbol, colon, asciicircum, onequarter ] };
key <AE07> { [ NoSymbol, question, ampersand, onehalf ] };
key <AE08> { [ NoSymbol, asterisk, asciitilde, threequarters ] };
key <AE09> { [ NoSymbol, parenleft, guillemotleft, plusminus ] };
key <AE10> { [ NoSymbol, parenright, guillemotright, trademark ] };
key <AE11> { [ NoSymbol, underscore, yen, U20B4 ] };
key <AE12> { [ NoSymbol, plus, multiply, division ] };

key <AD02> { [ NoSymbol, NoSymbol, Cyrillic_dzhe, Cyrillic_DZHE ] };
key <AD04> { [ NoSymbol, NoSymbol, paragraph, registered ] };
key <AD05> { [ NoSymbol, NoSymbol, Ukrainian_ie, Ukrainian_IE ] };
key <AD06> { [ NoSymbol, NoSymbol, Cyrillic_nje, Cyrillic_NJE ] };
key <AD07> { [ NoSymbol, NoSymbol, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
key <AD08> { [ NoSymbol, NoSymbol, Ukrainian_yi, Ukrainian_YI ] };
key <AD09> { [ NoSymbol, NoSymbol, Byelorussian_shortu, Byelorussian_SHORTU ] };
key <AD11> { [ NoSymbol, NoSymbol, braceleft, leftdoublequotemark ] };
key <AD12> { [ NoSymbol, NoSymbol, braceright, rightdoublequotemark ] };
key <BKSL> { [ slash, backslash, bar, notsign ] };

key <AC02> { [ NoSymbol, NoSymbol, section, section ] };
key <AC04> { [ NoSymbol, NoSymbol, VoidSymbol, ordfeminine ] };
key <AC05> { [ NoSymbol, NoSymbol, Greek_OMEGA, VoidSymbol ] };
key <AC07> { [ NoSymbol, NoSymbol, Cyrillic_je, Cyrillic_JE ] };
key <AC08> { [ NoSymbol, NoSymbol, Cyrillic_lje, Cyrillic_LJE ] };
key <AC09> { [ NoSymbol, NoSymbol, Serbian_dje, Serbian_DJE ] };
key <AC10> { [ NoSymbol, NoSymbol, bracketleft, leftsinglequotemark ] };
key <AC11> { [ NoSymbol, NoSymbol, bracketright, rightsinglequotemark ] };

key <LSGT> { [ slash, backslash, bar, notsign ] };
key <AB01> { [ NoSymbol, NoSymbol, s, S ] };
key <AB02> { [ NoSymbol, NoSymbol, Serbian_tshe, Serbian_TSHE ] };
key <AB03> { [ NoSymbol, NoSymbol, cent, copyright ] };
key <AB04> { [ NoSymbol, NoSymbol, downarrow, uparrow ] };
key <AB05> { [ NoSymbol, NoSymbol, Ukrainian_i, Ukrainian_I ] };
key <AB07> { [ NoSymbol, NoSymbol, mu, masculine ] };
key <AB08> { [ NoSymbol, NoSymbol, less, leftarrow ] };
key <AB09> { [ NoSymbol, NoSymbol, greater, rightarrow ] };
key <AB10> { [ period, comma, apostrophe, degree ] };

key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
};

// RuIntl latin keyboard layout
// Based on the English standard keyboard layout
// Denis Kaliberov <[email protected]>
// Updated 2022-11-04
// Version 1.1
partial alphanumeric_keys
xkb_symbols "ruintl_en" {

name[Group1]= "Russian (international, EN)";

include "us(basic)"

key <TLDE> { [ dead_grave, dead_acute, grave, U0301 ] };
key <AE01> { [ NoSymbol, exclam, exclamdown, onesuperior ] };
key <AE02> { [ NoSymbol, quotedbl, at, twosuperior ] };
key <AE03> { [ NoSymbol, numbersign, questiondown, threesuperior ] };
key <AE04> { [ NoSymbol, semicolon, dollar, currency ] };
key <AE05> { [ NoSymbol, percent, EuroSign, sterling ] };
key <AE06> { [ NoSymbol, colon, asciicircum, onequarter ] };
key <AE07> { [ NoSymbol, question, ampersand, onehalf ] };
key <AE08> { [ NoSymbol, asterisk, asciitilde, threequarters ] };
key <AE09> { [ NoSymbol, parenleft, guillemotleft, plusminus ] };
key <AE10> { [ NoSymbol, parenright, guillemotright, trademark ] };
key <AE11> { [ NoSymbol, underscore, yen, dead_abovering ] };
key <AE12> { [ NoSymbol, plus, multiply, division ] };

key <AD01> { [ NoSymbol, NoSymbol, adiaeresis, Adiaeresis ] };
key <AD02> { [ NoSymbol, NoSymbol, aring, Aring ] };
key <AD03> { [ NoSymbol, NoSymbol, eacute, Eacute ] };
key <AD04> { [ NoSymbol, NoSymbol, paragraph, registered ] };
key <AD05> { [ NoSymbol, NoSymbol, thorn, THORN ] };
key <AD06> { [ NoSymbol, NoSymbol, udiaeresis, Udiaeresis ] };
key <AD07> { [ NoSymbol, NoSymbol, uacute, Uacute ] };
key <AD08> { [ NoSymbol, NoSymbol, iacute, Iacute ] };
key <AD09> { [ NoSymbol, NoSymbol, oacute, Oacute ] };
key <AD10> { [ NoSymbol, NoSymbol, odiaeresis, Odiaeresis ] };
key <AD11> { [ dead_circumflex, dead_diaeresis, braceleft, leftdoublequotemark ] };
key <AD12> { [ dead_tilde, dead_macron, braceright, rightdoublequotemark ] };
key <BKSL> { [ slash, backslash, bar, notsign ] };

key <AC01> { [ NoSymbol, NoSymbol, aacute, Aacute ] };
key <AC02> { [ NoSymbol, NoSymbol, ssharp, section ] };
key <AC03> { [ NoSymbol, NoSymbol, eth, ETH ] };
key <AC04> { [ NoSymbol, NoSymbol, VoidSymbol, ordfeminine ] };
key <AC05> { [ NoSymbol, NoSymbol, Greek_OMEGA, VoidSymbol ] };
key <AC06> { [ NoSymbol, NoSymbol, hstroke, Hstroke ] };
key <AC07> { [ NoSymbol, NoSymbol, oslash, Ooblique ] };
key <AC08> { [ NoSymbol, NoSymbol, oe, OE ] };
key <AC09> { [ NoSymbol, NoSymbol, lstroke, Lstroke ] };
key <AC10> { [ dead_cedilla, dead_ogonek, bracketleft, leftsinglequotemark ] };
key <AC11> { [ dead_doubleacute, dead_breve, bracketright, rightsinglequotemark ] };

key <LSGT> { [ slash, backslash, bar, notsign ] };
key <AB01> { [ NoSymbol, NoSymbol, ae, AE ] };
key <AB03> { [ NoSymbol, NoSymbol, cent, copyright ] };
key <AB04> { [ NoSymbol, NoSymbol, downarrow, uparrow ] };
key <AB05> { [ NoSymbol, NoSymbol, U0133, U0132 ] };
key <AB06> { [ NoSymbol, NoSymbol, ntilde, Ntilde ] };
key <AB07> { [ NoSymbol, NoSymbol, mu, masculine ] };
key <AB08> { [ ccedilla, Ccedilla, less, leftarrow ] };
key <AB09> { [ dead_abovedot, dead_caron, greater, rightarrow ] };
key <AB10> { [ period, comma, apostrophe, degree ] };

key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
};

// Compatibility mapping
partial xkb_symbols "os" {
include "ru(os_legacy)"
};
58 changes: 33 additions & 25 deletions usr/share/X11/xkb/symbols/us
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,8 @@ xkb_symbols "colemak_dh" {
key <AB03> { [ d, D, dead_diaeresis, asciitilde ] };
key <AB05> { [ z, Z, ae, AE ] }; //Z appears here too because <LSGT> key is not present on ANSI keyboards
key <AB07> { [ h, H, dead_caron, asciitilde ] };

key <CAPS> { [ Caps_Lock, Caps_Lock, Caps_Lock, Caps_Lock ] };
};

// Colemak-DH (Wide) symbols for xkb on X.Org Server 7.x
Expand Down Expand Up @@ -938,11 +940,11 @@ xkb_symbols "colemak_dh_wide_iso" {
include "us(colemak_dh_wide)"
name[Group1]= "English (Colemak-DH Wide ISO)";

key <AD12> { [ numbersign, asciitilde, backslash, bar ] };
key <AD12> { [ slash, question, questiondown, asciitilde ] };
key <BKSL> { [ apostrophe, quotedbl, otilde, Otilde ] };

key <AB05> { [ backslash, bar, asciitilde, brokenbar ] };
key <AB06> { [ slash, question, questiondown, asciitilde ] };
key <AB06> { [ numbersign, asciitilde, backslash, bar ] };
};

// Colemak-DH (ortholinear) symbols for xkb on X.Org Server 7.x
Expand Down Expand Up @@ -1695,8 +1697,8 @@ xkb_symbols "symbolic" {
key <AE08> { [ 8, asterisk, eightsuperior, infinity ] }; // 8 * ⁸ ∞
key <AE09> { [ 9, parenleft, ninesuperior, periodcentered ] }; // 9 ( ⁹ ·
key <AE10> { [ 0, parenright, zerosuperior, degree ] }; // 0 ) ⁰ °
key <AE11> { [ minus, underscore, notequal, plusminus ] }; // - _ ≠ ±
key <AE12> { [ equal, plus, multiply, division ] }; // = + × ÷
key <AE11> { [ minus, underscore, multiply, division ] }; // - _ × ÷
key <AE12> { [ equal, plus, notequal, plusminus ] }; // = + ≠ ±

key <AD01> { [ q, Q, U2200, U2203 ] }; // q Q ∀ ∃
key <AD02> { [ w, W, elementof, notelementof ] }; // w W ∈ ∉
Expand Down Expand Up @@ -2021,34 +2023,40 @@ xkb_symbols "3l" {
key <AB10> { [ ISO_Level5_Shift ] }; // Cur/Num Modifier

// Top row numbers - not part of spec, but given for convenience
key <AE01> { [ 1 ] };
key <AE02> { [ 2 ] };
key <AE03> { [ 3 ] };
key <AE04> { [ 4 ] };
key <AE05> { [ 5 ] };
key <AE06> { [ 6 ] };
key <AE07> { [ 7 ] };
key <AE08> { [ 8 ] };
key <AE09> { [ 9 ] };
key <AE10> { [ 0 ] };
key.type[Group1] = "TWO_LEVEL";
key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
key <AE03> { [ 3, numbersign ] };
key <AE04> { [ 4, dollar ] };
key <AE05> { [ 5, percent ] };
key <AE06> { [ 6, asciicircum ] };
key <AE07> { [ 7, ampersand ] };
key <AE08> { [ 8, asterisk ] };
key <AE09> { [ 9, parenleft ] };
key <AE10> { [ 0, parenright ] };
key <AE11> { [ minus, underscore ] };
key <AE12> { [ equal, plus ] };

// Main keys
// Order of mods (defined by EIGHT_LEVEL_SEMIALPHABETIC) is:
// [ None, Shift, Sym, Shift+Sym, Num, Shift+Num, Sym+Num, Shift+Sym+Num ]
key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";

// Second row
key <AD01> { [ q, Q, quotedbl, Greek_omicron, Prior, Prior, U21CD, Greek_OMICRON ] };
key <AD02> { [ f, F, underscore, Greek_phi, BackSpace, BackSpace, U21A4, Greek_PHI ] };
key <AD03> { [ u, U, bracketleft, Greek_upsilon, Up, Up, U2191, Greek_UPSILON ] };
key <AD04> { [ y, Y, bracketright, Greek_psi, Delete, Delete, U21A6, Greek_PSI ] };
key <AD05> { [ z, Z, asciicircum, Greek_zeta, Next, Next, U21CF, Greek_ZETA ] };
key <AD06> { [ x, X, exclam, Greek_xi, NoSymbol, NoSymbol, U2260, Greek_XI ] };
key <AD07> { [ k, K, less, Greek_kappa, 1, A, U2A7D, Greek_KAPPA ] };
key <AD08> { [ c, C, greater, Greek_chi, 2, B, U2A7E, Greek_CHI ] };
key <AD09> { [ w, W, equal, Greek_omega, 3, C, U2261, Greek_OMEGA ] };
key <AD10> { [ b, B, ampersand, Greek_beta, NoSymbol, NoSymbol, U2248, Greek_BETA ] };

key <AD01> { [ q, Q, quotedbl, Greek_omicron, Prior, Prior, U21CD, Greek_OMICRON ] };
key <AD02> { [ f, F, underscore, Greek_phi, BackSpace, BackSpace, U21A4, Greek_PHI ] };
key <AD03> { [ u, U, bracketleft, Greek_upsilon, Up, Up, U2191, Greek_UPSILON ] };
key <AD04> { [ y, Y, bracketright, Greek_psi, Delete, Delete, U21A6, Greek_PSI ] };
key <AD05> { [ z, Z, asciicircum, Greek_zeta, Next, Next, U21CF, Greek_ZETA ] };
key <AD06> { [ x, X, exclam, Greek_xi, NoSymbol, NoSymbol, U2260, Greek_XI ] };
key <AD07> { [ k, K, less, Greek_kappa, 1, A, U2264, Greek_KAPPA ] };
key <AD08> { [ c, C, greater, Greek_chi, 2, B, U2265, Greek_CHI ] };
key <AD09> { [ w, W, equal, Greek_omega, 3, C, U2261, Greek_OMEGA ] };
key <AD10> { [ b, B, ampersand, Greek_beta, NoSymbol, NoSymbol, U2248, Greek_BETA ] };
key <AD11> { [ bracketleft, braceleft, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AD12> { [ bracketright, braceright, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };

// Home row
key <AC01> { [ o, O, slash, Greek_omega, Home, Home, U21D0, Greek_OMEGA ] };
key <AC02> { [ h, H, minus, Greek_theta, Left, Left, U2190, Greek_THETA ] };
Expand Down

0 comments on commit d9679f6

Please sign in to comment.