Upgrade to nixfmt-rfc-style
This commit is contained in:
parent
0565c43ef9
commit
42b8f67be8
|
@ -1,4 +1,10 @@
|
||||||
{ config, lib, pkgs, inputs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
|
@ -6,9 +12,11 @@ with pkgs;
|
||||||
# Kernel configuration
|
# Kernel configuration
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||||
kernelParams =
|
|
||||||
[ "zfs.zfs_arc_max=8589934592" "zfs.zfs_arc_min=1073741824" ];
|
|
||||||
blacklistedKernelModules = [ "btusb" "bluetooth" ];
|
blacklistedKernelModules = [ "btusb" "bluetooth" ];
|
||||||
|
kernelParams = [
|
||||||
|
"zfs.zfs_arc_max=8589934592"
|
||||||
|
"zfs.zfs_arc_min=1073741824"
|
||||||
|
];
|
||||||
supportedFilesystems = [ "zfs" ];
|
supportedFilesystems = [ "zfs" ];
|
||||||
zfs = {
|
zfs = {
|
||||||
requestEncryptionCredentials = true;
|
requestEncryptionCredentials = true;
|
||||||
|
@ -38,7 +46,10 @@ with pkgs;
|
||||||
nix = {
|
nix = {
|
||||||
settings = {
|
settings = {
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
trusted-users = [ "root" "coolneng" ];
|
trusted-users = [
|
||||||
|
"root"
|
||||||
|
"coolneng"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
gc = {
|
gc = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
|
@ -76,7 +87,12 @@ with pkgs;
|
||||||
users.users.coolneng = {
|
users.users.coolneng = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
home = "/home/coolneng";
|
home = "/home/coolneng";
|
||||||
extraGroups = [ "wheel" "video" "audio" "lp" ];
|
extraGroups = [
|
||||||
|
"wheel"
|
||||||
|
"video"
|
||||||
|
"audio"
|
||||||
|
"lp"
|
||||||
|
];
|
||||||
shell = fish;
|
shell = fish;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -97,15 +113,25 @@ with pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Use same version of nixpkgs for nix-shell
|
# Use same version of nixpkgs for nix-shell
|
||||||
nix.nixPath = let path = toString ./.;
|
nix.nixPath =
|
||||||
in [ "nixpkgs=${inputs.nixpkgs}" "nixos-config=${path}/configuration.nix" ];
|
let
|
||||||
|
path = toString ./.;
|
||||||
|
in
|
||||||
|
[
|
||||||
|
"nixpkgs=${inputs.nixpkgs}"
|
||||||
|
"nixos-config=${path}/configuration.nix"
|
||||||
|
];
|
||||||
|
|
||||||
# Auto-upgrade the system
|
# Auto-upgrade the system
|
||||||
system.autoUpgrade = {
|
system.autoUpgrade = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dates = "22:30";
|
dates = "22:30";
|
||||||
flake = "/home/coolneng/Projects/panacea";
|
flake = "/home/coolneng/Projects/panacea";
|
||||||
flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
|
flags = [
|
||||||
|
"--update-input"
|
||||||
|
"nixpkgs"
|
||||||
|
"--commit-lock-file"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Add required dependencies to the auto-upgrade service
|
# Add required dependencies to the auto-upgrade service
|
||||||
|
|
|
@ -1,16 +1,25 @@
|
||||||
{ config, lib, pkgs, inputs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
let
|
let
|
||||||
# HACK Replace youtube-dl with yt-dlp in mopidy-youtube
|
# HACK Replace youtube-dl with yt-dlp in mopidy-youtube
|
||||||
mopidy-youtube-yt_dlp = mopidy-youtube.overrideAttrs (old: rec {
|
mopidy-youtube-yt_dlp = mopidy-youtube.overrideAttrs (old: rec {
|
||||||
propagatedBuildInputs = old.propagatedBuildInputs
|
propagatedBuildInputs = old.propagatedBuildInputs ++ [
|
||||||
++ [ python3.pkgs.yt-dlp python3.pkgs.ytmusicapi ];
|
python3.pkgs.yt-dlp
|
||||||
|
python3.pkgs.ytmusicapi
|
||||||
|
];
|
||||||
});
|
});
|
||||||
soundcloud_token = builtins.readFile ../secrets/soundcloud_token;
|
soundcloud_token = builtins.readFile ../secrets/soundcloud_token;
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
# Configure pipewire as sound server
|
# Configure pipewire as sound server
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,23 @@
|
||||||
{ config, lib, pkgs, inputs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
let
|
let
|
||||||
custom-mpv = (mpv-unwrapped.wrapper {
|
custom-mpv = (
|
||||||
mpv = mpv-unwrapped;
|
mpv-unwrapped.wrapper {
|
||||||
scripts = with mpvScripts; [ sponsorblock-minimal mpv-cheatsheet ];
|
mpv = mpv-unwrapped;
|
||||||
});
|
scripts = with mpvScripts; [
|
||||||
|
sponsorblock-minimal
|
||||||
|
mpv-cheatsheet
|
||||||
|
];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
patched-bitwig = bitwig-studio.overrideAttrs (old: rec {
|
patched-bitwig = bitwig-studio.overrideAttrs (old: rec {
|
||||||
src = "${inputs.local-bitwig}/bitwig-studio.deb";
|
src = "${inputs.local-bitwig}/bitwig-studio.deb";
|
||||||
|
@ -15,7 +26,8 @@ let
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
# Monitoring
|
# Monitoring
|
||||||
htop
|
htop
|
||||||
|
@ -102,7 +114,7 @@ in {
|
||||||
shellcheck
|
shellcheck
|
||||||
shfmt
|
shfmt
|
||||||
## Nix
|
## Nix
|
||||||
nixfmt
|
nixfmt-rfc-style
|
||||||
## Python
|
## Python
|
||||||
nodePackages.pyright
|
nodePackages.pyright
|
||||||
black
|
black
|
||||||
|
|
Loading…
Reference in New Issue