From 97e64c9dbab53819d1de04a46a7d89c23cb55d22 Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 5 Apr 2024 18:08:07 +0000 Subject: [PATCH 1/2] Automatic Update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 77831538..0ca7e0b4 100644 --- a/flake.lock +++ b/flake.lock @@ -263,11 +263,11 @@ ] }, "locked": { - "lastModified": 1712105737, - "narHash": "sha256-cNdOAdt1sye8D3DJmB7oU1baMYuDr0253dRPB62Et7k=", + "lastModified": 1712323042, + "narHash": "sha256-laUkWutGaTRbW5Hp/l5UDbemy/SX2R2zvSfeKQuyCc4=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "08cb4636928b6019ec146bc641c14bdf2b0b4438", + "rev": "ba6c87cf1e1cf91dc107cbf9dd113238c8af0900", "type": "github" }, "original": { @@ -428,11 +428,11 @@ ] }, "locked": { - "lastModified": 1712093955, - "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=", + "lastModified": 1712317700, + "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=", "owner": "nix-community", "repo": "home-manager", - "rev": "80546b220e95a575c66c213af1b09fe255299438", + "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "nixpkgs": "nixpkgs_2" }, "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 +641,11 @@ ] }, "locked": { - "lastModified": 1711815287, - "narHash": "sha256-+zEeB/5l7Chc2R4CN3Ua6WMm7poXzsgsUv4BwMUnYeU=", + "lastModified": 1712298116, + "narHash": "sha256-Q+yy7dv/zQorG9XqyKVXhiD6lk++v7zdvOO7PKRXNYA=", "owner": "DarkKirb", "repo": "nix-packages", - "rev": "9349197eac26c8f554407272bdb1524e8225d1b4", + "rev": "415337fd2d7aafa10c120fe4fbf0ce820f2299f1", "type": "github" }, "original": { @@ -657,11 +657,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": { @@ -743,11 +743,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712127920, - "narHash": "sha256-NlGxkuDcUjhRm4HOlBDfthMNIZnPzz3lODZJ09ZjCSw=", + "lastModified": 1712340328, + "narHash": "sha256-9wfxP1Cm74S55MaZyBK05zH0P776h8oiM03DVSOf9WY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04831b88509839ebc9d7a4a9b0c1c0e4d115b1f", + "rev": "d3cbc72a06e400250c9c5e6a73383c0b8675a2cf", "type": "github" }, "original": { @@ -797,11 +797,11 @@ ] }, "locked": { - "lastModified": 1712110341, - "narHash": "sha256-8LU2IM4ctHz043hlzoFUwQS1QIdhiMGEH/oIfPCxoWU=", + "lastModified": 1712283118, + "narHash": "sha256-aZhKaT1qiwlRjdwd2rcPfcrYqpMMnOe9TMKoihEcw50=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "74deb67494783168f5b6d2071d73177e6bccab65", + "rev": "7790ac860cc3b2bad7f6f4759f4138c79bcb2988", "type": "github" }, "original": { -- 2.47.0 From dedffb7c40463f0ccec39c0582cdac825b8da874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 6 Apr 2024 18:58:02 +0100 Subject: [PATCH 2/2] update config --- config/programs/pass-secret-service.nix | 5 -- config/programs/plover.nix | 65 +++---------------------- config/programs/sway.nix | 2 +- flake.lock | 52 ++++++++------------ flake.nix | 2 +- 5 files changed, 29 insertions(+), 97 deletions(-) delete mode 100644 config/programs/pass-secret-service.nix diff --git a/config/programs/pass-secret-service.nix b/config/programs/pass-secret-service.nix deleted file mode 100644 index fd3afd66..00000000 --- a/config/programs/pass-secret-service.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - services.pass-secret-service = { - enable = true; - }; -} diff --git a/config/programs/plover.nix b/config/programs/plover.nix index 5e6ce766..3786d556 100644 --- a/config/programs/plover.nix +++ b/config/programs/plover.nix @@ -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 - ''; } diff --git a/config/programs/sway.nix b/config/programs/sway.nix index 097c206f..42d5eb7a 100644 --- a/config/programs/sway.nix +++ b/config/programs/sway.nix @@ -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; diff --git a/flake.lock b/flake.lock index 0ca7e0b4..4c2c06ac 100644 --- a/flake.lock +++ b/flake.lock @@ -263,11 +263,11 @@ ] }, "locked": { - "lastModified": 1712323042, - "narHash": "sha256-laUkWutGaTRbW5Hp/l5UDbemy/SX2R2zvSfeKQuyCc4=", + "lastModified": 1712406250, + "narHash": "sha256-zCcgA6LMd6J3BcQ+esLN2bhWJML8SXISdYfiS970UQY=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "ba6c87cf1e1cf91dc107cbf9dd113238c8af0900", + "rev": "28cde6ba811019d8293580b2d2d99051eef91514", "type": "github" }, "original": { @@ -428,11 +428,11 @@ ] }, "locked": { - "lastModified": 1712317700, - "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=", + "lastModified": 1712390667, + "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "owner": "nix-community", "repo": "home-manager", - "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f", + "rev": "b787726a8413e11b074cde42704b4af32d95545c", "type": "github" }, "original": { @@ -590,7 +590,9 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1712141380, @@ -641,11 +643,11 @@ ] }, "locked": { - "lastModified": 1712298116, - "narHash": "sha256-Q+yy7dv/zQorG9XqyKVXhiD6lk++v7zdvOO7PKRXNYA=", + "lastModified": 1712426181, + "narHash": "sha256-H6ebkbemZNMId/AGoScxQbe9NdgekFwiBM30TPnhsFE=", "owner": "DarkKirb", "repo": "nix-packages", - "rev": "415337fd2d7aafa10c120fe4fbf0ce820f2299f1", + "rev": "13e49257d6c7ad5a921bbd44b0be9eac7da1381b", "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": 1712340328, - "narHash": "sha256-9wfxP1Cm74S55MaZyBK05zH0P776h8oiM03DVSOf9WY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d3cbc72a06e400250c9c5e6a73383c0b8675a2cf", + "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": 1712283118, - "narHash": "sha256-aZhKaT1qiwlRjdwd2rcPfcrYqpMMnOe9TMKoihEcw50=", + "lastModified": 1712369449, + "narHash": "sha256-tbWug3uXPlSm1j0xD80Y3xbP+otT6gLnQo1e/vQat48=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7790ac860cc3b2bad7f6f4759f4138c79bcb2988", + "rev": "41b3b080cc3e4b3a48e933b87fc15a05f1870779", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f64fdbff..29a1fb44 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = { -- 2.47.0