diff --git a/README.md b/README.md index be05b562..1f91085e 100644 --- a/README.md +++ b/README.md @@ -58,10 +58,6 @@ https://leana8959.cachix.org leana8959.cachix.org-1:CxQSAp8lcgMv8Me459of0jdXRW2tcyeYRKTiiUq8z0M= ``` -# Layout -My [dvorak french](https://github.com/leana8959/dvorak-french) layout has been -ported to linux using nix. - # Theme I have made a theme (a fork of Atom's one-light) where all my tools are visually unified. It's neovim part can be found [here](https://github.com/leana8959/curry.nvim). diff --git a/nix/nixosModules/extra/layouts/README.md b/nix/nixosModules/extra/layouts/README.md deleted file mode 100644 index c7e87662..00000000 --- a/nix/nixosModules/extra/layouts/README.md +++ /dev/null @@ -1,41 +0,0 @@ -This folder contains my very awesome dvorak French layout on linux - -# Ubuntu -`$XDG_CONFIG_HOME/.config/xkb` doesn't work. -[source](https://github.com/elias19r/xkb-layouts) - -NOTE: make sure the copied file has no extension, otherwise your x11 will crash. -`# cp dvorak-french.xkb /usr/share/X11/xkb/symbols/` - -`/usr/share/X11/xkb/rules/evdev.xml` -```xml - -... - - - dvorak-french - Baguette - French Dvorak - - -... - -``` - -`/usr/share/X11/xkb/rules/evdev.lst` -```xml -! layout - dvorak-french French Dvorak -``` - -## Swap escape and capslock -`dconf write /org/gnome/desktop/input-sources/xkb-options "['caps:swapescape']"` -(to undo, use `dconf reset`) - -# Notes -Use `setxkbmap -option caps:swapescape` to swap escape and capslock -It is possible to reset this option by using the `-option` flag without any argument. -[source](https://askubuntu.com/a/830343) - -## Sources -https://help.ubuntu.com/community/Custom%20keyboard%20layout%20definitions diff --git a/nix/nixosModules/extra/layouts/default.nix b/nix/nixosModules/extra/layouts/default.nix deleted file mode 100644 index cc5b9b92..00000000 --- a/nix/nixosModules/extra/layouts/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - services.xserver.xkb = { - extraLayouts = { - "myDvorak" = { - languages = ["us"]; - symbolsFile = ./dvorak.xkb; - description = "Leana's dvorak"; - }; - "myDvorakFrench" = { - languages = ["fr"]; - symbolsFile = ./dvorak-french.xkb; - description = "Leana's dvorak but baguette"; - }; - }; - }; - - services.xserver.xkb = { - layout = "myDvorak"; - options = builtins.concatStringsSep "," [ - "caps:swapescape" - "compose:ralt" - ]; - }; - console.useXkbConfig = true; -} diff --git a/nix/nixosModules/extra/layouts/dvorak-french.xkb b/nix/nixosModules/extra/layouts/dvorak-french.xkb deleted file mode 100644 index fa01bdbb..00000000 --- a/nix/nixosModules/extra/layouts/dvorak-french.xkb +++ /dev/null @@ -1,58 +0,0 @@ -// vim:syntax=xkb - -partial alphanumeric_keys -xkb_symbols "dvorak-french" { - - name[Group1]= "French Dvorak"; - - key {[ grave, asciitilde, dead_grave, dead_tilde ]}; - key {[ VoidSymbol, exclam ]}; - key {[ egrave, at ]}; - key {[ eacute, numbersign ]}; - key {[ U22c5, dollar ]}; - key {[ oe, percent ]}; - key {[ dead_diaeresis, asciicircum ]}; - key {[ dead_circumflex, ampersand ]}; - key {[ ccedilla, asterisk, Ccedilla ]}; - key {[ agrave, parenleft, dead_grave, dead_breve ]}; - key {[ ugrave, parenright, U00ba ]}; - key {[ bracketleft, braceleft ]}; - key {[ bracketright, braceright, dead_tilde ]}; - - key {[apostrophe, quotedbl, dead_acute, dead_diaeresis ]}; - key {[ comma, less, dead_cedilla, dead_caron ]}; - key {[ period, greater, dead_abovedot, periodcentered ]}; - key {[ p, P ]}; - key {[ y, Y ]}; - key {[ f, F ]}; - key {[ g, G ]}; - key {[ c, C ]}; - key {[ r, R ]}; - key {[ l, L ]}; - key {[ slash, question ]}; - key {[ equal, plus ]}; - key {[ a, A ]}; - key {[ o, O ]}; - key {[ e, E ]}; - key {[ u, U ]}; - key {[ i, I ]}; - key {[ d, D ]}; - key {[ h, H ]}; - key {[ t, T ]}; - key {[ n, N ]}; - key {[ s, S ]}; - key {[ minus, underscore ]}; - key {[ backslash, bar ]}; - - key {[ semicolon, colon, dead_ogonek, dead_doubleacute ]}; - key {[ q, Q ]}; - key {[ j, J ]}; - key {[ k, K ]}; - key {[ x, X ]}; - key {[ b, B ]}; - key {[ m, M ]}; - key {[ w, W ]}; - key {[ v, V ]}; - key {[ z, Z ]}; - -}; diff --git a/nix/nixosModules/extra/layouts/dvorak.xkb b/nix/nixosModules/extra/layouts/dvorak.xkb deleted file mode 100644 index 6d714ddd..00000000 --- a/nix/nixosModules/extra/layouts/dvorak.xkb +++ /dev/null @@ -1,58 +0,0 @@ -// vim:syntax=xkb - -partial alphanumeric_keys -xkb_symbols "dvorak" { - - name[Group1]= "English (Dvorak)"; - - key {[ grave, asciitilde, dead_grave, dead_tilde ]}; - key {[ 1, exclam ]}; - key {[ 2, at ]}; - key {[ 3, numbersign ]}; - key {[ 4, dollar ]}; - key {[ 5, percent ]}; - key {[ 6, asciicircum, dead_circumflex, dead_circumflex ]}; - key {[ 7, ampersand ]}; - key {[ 8, asterisk ]}; - key {[ 9, parenleft, dead_grave, dead_breve ]}; - key {[ 0, parenright ]}; - key {[ bracketleft, braceleft ]}; - key {[bracketright, braceright, dead_tilde]}; - - key {[apostrophe, quotedbl, dead_acute, dead_diaeresis ]}; - key {[ comma, less, dead_cedilla, dead_caron ]}; - key {[ period, greater, dead_abovedot, periodcentered ]}; - key {[ p, P ]}; - key {[ y, Y ]}; - key {[ f, F ]}; - key {[ g, G ]}; - key {[ c, C ]}; - key {[ r, R ]}; - key {[ l, L ]}; - key {[ slash, question ]}; - key {[ equal, plus ]}; - - key {[ a, A ]}; - key {[ o, O ]}; - key {[ e, E ]}; - key {[ u, U ]}; - key {[ i, I ]}; - key {[ d, D ]}; - key {[ h, H ]}; - key {[ t, T ]}; - key {[ n, N ]}; - key {[ s, S ]}; - key {[ minus, underscore ]}; - key {[ backslash, bar ]}; - - key {[ semicolon, colon, dead_ogonek, dead_doubleacute ]}; - key {[ q, Q ]}; - key {[ j, J ]}; - key {[ k, K ]}; - key {[ x, X ]}; - key {[ b, B ]}; - key {[ m, M ]}; - key {[ w, W ]}; - key {[ v, V ]}; - key {[ z, Z ]}; -};