updates from makefile
This commit is contained in:
parent
d28eb42890
commit
fcb6c31999
5 changed files with 131 additions and 30 deletions
105
flake.lock
generated
105
flake.lock
generated
|
|
@ -1,5 +1,21 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -7,11 +23,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1704100519,
|
||||
"narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=",
|
||||
"lastModified": 1704358952,
|
||||
"narHash": "sha256-yazDFmdyKr0JGMqmzQ5bYOW5FWvau8oFvsQ8eSB2f3A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6e91c5df192395753d8e6d55a0352109cb559790",
|
||||
"rev": "c36cb65c4a0ba17ab9262ab3c30920429348746c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -21,13 +37,49 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"libgit2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1697646580,
|
||||
"narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
|
||||
"owner": "libgit2",
|
||||
"repo": "libgit2",
|
||||
"rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "libgit2",
|
||||
"repo": "libgit2",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"libgit2": "libgit2",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-regression": "nixpkgs-regression"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1704320737,
|
||||
"narHash": "sha256-yqu7/fYKTSEDVE8T2ThEGEeqWambFgCaDvsgQnjxzN4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nix",
|
||||
"rev": "65fad9b84c8ed95c3c16ccbfb0a87d8119dea15a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nix",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1704124233,
|
||||
"narHash": "sha256-lBHs/yUtkcGgapHRS31oOb5NqvnVrikvktGOW8rK+sE=",
|
||||
"lastModified": 1704266875,
|
||||
"narHash": "sha256-luA5SGmeIRZlgLfSLUuR3eacS63q2bJ0Yywqak5lj3E=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "f752581d6723a10da7dfe843e917a3b5e4d8115a",
|
||||
"rev": "8e34f33464d77bea2d5cf7dc1066647b1ad2b324",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -39,11 +91,43 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1703961334,
|
||||
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
|
||||
"lastModified": 1701355166,
|
||||
"narHash": "sha256-4V7XMI0Gd+y0zsi++cEHd99u3GNL0xSTGRmiWKzGnUQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "36c4ac09e9bebcec1fa7b7539cddb0c9e837409c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "staging-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-regression": {
|
||||
"locked": {
|
||||
"lastModified": 1643052045,
|
||||
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1704194953,
|
||||
"narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
|
||||
"rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -56,8 +140,9 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nix": "nix",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,7 +13,14 @@
|
|||
#};
|
||||
};
|
||||
|
||||
outputs = inputs: {
|
||||
outputs = inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
nix,
|
||||
nixos-hardware,
|
||||
home-manager,
|
||||
...
|
||||
}: {
|
||||
nixosConfigurations = let
|
||||
workstation = {
|
||||
system = "x86_64-linux";
|
||||
|
|
|
|||
|
|
@ -357,6 +357,7 @@ exec --no-startup-id /usr/bin/gnome-keyring-daemon --start
|
|||
exec wl-paste -t text --watch clipman store
|
||||
exec configure-gtk
|
||||
exec supersonic
|
||||
exec sonixd
|
||||
exec safeeyes
|
||||
exec dovideo.sh
|
||||
exec auto-start
|
||||
|
|
|
|||
45
home/mpv.nix
45
home/mpv.nix
|
|
@ -1,24 +1,31 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
# config = {
|
||||
# cache-dir = "\${HOME}/.cache";
|
||||
# cache-on-disk = "yes";
|
||||
# cache = "yes";
|
||||
# demuxer-max-back-bytes = "100M";
|
||||
# demuxer-max-bytes = "500M";
|
||||
# demuxer-readahead-secs = "20";
|
||||
# pause = "no";
|
||||
# save-position-on-quit = "yes";
|
||||
# slang = "en";
|
||||
# user-agent = "Mozilla/5.0";
|
||||
# ytdl-format = "bestvideo+bestaudio";
|
||||
# ytdl-raw-options = "no-playlist=";
|
||||
# ytdl = "yes";
|
||||
# script-opts = "ytdl_hook-ytdl_path=yt-dlp";
|
||||
# };
|
||||
scripts = [ pkgs.mpvScripts.autoload ];
|
||||
#scripts = [ pkgs.mpvScripts.autoload pkgs.mpvScripts.sponsorblock ];
|
||||
config = {
|
||||
cache-on-disk = "yes";
|
||||
cache = "yes";
|
||||
demuxer-max-back-bytes = "100M";
|
||||
demuxer-max-bytes = "500M";
|
||||
demuxer-readahead-secs = "20";
|
||||
pause = "no";
|
||||
save-position-on-quit = "yes";
|
||||
slang = "en";
|
||||
user-agent = "Mozilla/5.0";
|
||||
ytdl-format = "bestvideo+bestaudio";
|
||||
ytdl-raw-options = "no-playlist=";
|
||||
ytdl = "yes";
|
||||
script-opts = "ytdl_hook-ytdl_path=${pkgs.mpv}/bin/yt-dlp";
|
||||
#scripts = [ pkgs.mpvScripts.autoload ];
|
||||
};
|
||||
profiles = {
|
||||
"protocol.https" = {
|
||||
speed = 1.77;
|
||||
keep-open = true;
|
||||
};
|
||||
"protocol.http" = {
|
||||
profile = "protocol.https";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@
|
|||
qutebrowser
|
||||
rofi
|
||||
signal-desktop
|
||||
sonixd
|
||||
source-code-pro
|
||||
supersonic
|
||||
syncthingtray
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue