summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nixos/common.nix20
-rw-r--r--qutebrowser/config.py1
-rw-r--r--xkb/compat/fr-custom-lx483
-rw-r--r--xkb/keycodes/fr-custom-lx297
-rw-r--r--xkb/symbols/fr-custom-lx6
-rw-r--r--xkb/types/fr-custom-lx386
6 files changed, 23 insertions, 1170 deletions
diff --git a/nixos/common.nix b/nixos/common.nix
index bcecd32..1917f1a 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -82,9 +82,6 @@ in
description = "French (LX custom azerty)";
languages = ["fre"];
symbolsFile = ../xkb/symbols/fr-custom-lx;
- compatFile = ../xkb/compat/fr-custom-lx;
- typesFile = ../xkb/types/fr-custom-lx;
- keycodesFile = ../xkb/keycodes/fr-custom-lx;
};
# Enable CUPS to print documents.
@@ -136,12 +133,27 @@ in
keep-derivations = true
'';
+ nixpkgs.overlays = [
+ # fix jellyfin media player to not try to use wayland-egl backend
+ (self: super: {
+ jellyfin-media-player = pkgs.symlinkJoin {
+ name = "jellyfin-media-player";
+ paths = [ super.jellyfin-media-player ];
+ buildInputs = [ pkgs.makeWrapper ];
+ postBuild = ''
+ wrapProgram $out/bin/jellyfinmediaplayer --set QT_QPA_PLATFORM xcb
+ '';
+ };
+ })
+ ];
+
fonts.fonts = with pkgs; [
profont
symbola
ipafont
hanazono
takao
+ font-awesome
];
environment.systemPackages = with pkgs; [
@@ -208,7 +220,7 @@ in
alacritty
firefox
qutebrowser
- (tor-browser-bundle-bin.override { useHardenedMalloc = false; })
+ tor-browser-bundle-bin
lagrange
thunderbird
qbittorrent
diff --git a/qutebrowser/config.py b/qutebrowser/config.py
index 3245e62..e7ded7c 100644
--- a/qutebrowser/config.py
+++ b/qutebrowser/config.py
@@ -1,4 +1,5 @@
config.load_autoconfig(False) # disable saved configs
c.hints.chars = "qsdjflkmazeruiopghwxcvn"
+c.auto_save.session = True
config.bind('ed', 'download-open')
diff --git a/xkb/compat/fr-custom-lx b/xkb/compat/fr-custom-lx
deleted file mode 100644
index 0fea91d..0000000
--- a/xkb/compat/fr-custom-lx
+++ /dev/null
@@ -1,483 +0,0 @@
-xkb_compatibility "fr-custom-lx" {
-
- virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
-
- interpret.useModMapMods= AnyLevel;
- interpret.repeat= False;
- interpret.locking= False;
- interpret ISO_Level2_Latch+Exactly(Shift) {
- useModMapMods=level1;
- action= LatchMods(modifiers=Shift,clearLocks,latchToLock);
- };
- interpret Shift_Lock+AnyOf(Shift+Lock) {
- action= LockMods(modifiers=Shift);
- };
- interpret Num_Lock+AnyOf(all) {
- virtualModifier= NumLock;
- action= LockMods(modifiers=NumLock);
- };
- interpret ISO_Level3_Shift+AnyOf(all) {
- virtualModifier= LevelThree;
- useModMapMods=level1;
- action= SetMods(modifiers=LevelThree,clearLocks);
- };
- interpret ISO_Level3_Latch+AnyOf(all) {
- virtualModifier= LevelThree;
- useModMapMods=level1;
- action= LatchMods(modifiers=LevelThree,clearLocks,latchToLock);
- };
- interpret ISO_Level3_Lock+AnyOf(all) {
- virtualModifier= LevelThree;
- useModMapMods=level1;
- action= LockMods(modifiers=LevelThree);
- };
- interpret Alt_L+AnyOf(all) {
- virtualModifier= Alt;
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- interpret Alt_R+AnyOf(all) {
- virtualModifier= Alt;
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- interpret Meta_L+AnyOf(all) {
- virtualModifier= Meta;
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- interpret Meta_R+AnyOf(all) {
- virtualModifier= Meta;
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- interpret Super_L+AnyOf(all) {
- virtualModifier= Super;
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- interpret Super_R+AnyOf(all) {
- virtualModifier= Super;
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- interpret Hyper_L+AnyOf(all) {
- virtualModifier= Hyper;
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- interpret Hyper_R+AnyOf(all) {
- virtualModifier= Hyper;
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- interpret Scroll_Lock+AnyOf(all) {
- virtualModifier= ScrollLock;
- action= LockMods(modifiers=modMapMods);
- };
- interpret ISO_Level5_Shift+AnyOf(all) {
- virtualModifier= LevelFive;
- useModMapMods=level1;
- action= SetMods(modifiers=LevelFive,clearLocks);
- };
- interpret ISO_Level5_Latch+AnyOf(all) {
- virtualModifier= LevelFive;
- useModMapMods=level1;
- action= LatchMods(modifiers=LevelFive,clearLocks,latchToLock);
- };
- interpret ISO_Level5_Lock+AnyOf(all) {
- virtualModifier= LevelFive;
- useModMapMods=level1;
- action= LockMods(modifiers=LevelFive);
- };
- interpret Mode_switch+AnyOfOrNone(all) {
- virtualModifier= AltGr;
- useModMapMods=level1;
- action= SetGroup(group=+1);
- };
- interpret ISO_Level3_Shift+AnyOfOrNone(all) {
- action= SetMods(modifiers=LevelThree,clearLocks);
- };
- interpret ISO_Level3_Latch+AnyOfOrNone(all) {
- action= LatchMods(modifiers=LevelThree,clearLocks,latchToLock);
- };
- interpret ISO_Level3_Lock+AnyOfOrNone(all) {
- action= LockMods(modifiers=LevelThree);
- };
- interpret ISO_Group_Latch+AnyOfOrNone(all) {
- virtualModifier= AltGr;
- useModMapMods=level1;
- action= LatchGroup(group=2);
- };
- interpret ISO_Next_Group+AnyOfOrNone(all) {
- virtualModifier= AltGr;
- useModMapMods=level1;
- action= LockGroup(group=+1);
- };
- interpret ISO_Prev_Group+AnyOfOrNone(all) {
- virtualModifier= AltGr;
- useModMapMods=level1;
- action= LockGroup(group=-1);
- };
- interpret ISO_First_Group+AnyOfOrNone(all) {
- action= LockGroup(group=1);
- };
- interpret ISO_Last_Group+AnyOfOrNone(all) {
- action= LockGroup(group=2);
- };
- interpret KP_1+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=-1,y=+1);
- };
- interpret KP_End+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=-1,y=+1);
- };
- interpret KP_2+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+0,y=+1);
- };
- interpret KP_Down+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+0,y=+1);
- };
- interpret KP_3+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+1,y=+1);
- };
- interpret KP_Next+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+1,y=+1);
- };
- interpret KP_4+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=-1,y=+0);
- };
- interpret KP_Left+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=-1,y=+0);
- };
- interpret KP_6+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+1,y=+0);
- };
- interpret KP_Right+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+1,y=+0);
- };
- interpret KP_7+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=-1,y=-1);
- };
- interpret KP_Home+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=-1,y=-1);
- };
- interpret KP_8+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+0,y=-1);
- };
- interpret KP_Up+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+0,y=-1);
- };
- interpret KP_9+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+1,y=-1);
- };
- interpret KP_Prior+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+1,y=-1);
- };
- interpret KP_5+AnyOfOrNone(all) {
- repeat= True;
- action= PtrBtn(button=default);
- };
- interpret KP_Begin+AnyOfOrNone(all) {
- repeat= True;
- action= PtrBtn(button=default);
- };
- interpret KP_F2+AnyOfOrNone(all) {
- repeat= True;
- action= SetPtrDflt(affect=button,button=1);
- };
- interpret KP_Divide+AnyOfOrNone(all) {
- repeat= True;
- action= SetPtrDflt(affect=button,button=1);
- };
- interpret KP_F3+AnyOfOrNone(all) {
- repeat= True;
- action= SetPtrDflt(affect=button,button=2);
- };
- interpret KP_Multiply+AnyOfOrNone(all) {
- repeat= True;
- action= SetPtrDflt(affect=button,button=2);
- };
- interpret KP_F4+AnyOfOrNone(all) {
- repeat= True;
- action= SetPtrDflt(affect=button,button=3);
- };
- interpret KP_Subtract+AnyOfOrNone(all) {
- repeat= True;
- action= SetPtrDflt(affect=button,button=3);
- };
- interpret KP_Separator+AnyOfOrNone(all) {
- repeat= True;
- action= PtrBtn(button=default,count=2);
- };
- interpret KP_Add+AnyOfOrNone(all) {
- repeat= True;
- action= PtrBtn(button=default,count=2);
- };
- interpret KP_0+AnyOfOrNone(all) {
- repeat= True;
- action= LockPtrBtn(button=default,affect=lock);
- };
- interpret KP_Insert+AnyOfOrNone(all) {
- repeat= True;
- action= LockPtrBtn(button=default,affect=lock);
- };
- interpret KP_Decimal+AnyOfOrNone(all) {
- repeat= True;
- action= LockPtrBtn(button=default,affect=unlock);
- };
- interpret KP_Delete+AnyOfOrNone(all) {
- repeat= True;
- action= LockPtrBtn(button=default,affect=unlock);
- };
- interpret F25+AnyOfOrNone(all) {
- repeat= True;
- action= SetPtrDflt(affect=button,button=1);
- };
- interpret F26+AnyOfOrNone(all) {
- repeat= True;
- action= SetPtrDflt(affect=button,button=2);
- };
- interpret F27+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=-1,y=-1);
- };
- interpret F29+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+1,y=-1);
- };
- interpret F31+AnyOfOrNone(all) {
- repeat= True;
- action= PtrBtn(button=default);
- };
- interpret F33+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=-1,y=+1);
- };
- interpret F35+AnyOfOrNone(all) {
- repeat= True;
- action= MovePtr(x=+1,y=+1);
- };
- interpret Pointer_Button_Dflt+AnyOfOrNone(all) {
- action= PtrBtn(button=default);
- };
- interpret Pointer_Button1+AnyOfOrNone(all) {
- action= PtrBtn(button=1);
- };
- interpret Pointer_Button2+AnyOfOrNone(all) {
- action= PtrBtn(button=2);
- };
- interpret Pointer_Button3+AnyOfOrNone(all) {
- action= PtrBtn(button=3);
- };
- interpret Pointer_DblClick_Dflt+AnyOfOrNone(all) {
- action= PtrBtn(button=default,count=2);
- };
- interpret Pointer_DblClick1+AnyOfOrNone(all) {
- action= PtrBtn(button=1,count=2);
- };
- interpret Pointer_DblClick2+AnyOfOrNone(all) {
- action= PtrBtn(button=2,count=2);
- };
- interpret Pointer_DblClick3+AnyOfOrNone(all) {
- action= PtrBtn(button=3,count=2);
- };
- interpret Pointer_Drag_Dflt+AnyOfOrNone(all) {
- action= LockPtrBtn(button=default,affect=both);
- };
- interpret Pointer_Drag1+AnyOfOrNone(all) {
- action= LockPtrBtn(button=1,affect=both);
- };
- interpret Pointer_Drag2+AnyOfOrNone(all) {
- action= LockPtrBtn(button=2,affect=both);
- };
- interpret Pointer_Drag3+AnyOfOrNone(all) {
- action= LockPtrBtn(button=3,affect=both);
- };
- interpret Pointer_EnableKeys+AnyOfOrNone(all) {
- action= LockControls(controls=MouseKeys);
- };
- interpret Pointer_Accelerate+AnyOfOrNone(all) {
- action= LockControls(controls=MouseKeysAccel);
- };
- interpret Pointer_DfltBtnNext+AnyOfOrNone(all) {
- action= SetPtrDflt(affect=button,button=+1);
- };
- interpret Pointer_DfltBtnPrev+AnyOfOrNone(all) {
- action= SetPtrDflt(affect=button,button=-1);
- };
- interpret AccessX_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=AccessXKeys);
- };
- interpret AccessX_Feedback_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=AccessXFeedback);
- };
- interpret RepeatKeys_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=RepeatKeys);
- };
- interpret SlowKeys_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=SlowKeys);
- };
- interpret BounceKeys_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=BounceKeys);
- };
- interpret StickyKeys_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=StickyKeys);
- };
- interpret MouseKeys_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=MouseKeys);
- };
- interpret MouseKeys_Accel_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=MouseKeysAccel);
- };
- interpret Overlay1_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=none);
- };
- interpret Overlay2_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=none);
- };
- interpret AudibleBell_Enable+AnyOfOrNone(all) {
- action= LockControls(controls=AudibleBell);
- };
- interpret Terminate_Server+AnyOfOrNone(all) {
- action= Terminate();
- };
- interpret Alt_L+AnyOfOrNone(all) {
- action= SetMods(modifiers=Alt,clearLocks);
- };
- interpret Alt_R+AnyOfOrNone(all) {
- action= SetMods(modifiers=Alt,clearLocks);
- };
- interpret Meta_L+AnyOfOrNone(all) {
- action= SetMods(modifiers=Meta,clearLocks);
- };
- interpret Meta_R+AnyOfOrNone(all) {
- action= SetMods(modifiers=Meta,clearLocks);
- };
- interpret Super_L+AnyOfOrNone(all) {
- action= SetMods(modifiers=Super,clearLocks);
- };
- interpret Super_R+AnyOfOrNone(all) {
- action= SetMods(modifiers=Super,clearLocks);
- };
- interpret Hyper_L+AnyOfOrNone(all) {
- action= SetMods(modifiers=Hyper,clearLocks);
- };
- interpret Hyper_R+AnyOfOrNone(all) {
- action= SetMods(modifiers=Hyper,clearLocks);
- };
- interpret Shift_L+AnyOfOrNone(all) {
- action= SetMods(modifiers=Shift,clearLocks);
- };
- interpret XF86Switch_VT_1+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=1,!same);
- };
- interpret XF86Switch_VT_2+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=2,!same);
- };
- interpret XF86Switch_VT_3+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=3,!same);
- };
- interpret XF86Switch_VT_4+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=4,!same);
- };
- interpret XF86Switch_VT_5+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=5,!same);
- };
- interpret XF86Switch_VT_6+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=6,!same);
- };
- interpret XF86Switch_VT_7+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=7,!same);
- };
- interpret XF86Switch_VT_8+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=8,!same);
- };
- interpret XF86Switch_VT_9+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=9,!same);
- };
- interpret XF86Switch_VT_10+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=10,!same);
- };
- interpret XF86Switch_VT_11+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=11,!same);
- };
- interpret XF86Switch_VT_12+AnyOfOrNone(all) {
- repeat= True;
- action= SwitchScreen(screen=12,!same);
- };
- interpret XF86LogGrabInfo+AnyOfOrNone(all) {
- repeat= True;
- action= Private(type=0x86,data[0]=0x50,data[1]=0x72,data[2]=0x47,data[3]=0x72,data[4]=0x62,data[5]=0x73,data[6]=0x00);
- };
- interpret XF86LogWindowTree+AnyOfOrNone(all) {
- repeat= True;
- action= Private(type=0x86,data[0]=0x50,data[1]=0x72,data[2]=0x57,data[3]=0x69,data[4]=0x6e,data[5]=0x73,data[6]=0x00);
- };
- interpret XF86Next_VMode+AnyOfOrNone(all) {
- repeat= True;
- action= Private(type=0x86,data[0]=0x2b,data[1]=0x56,data[2]=0x4d,data[3]=0x6f,data[4]=0x64,data[5]=0x65,data[6]=0x00);
- };
- interpret XF86Prev_VMode+AnyOfOrNone(all) {
- repeat= True;
- action= Private(type=0x86,data[0]=0x2d,data[1]=0x56,data[2]=0x4d,data[3]=0x6f,data[4]=0x64,data[5]=0x65,data[6]=0x00);
- };
- interpret ISO_Level5_Shift+AnyOfOrNone(all) {
- action= SetMods(modifiers=LevelFive,clearLocks);
- };
- interpret ISO_Level5_Latch+AnyOfOrNone(all) {
- action= LatchMods(modifiers=LevelFive,clearLocks,latchToLock);
- };
- interpret ISO_Level5_Lock+AnyOfOrNone(all) {
- action= LockMods(modifiers=LevelFive);
- };
- interpret Caps_Lock+AnyOfOrNone(all) {
- action= LockMods(modifiers=Lock);
- };
- interpret Any+Exactly(Lock) {
- action= LockMods(modifiers=Lock);
- };
- interpret Any+AnyOf(all) {
- action= SetMods(modifiers=modMapMods,clearLocks);
- };
- indicator "Caps Lock" {
- whichModState= locked;
- modifiers= Lock;
- };
- indicator "Num Lock" {
- whichModState= locked;
- modifiers= NumLock;
- };
- indicator "Scroll Lock" {
- whichModState= locked;
- modifiers= ScrollLock;
- };
- indicator "Shift Lock" {
- whichModState= locked;
- modifiers= Shift;
- };
- indicator "Group 2" {
- groups= 0xfe;
- };
- indicator "Mouse Keys" {
- controls= mouseKeys;
- };
-};
diff --git a/xkb/keycodes/fr-custom-lx b/xkb/keycodes/fr-custom-lx
deleted file mode 100644
index 0800e3b..0000000
--- a/xkb/keycodes/fr-custom-lx
+++ /dev/null
@@ -1,297 +0,0 @@
-xkb_keycodes "fr-custom-lx" {
- minimum = 8;
- maximum = 255;
- <ESC> = 9;
- <AE01> = 10;
- <AE02> = 11;
- <AE03> = 12;
- <AE04> = 13;
- <AE05> = 14;
- <AE06> = 15;
- <AE07> = 16;
- <AE08> = 17;
- <AE09> = 18;
- <AE10> = 19;
- <AE11> = 20;
- <AE12> = 21;
- <BKSP> = 22;
- <TAB> = 23;
- <AD01> = 24;
- <AD02> = 25;
- <AD03> = 26;
- <AD04> = 27;
- <AD05> = 28;
- <AD06> = 29;
- <AD07> = 30;
- <AD08> = 31;
- <AD09> = 32;
- <AD10> = 33;
- <AD11> = 34;
- <AD12> = 35;
- <RTRN> = 36;
- <LCTL> = 37;
- <AC01> = 38;
- <AC02> = 39;
- <AC03> = 40;
- <AC04> = 41;
- <AC05> = 42;
- <AC06> = 43;
- <AC07> = 44;
- <AC08> = 45;
- <AC09> = 46;
- <AC10> = 47;
- <AC11> = 48;
- <TLDE> = 49;
- <LFSH> = 50;
- <BKSL> = 51;
- <AB01> = 52;
- <AB02> = 53;
- <AB03> = 54;
- <AB04> = 55;
- <AB05> = 56;
- <AB06> = 57;
- <AB07> = 58;
- <AB08> = 59;
- <AB09> = 60;
- <AB10> = 61;
- <RTSH> = 62;
- <KPMU> = 63;
- <LALT> = 64;
- <SPCE> = 65;
- <CAPS> = 66;
- <FK01> = 67;
- <FK02> = 68;
- <FK03> = 69;
- <FK04> = 70;
- <FK05> = 71;
- <FK06> = 72;
- <FK07> = 73;
- <FK08> = 74;
- <FK09> = 75;
- <FK10> = 76;
- <NMLK> = 77;
- <SCLK> = 78;
- <KP7> = 79;
- <KP8> = 80;
- <KP9> = 81;
- <KPSU> = 82;
- <KP4> = 83;
- <KP5> = 84;
- <KP6> = 85;
- <KPAD> = 86;
- <KP1> = 87;
- <KP2> = 88;
- <KP3> = 89;
- <KP0> = 90;
- <KPDL> = 91;
- <LVL3> = 92;
- <LSGT> = 94;
- <FK11> = 95;
- <FK12> = 96;
- <AB11> = 97;
- <KATA> = 98;
- <HIRA> = 99;
- <HENK> = 100;
- <HKTG> = 101;
- <MUHE> = 102;
- <JPCM> = 103;
- <KPEN> = 104;
- <RCTL> = 105;
- <KPDV> = 106;
- <PRSC> = 107;
- <RALT> = 108;
- <LNFD> = 109;
- <HOME> = 110;
- <UP> = 111;
- <PGUP> = 112;
- <LEFT> = 113;
- <RGHT> = 114;
- <END> = 115;
- <DOWN> = 116;
- <PGDN> = 117;
- <INS> = 118;
- <DELE> = 119;
- <I120> = 120;
- <MUTE> = 121;
- <VOL-> = 122;
- <VOL+> = 123;
- <POWR> = 124;
- <KPEQ> = 125;
- <I126> = 126;
- <PAUS> = 127;
- <I128> = 128;
- <I129> = 129;
- <HNGL> = 130;
- <HJCV> = 131;
- <AE13> = 132;
- <LWIN> = 133;
- <RWIN> = 134;
- <COMP> = 135;
- <STOP> = 136;
- <AGAI> = 137;
- <PROP> = 138;
- <UNDO> = 139;
- <FRNT> = 140;
- <COPY> = 141;
- <OPEN> = 142;
- <PAST> = 143;
- <FIND> = 144;
- <CUT> = 145;
- <HELP> = 146;
- <I147> = 147;
- <I148> = 148;
- <I149> = 149;
- <I150> = 150;
- <I151> = 151;
- <I152> = 152;
- <I153> = 153;
- <I154> = 154;
- <I155> = 155;
- <I156> = 156;
- <I157> = 157;
- <I158> = 158;
- <I159> = 159;
- <I160> = 160;
- <I161> = 161;
- <I162> = 162;
- <I163> = 163;
- <I164> = 164;
- <I165> = 165;
- <I166> = 166;
- <I167> = 167;
- <I168> = 168;
- <I169> = 169;
- <I170> = 170;
- <I171> = 171;
- <I172> = 172;
- <I173> = 173;
- <I174> = 174;
- <I175> = 175;
- <I176> = 176;
- <I177> = 177;
- <I178> = 178;
- <I179> = 179;
- <I180> = 180;
- <I181> = 181;
- <I182> = 182;
- <I183> = 183;
- <I184> = 184;
- <I185> = 185;
- <I186> = 186;
- <I187> = 187;
- <I188> = 188;
- <I189> = 189;
- <I190> = 190;
- <FK13> = 191;
- <FK14> = 192;
- <FK15> = 193;
- <FK16> = 194;
- <FK17> = 195;
- <FK18> = 196;
- <FK19> = 197;
- <FK20> = 198;
- <FK21> = 199;
- <FK22> = 200;
- <FK23> = 201;
- <FK24> = 202;
- <MDSW> = 203;
- <ALT> = 204;
- <META> = 205;
- <SUPR> = 206;
- <HYPR> = 207;
- <I208> = 208;
- <I209> = 209;
- <I210> = 210;
- <I211> = 211;
- <I212> = 212;
- <I213> = 213;
- <I214> = 214;
- <I215> = 215;
- <I216> = 216;
- <I217> = 217;
- <I218> = 218;
- <I219> = 219;
- <I220> = 220;
- <I221> = 221;
- <I222> = 222;
- <I223> = 223;
- <I224> = 224;
- <I225> = 225;
- <I226> = 226;
- <I227> = 227;
- <I228> = 228;
- <I229> = 229;
- <I230> = 230;
- <I231> = 231;
- <I232> = 232;
- <I233> = 233;
- <I234> = 234;
- <I235> = 235;
- <I236> = 236;
- <I237> = 237;
- <I238> = 238;
- <I239> = 239;
- <I240> = 240;
- <I241> = 241;
- <I242> = 242;
- <I243> = 243;
- <I244> = 244;
- <I245> = 245;
- <I246> = 246;
- <I247> = 247;
- <I248> = 248;
- <I249> = 249;
- <I250> = 250;
- <I251> = 251;
- <I252> = 252;
- <I253> = 253;
- <I254> = 254;
- <I255> = 255;
- indicator 1 = "Caps Lock";
- indicator 2 = "Num Lock";
- indicator 3 = "Scroll Lock";
- indicator 4 = "Compose";
- indicator 5 = "Kana";
- indicator 6 = "Sleep";
- indicator 7 = "Suspend";
- indicator 8 = "Mute";
- indicator 9 = "Misc";
- indicator 10 = "Mail";
- indicator 11 = "Charging";
- indicator 12 = "Shift Lock";
- indicator 13 = "Group 2";
- indicator 14 = "Mouse Keys";
- alias <AC12> = <BKSL>;
- alias <MENU> = <COMP>;
- alias <HZTG> = <TLDE>;
- alias <LMTA> = <LWIN>;
- alias <RMTA> = <RWIN>;
- alias <ALGR> = <RALT>;
- alias <KPPT> = <I129>;
- alias <LatA> = <AD01>;
- alias <LatZ> = <AD02>;
- alias <LatE> = <AD03>;
- alias <LatR> = <AD04>;
- alias <LatT> = <AD05>;
- alias <LatY> = <AD06>;
- alias <LatU> = <AD07>;
- alias <LatI> = <AD08>;
- alias <LatO> = <AD09>;
- alias <LatP> = <AD10>;
- alias <LatQ> = <AC01>;
- alias <LatS> = <AC02>;
- alias <LatD> = <AC03>;
- alias <LatF> = <AC04>;
- alias <LatG> = <AC05>;
- alias <LatH> = <AC06>;
- alias <LatJ> = <AC07>;
- alias <LatK> = <AC08>;
- alias <LatL> = <AC09>;
- alias <LatM> = <AC10>;
- alias <LatW> = <AB01>;
- alias <LatX> = <AB02>;
- alias <LatC> = <AB03>;
- alias <LatV> = <AB04>;
- alias <LatB> = <AB05>;
- alias <LatN> = <AB06>;
-};
diff --git a/xkb/symbols/fr-custom-lx b/xkb/symbols/fr-custom-lx
index 77a1e9f..d4c11e9 100644
--- a/xkb/symbols/fr-custom-lx
+++ b/xkb/symbols/fr-custom-lx
@@ -1,5 +1,11 @@
+default partial alphanumeric_keys
xkb_symbols "fr-custom-lx" {
+ #include "latin"
+ include "level3(ralt_switch)"
+ #include "nbsp(level4n)"
+ include "keypad(oss)"
+
name[group1]="French (LX custom AZERTY)";
key <ESC> { [ Escape ] };
diff --git a/xkb/types/fr-custom-lx b/xkb/types/fr-custom-lx
deleted file mode 100644
index b4a53a9..0000000
--- a/xkb/types/fr-custom-lx
+++ /dev/null
@@ -1,386 +0,0 @@
-xkb_types "fr-custom-lx" {
-
- virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
-
- type "ONE_LEVEL" {
- modifiers= none;
- level_name[Level1]= "Any";
- };
- type "TWO_LEVEL" {
- modifiers= Shift;
- map[Shift]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- };
- type "ALPHABETIC" {
- modifiers= Shift+Lock;
- map[Shift]= Level2;
- map[Lock]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "Caps";
- };
- type "KEYPAD" {
- modifiers= Shift+NumLock;
- map[Shift]= Level2;
- map[NumLock]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "Number";
- };
- type "SHIFT+ALT" {
- modifiers= Shift+Alt;
- map[Shift+Alt]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift+Alt";
- };
- type "PC_SUPER_LEVEL2" {
- modifiers= Mod4;
- map[Mod4]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "Super";
- };
- type "PC_CONTROL_LEVEL2" {
- modifiers= Control;
- map[Control]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "Control";
- };
- type "PC_LCONTROL_LEVEL2" {
- modifiers= LControl;
- map[LControl]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "LControl";
- };
- type "PC_RCONTROL_LEVEL2" {
- modifiers= RControl;
- map[RControl]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "RControl";
- };
- type "PC_ALT_LEVEL2" {
- modifiers= Alt;
- map[Alt]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "Alt";
- };
- type "PC_LALT_LEVEL2" {
- modifiers= LAlt;
- map[LAlt]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "LAlt";
- };
- type "PC_RALT_LEVEL2" {
- modifiers= RAlt;
- map[RAlt]= Level2;
- level_name[Level1]= "Base";
- level_name[Level2]= "RAlt";
- };
- type "CTRL+ALT" {
- modifiers= Shift+Control+Alt+LevelThree;
- map[Shift]= Level2;
- preserve[Shift]= Shift;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- preserve[Shift+LevelThree]= Shift;
- map[Control+Alt]= Level5;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- level_name[Level5]= "Ctrl+Alt";
- };
- type "LOCAL_EIGHT_LEVEL" {
- modifiers= Shift+Lock+Control+LevelThree;
- map[Shift]= Level2;
- map[Lock]= Level2;
- map[LevelThree]= Level3;
- map[Shift+Lock+LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[Lock+LevelThree]= Level4;
- map[Control]= Level5;
- map[Shift+Lock+Control]= Level5;
- map[Shift+Control]= Level6;
- map[Lock+Control]= Level6;
- map[Control+LevelThree]= Level7;
- map[Shift+Lock+Control+LevelThree]= Level7;
- map[Shift+Control+LevelThree]= Level8;
- map[Lock+Control+LevelThree]= Level8;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Level3";
- level_name[Level4]= "Shift Level3";
- level_name[Level5]= "Ctrl";
- level_name[Level6]= "Shift Ctrl";
- level_name[Level7]= "Level3 Ctrl";
- level_name[Level8]= "Shift Level3 Ctrl";
- };
- type "THREE_LEVEL" {
- modifiers= Shift+LevelThree;
- map[Shift]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level3;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Level3";
- };
- type "EIGHT_LEVEL" {
- modifiers= Shift+LevelThree+LevelFive;
- map[Shift]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[LevelFive]= Level5;
- map[Shift+LevelFive]= Level6;
- map[LevelThree+LevelFive]= Level7;
- map[Shift+LevelThree+LevelFive]= Level8;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- level_name[Level5]= "X";
- level_name[Level6]= "X Shift";
- level_name[Level7]= "X Alt Base";
- level_name[Level8]= "X Shift Alt";
- };
- type "EIGHT_LEVEL_ALPHABETIC" {
- modifiers= Shift+Lock+LevelThree+LevelFive;
- map[Shift]= Level2;
- map[Lock]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[Lock+LevelThree]= Level4;
- map[Shift+Lock+LevelThree]= Level3;
- map[LevelFive]= Level5;
- map[Shift+LevelFive]= Level6;
- map[Lock+LevelFive]= Level6;
- map[LevelThree+LevelFive]= Level7;
- map[Shift+LevelThree+LevelFive]= Level8;
- map[Lock+LevelThree+LevelFive]= Level8;
- map[Shift+Lock+LevelThree+LevelFive]= Level7;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- level_name[Level5]= "X";
- level_name[Level6]= "X Shift";
- level_name[Level7]= "X Alt Base";
- level_name[Level8]= "X Shift Alt";
- };
- type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
- modifiers= Shift+Lock+NumLock+LevelThree+LevelFive;
- map[Shift]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[LevelFive]= Level5;
- map[Shift+LevelFive]= Level6;
- preserve[Shift+LevelFive]= Shift;
- map[LevelThree+LevelFive]= Level7;
- map[Shift+LevelThree+LevelFive]= Level8;
- map[NumLock]= Level5;
- map[Shift+NumLock]= Level6;
- preserve[Shift+NumLock]= Shift;
- map[NumLock+LevelThree]= Level7;
- map[Shift+NumLock+LevelThree]= Level8;
- map[Shift+NumLock+LevelFive]= Level2;
- map[NumLock+LevelThree+LevelFive]= Level3;
- map[Shift+NumLock+LevelThree+LevelFive]= Level4;
- map[Shift+Lock]= Level2;
- map[Lock+LevelThree]= Level3;
- map[Shift+Lock+LevelThree]= Level4;
- map[Lock+LevelFive]= Level5;
- map[Shift+Lock+LevelFive]= Level6;
- preserve[Shift+Lock+LevelFive]= Shift;
- map[Lock+LevelThree+LevelFive]= Level7;
- map[Shift+Lock+LevelThree+LevelFive]= Level8;
- map[Lock+NumLock]= Level5;
- map[Shift+Lock+NumLock]= Level6;
- preserve[Shift+Lock+NumLock]= Shift;
- map[Lock+NumLock+LevelThree]= Level7;
- map[Shift+Lock+NumLock+LevelThree]= Level8;
- map[Shift+Lock+NumLock+LevelFive]= Level2;
- map[Lock+NumLock+LevelThree+LevelFive]= Level3;
- map[Shift+Lock+NumLock+LevelThree+LevelFive]= Level4;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- level_name[Level5]= "X";
- level_name[Level6]= "X Shift";
- level_name[Level7]= "X Alt Base";
- level_name[Level8]= "X Shift Alt";
- };
- type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
- modifiers= Shift+Lock+NumLock+LevelThree+LevelFive;
- map[Shift]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[LevelFive]= Level5;
- map[Shift+LevelFive]= Level6;
- preserve[Shift+LevelFive]= Shift;
- map[LevelThree+LevelFive]= Level7;
- map[Shift+LevelThree+LevelFive]= Level8;
- map[NumLock]= Level5;
- map[Shift+NumLock]= Level6;
- preserve[Shift+NumLock]= Shift;
- map[NumLock+LevelThree]= Level7;
- map[Shift+NumLock+LevelThree]= Level8;
- map[Shift+NumLock+LevelFive]= Level2;
- map[NumLock+LevelThree+LevelFive]= Level3;
- map[Shift+NumLock+LevelThree+LevelFive]= Level4;
- map[Lock]= Level2;
- map[Lock+LevelThree]= Level3;
- map[Shift+Lock+LevelThree]= Level4;
- map[Lock+LevelFive]= Level5;
- map[Shift+Lock+LevelFive]= Level6;
- map[Lock+LevelThree+LevelFive]= Level7;
- map[Shift+Lock+LevelThree+LevelFive]= Level8;
- map[Lock+NumLock]= Level5;
- map[Shift+Lock+NumLock]= Level6;
- map[Lock+NumLock+LevelThree]= Level7;
- map[Shift+Lock+NumLock+LevelThree]= Level8;
- map[Lock+NumLock+LevelFive]= Level2;
- map[Lock+NumLock+LevelThree+LevelFive]= Level4;
- map[Shift+Lock+NumLock+LevelThree+LevelFive]= Level3;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- level_name[Level5]= "X";
- level_name[Level6]= "X Shift";
- level_name[Level7]= "X Alt Base";
- level_name[Level8]= "X Shift Alt";
- };
- type "EIGHT_LEVEL_SEMIALPHABETIC" {
- modifiers= Shift+Lock+LevelThree+LevelFive;
- map[Shift]= Level2;
- map[Lock]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[Lock+LevelThree]= Level3;
- preserve[Lock+LevelThree]= Lock;
- map[Shift+Lock+LevelThree]= Level4;
- preserve[Shift+Lock+LevelThree]= Lock;
- map[LevelFive]= Level5;
- map[Shift+LevelFive]= Level6;
- map[Lock+LevelFive]= Level6;
- preserve[Lock+LevelFive]= Lock;
- map[Shift+Lock+LevelFive]= Level6;
- preserve[Shift+Lock+LevelFive]= Lock;
- map[LevelThree+LevelFive]= Level7;
- map[Shift+LevelThree+LevelFive]= Level8;
- map[Lock+LevelThree+LevelFive]= Level7;
- preserve[Lock+LevelThree+LevelFive]= Lock;
- map[Shift+Lock+LevelThree+LevelFive]= Level8;
- preserve[Shift+Lock+LevelThree+LevelFive]= Lock;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- level_name[Level5]= "X";
- level_name[Level6]= "X Shift";
- level_name[Level7]= "X Alt Base";
- level_name[Level8]= "X Shift Alt";
- };
- type "FOUR_LEVEL" {
- modifiers= Shift+LevelThree;
- map[Shift]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- };
- type "FOUR_LEVEL_ALPHABETIC" {
- modifiers= Shift+Lock+LevelThree;
- map[Shift]= Level2;
- map[Lock]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[Lock+LevelThree]= Level4;
- map[Shift+Lock+LevelThree]= Level3;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- };
- type "FOUR_LEVEL_SEMIALPHABETIC" {
- modifiers= Shift+Lock+LevelThree;
- map[Shift]= Level2;
- map[Lock]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[Lock+LevelThree]= Level3;
- preserve[Lock+LevelThree]= Lock;
- map[Shift+Lock+LevelThree]= Level4;
- preserve[Shift+Lock+LevelThree]= Lock;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- };
- type "FOUR_LEVEL_MIXED_KEYPAD" {
- modifiers= Shift+NumLock+LevelThree;
- map[NumLock]= Level2;
- map[Shift]= Level2;
- map[LevelThree]= Level3;
- map[NumLock+LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[Shift+NumLock+LevelThree]= Level4;
- level_name[Level1]= "Base";
- level_name[Level2]= "Number";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- };
- type "FOUR_LEVEL_X" {
- modifiers= Shift+Control+Alt+LevelThree;
- map[LevelThree]= Level2;
- map[Shift+LevelThree]= Level3;
- map[Control+Alt]= Level4;
- level_name[Level1]= "Base";
- level_name[Level2]= "Alt Base";
- level_name[Level3]= "Shift Alt";
- level_name[Level4]= "Ctrl+Alt";
- };
- type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" {
- modifiers= Shift+Lock+LevelThree;
- map[Shift]= Level2;
- map[Lock]= Level4;
- preserve[Lock]= Lock;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[Lock+LevelThree]= Level3;
- preserve[Lock+LevelThree]= Lock;
- map[Shift+Lock+LevelThree]= Level3;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "AltGr Base";
- level_name[Level4]= "Shift AltGr";
- };
- type "FOUR_LEVEL_PLUS_LOCK" {
- modifiers= Shift+Lock+LevelThree;
- map[Shift]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[Lock]= Level5;
- map[Shift+Lock]= Level2;
- map[Lock+LevelThree]= Level3;
- map[Shift+Lock+LevelThree]= Level4;
- level_name[Level1]= "Base";
- level_name[Level2]= "Shift";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Shift Alt";
- level_name[Level5]= "Lock";
- };
- type "FOUR_LEVEL_KEYPAD" {
- modifiers= Shift+NumLock+LevelThree;
- map[Shift]= Level2;
- map[NumLock]= Level2;
- map[LevelThree]= Level3;
- map[Shift+LevelThree]= Level4;
- map[NumLock+LevelThree]= Level4;
- map[Shift+NumLock+LevelThree]= Level3;
- level_name[Level1]= "Base";
- level_name[Level2]= "Number";
- level_name[Level3]= "Alt Base";
- level_name[Level4]= "Alt Number";
- };
-};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 23:04:16 +0000