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

update inputs

Browse source
This commit is contained in:
chayleaf 2023-04-06 21:00:49 +07:00
parent db89ba3f10
commit 87b78d6405
11 changed files with 1566 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
home/_sources/generated.json
View file

@ -1,4 +1,19 @@
{ {
"fastforward": {
"cargoLocks": null,
"date": null,
"extract": null,
"name": "fastforward",
"passthru": null,
"pinned": false,
"src": {
"name": null,
"sha256": "sha256-mrWvbjqUphMKi8ItRFSmRAzMyzsqB9rJbZFm+I7ocSc=",
"type": "url",
"url": "https://github.com/FastForwardTeam/FastForward/releases/download/0.2237/fastforwardteam-0.2237.xpi"
},
"version": "0.2237"
},
"proton-ge": { "proton-ge": {
"cargoLocks": null, "cargoLocks": null,
"date": null, "date": null,
@ -8,11 +23,11 @@
"pinned": false, "pinned": false,
"src": { "src": {
"name": null, "name": null,
"sha256": "sha256-T+7R+zFMd0yQ0v7/WGym2kzMMulUmATS/LCEQS8whiw=", "sha256": "sha256-tPL8d5fJzT428UJImJgzW9ECI+ENkvbD1fCPmjU7Yhk=",
"type": "url", "type": "url",
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-49/GE-Proton7-49.tar.gz" "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-54/GE-Proton7-54.tar.gz"
}, },
"version": "GE-Proton7-49" "version": "GE-Proton7-54"
}, },
"yomichan": { "yomichan": {
"cargoLocks": null, "cargoLocks": null,

14
home/_sources/generated.nix
View file

@ -1,12 +1,20 @@
# This file was generated by nvfetcher, please do not modify it manually. # This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{ {
fastforward = {
pname = "fastforward";
version = "0.2237";
src = fetchurl {
url = "https://github.com/FastForwardTeam/FastForward/releases/download/0.2237/fastforwardteam-0.2237.xpi";
sha256 = "sha256-mrWvbjqUphMKi8ItRFSmRAzMyzsqB9rJbZFm+I7ocSc=";
};
};
proton-ge = { proton-ge = {
pname = "proton-ge"; pname = "proton-ge";
version = "GE-Proton7-49"; version = "GE-Proton7-54";
src = fetchurl { src = fetchurl {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-49/GE-Proton7-49.tar.gz"; url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-54/GE-Proton7-54.tar.gz";
sha256 = "sha256-T+7R+zFMd0yQ0v7/WGym2kzMMulUmATS/LCEQS8whiw="; sha256 = "sha256-tPL8d5fJzT428UJImJgzW9ECI+ENkvbD1fCPmjU7Yhk=";
}; };
}; };
yomichan = { yomichan = {

16
home/common/firefox/default.nix
View file

@ -63,6 +63,22 @@ let firefoxWithCcache = ({ useSccache, firefox-unwrapped }:
platforms = platforms.all; platforms = platforms.all;
}; };
}; };
fastforward = pkgs.stdenvNoCC.mkDerivation {
inherit (sources.fastforward) pname version src;
preferLocalBuild = true;
allowSubstitutes = true;
buildCommand = ''
dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
mkdir -p "$dst"
install -v -m644 "$src" "$dst/addon@fastforward.team"
'';
meta = with lib; {
homepage = "https://fastforward.team";
description = "Don't waste time with compliance. Use FastForward to skip annoying URL \"shorteners\"";
license = licenses.unlicense;
platforms = platforms.all;
};
};
in with (import ./generated.nix { in with (import ./generated.nix {
inherit lib stdenv fetchurl buildFirefoxXpiAddon; inherit lib stdenv fetchurl buildFirefoxXpiAddon;
}); });

10
home/common/general.nix
View file

@ -49,19 +49,13 @@
# utils # utils
gnused mktemp fzf coreutils-full findutils xdg-utils git gnupg whois curl gnused mktemp fzf coreutils-full findutils xdg-utils git gnupg whois curl
file mediainfo unzip gnutar man rclone sshfs trash-cli file mediainfo unzip gnutar man rclone sshfs trash-cli
# drag & drop
xdragon
# xembed
tabbed
# for preview # for preview
exa bat exa bat
ffmpeg ffmpegthumbnailer nsxiv imagemagick
libarchive atool libarchive atool
libreoffice poppler_utils fontpreview djvulibre
glow w3m glow w3m
# for opening # for opening
p7zip unrar-wrapper zathura odt2txt p7zip unrar-wrapper odt2txt
] ++ lib.optionals (!config.programs.mpv.enable) [ mpv ]; ];
plugins = { plugins = {
src = pluginSrc; src = pluginSrc;
mappings = { mappings = {

9
home/common/gui.nix
View file

@ -27,6 +27,15 @@
# a bad idea to set SDL_DYNAMIC_API globally # a bad idea to set SDL_DYNAMIC_API globally
SDL2_DYNAMIC_API = "${pkgs.SDL2}/lib/libSDL2.so"; SDL2_DYNAMIC_API = "${pkgs.SDL2}/lib/libSDL2.so";
}; };
programs.nnn.extraPackages = with pkgs; [
# drag & drop
xdragon
# xembed
tabbed
# for preview
ffmpeg ffmpegthumbnailer nsxiv imagemagick
zathura /*TODO libreoffice*/ fontpreview djvulibre poppler_utils
] ++ lib.optionals (!config.programs.mpv.enable) [ mpv ];
xdg.configFile."alsoft.conf".text = '' xdg.configFile."alsoft.conf".text = ''
[general] [general]
hrtf = true hrtf = true

38
home/flake.lock
View file

@ -8,11 +8,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1677783711, "lastModified": 1680597706,
"narHash": "sha256-eq5mOVk3gv5HITtLhPjKwi8bFnOaQplA3X0WFgHnmxE=", "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b9e3a29864798d55ec1d6579ab97876bb1ee9664", "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677773085, "lastModified": 1680655986,
"narHash": "sha256-TtNq5ooEUvyHMwOnFr1nUIpqzslM3pPGmbZKe+7BU4w=", "narHash": "sha256-u6gs9B6ckuL3dXjI/LdATeXltEh04DYxCk6vZtF/WEs=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "d59c534258d8d9779a5497e5a6a0f4e9616365ce", "rev": "9ba4a24198646582e208ec8cdf5e8324be23e2d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,10 +43,10 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677932085, "lastModified": 1680669251,
"narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=",
"path": "/nix/store/qilsyakhi0qmjq9iwxn49g3qbl1rp5m7-source", "path": "/nix/store/qw9nnl2wmvx0ad0f9aqvdbw5cl5mirvc-source",
"rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679341830, "lastModified": 1680277516,
"narHash": "sha256-7+tqtNEpj/rtL55KntBI1gKo3YEu8JuKOHoK4dMx58k=", "narHash": "sha256-ACq/VPe+nuqlm0RNrNho/y1yijNAERSSW81epV71MGU=",
"owner": "chayleaf", "owner": "chayleaf",
"repo": "notlua", "repo": "notlua",
"rev": "8a36fec181a1fdd314064f55aa90ec9e4744ebd1", "rev": "95fd2ccfda749044ed0bcc0cb0cedbda5bd46e62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,11 +77,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1678002043, "lastModified": 1680758135,
"narHash": "sha256-CKAoPQaUA+kitq4ChzlM5O3oTGHuQnlSV4hNSI1Ht0g=", "narHash": "sha256-gmTwQ6VHbXAfXbBgeqXZyyuEb0Hhroi8IOM/nokBOwM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "45ce037949e32a72bc65be6f20dc87fa73c5039d", "rev": "9570cfc60f7ca32fdcdc4292f1e24ea5c62977bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,11 +101,11 @@
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1678901627,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
home/nvfetcher.toml
View file

@ -6,3 +6,7 @@ fetch.url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/downlo
src.github = "FooSoft/yomichan" src.github = "FooSoft/yomichan"
fetch.url = "https://github.com/FooSoft/yomichan/releases/download/$ver/yomichan-firefox-dev.xpi" fetch.url = "https://github.com/FooSoft/yomichan/releases/download/$ver/yomichan-firefox-dev.xpi"
[fastforward]
# allow prereleases
src.github_tag = "FastForwardTeam/FastForward"
fetch.url = "https://github.com/FastForwardTeam/FastForward/releases/download/$ver/fastforwardteam-$ver.xpi"

24
system/flake.lock
View file

@ -52,11 +52,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677773085, "lastModified": 1680655986,
"narHash": "sha256-TtNq5ooEUvyHMwOnFr1nUIpqzslM3pPGmbZKe+7BU4w=", "narHash": "sha256-u6gs9B6ckuL3dXjI/LdATeXltEh04DYxCk6vZtF/WEs=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "d59c534258d8d9779a5497e5a6a0f4e9616365ce", "rev": "9ba4a24198646582e208ec8cdf5e8324be23e2d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1677949148, "lastModified": 1680070330,
"narHash": "sha256-dEdcn+UYs8TUK3VTNCQk9TsJapJLEq50A4q7eC3/PTU=", "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d63e86cbed3d399c4162594943bd8c1d8392e550", "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,11 +82,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677932085, "lastModified": 1680669251,
"narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677983714, "lastModified": 1680747499,
"narHash": "sha256-2A5uDpF0vN4w9tvo5N+918bK0yRYfg4FdNZ/qccgH6s=", "narHash": "sha256-E9rcxSTsqRqNd4SD+D/4aqm3qfFyVw0S9YseCks7h+c=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "1a9f6285d441ff438a6a1422dc3fde109d8615bf", "rev": "8ad3b5ee01a2074b54274216ff2cf0ab844a7426",
"type": "github" "type": "github"
}, },
"original": { "original": {

59
system/hosts/nixmsi.nix
View file

@ -88,9 +88,9 @@ in {
# zen619.configuration.boot.kernelPackages = pkgs.linuxPackagesFor (zenKernel "6.1.9" "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv"); # zen619.configuration.boot.kernelPackages = pkgs.linuxPackagesFor (zenKernel "6.1.9" "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv");
# }; # };
nixpkgs.config.allowUnfreePredicate = pkg: (lib.getName pkg) == "steam-original"; nixpkgs.config.allowUnfreePredicate = pkg: (lib.getName pkg) == "steam-original";
console.font = "${pkgs.terminus_font}/share/consolefonts/ter-v32n.psf.gz";
hardware = { hardware = {
steam-hardware.enable = true; steam-hardware.enable = true;
video.hidpi.enable = true;
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
opengl.driSupport32Bit = true; opengl.driSupport32Bit = true;
# sway WLR_RENDERER=vulkan # sway WLR_RENDERER=vulkan
@ -356,61 +356,8 @@ in {
''; '';
# overlays # overlays
nixpkgs.overlays = [(self: super: with lib; with pkgs; { nixpkgs.overlays = [(self: super: {
system76-scheduler = rustPlatform.buildRustPackage { system76-scheduler = super.callPackage ../pkgs/system76-scheduler.nix { };
pname = "system76-scheduler";
version = "unstable-2022-10-05";
src = fetchFromGitHub {
owner = "pop-os";
repo = "system76-scheduler";
rev = "25a45add4300eab47ceb332b4ec07e1e74e4baaf";
sha256 = "sha256-eB1Qm+ITlLM51nn7GG42bydO1SQ4ZKM0wgRl8q522vw=";
};
cargoPatches = [(pkgs.writeText "system76-scheduler-cargo.patch" ''
diff --git i/daemon/Cargo.toml w/daemon/Cargo.toml
index 0397788..fbd6202 100644
--- i/daemon/Cargo.toml
+++ w/daemon/Cargo.toml
@@ -33,7 +33,7 @@ clap = { version = "3.1.18", features = ["cargo"] }
# Necessary for deserialization of untagged enums in assignments.
[dependencies.ron]
git = "https://github.com/MomoLangenstein/ron"
-branch = "253-untagged-enums"
+rev = "a9c5444d74677716f4a8a00504fb1bedbde55156"
[dependencies.tracing-subscriber]
version = "0.3.11"
diff --git i/Cargo.lock w/Cargo.lock
index a782756..fe56c1f 100644
--- i/Cargo.lock
+++ w/Cargo.lock
@@ -788,7 +788,7 @@ dependencies = [
[[package]]
name = "ron"
version = "0.7.0"
-source = "git+https://github.com/MomoLangenstein/ron?branch=253-untagged-enums#a9c5444d74677716f4a8a00504fb1bedbde55156"
+source = "git+https://github.com/MomoLangenstein/ron?rev=a9c5444d74677716f4a8a00504fb1bedbde55156#a9c5444d74677716f4a8a00504fb1bedbde55156"
dependencies = [
"base64",
"bitflags",
'')];
cargoSha256 = "sha256-EzvJEJlJzCzNEJLCE3U167LkaQHzGthPhIJ6fp0aGk8=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus ];
EXECSNOOP_PATH = "${bcc}/bin/execsnoop";
postInstall = ''
install -D -m 0644 data/com.system76.Scheduler.conf $out/etc/dbus-1/system.d/com.system76.Scheduler.conf
mkdir -p $out/etc/system76-scheduler
install -D -m 0644 data/*.ron $out/etc/system76-scheduler/
'';
meta = {
description = "System76 Scheduler";
homepage = "https://github.com/pop-os/system76-scheduler";
license = licenses.mpl20;
platforms = [ "i686-linux" "x86_64-linux" ];
};
};
})]; })];
} }

1407
system/pkgs/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

65
system/pkgs/system76-scheduler.nix Normal file
View file

@ -0,0 +1,65 @@
{ lib
, fetchFromGitHub
, writeText
, rustPlatform
, pkg-config
, dbus
, bcc
}:
rustPlatform.buildRustPackage {
pname = "system76-scheduler";
version = "unstable-2022-11-08";
src = fetchFromGitHub {
owner = "pop-os";
repo = "system76-scheduler";
rev = "0fe4d8dfc4275fd856aee28ca942b9fa53229fc9";
sha256 = "sha256-uFFJkuMxqcGj6OQShF0zh/FGwX4/ln1l6NwGonkUsNI=";
};
cargoPatches = [(writeText "ron-rev.diff" ''
diff --git i/daemon/Cargo.toml w/daemon/Cargo.toml
index 0397788..fbd6202 100644
--- i/daemon/Cargo.toml
+++ w/daemon/Cargo.toml
@@ -33,7 +33,7 @@ clap = { version = "3.1.18", features = ["cargo"] }
# Necessary for deserialization of untagged enums in assignments.
[dependencies.ron]
git = "https://github.com/MomoLangenstein/ron"
-branch = "253-untagged-enums"
+rev = "afb960bb8b0402a79260533aa3b9d87a8abae72b"
[dependencies.tracing-subscriber]
version = "0.3.11"
diff --git i/Cargo.lock w/Cargo.lock
index a782756..fe56c1f 100644
--- i/Cargo.lock
+++ w/Cargo.lock
@@ -788,7 +788,7 @@ dependencies = [
[[package]]
name = "ron"
version = "0.8.0"
-source = "git+https://github.com/MomoLangenstein/ron?branch=253-untagged-enums#afb960bb8b0402a79260533aa3b9d87a8abae72b"
+source = "git+https://github.com/MomoLangenstein/ron?rev=afb960bb8b0402a79260533aa3b9d87a8abae72b#afb960bb8b0402a79260533aa3b9d87a8abae72b"
dependencies = [
"base64",
"bitflags",
'')];
cargoSha256 = "sha256-tY7o09Nu1/Lbn//5+iecUmV67Aw1QvVLdUaD8DDgKi0=";
cargoLock.lockFile = ./Cargo.lock;
cargoLock.outputHashes."ron-0.8.0" = "sha256-k+LuTEq97/DohcsulXoLXWqFLzPUzIR1D5pGru+M5Ew=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus ];
EXECSNOOP_PATH = "${bcc}/bin/execsnoop";
postInstall = ''
install -D -m 0644 data/com.system76.Scheduler.conf $out/etc/dbus-1/system.d/com.system76.Scheduler.conf
mkdir -p $out/etc/system76-scheduler
install -D -m 0644 data/*.ron $out/etc/system76-scheduler/
'';
meta = {
description = "System76 Scheduler";
homepage = "https://github.com/pop-os/system76-scheduler";
license = lib.licenses.mpl20;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}