Run automatic update #388

Merged
github-actions[bot] merged 2 commits from create-pull-request/patch into main 2024-04-06 20:13:22 +00:00
5 changed files with 35 additions and 103 deletions

View file

@ -1,5 +0,0 @@
{
services.pass-secret-service = {
enable = true;
};
}

View file

@ -7,7 +7,7 @@
emily-symbols,
...
}: let
plover-env = pkgs.plover.pythonModule.withPackages (_:
plover-env = (pkgs.plover.pythonModule.withPackages (_:
with pkgs; [
plover
plover-plugins-manager
@ -18,64 +18,15 @@
plover-plugin-python-dictionary
plover-plugin-stenotype-extended
plover-plugin-dotool-output
]);
plover-src = pkgs.plover.src;
plover-dictionaries-english =
[
{
enabled = true;
path = "tmpdic.yaml";
}
{
enabled = true;
path = ../../extra/user.yaml;
}
{
enabled = true;
path = ../../extra/emily-modifiers.json;
}
{
enabled = true;
path = ../../extra/emily-symbols.json;
}
]
++ (map (module: {
enabled = true;
path = "${pkgs.plover-dict-didoesdigital}/dictionaries/${module}.json";
}) [
#Put this first
"fingerspelling"
# put these in alphabetical order
"abbreviations"
"briefs"
"currency"
"dict"
"nouns"
"numbers"
"numbers-powerups"
"plover-use"
"proper-nouns"
"top-level-domains"
# Put these last
"condensed-strokes"
]);
plover-cfg = pkgs.writeText "plover.cfg" (lib.generators.toINI {} {
"Machine Configuration".machine_type = "Plover HID";
"System: Stenotype Extended" = {
dictionaries = builtins.toJSON plover-dictionaries-english;
"keymap[plover hid]" = ''[["#", ["X3", "X4", "X5", "X6", "X7", "X8", "X43", "X44", "X45", "X46", "X47", "X48"]], ["^-", ["X24", "X37", "X38", "X77", "X78"]], ["+-", ["X16"]], ["S-", ["X15", "X23"]], ["T-", ["X14"]], ["K-", ["X22"]], ["P-", ["X13"]], ["W-", ["X21"]], ["H-", ["X12"]], ["R-", ["X20"]], ["A-", ["X36"]], ["O-", ["X35"]], ["*", ["X11", "X19", "X56", "X64"]], ["-E", ["X80"]], ["-U", ["X79"]], ["-F", ["X55"]], ["-R", ["X63"]], ["-P", ["X54"]], ["-B", ["X62"]], ["-L", ["X53"]], ["-G", ["X61"]], ["-T", ["X52"]], ["-S", ["X60"]], ["-D", ["X51"]], ["-Z", ["X59"]], ["no-op", ["X1", "X2", "X9", "X10", "X17", "X18", "X25", "X26", "X27", "X28", "X29", "X30", "X31", "X32", "X33", "X34", "X39", "X40", "X41", "X42", "X49", "X50", "X57", "X58", "X65", "X66", "X67", "X68", "X69", "X70", "X71", "X72", "X73", "X74", "X75", "X76"]]]'';
};
Plugins.enabled_extensions = builtins.toJSON ["RKB Unicode Sender" "plover_dotool_output" "plover_tapey_tape"];
System.name = "Stenotype Extended";
});
plover-plugin-lapwing-aio
])).overrideDerivation (super: {
nativeBuildInputs = super.nativeBuildInputs or [] ++ [pkgs.qt5.wrapQtAppsHook];
postBuild = super.postBuild + ''
wrapQtApp $out/bin/plover
'';
});
in {
home.packages = [
plover-env
];
home.activation.ploverSettings = lib.hm.dag.entryAfter ["writeBoundary"] ''
$DRY_RUN_CMD mkdir $VERBOSE_ARG -p $HOME/.config/plover
$DRY_RUN_CMD rm -f $HOME/.config/plover/plover.cfg
$DRY_RUN_CMD cp $VERBOSE_ARG ${plover-cfg} $HOME/.config/plover/plover.cfg
$DRY_RUN_CMD chmod +w $VERBOSE_ARG $HOME/.config/plover/plover.cfg
'';
}

View file

@ -45,7 +45,6 @@ in {
./swayidle.nix
./rofi.nix
./fcitx.nix
./pass-secret-service.nix
./kitty.nix
./mpd.nix
];
@ -147,6 +146,7 @@ in {
default_border none
gaps outer 8
gaps inner 4
exec_always ${pkgs.xorg.xrandr}/bin/xrandr --output DP-1 --primary
'';
};
home.file.".XCompose".source = ../../extra/.XCompose;

View file

@ -263,11 +263,11 @@
]
},
"locked": {
"lastModified": 1712105737,
"narHash": "sha256-cNdOAdt1sye8D3DJmB7oU1baMYuDr0253dRPB62Et7k=",
"lastModified": 1712406250,
"narHash": "sha256-zCcgA6LMd6J3BcQ+esLN2bhWJML8SXISdYfiS970UQY=",
"owner": "nix-community",
"repo": "flake-firefox-nightly",
"rev": "08cb4636928b6019ec146bc641c14bdf2b0b4438",
"rev": "28cde6ba811019d8293580b2d2d99051eef91514",
"type": "github"
},
"original": {
@ -428,11 +428,11 @@
]
},
"locked": {
"lastModified": 1712093955,
"narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
"lastModified": 1712390667,
"narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "80546b220e95a575c66c213af1b09fe255299438",
"rev": "b787726a8413e11b074cde42704b4af32d95545c",
"type": "github"
},
"original": {
@ -590,14 +590,16 @@
"flake-parts": [
"flake-parts"
],
"nixpkgs": "nixpkgs_2"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1711847810,
"narHash": "sha256-gLeUuU3hQ2ErboVIyzDNes2bywdTYDidvi6wG5+tnQ8=",
"lastModified": 1712141380,
"narHash": "sha256-C2i314gBs1PS98CDbUJGRKx+avs0y9dBLwdWI7O36hs=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "4ec1bf4262e913af85e3f699f564769ec2f23cff",
"rev": "2a90858fa6ab2d051cfd1b940f3560f679e92a1a",
"type": "github"
},
"original": {
@ -641,11 +643,11 @@
]
},
"locked": {
"lastModified": 1711815287,
"narHash": "sha256-+zEeB/5l7Chc2R4CN3Ua6WMm7poXzsgsUv4BwMUnYeU=",
"lastModified": 1712426181,
"narHash": "sha256-H6ebkbemZNMId/AGoScxQbe9NdgekFwiBM30TPnhsFE=",
"owner": "DarkKirb",
"repo": "nix-packages",
"rev": "9349197eac26c8f554407272bdb1524e8225d1b4",
"rev": "13e49257d6c7ad5a921bbd44b0be9eac7da1381b",
"type": "github"
},
"original": {
@ -657,11 +659,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1711352745,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"lastModified": 1712324865,
"narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
"type": "github"
},
"original": {
@ -727,27 +729,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1711715736,
"narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
"lastModified": 1712426172,
"narHash": "sha256-YOu2VEfn7x1HXyV+vy1E8E0stERHrKZOebgr9FWLJoQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1712127920,
"narHash": "sha256-NlGxkuDcUjhRm4HOlBDfthMNIZnPzz3lODZJ09ZjCSw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c04831b88509839ebc9d7a4a9b0c1c0e4d115b1f",
"rev": "7a3d614ba119fcbb3e079ee1fcf9ed31779edb77",
"type": "github"
},
"original": {
@ -781,7 +767,7 @@
"nix-packages": "nix-packages",
"nixos-hardware": "nixos-hardware",
"nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay",
"sops-nix": "sops-nix",
"systems": "systems_2"
@ -797,11 +783,11 @@
]
},
"locked": {
"lastModified": 1712110341,
"narHash": "sha256-8LU2IM4ctHz043hlzoFUwQS1QIdhiMGEH/oIfPCxoWU=",
"lastModified": 1712369449,
"narHash": "sha256-tbWug3uXPlSm1j0xD80Y3xbP+otT6gLnQo1e/vQat48=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "74deb67494783168f5b6d2071d73177e6bccab65",
"rev": "41b3b080cc3e4b3a48e933b87fc15a05f1870779",
"type": "github"
},
"original": {

View file

@ -101,7 +101,7 @@ rec {
};
nix-gaming = {
url = "github:fufexan/nix-gaming";
#inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};
nix-neovim = {