Merge commit 'a387df2c424e49e847e161bc46d3c6d836c78357'
This commit is contained in:
commit
bdff393f98
11 changed files with 67 additions and 61 deletions
|
@ -85,4 +85,7 @@
|
|||
enable = true;
|
||||
};
|
||||
i18n.defaultLocale = "nl_NL.UTF-8";
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"olm-3.2.16"
|
||||
];
|
||||
}
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
services.xserver = {
|
||||
displayManager.sddm.enable = true;
|
||||
displayManager.sddm.wayland.enable = true;
|
||||
desktopManager.plasma6.enable = true;
|
||||
#desktopManager.plasma5.enable = true;
|
||||
displayManager.defaultSession = "plasma";
|
||||
#displayManager.defaultSession = "plasmawayland";
|
||||
#desktopManager.plasma6.enable = true;
|
||||
desktopManager.plasma5.enable = true;
|
||||
#displayManager.defaultSession = "plasma";
|
||||
displayManager.defaultSession = "plasmawayland";
|
||||
};
|
||||
}
|
||||
|
|
62
flake.lock
62
flake.lock
|
@ -326,11 +326,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1725024810,
|
||||
"narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "af510d4a62d071ea13925ce41c95e3dec816c01d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -389,11 +389,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722936497,
|
||||
"narHash": "sha256-UBst8PkhY0kqTgdKiR8MtTBt4c1XmjJoOV11efjsC/o=",
|
||||
"lastModified": 1724435763,
|
||||
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a6c743980e23f4cef6c2a377f9ffab506568413a",
|
||||
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -423,11 +423,11 @@
|
|||
},
|
||||
"impermanence": {
|
||||
"locked": {
|
||||
"lastModified": 1719091691,
|
||||
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
|
||||
"lastModified": 1724489415,
|
||||
"narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
|
||||
"rev": "c7f5b394397398c023000cf843986ee2571a1fd7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -446,11 +446,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722773431,
|
||||
"narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=",
|
||||
"lastModified": 1724587851,
|
||||
"narHash": "sha256-+tnTRvR9TzXQDl5OynS+tKBZyPB6viT99zs4fXI0lfk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "04a4b4d84e02590715e753da3d35fb03cddc6425",
|
||||
"rev": "eda1cdaddc64064f53e65ae614e061010e5fb92f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -532,11 +532,11 @@
|
|||
"umu": "umu"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722734656,
|
||||
"narHash": "sha256-3Fk8o9WR1oVroPx3hDhmLguzhaFz0OifsIpLXLbef/Q=",
|
||||
"lastModified": 1724549799,
|
||||
"narHash": "sha256-F4lN1qmMJpJALwZ2ENb6MDSXG40om7ktZyAt7yh/DS8=",
|
||||
"owner": "fufexan",
|
||||
"repo": "nix-gaming",
|
||||
"rev": "88aa6c5d59424d979741bc7fc817f02f5b200c08",
|
||||
"rev": "963803d3be8ed721b21326804513dec884e9d494",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -547,11 +547,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1722332872,
|
||||
"narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
|
||||
"lastModified": 1724878143,
|
||||
"narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
|
||||
"rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -632,11 +632,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1722967064,
|
||||
"narHash": "sha256-cQDo0aGuz2JSUo5Pc8JvFa905nTRHrSEce+lij6S8jw=",
|
||||
"lastModified": 1725041218,
|
||||
"narHash": "sha256-k6MEdh4pZOXwnyYVCHAbEbSTfbroas9punPIVwsvZgA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "eec16b48aa9e98c64b4fdd4a564092ea03a9c8a8",
|
||||
"rev": "b4112246dafd0b255f8cbcc39215ea437d76b55f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -702,11 +702,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722910815,
|
||||
"narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=",
|
||||
"lastModified": 1724984647,
|
||||
"narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733",
|
||||
"rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -725,11 +725,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722897572,
|
||||
"narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=",
|
||||
"lastModified": 1723501126,
|
||||
"narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9",
|
||||
"rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -762,11 +762,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "packaging/nix",
|
||||
"lastModified": 1722710858,
|
||||
"narHash": "sha256-PzMKVcp5ffL4v8+ukuTZRp78DI3kmjUBJUo0Vz5OYC4=",
|
||||
"lastModified": 1724179424,
|
||||
"narHash": "sha256-2r2y1p9YQuaWCxuFj45MVRqJ/uWglhzY5O9BW1jRXcg=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "babc7214d9bc5007eb6c0d59a720dea59fa694ac",
|
||||
"revCount": 696,
|
||||
"rev": "dd3105e4ceef83bdc9d7437139f9475325e2a66d",
|
||||
"revCount": 700,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
|
||||
|
|
|
@ -175,6 +175,9 @@ rec {
|
|||
self.overlays.${system}
|
||||
];
|
||||
config.allowUnfree = true;
|
||||
config.permittedInsecurePackages = [
|
||||
"olm-3.2.16"
|
||||
];
|
||||
};
|
||||
common = {
|
||||
inherit
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"url": "https://github.com/kreativekorp/open-relay.git",
|
||||
"rev": "066db488593cb2fc6f9dbb2e4079f20da4d65e4c",
|
||||
"date": "2024-06-09T01:41:49-07:00",
|
||||
"rev": "6b127fc7aa09ffecfc28ddae0ff85fa4663fe31f",
|
||||
"date": "2024-08-28T22:49:27-07:00",
|
||||
"path": "/nix/store/0c9m0xyj7a1hirayxlhk5spccamz7ysy-open-relay",
|
||||
"sha256": "106ls1h75pfz3568xy6bizhin0pp2a4giqlkr3wj5njdl23zmsvi",
|
||||
"hash": "sha256-cev6h6BN2iL5yJPi+IgS9wIb4Y/L+I5MGd/dcmDQ1IA=",
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"url": "https://github.com/turt2live/matrix-media-repo",
|
||||
"rev": "85fabea54375630e4f404ff6ecc8c63fbaa28cdc",
|
||||
"date": "2024-07-30T15:15:28-06:00",
|
||||
"path": "/nix/store/cfkry06c1jdv9sg0bwakjd1x35s6cwkr-matrix-media-repo",
|
||||
"sha256": "1vqwn6mpjy6gl21kgwvy1swfxkx6m9gmyl1a815s5wgxr7w6gddn",
|
||||
"hash": "sha256-trVn+Mn98aJLQCpQX1+qps/uuA5+8zeDoM94eauxHO8=",
|
||||
"rev": "eb774d8dae96bbb849c20df123046f414f85613d",
|
||||
"date": "2024-08-09T13:01:19-06:00",
|
||||
"path": "/nix/store/ilj0p53iskkxr7zdgj7r73pcqq4kvkky-matrix-media-repo",
|
||||
"sha256": "1fwwr7f80kd6qv0q55bx4427kj3gw7x4h4w87wmpsaklacpq3ccq",
|
||||
"hash": "sha256-mLGBL1N0Kn0rP4gTSPrhb8h5BCF9lYLBxqZNgNzJnLs=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -83,8 +83,8 @@ schema = 3
|
|||
version = "v0.1.0"
|
||||
hash = "sha256-KIP/Onw0t/o10oBuvmRQDff7GF8G5lsMaDXpe0fjvNg="
|
||||
[mod."go.mau.fi/whatsmeow"]
|
||||
version = "v0.0.0-20240726213518-bb5852f056ca"
|
||||
hash = "sha256-apRx745wj9s7cPF44Hx+AH2O8pAGaOxDt8YlZ3lIJMs="
|
||||
version = "v0.0.0-20240828153534-8acde1ba8592"
|
||||
hash = "sha256-W0M+AFkgZW56ASpqEeZ/o8Iut/k2iMDn0XLQ6PwTPO0="
|
||||
[mod."go.mau.fi/zeroconfig"]
|
||||
version = "v0.1.3"
|
||||
hash = "sha256-TPwXOQql1MV8pXn6ZPxtkBUHzBCwIngNjrfqTfOSJX4="
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"url": "https://github.com/mautrix/whatsapp",
|
||||
"rev": "00ca0d84c1624543bd8cd77b060712aacd10cb47",
|
||||
"date": "2024-07-27T00:35:44+03:00",
|
||||
"path": "/nix/store/xmancfliq464q9jkxmpwfg8vh7b2g420-whatsapp",
|
||||
"sha256": "15lqswqssmkk8kqpyl9vn1f9s600qb3zsgswljfri3dczk6yy1g0",
|
||||
"hash": "sha256-4AXvzfysjZidpFw//cfCABidXLA7UX/xRHNWrTHXmJY=",
|
||||
"rev": "5cb481585713ccdc5403686d72b3035253f8f4b0",
|
||||
"date": "2024-08-28T18:37:33+03:00",
|
||||
"path": "/nix/store/97ivsv8apdvhf7786hna21rqax5921da-whatsapp",
|
||||
"sha256": "01xqq6asnscr43mz4knmrvk17xx6z289glm8n43q3bwshx7l0p1r",
|
||||
"hash": "sha256-OVxAT4ear4EHsajSl5D4pvcT5s7VTvLrIJlpq5XBuAc=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"url": "https://github.com/matrix-org/sliding-sync",
|
||||
"rev": "f70dbe0186ecc1e7dcdbed32fea6326de3dbd844",
|
||||
"date": "2024-06-28T16:20:09+01:00",
|
||||
"path": "/nix/store/pfh4yysr6d1dfldwb86wggn49zpvw7jq-sliding-sync",
|
||||
"sha256": "1bj0qya3jmj7nf87jkvgnf1mzabab3dry2wg8xzy4dd8r3w4p1f3",
|
||||
"hash": "sha256-w4VL+MioNeJ/R48Ln9tYaqlfg7NvT3mQs0dWOZTHQK4=",
|
||||
"rev": "c2dd20a00e97f37deb0c803fe2c72fd9c6c2c375",
|
||||
"date": "2024-08-21T09:30:08+01:00",
|
||||
"path": "/nix/store/6bk3bjjm37jyvgas2alvzs9b0nxbqpfn-sliding-sync",
|
||||
"sha256": "1rxg1yf18l1kszxlapq963a8b1pzx09i1xmf48f3bhwppwddr1na",
|
||||
"hash": "sha256-yobcGr+XwzUcIq72EBPo/4aF1DAJX0X71zNQFJwPr+c=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"url": "https://github.com/didoesdigital/steno-dictionaries",
|
||||
"rev": "405fe7b3f471984e0eeef8541c57c624b842ac35",
|
||||
"date": "2024-03-03T09:47:16+10:00",
|
||||
"path": "/nix/store/rs8vj2b9h699rc2a4l7ayd9z7a2lq29b-steno-dictionaries",
|
||||
"sha256": "019qdlxr5n7bggq7xqmra51ndii7l1qw258fmknn4yj8rrww60fv",
|
||||
"hash": "sha256-2wHDec5IemLtrA4VwXGgJ8ZmQ1G54n7we+vYkjttOAU=",
|
||||
"rev": "0fd024b0882688f0ef7c0b1b708d57a9e3d5c9dc",
|
||||
"date": "2024-08-18T09:26:08+10:00",
|
||||
"path": "/nix/store/hkyp8psnhayk9iznyrskxf7c1ymxw7rx-steno-dictionaries",
|
||||
"sha256": "1v1h2g4bgf359389q5wv352h7vw3lvvwa211pkgbrad1vf9691mr",
|
||||
"hash": "sha256-uYZkktuhqbzevCEIxfemg+8DRRmbF5zQSGW4t8gTMOw=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
@ -14,10 +14,10 @@
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "plover_lapwing_aio";
|
||||
version = "1.1.20";
|
||||
version = "1.1.22";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7IQgbUerHdn+O8WPpR9w5lEXcewJm/zIqcJbXStePmQ=";
|
||||
sha256 = "sha256-YJpJ20v+eLTnKrmbbK/ZecyXgcIawoVqgPzjM2fYqJE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
Loading…
Reference in a new issue