chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: chayleaf:7fb530b64efca356c6eb83773ad1558d02dcd215
Branches Tags
chayleaf:master
chayleaf:ci
...
compare: chayleaf:0724bd08ef9f6341005362de4dd68a7afb2bcd94
Branches Tags
chayleaf:master
chayleaf:ci

3 commits
7fb530b64e ... 0724bd08ef

Author SHA1 Message Date
chayleaf 0724bd08ef
temporarily; switch to alacritty add black for pylsp 2024-06-05 00:16:21 +07:00
chayleaf 9cdfd81a88
tmp 2024-05-18 08:31:41 +07:00
chayleaf f93171ae1b
change update script for ci branch 2024-05-17 19:04:22 +07:00
10 changed files with 83 additions and 68 deletions
Show stats Expand all files Collapse all files

67
flake.lock
View file

@ -113,11 +113,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"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": {
@ -205,11 +205,11 @@
]
},
"locked": {
"lastModified": 1712452624,
"narHash": "sha256-R35K+4krhK5B2fcV6W2HFe/uhXmP8YGTb35uZ+nDAxw=",
"lastModified": 1715908553,
"narHash": "sha256-9te1GH3e4gTARupbBhzqeMDKdVDHEky3AvIGzJpnm+I=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "06314bbf8fedd83c7253442994a2f0c81d47988e",
"rev": "8bd322b708faab6e8e09d300acec3ada7443b9a3",
"type": "github"
},
"original": {
@ -225,11 +225,11 @@
]
},
"locked": {
"lastModified": 1712459390,
"narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=",
"lastModified": 1715483403,
"narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "4676d72d872459e1e3a248d049609f110c570e9a",
"rev": "f9027322f48b427da23746aa359a6510dfcd0228",
"type": "github"
},
"original": {
@ -240,11 +240,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1712760404,
"narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
"lastModified": 1715881912,
"narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
"rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
"type": "github"
},
"original": {
@ -263,11 +263,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1710449465,
"narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=",
"lastModified": 1714720456,
"narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "79c8cfcd5873a85559da6201b116fb38b490d030",
"rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
"type": "gitlab"
},
"original": {
@ -298,35 +298,30 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1712769857,
"narHash": "sha256-YUyh+yfB15+2gvvvTvWBQbAUrD1x391QF1PRZUSt87k=",
"lastModified": 1715947901,
"narHash": "sha256-nAcmnm4/PBA+E3kjtLZJy7aKmzu4Ou5dzVFAC0j9ORM=",
"owner": "chayleaf",
"repo": "nixpkgs",
"rev": "058c6a3724a1cc5ef010ce6f2163d959666e8a86",
"rev": "8620504340e055daa4f81b43117e55952c8b7a87",
"type": "github"
},
"original": {
"owner": "chayleaf",
"ref": "ci",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
"lastModified": 1714640452,
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
}
},
"notlua": {
@ -371,11 +366,11 @@
},
"nur": {
"locked": {
"lastModified": 1712785619,
"narHash": "sha256-1RCStMZUGqus3DAl7jivw7XM5jpbecfqWtA1r45Ts90=",
"lastModified": 1715946360,
"narHash": "sha256-abzd4TBwow7x2Se/TCIHlSF+7k7N9dEJCurUv7FrKoY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "a0471f14e0499a66898fc1c7d5aff259a9fa58b9",
"rev": "6572df0e6656b9f1f388c7051e070dc962d85993",
"type": "github"
},
"original": {
@ -411,11 +406,11 @@
]
},
"locked": {
"lastModified": 1712715149,
"narHash": "sha256-uOx7GaLV+5hekAYtm/CBr627Pi7+d1Yh70hwKmVjYYo=",
"lastModified": 1715912155,
"narHash": "sha256-UXHk4dKvvm5mSuDDON3lXU5CHKiTRnIjA5mUtDOtKEU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9ef1eca23bee5fb8080863909af3802130b2ee57",
"rev": "d3a96b08a7280a5753246129b462eed3662815d5",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -4,7 +4,7 @@
inputs = {
#nixpkgs.url = "github:NixOS/nixpkgs/3dc2b4f8166f744c3b3e9ff8224e7c5d74a5424f";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:chayleaf/nixpkgs";
nixpkgs.url = "github:chayleaf/nixpkgs/ci";
nixos-hardware.url = "github:NixOS/nixos-hardware";
nix-index-database = {
url = "github:nix-community/nix-index-database";

10
home/hosts/nixmsi.nix
View file

@ -42,7 +42,7 @@
home.stateVersion = "22.11";
home.username = "user";
home.homeDirectory = "/home/user";
terminals = [ "kitty" ];
terminals = [ "alacritty" "foot" "kitty" ];
# xsession.windowManager.i3.enable = true;
wayland.windowManager.sway.enable = true;
services.kdeconnect.enable = true;
@ -58,13 +58,13 @@
anki-bin
(gimp.overrideAttrs (old: { doCheck = false; })) krita blender-hip
kdenlive glaxnimate mediainfo
ghidra (cutter.withPlugins (p: with p; [ sigdb rz-ghidra ]))
ghidra # (cutter.withPlugins (p: with p; [ sigdb rz-ghidra ]))
openrgb piper
steam-run steam
# faf-client
(osu-lazer-bin.override {
command_prefix = "env SDL_VIDEODRIVER=wayland ${obs-studio-plugins.obs-vkcapture}/bin/obs-gamecapture";
})
#(osu-lazer-bin.override {
#command_prefix = "env SDL_VIDEODRIVER=wayland ${obs-studio-plugins.obs-vkcapture}/bin/obs-gamecapture";
#})
taisei
techmino
(wrapOBS {

2
home/modules/nvim.nix
View file

@ -80,6 +80,7 @@
ripgrep
(python3.withPackages (p: with p; [
python-lsp-server
python-lsp-black
pylsp-mypy
python-lsp-server.optional-dependencies.pyflakes
python-lsp-server.optional-dependencies.mccabe
@ -433,6 +434,7 @@
pylsp = {
settings = {
pylsp.plugins.pylsp_mypy.enabled = true;
pylsp.plugins.black.enabled = true;
};
};
svelte = { };

14
pkgs/_sources/generated.json
View file

@ -22,24 +22,24 @@
"pinned": false,
"src": {
"name": null,
"sha256": "sha256-wCIffeayOy3kEwmIKB7e+NrliuSpKXoVYC334fxVB3U=",
"sha256": "sha256-lEoHakxH7vvUmnBVAfJJYZ87WIeS1eIz1CFMczrNVTA=",
"type": "url",
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-1/GE-Proton9-1.tar.gz"
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-5/GE-Proton9-5.tar.gz"
},
"version": "GE-Proton9-1"
"version": "GE-Proton9-5"
},
"searxng": {
"cargoLocks": null,
"date": "2024-03-15",
"date": "2024-05-17",
"extract": null,
"name": "searxng",
"passthru": null,
"pinned": false,
"src": {
"sha256": "sha256-BqVnp/lByAMr/LOCGkuXCYsomu9hRBGXK3DbBQX10TA=",
"sha256": "sha256-Au2XNJUfhcVd1vOzJPDTRa23cYa1SOxYGxqTM22fb80=",
"type": "tarball",
"url": "https://github.com/searxng/searxng/archive/e2af3e49702f6fb40e1614f826544dc3b03bca2f.tar.gz"
"url": "https://github.com/searxng/searxng/archive/3585d71f99d37b58fff4c6238e95cf1fd3391898.tar.gz"
},
"version": "e2af3e49702f6fb40e1614f826544dc3b03bca2f"
"version": "3585d71f99d37b58fff4c6238e95cf1fd3391898"
}
}

14
pkgs/_sources/generated.nix
View file

@ -12,19 +12,19 @@
};
proton-ge = {
pname = "proton-ge";
version = "GE-Proton9-1";
version = "GE-Proton9-5";
src = fetchurl {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-1/GE-Proton9-1.tar.gz";
sha256 = "sha256-wCIffeayOy3kEwmIKB7e+NrliuSpKXoVYC334fxVB3U=";
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-5/GE-Proton9-5.tar.gz";
sha256 = "sha256-lEoHakxH7vvUmnBVAfJJYZ87WIeS1eIz1CFMczrNVTA=";
};
};
searxng = {
pname = "searxng";
version = "e2af3e49702f6fb40e1614f826544dc3b03bca2f";
version = "3585d71f99d37b58fff4c6238e95cf1fd3391898";
src = fetchTarball {
url = "https://github.com/searxng/searxng/archive/e2af3e49702f6fb40e1614f826544dc3b03bca2f.tar.gz";
sha256 = "sha256-BqVnp/lByAMr/LOCGkuXCYsomu9hRBGXK3DbBQX10TA=";
url = "https://github.com/searxng/searxng/archive/3585d71f99d37b58fff4c6238e95cf1fd3391898.tar.gz";
sha256 = "sha256-Au2XNJUfhcVd1vOzJPDTRa23cYa1SOxYGxqTM22fb80=";
};
date = "2024-03-15";
date = "2024-05-17";
};
}

2
pkgs/default.nix
View file

@ -79,9 +79,11 @@ in
sha256 = "sha256-6vYbNmNJBCoU23nVculac24tHqH7F4AZVftIjL93WJU=";
fetchSubmodules = true;
};
patches = [ ];
});
kvmfrOverlay = kvmfr: kvmfr.overrideAttrs (old: {
inherit (pkgs'.looking-glass-client) version src;
patches = [ ./looking-glass.patch ];
});
mobile-config-firefox = callPackage ./mobile-config-firefox { };
osu-wine = callPackage ./osu-wine { };

12
pkgs/firefox-addons/generated.nix
View file

@ -2,10 +2,10 @@
{
"fastforwardteam" = buildFirefoxXpiAddon {
pname = "fastforwardteam";
version = "0.2334";
version = "0.2383";
addonId = "addon@fastforward.team";
url = "https://addons.mozilla.org/firefox/downloads/file/4177101/fastforwardteam-0.2334.xpi";
sha256 = "d790219622469f08316b41c0d01abf2b584a37fa87b45666a74bd30cffb95ed0";
url = "https://addons.mozilla.org/firefox/downloads/file/4258067/fastforwardteam-0.2383.xpi";
sha256 = "eec6328df3df1afe2cb6a331f6907669d804235551ea766d48655f8f831caf28";
meta = with lib;
{
homepage = "https://fastforward.team";
@ -23,10 +23,10 @@
};
"rikaitan" = buildFirefoxXpiAddon {
pname = "rikaitan";
version = "24.3.7.1";
version = "24.4.29.0";
addonId = "tatsu@autistici.org";
url = "https://addons.mozilla.org/firefox/downloads/file/4246908/rikaitan-24.3.7.1.xpi";
sha256 = "db849343b029b2f1b510cc66032157502e3fe9e6168072d27e8aad9867b6ec17";
url = "https://addons.mozilla.org/firefox/downloads/file/4279894/rikaitan-24.4.29.0.xpi";
sha256 = "81c95b10e77126c29e6a5fc829b73bdc4659bd84bdefd7003388616b7912084c";
meta = with lib;
{
homepage = "https://github.com/Ajatt-Tools/rikaitan";

16
pkgs/looking-glass.patch Normal file
View file

@ -0,0 +1,16 @@
diff --git a/kvmfr.c b/kvmfr.c
index 121aae5b..2f4c9e1a 100644
--- a/kvmfr.c
+++ b/kvmfr.c
@@ -539,7 +539,11 @@ static int __init kvmfr_module_init(void)
if (kvmfr->major < 0)
goto out_free;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
kvmfr->pClass = class_create(THIS_MODULE, KVMFR_DEV_NAME);
+#else
+ kvmfr->pClass = class_create(KVMFR_DEV_NAME);
+#endif
if (IS_ERR(kvmfr->pClass))
goto out_unreg;

12
update.sh
View file

@ -7,9 +7,9 @@ mozilla-addons-to-nix \
./pkgs/firefox-addons/addons.json \
./pkgs/firefox-addons/generated.nix || echo "failed to update firefox addons"
nix flake update
if [ -z ${SUDO_ASKPASS+x} ]; then
sudo nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
else
sudo -A nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
fi
home-manager switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
#if [ -z ${SUDO_ASKPASS+x} ]; then
# sudo nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
#else
# sudo -A nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
#fi
#home-manager switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"