upgrade system

This commit is contained in:
Dmitriy Kholkin 2024-06-03 04:05:33 +03:00
parent edc6aed67f
commit 72c27faa73
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
8 changed files with 159 additions and 192 deletions

252
flake.lock generated
View File

@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1715314394,
"narHash": "sha256-N7NFoDXEafFaIbrTQeGR/A+Tpknx9S3S2TaKHQZ31e0=",
"lastModified": 1716664326,
"narHash": "sha256-L7MeDg9Q6Si2Rwxe++BoNdldX9Os/DzqoqGDJod0qyk=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "21c365a625a35db779e59853ce6eaf9e69a8dbc6",
"rev": "347a50c615c45b3c89c41e774736861b7b41cf71",
"type": "github"
},
"original": {
@ -42,11 +42,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1715955315,
"narHash": "sha256-C6ya8PEWtvFH5baizF4miP3iy8ZotpOeDZ+hYNfv6uQ=",
"lastModified": 1716711734,
"narHash": "sha256-ctxQELje8CILFNhWdlT9CSFpfh+uq8P3Sn+NRgn/vbA=",
"owner": "AtaraxiaSjel",
"repo": "nur",
"rev": "048c6c6e83eca9de3db1afc41aa64932596f4a74",
"rev": "79e75b98b551d5ee2b38aeafe50e3b40ef75899c",
"type": "github"
},
"original": {
@ -64,11 +64,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1711742460,
"narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=",
"lastModified": 1717279440,
"narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0",
"rev": "717cc95983cdc357bc347d70be20ced21f935843",
"type": "github"
},
"original": {
@ -170,11 +170,11 @@
]
},
"locked": {
"lastModified": 1702918879,
"narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=",
"lastModified": 1717025063,
"narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=",
"owner": "ipetkov",
"repo": "crane",
"rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb",
"rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e",
"type": "github"
},
"original": {
@ -190,11 +190,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1711973905,
"narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
"lastModified": 1715699772,
"narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
"rev": "b3ea6f333f9057b77efd9091119ba67089399ced",
"type": "github"
},
"original": {
@ -212,11 +212,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1715346321,
"narHash": "sha256-l65J9y7hH9jASeYG8k7NCLKnwbKcPrUgcO6ZRmG8TQU=",
"lastModified": 1717245169,
"narHash": "sha256-+mW3rTBjGU8p1THJN0lX/Dd/8FbnF+3dB+mJuSaxewE=",
"owner": "cachix",
"repo": "devenv",
"rev": "61033d861900f36bfa6afcd5b8580f098d65e137",
"rev": "c3f9f053c077c6f88a3de5276d9178c62baa3fc3",
"type": "github"
},
"original": {
@ -263,11 +263,11 @@
]
},
"locked": {
"lastModified": 1715217706,
"narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=",
"lastModified": 1717177033,
"narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
"owner": "nix-community",
"repo": "disko",
"rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046",
"rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
"type": "github"
},
"original": {
@ -427,11 +427,11 @@
]
},
"locked": {
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"lastModified": 1715865404,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github"
},
"original": {
@ -466,11 +466,11 @@
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github"
},
"original": {
@ -754,11 +754,11 @@
]
},
"locked": {
"lastModified": 1715348159,
"narHash": "sha256-nP0PJZ3dR0ols1V+w+sYBki7JlSRFvFJ8J8B00Oa7BM=",
"lastModified": 1717097707,
"narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "223743313bab8b0b44a57eaf9573de9f69082b4d",
"rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9",
"type": "github"
},
"original": {
@ -783,11 +783,11 @@
]
},
"locked": {
"lastModified": 1713612213,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
"lastModified": 1716576411,
"narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
"rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621",
"type": "github"
},
"original": {
@ -808,11 +808,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1715342341,
"narHash": "sha256-jHCjAwaukNCI7yVsbB8oppl1dUujvFAfRiXaecqWGI0=",
"lastModified": 1717267530,
"narHash": "sha256-sD1AS7l+V4FoWN3TZ6aZ9a0/lkCdG3rwBH4pP1yMpds=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "38911d6df4977b6b00557cc887eb151d032e505b",
"rev": "0ebb43c1a37e7321e5ed7223ea85ed555cc82735",
"type": "github"
},
"original": {
@ -860,11 +860,11 @@
]
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"lastModified": 1716473782,
"narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"rev": "87d5d984109c839482b88b4795db073eb9ed446f",
"type": "github"
},
"original": {
@ -901,11 +901,11 @@
"systems": "systems_7"
},
"locked": {
"lastModified": 1714910693,
"narHash": "sha256-kkgjq8ZCnxYgqPX7O2kUHdzBm08bRlESCukSzE7XE2g=",
"lastModified": 1716658811,
"narHash": "sha256-tJ/roE0BqzO2Sn73fF+50RpYYrRS5hDCHI8BmiuPMjA=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "1e1fc79d84c35a673c52cfa0be1ea9df1aed8442",
"rev": "2c57525de840e4edada2cfd2924659b80f513ece",
"type": "github"
},
"original": {
@ -926,11 +926,11 @@
]
},
"locked": {
"lastModified": 1715287423,
"narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
"lastModified": 1716058375,
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
"rev": "3afed4364790aebe0426077631af1e164a9650cc",
"type": "github"
},
"original": {
@ -1044,11 +1044,11 @@
]
},
"locked": {
"lastModified": 1713164845,
"narHash": "sha256-6X0H56qGmN/LoEdcBcwm3+apHLEe7r4caO719q1/KMI=",
"lastModified": 1715754082,
"narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5",
"rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be",
"type": "github"
},
"original": {
@ -1064,11 +1064,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1715279591,
"narHash": "sha256-adAKVYQk2S30MSJ1VUmuI2K7i8J0A5iTO2ogL7rJhEA=",
"lastModified": 1716957285,
"narHash": "sha256-lbmFJ1NKz7XhCXNv8PCZiTtagSEL2EYWjxLnSqq4QDI=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "45f4a56d9dd57191e42e586aa64806e04002d5dd",
"rev": "1223f170d83efbe3a6f494f073b1d6b2d3dbae94",
"type": "github"
},
"original": {
@ -1086,11 +1086,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1714663357,
"narHash": "sha256-2D2UVkXHivtNUohlJy3GjMaiE7efozJCRgnYOkBbZlY=",
"lastModified": 1715803356,
"narHash": "sha256-wvsg/UMM/jekzgbggH56KLZJzRmwrB9ErevaXXyWyqc=",
"owner": "Mic92",
"repo": "nix-fast-build",
"rev": "071d44681486271060f938a354ef9ba82ee4f9ea",
"rev": "cfff239d93716e92f6467f8953d8f8c12da1892a",
"type": "github"
},
"original": {
@ -1143,11 +1143,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1713067146,
"narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=",
"lastModified": 1715483403,
"narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c",
"rev": "f9027322f48b427da23746aa359a6510dfcd0228",
"type": "github"
},
"original": {
@ -1165,11 +1165,11 @@
]
},
"locked": {
"lastModified": 1715304237,
"narHash": "sha256-MH9DsolHEmNh5s41tCHDVYOune1pzHK1Qb+QGG+KUEM=",
"lastModified": 1717205309,
"narHash": "sha256-FxtY2Y9S/s759GWMT4L7w81hiklTt3no/+jOfiwxAZQ=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "0fe993bf882c7859b363e9b69178977ac845ea0e",
"rev": "af34bb2d85bef3d2a27c9044a2d4cc1231d0bc2e",
"type": "github"
},
"original": {
@ -1248,11 +1248,11 @@
]
},
"locked": {
"lastModified": 1713783234,
"narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=",
"lastModified": 1716210724,
"narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e",
"rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94",
"type": "github"
},
"original": {
@ -1291,11 +1291,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1715355730,
"narHash": "sha256-g3pj7gLMXUROwm/z2NYKdtdqHgXkmsYqS+dYelkStqs=",
"lastModified": 1717287887,
"narHash": "sha256-Ma53Y67am2NfsUe1XPK+3tsADSLKn8GnLrwHxsEs9QI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3bb855986fa24e8ff70f7e8326b464e3b59e56ad",
"rev": "b1afe5bcf29143f35d7c796e6cbfcc31fd39eb70",
"type": "github"
},
"original": {
@ -1387,11 +1387,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1715218190,
"narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=",
"lastModified": 1716991068,
"narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9a9960b98418f8c385f52de3b09a63f9c561427a",
"rev": "25cf937a30bf0801447f6bf544fc7486c6309234",
"type": "github"
},
"original": {
@ -1403,11 +1403,11 @@
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1714858427,
"narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
"lastModified": 1716655032,
"narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
"rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f",
"type": "github"
},
"original": {
@ -1418,38 +1418,6 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1712791164,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1715037484,
"narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@ -1465,13 +1433,45 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_11": {
"locked": {
"lastModified": 1714213793,
"narHash": "sha256-Yg5D5LhyAZvd3DZrQQfJAVK8K3TkUYKooFtH1ulM0mw=",
"lastModified": 1716715802,
"narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1716948383,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d6f6eb2a984f2ba9a366c31e4d36d65465683450",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_13": {
"locked": {
"lastModified": 1715413075,
"narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d",
"type": "github"
},
"original": {
@ -1680,11 +1680,11 @@
]
},
"locked": {
"lastModified": 1713954846,
"narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=",
"lastModified": 1714478972,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "6fb82e44254d6a0ece014ec423cb62d92435336f",
"rev": "2849da033884f54822af194400f8dff435ada242",
"type": "github"
},
"original": {
@ -1702,11 +1702,11 @@
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1714792305,
"narHash": "sha256-UaL4+bHKb6iVIr2nAL0Ns5EM9s+8EmPbTb8PuUSZHc4=",
"lastModified": 1716002051,
"narHash": "sha256-7GbTSJ2uMuXjghX83lEzUbbDEwiZFsCnwsqYq1bl0ds=",
"owner": "AtaraxiaSjel",
"repo": "PrismLauncher",
"rev": "ccf38c3cfeb573e45d6b4e626cbab8c8c84c9deb",
"rev": "19c85a42f3d2f83348ffbda6e2df7c1fc9c9c409",
"type": "github"
},
"original": {
@ -1752,11 +1752,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1715355595,
"narHash": "sha256-7GQxBVLahCjHCJtdOucyBpvUlNiyW7JUIt/pchZ/LAg=",
"lastModified": 1717214600,
"narHash": "sha256-6cL574j1SSL9At2oZwGarAv9FcwphI9Pd8im+uQ5/bE=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "7fd7459e12220af47b956e1e4d925814dcbd55e7",
"rev": "4118c12978f50c094d2e40146d2b1524012a6dd5",
"type": "gitlab"
},
"original": {
@ -1773,11 +1773,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1715244550,
"narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=",
"lastModified": 1716692524,
"narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f",
"rev": "962797a8d7f15ed7033031731d0bb77244839960",
"type": "github"
},
"original": {
@ -1959,11 +1959,11 @@
]
},
"locked": {
"lastModified": 1714058656,
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"lastModified": 1715940852,
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
"type": "github"
},
"original": {
@ -2049,11 +2049,11 @@
]
},
"locked": {
"lastModified": 1714662532,
"narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
"lastModified": 1716290197,
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "1f228ba2f1f254195c0b571302b37482861abee3",
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
"type": "github"
},
"original": {

View File

@ -124,7 +124,7 @@
# permittedInsecurePackages = [ "electron-25.9.0" ];
};
channels.unstable.input = nixpkgs;
channels.unstable.patches = patchesPath [ "zen-kernels.patch" "ydotoold.patch" ] ++ sharedPatches;
channels.unstable.patches = patchesPath [ "zen-kernels.patch" ] ++ sharedPatches;
channels.stable.input = inputs.nixpkgs-stable;
channels.stable.patches = sharedPatches;

View File

@ -4,7 +4,7 @@ let
in {
boot = {
# zfs.package = pkgs.zfs_unstable;
kernelPackages = pkgs.linuxPackages_zen;
kernelPackages = pkgs.linuxPackages_lqx;
initrd = {
supportedFilesystems = [ "zfs" ];

View File

@ -4,7 +4,7 @@ let
in {
boot = {
# zfs.package = pkgs.zfs_unstable;
kernelPackages = pkgs.linuxPackages_zen;
kernelPackages = pkgs.linuxPackages_lqx;
initrd = {
supportedFilesystems = [ "zfs" ];

View File

@ -1,58 +0,0 @@
From e0f8aaa755eda1fd65dbe5f330c3cdffacf97cc7 Mon Sep 17 00:00:00 2001
From: kraem <ebrin.ronnie@protonmail.com>
Date: Sun, 18 Sep 2022 22:53:08 +0200
Subject: [PATCH] nixos/ydotool: module init
---
nixos/modules/module-list.nix | 1 +
nixos/modules/programs/ydotool.nix | 29 +++++++++++++++++++
4 files changed, 39 insertions(+)
create mode 100644 nixos/modules/programs/ydotool.nix
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dce6e878540d5..580d938030685 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -280,6 +280,7 @@
./programs/xwayland.nix
./programs/yabar.nix
./programs/yazi.nix
+ ./programs/ydotool.nix
./programs/yubikey-touch-detector.nix
./programs/zsh/zmap.nix
./programs/zsh/oh-my-zsh.nix
diff --git a/nixos/modules/programs/ydotool.nix b/nixos/modules/programs/ydotool.nix
new file mode 100644
index 0000000000000..f5996059a4c36
--- /dev/null
+++ b/nixos/modules/programs/ydotool.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.programs.ydotool;
+in
+
+{
+
+ options = {
+ programs.ydotool = {
+ enable = lib.mkEnableOption "ydotool, a generic Linux command-line automation tool";
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.ydotool ];
+
+ systemd.user.services.ydotoold = {
+ description = "Starts ydotoold service";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.ydotool}/bin/ydotoold -p $XDG_RUNTIME_DIR/ydotoold.sock";
+ Restart = "always";
+ };
+ };
+ };
+}
+

View File

@ -71,8 +71,8 @@ with config.deviceSpecific; {
protonhax
protontricks
vkBasalt
wine
winetricks
# wine
# winetricks
];
};

View File

@ -45,7 +45,7 @@ with config.deviceSpecific; {
"kvm.report_ignored_msrs=0"
];
kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
kernelPackages = lib.mkDefault pkgs.linuxPackages_lqx;
consoleLogLevel = 3;
kernel.sysctl = if config.zramSwap.enable then {

View File

@ -20,7 +20,6 @@ with lib; {
inputs.ataraxiasjel-nur.overlays.default
inputs.ataraxiasjel-nur.overlays.grub2-argon2
inputs.deploy-rs.overlay
# inputs.hyprland.overlays.default
(final: prev:
{
attic = inputs.attic.packages.${system}.attic;
@ -31,7 +30,6 @@ with lib; {
nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
prismlauncher = inputs.prismlauncher.packages.${system}.default;
wine = prev.wineWowPackages.staging;
xray = master.xray;
youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
yt-dlp = master.yt-dlp;
@ -72,6 +70,33 @@ with lib; {
yandex-taxi-py = prev.writers.writePython3 "yandex-taxi.py" {
libraries = with prev.python3Packages; [ requests ];
} ./packages/yandex-taxi-py.nix;
spotify-spotx = let
spotx = with prev; stdenv.mkDerivation {
pname = "spotx-bash";
version = "unstable-2023-12-15";
src = fetchFromGitHub {
owner = "SpotX-Official";
repo = "SpotX-Bash";
rev = "a0823cb2f7495f9eaf0c94194abe6d2f0ff1b58c";
hash = "sha256-qgG5m4ajlbq0G6D1Fx2x+yqxcz+OGN1zsfVDO2/koG4=";
};
dontBuild = true;
nativeBuildInputs = [ makeBinaryWrapper ];
installPhase = ''
install -Dm 755 spotx.sh $out/bin/spotx
sed -i 's/sxbLive=.\+/sxbLive=$buildVer/' $out/bin/spotx
patchShebangs $out/bin/spotx
wrapProgram $out/bin/spotx --prefix PATH : ${lib.makeBinPath [ perl unzip zip util-linux ]}
'';
};
in prev.spotify.overrideAttrs (_oa: {
postInstall = ''
${spotx}/bin/spotx -h -P "$out/share/spotify"
rm -f "$out/share/spotify/Apps/xpui.bak" "$out/share/spotify/spotify.bak"
'';
});
spotifywm = prev.spotifywm.override { spotify = final.spotify-spotx; };
}
)
];