Update to NixOS 23.05
This commit is contained in:
parent
9bdce30b64
commit
36094437c7
9 changed files with 35 additions and 41 deletions
|
@ -43,7 +43,7 @@ Configuration structure:
|
||||||
git clone 'git@gitlab.com:Andrew/configuration.git' "$HOME/src/configuration"
|
git clone 'git@gitlab.com:Andrew/configuration.git' "$HOME/src/configuration"
|
||||||
ln -rs "$HOME/src/configuration/hosts/$HOST/system.nix" '/etc/nixos/configuration.nix'
|
ln -rs "$HOME/src/configuration/hosts/$HOST/system.nix" '/etc/nixos/configuration.nix'
|
||||||
ln -rs "$HOME/src/configuration/hosts/$HOST/nix.conf" "$HOME/.config/nix/nix.conf"
|
ln -rs "$HOME/src/configuration/hosts/$HOST/nix.conf" "$HOME/.config/nix/nix.conf"
|
||||||
ln -rs "$HOME/src/configuration/hosts/$HOST/user.nix" "$HOME/.config/nixpkgs/home.nix"
|
ln -rs "$HOME/src/configuration/hosts/$HOST/user.nix" "$HOME/.config/home-manager/home.nix"
|
||||||
ln -rs "$HOME/src/configuration/common/packages.nix" "$HOME/.config/nixpkgs/overlays/packages.nix"
|
ln -rs "$HOME/src/configuration/common/packages.nix" "$HOME/.config/nixpkgs/overlays/packages.nix"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,7 @@ in
|
||||||
duperemove
|
duperemove
|
||||||
efficient-compression-tool
|
efficient-compression-tool
|
||||||
exiftool
|
exiftool
|
||||||
|
eyedropper
|
||||||
fd
|
fd
|
||||||
ffmpeg
|
ffmpeg
|
||||||
file
|
file
|
||||||
|
@ -144,7 +145,7 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
home.sessionVariables.ANSIBLE_NOCOWS = true;
|
home.sessionVariables.ANSIBLE_NOCOWS = "✓";
|
||||||
xdg.configFile."cargo-release/release.toml".text = ''
|
xdg.configFile."cargo-release/release.toml".text = ''
|
||||||
push = false
|
push = false
|
||||||
publish = false
|
publish = false
|
||||||
|
|
|
@ -42,6 +42,7 @@ in
|
||||||
|
|
||||||
# Application
|
# Application
|
||||||
"breadcrumbs.enabled" = false;
|
"breadcrumbs.enabled" = false;
|
||||||
|
"diffEditor.diffAlgorithm" = "advanced";
|
||||||
"editor.acceptSuggestionOnCommitCharacter" = false;
|
"editor.acceptSuggestionOnCommitCharacter" = false;
|
||||||
"editor.acceptSuggestionOnEnter" = "off";
|
"editor.acceptSuggestionOnEnter" = "off";
|
||||||
"editor.copyWithSyntaxHighlighting" = false;
|
"editor.copyWithSyntaxHighlighting" = false;
|
||||||
|
@ -89,7 +90,7 @@ in
|
||||||
"diffEditor.ignoreTrimWhitespace" = false;
|
"diffEditor.ignoreTrimWhitespace" = false;
|
||||||
"git.alwaysShowStagedChangesResourceGroup" = true;
|
"git.alwaysShowStagedChangesResourceGroup" = true;
|
||||||
"git.enableStatusBarSync" = false;
|
"git.enableStatusBarSync" = false;
|
||||||
"git.showActionButton" = false;
|
"git.showActionButton" = { commit = false; publish = false; sync = false; };
|
||||||
"git.suggestSmartCommit" = false;
|
"git.suggestSmartCommit" = false;
|
||||||
|
|
||||||
# Colors
|
# Colors
|
||||||
|
|
|
@ -5,8 +5,6 @@ with import ../packages/override-utils.nix { inherit stable; };
|
||||||
specify {
|
specify {
|
||||||
add-words = any;
|
add-words = any;
|
||||||
affine = any;
|
affine = any;
|
||||||
ansible.version = "≥2.15.0"; # ansible/ansible#80018
|
|
||||||
ansible-lint.version = "≥6.14.3";
|
|
||||||
ansible-vault-pass-client = any;
|
ansible-vault-pass-client = any;
|
||||||
apex = any;
|
apex = any;
|
||||||
attachments = any;
|
attachments = any;
|
||||||
|
@ -15,7 +13,7 @@ specify {
|
||||||
decompiler-mc = any;
|
decompiler-mc = any;
|
||||||
dmarc-report-converter = any;
|
dmarc-report-converter = any;
|
||||||
email-hash = any;
|
email-hash = any;
|
||||||
fastnbt-tools = specify { rustPlatform.condition = r: stable.lib.versionAtLeast r.rust.rustc.version "1.65.0"; };
|
fastnbt-tools = any;
|
||||||
firefox.overlay = w: { buildCommand = w.buildCommand + "\nwrapProgram $executablePath --unset LC_TIME"; }; # Workaround for bugzilla#1269895
|
firefox.overlay = w: { buildCommand = w.buildCommand + "\nwrapProgram $executablePath --unset LC_TIME"; }; # Workaround for bugzilla#1269895
|
||||||
git-diff-image = any;
|
git-diff-image = any;
|
||||||
git-diff-minecraft = any;
|
git-diff-minecraft = any;
|
||||||
|
@ -23,28 +21,21 @@ specify {
|
||||||
gnome.gnome-shell.patch = ../packages/resources/gnome-shell_screenshot-location.patch; # Pending GNOME/gnome-shell#5370
|
gnome.gnome-shell.patch = ../packages/resources/gnome-shell_screenshot-location.patch; # Pending GNOME/gnome-shell#5370
|
||||||
gopass-await.deps = { inherit (stable.gnome) zenity; };
|
gopass-await.deps = { inherit (stable.gnome) zenity; };
|
||||||
gopass-ydotool = any;
|
gopass-ydotool = any;
|
||||||
gopass.version = "≥1.15.4"; # gopasspw/gopass#2387
|
|
||||||
gpx-reduce = any;
|
gpx-reduce = any;
|
||||||
graalvm17-ce = { version = "22.1.0"; search = pin "34bfa94" "sha256-yqLXI+viN5+Vx5YpG9gNapKL3/+P6Pkprc36xNdyqSU="; }; # Pending Gubaer/josm-scripting-plugin#101
|
|
||||||
ios-safari-remote-debug-kit = any;
|
ios-safari-remote-debug-kit = any;
|
||||||
ios-webkit-debug-proxy = any;
|
ios-webkit-debug-proxy = any;
|
||||||
iosevka-custom = any;
|
iosevka-custom = any;
|
||||||
josm = { version = "≥18721"; jre = resolved.graalvm17-ce /* josm-scripting-plugin */; };
|
josm.jre = (specify { graalvm17-ce = { version = "22.1.0"; search = pin "34bfa94" "sha256-yqLXI+viN5+Vx5YpG9gNapKL3/+P6Pkprc36xNdyqSU="; }; /* Pending Gubaer/josm-scripting-plugin#101 */ }).graalvm17-ce; # josm-scripting-plugin
|
||||||
mcaselector = any;
|
mcaselector = any;
|
||||||
minemap = any;
|
minemap = any;
|
||||||
mozjpeg-simple = any;
|
mozjpeg-simple = any;
|
||||||
nbt-explorer = any;
|
nbt-explorer = any;
|
||||||
nix-update-script.release = "≥23.05"; # NixOS/nixpkgs#203371, NixOS/nixpkgs#207703
|
|
||||||
obsidian.version = "≥1.1.9"; # NixOS/nixpkgs#213593
|
|
||||||
off = any;
|
off = any;
|
||||||
pngquant-interactive = any;
|
pngquant-interactive = any;
|
||||||
rapid-photo-downloader.version = "≥0.9.34";
|
|
||||||
ruff.version = "≥0.0.261";
|
|
||||||
signal-desktop.gappsWrapperArgs = "--add-flags --use-tray-icon"; # Enable tray icon
|
signal-desktop.gappsWrapperArgs = "--add-flags --use-tray-icon"; # Enable tray icon
|
||||||
tile-stitch = any;
|
tile-stitch = any;
|
||||||
trafilatura = any;
|
trafilatura = any;
|
||||||
vscodium.gappsWrapperArgs = "--unset NIXOS_OZONE_WL"; # Workaround for mangled keybindings
|
vscodium.gappsWrapperArgs = "--unset NIXOS_OZONE_WL"; # Workaround for mangled keybindings
|
||||||
wireguard-vanity-address.version = "≥0.4.0";
|
|
||||||
yaru-theme.patch = ../packages/resources/yaru-theme_font.patch; # Set GNOME Shell font
|
yaru-theme.patch = ../packages/resources/yaru-theme_font.patch; # Set GNOME Shell font
|
||||||
ydotool.patch = ../packages/resources/ydotool-halmakish.patch; # Pending ReimuNotMoe/ydotool#177
|
ydotool.patch = ../packages/resources/ydotool-halmakish.patch; # Pending ReimuNotMoe/ydotool#177
|
||||||
yubikey-touch-detector = { condition = y: y ? "iconSrc"; }; # NixOS/nixpkgs#232889
|
yubikey-touch-detector = { condition = y: y ? "iconSrc"; }; # NixOS/nixpkgs#232889
|
||||||
|
|
|
@ -51,7 +51,7 @@ in
|
||||||
};
|
};
|
||||||
fileSystems."/".options = [ "compress=zstd:2" "discard=async" "noatime" ];
|
fileSystems."/".options = [ "compress=zstd:2" "discard=async" "noatime" ];
|
||||||
services.btrfs.autoScrub.enable = true;
|
services.btrfs.autoScrub.enable = true;
|
||||||
boot.cleanTmpDir = true;
|
boot.tmp.cleanOnBoot = true;
|
||||||
|
|
||||||
# Console
|
# Console
|
||||||
console.packages = with pkgs; [ terminus_font ];
|
console.packages = with pkgs; [ terminus_font ];
|
||||||
|
@ -91,7 +91,7 @@ in
|
||||||
# SSH
|
# SSH
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
passwordAuthentication = false;
|
settings.PasswordAuthentication = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# SMART monitoring
|
# SMART monitoring
|
||||||
|
|
|
@ -88,7 +88,7 @@ in
|
||||||
users.users.${identity.username}.extraGroups = [ "usbmux" "wireshark" ];
|
users.users.${identity.username}.extraGroups = [ "usbmux" "wireshark" ];
|
||||||
|
|
||||||
# UniFi Network application
|
# UniFi Network application
|
||||||
allowedUnfree = [ "unifi-controller" ];
|
allowedUnfree = [ "mongodb" "unifi-controller" ];
|
||||||
services.unifi = { enable = true; openFirewall = false; };
|
services.unifi = { enable = true; openFirewall = false; };
|
||||||
systemd.services.unifi.wantedBy = lib.mkForce []; # Manual start
|
systemd.services.unifi.wantedBy = lib.mkForce []; # Manual start
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,6 +63,8 @@ let
|
||||||
cent = "open";
|
cent = "open";
|
||||||
percent = "dots";
|
percent = "dots";
|
||||||
bar = "force-upright";
|
bar = "force-upright";
|
||||||
|
lig-equal-chain = "without-notch";
|
||||||
|
lig-double-arrow-bar = "without-notch";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
# Dependencies
|
# Dependencies
|
||||||
, cmake
|
, cmake
|
||||||
, curl
|
, curl
|
||||||
|
, git
|
||||||
, libXcursor
|
, libXcursor
|
||||||
, libXinerama
|
, libXinerama
|
||||||
, mesa
|
, mesa
|
||||||
|
@ -26,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
cargoHash = "sha256-y5cJ7HBTEAAk840rD137rUA6EhjqE8WalxA5g9irgxI=";
|
cargoHash = "sha256-y5cJ7HBTEAAk840rD137rUA6EhjqE8WalxA5g9irgxI=";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake curl pkg-config ];
|
nativeBuildInputs = [ cmake curl git pkg-config ];
|
||||||
buildInputs = [ libXcursor libXinerama mesa pango ];
|
buildInputs = [ libXcursor libXinerama mesa pango ];
|
||||||
|
|
||||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||||
|
|
|
@ -1,51 +1,49 @@
|
||||||
--- a/Client/tool_type.c
|
--- a/Client/tool_type.c
|
||||||
+++ b/Client/tool_type.c
|
+++ b/Client/tool_type.c
|
||||||
@@ -39,1 +39,2 @@
|
@@ -40 +40,2 @@
|
||||||
-#define FLAG_UPPERCASE 0x80000000
|
-#define FLAG_UPPERCASE 0x80000000
|
||||||
+#define FLAG_ALTGR 0x40000000
|
+#define FLAG_ALTGR 0x40000000
|
||||||
+#define FLAG_SHIFT 0x80000000
|
+#define FLAG_SHIFT 0x80000000
|
||||||
@@ -51,2 +52,2 @@
|
@@ -52,2 +53,2 @@
|
||||||
- KEY_SPACE,KEY_1|FLAG_UPPERCASE,KEY_APOSTROPHE|FLAG_UPPERCASE,KEY_3|FLAG_UPPERCASE,KEY_4|FLAG_UPPERCASE,KEY_5|FLAG_UPPERCASE,KEY_7|FLAG_UPPERCASE,KEY_APOSTROPHE,
|
- KEY_SPACE,KEY_1|FLAG_UPPERCASE,KEY_APOSTROPHE|FLAG_UPPERCASE,KEY_3|FLAG_UPPERCASE,KEY_4|FLAG_UPPERCASE,KEY_5|FLAG_UPPERCASE,KEY_7|FLAG_UPPERCASE,KEY_APOSTROPHE,
|
||||||
- KEY_9|FLAG_UPPERCASE,KEY_0|FLAG_UPPERCASE,KEY_8|FLAG_UPPERCASE,KEY_EQUAL|FLAG_UPPERCASE,KEY_COMMA,KEY_MINUS,KEY_DOT,KEY_SLASH,
|
- KEY_9|FLAG_UPPERCASE,KEY_0|FLAG_UPPERCASE,KEY_8|FLAG_UPPERCASE,KEY_EQUAL|FLAG_UPPERCASE,KEY_COMMA,KEY_MINUS,KEY_DOT,KEY_SLASH,
|
||||||
+ KEY_SPACE,KEY_R|FLAG_ALTGR,KEY_LEFTBRACE|FLAG_ALTGR,KEY_A|FLAG_ALTGR,KEY_N|FLAG_ALTGR,KEY_Y|FLAG_ALTGR,KEY_Q|FLAG_ALTGR,KEY_APOSTROPHE|FLAG_ALTGR,
|
+ KEY_SPACE,KEY_R|FLAG_ALTGR,KEY_LEFTBRACE|FLAG_ALTGR,KEY_A|FLAG_ALTGR,KEY_N|FLAG_ALTGR,KEY_Y|FLAG_ALTGR,KEY_Q|FLAG_ALTGR,KEY_APOSTROPHE|FLAG_ALTGR,
|
||||||
+ KEY_RIGHTBRACE,KEY_RIGHTBRACE|FLAG_SHIFT,KEY_P|FLAG_ALTGR,KEY_SLASH|FLAG_ALTGR,KEY_COMMA,KEY_V|FLAG_SHIFT,KEY_V,KEY_H,
|
+ KEY_RIGHTBRACE,KEY_RIGHTBRACE|FLAG_SHIFT,KEY_P|FLAG_ALTGR,KEY_SLASH|FLAG_ALTGR,KEY_COMMA,KEY_V|FLAG_SHIFT,KEY_V,KEY_H,
|
||||||
@@ -55,2 +56,2 @@
|
@@ -56,2 +57,2 @@
|
||||||
- KEY_0,KEY_1,KEY_2,KEY_3,KEY_4,KEY_5,KEY_6,KEY_7,
|
- KEY_0,KEY_1,KEY_2,KEY_3,KEY_4,KEY_5,KEY_6,KEY_7,
|
||||||
- KEY_8,KEY_9,KEY_SEMICOLON|FLAG_UPPERCASE,KEY_SEMICOLON,KEY_COMMA|FLAG_UPPERCASE,KEY_EQUAL,KEY_DOT|FLAG_UPPERCASE,KEY_SLASH|FLAG_UPPERCASE,
|
- KEY_8,KEY_9,KEY_SEMICOLON|FLAG_UPPERCASE,KEY_SEMICOLON,KEY_COMMA|FLAG_UPPERCASE,KEY_EQUAL,KEY_DOT|FLAG_UPPERCASE,KEY_SLASH|FLAG_UPPERCASE,
|
||||||
+ KEY_SEMICOLON|FLAG_ALTGR,KEY_SPACE|FLAG_ALTGR,KEY_COMMA|FLAG_ALTGR,KEY_DOT|FLAG_ALTGR,KEY_J|FLAG_ALTGR,KEY_K|FLAG_ALTGR,KEY_L|FLAG_ALTGR,KEY_U|FLAG_ALTGR,
|
+ KEY_SEMICOLON|FLAG_ALTGR,KEY_SPACE|FLAG_ALTGR,KEY_COMMA|FLAG_ALTGR,KEY_DOT|FLAG_ALTGR,KEY_J|FLAG_ALTGR,KEY_K|FLAG_ALTGR,KEY_L|FLAG_ALTGR,KEY_U|FLAG_ALTGR,
|
||||||
+ KEY_I|FLAG_ALTGR,KEY_O|FLAG_ALTGR,KEY_COMMA|FLAG_SHIFT,KEY_R,KEY_X|FLAG_ALTGR,KEY_F|FLAG_ALTGR,KEY_C|FLAG_ALTGR,KEY_Z|FLAG_ALTGR,
|
+ KEY_I|FLAG_ALTGR,KEY_O|FLAG_ALTGR,KEY_COMMA|FLAG_SHIFT,KEY_R,KEY_X|FLAG_ALTGR,KEY_F|FLAG_ALTGR,KEY_C|FLAG_ALTGR,KEY_Z|FLAG_ALTGR,
|
||||||
@@ -59,2 +60,2 @@
|
@@ -60,2 +61,2 @@
|
||||||
- KEY_2|FLAG_UPPERCASE,KEY_A|FLAG_UPPERCASE,KEY_B|FLAG_UPPERCASE,KEY_C|FLAG_UPPERCASE,KEY_D|FLAG_UPPERCASE,KEY_E|FLAG_UPPERCASE,KEY_F|FLAG_UPPERCASE,KEY_G|FLAG_UPPERCASE,
|
- KEY_2|FLAG_UPPERCASE,KEY_A|FLAG_UPPERCASE,KEY_B|FLAG_UPPERCASE,KEY_C|FLAG_UPPERCASE,KEY_D|FLAG_UPPERCASE,KEY_E|FLAG_UPPERCASE,KEY_F|FLAG_UPPERCASE,KEY_G|FLAG_UPPERCASE,
|
||||||
- KEY_H|FLAG_UPPERCASE,KEY_I|FLAG_UPPERCASE,KEY_J|FLAG_UPPERCASE,KEY_K|FLAG_UPPERCASE,KEY_L|FLAG_UPPERCASE,KEY_M|FLAG_UPPERCASE,KEY_N|FLAG_UPPERCASE,KEY_O|FLAG_UPPERCASE,
|
- KEY_H|FLAG_UPPERCASE,KEY_I|FLAG_UPPERCASE,KEY_J|FLAG_UPPERCASE,KEY_K|FLAG_UPPERCASE,KEY_L|FLAG_UPPERCASE,KEY_M|FLAG_UPPERCASE,KEY_N|FLAG_UPPERCASE,KEY_O|FLAG_UPPERCASE,
|
||||||
+ KEY_G|FLAG_ALTGR,KEY_J|FLAG_SHIFT,KEY_T|FLAG_SHIFT,KEY_C|FLAG_SHIFT,KEY_O|FLAG_SHIFT,KEY_K|FLAG_SHIFT,KEY_Q|FLAG_SHIFT,KEY_N|FLAG_SHIFT,
|
+ KEY_G|FLAG_ALTGR,KEY_J|FLAG_SHIFT,KEY_T|FLAG_SHIFT,KEY_C|FLAG_SHIFT,KEY_O|FLAG_SHIFT,KEY_K|FLAG_SHIFT,KEY_Q|FLAG_SHIFT,KEY_N|FLAG_SHIFT,
|
||||||
+ KEY_S|FLAG_SHIFT,KEY_SEMICOLON|FLAG_SHIFT,KEY_P|FLAG_SHIFT,KEY_DOT|FLAG_SHIFT,KEY_W|FLAG_SHIFT,KEY_X|FLAG_SHIFT,KEY_D|FLAG_SHIFT,KEY_L|FLAG_SHIFT,
|
+ KEY_S|FLAG_SHIFT,KEY_SEMICOLON|FLAG_SHIFT,KEY_P|FLAG_SHIFT,KEY_DOT|FLAG_SHIFT,KEY_W|FLAG_SHIFT,KEY_X|FLAG_SHIFT,KEY_D|FLAG_SHIFT,KEY_L|FLAG_SHIFT,
|
||||||
@@ -63,2 +64,2 @@
|
@@ -64,2 +65,2 @@
|
||||||
- KEY_P|FLAG_UPPERCASE,KEY_Q|FLAG_UPPERCASE,KEY_R|FLAG_UPPERCASE,KEY_S|FLAG_UPPERCASE,KEY_T|FLAG_UPPERCASE,KEY_U|FLAG_UPPERCASE,KEY_V|FLAG_UPPERCASE,KEY_W|FLAG_UPPERCASE,
|
- KEY_P|FLAG_UPPERCASE,KEY_Q|FLAG_UPPERCASE,KEY_R|FLAG_UPPERCASE,KEY_S|FLAG_UPPERCASE,KEY_T|FLAG_UPPERCASE,KEY_U|FLAG_UPPERCASE,KEY_V|FLAG_UPPERCASE,KEY_W|FLAG_UPPERCASE,
|
||||||
- KEY_X|FLAG_UPPERCASE,KEY_Y|FLAG_UPPERCASE,KEY_Z|FLAG_UPPERCASE,KEY_LEFTBRACE,KEY_BACKSLASH,KEY_RIGHTBRACE,KEY_GRAVE|FLAG_UPPERCASE,KEY_MINUS|FLAG_UPPERCASE,
|
- KEY_X|FLAG_UPPERCASE,KEY_Y|FLAG_UPPERCASE,KEY_Z|FLAG_UPPERCASE,KEY_LEFTBRACE,KEY_BACKSLASH,KEY_RIGHTBRACE,KEY_6|FLAG_UPPERCASE,KEY_MINUS|FLAG_UPPERCASE,
|
||||||
+ KEY_U|FLAG_SHIFT,KEY_Y|FLAG_SHIFT,KEY_E|FLAG_SHIFT,KEY_A|FLAG_SHIFT,KEY_F|FLAG_SHIFT,KEY_I|FLAG_SHIFT,KEY_B|FLAG_SHIFT,KEY_G|FLAG_SHIFT,
|
+ KEY_U|FLAG_SHIFT,KEY_Y|FLAG_SHIFT,KEY_E|FLAG_SHIFT,KEY_A|FLAG_SHIFT,KEY_F|FLAG_SHIFT,KEY_I|FLAG_SHIFT,KEY_B|FLAG_SHIFT,KEY_G|FLAG_SHIFT,
|
||||||
+ KEY_M|FLAG_SHIFT,KEY_SLASH|FLAG_SHIFT,KEY_Z|FLAG_SHIFT,KEY_W|FLAG_ALTGR,KEY_M|FLAG_ALTGR,KEY_E|FLAG_ALTGR,KEY_T|FLAG_ALTGR,KEY_R|FLAG_SHIFT,
|
+ KEY_M|FLAG_SHIFT,KEY_SLASH|FLAG_SHIFT,KEY_Z|FLAG_SHIFT,KEY_W|FLAG_ALTGR,KEY_M|FLAG_ALTGR,KEY_E|FLAG_ALTGR,KEY_T|FLAG_ALTGR,KEY_R|FLAG_SHIFT,
|
||||||
@@ -67,2 +68,2 @@
|
@@ -68,2 +69,2 @@
|
||||||
- KEY_GRAVE,KEY_A,KEY_B,KEY_C,KEY_D,KEY_E,KEY_F,KEY_G,
|
- KEY_GRAVE,KEY_A,KEY_B,KEY_C,KEY_D,KEY_E,KEY_F,KEY_G,
|
||||||
- KEY_H,KEY_I,KEY_J,KEY_K,KEY_L,KEY_M,KEY_N,KEY_O,
|
- KEY_H,KEY_I,KEY_J,KEY_K,KEY_L,KEY_M,KEY_N,KEY_O,
|
||||||
+ KEY_H|FLAG_ALTGR,KEY_J,KEY_T,KEY_C,KEY_O,KEY_K,KEY_Q,KEY_N,
|
+ KEY_H|FLAG_ALTGR,KEY_J,KEY_T,KEY_C,KEY_O,KEY_K,KEY_Q,KEY_N,
|
||||||
+ KEY_S,KEY_SEMICOLON,KEY_P,KEY_DOT,KEY_W,KEY_X,KEY_D,KEY_L,
|
+ KEY_S,KEY_SEMICOLON,KEY_P,KEY_DOT,KEY_W,KEY_X,KEY_D,KEY_L,
|
||||||
@@ -71,2 +72,2 @@
|
@@ -72,2 +73,2 @@
|
||||||
- KEY_P,KEY_Q,KEY_R,KEY_S,KEY_T,KEY_U,KEY_V,KEY_W,
|
- KEY_P,KEY_Q,KEY_R,KEY_S,KEY_T,KEY_U,KEY_V,KEY_W,
|
||||||
- KEY_X,KEY_Y,KEY_Z,KEY_LEFTBRACE|FLAG_UPPERCASE,KEY_BACKSLASH|FLAG_UPPERCASE,KEY_RIGHTBRACE|FLAG_UPPERCASE,KEY_GRAVE|FLAG_UPPERCASE,-1
|
- KEY_X,KEY_Y,KEY_Z,KEY_LEFTBRACE|FLAG_UPPERCASE,KEY_BACKSLASH|FLAG_UPPERCASE,KEY_RIGHTBRACE|FLAG_UPPERCASE,KEY_GRAVE|FLAG_UPPERCASE,-1
|
||||||
+ KEY_U,KEY_Y,KEY_E,KEY_A,KEY_F,KEY_I,KEY_B,KEY_G,
|
+ KEY_U,KEY_Y,KEY_E,KEY_A,KEY_F,KEY_I,KEY_B,KEY_G,
|
||||||
+ KEY_M,KEY_SLASH,KEY_Z,KEY_S|FLAG_ALTGR,KEY_B|FLAG_ALTGR,KEY_D|FLAG_ALTGR,KEY_H|FLAG_SHIFT,-1
|
+ KEY_M,KEY_SLASH,KEY_Z,KEY_S|FLAG_ALTGR,KEY_B|FLAG_ALTGR,KEY_D|FLAG_ALTGR,KEY_H|FLAG_SHIFT,-1
|
||||||
@@ -100,2 +101,5 @@
|
@@ -119 +120,4 @@
|
||||||
- if (kdef & FLAG_UPPERCASE) {
|
- if (kdef & FLAG_UPPERCASE) {
|
||||||
+ if (kdef & FLAG_ALTGR) {
|
+ if (kdef & FLAG_ALTGR) {
|
||||||
+ uinput_emit(EV_KEY, KEY_RIGHTALT, 1, 1);
|
+ uinput_emit(EV_KEY, KEY_RIGHTALT, 1, 1);
|
||||||
+ }
|
+ }
|
||||||
+ if (kdef & FLAG_SHIFT) {
|
+ if (kdef & FLAG_SHIFT) {
|
||||||
uinput_emit(EV_KEY, KEY_LEFTSHIFT, 1, 1);
|
@@ -127 +131 @@
|
||||||
@@ -108,4 +112,7 @@
|
- if (kdef & FLAG_UPPERCASE) {
|
||||||
- if (kdef & FLAG_UPPERCASE) {
|
+ if (kdef & FLAG_SHIFT) {
|
||||||
+ if (kdef & FLAG_SHIFT) {
|
@@ -129,0 +134,3 @@
|
||||||
uinput_emit(EV_KEY, KEY_LEFTSHIFT, 0, 1);
|
+ if (kdef & FLAG_ALTGR) {
|
||||||
}
|
+ uinput_emit(EV_KEY, KEY_RIGHTALT, 0, 1);
|
||||||
+ if (kdef & FLAG_ALTGR) {
|
+ }
|
||||||
+ uinput_emit(EV_KEY, KEY_RIGHTALT, 0, 1);
|
|
||||||
+ }
|
|
||||||
|
|
Loading…
Reference in a new issue