Compare commits

..

No commits in common. "42b8f67be810965a07f38e05d8a1b62020ee9b7f" and "c9fc8cf3bcf7db2f503053aa8349463dcfc30d78" have entirely different histories.

4 changed files with 22 additions and 77 deletions

View File

@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
inputs,
...
}:
{ config, lib, pkgs, inputs, ... }:
with pkgs;
@ -12,11 +6,9 @@ with pkgs;
# Kernel configuration
boot = {
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
kernelParams =
[ "zfs.zfs_arc_max=8589934592" "zfs.zfs_arc_min=1073741824" ];
blacklistedKernelModules = [ "btusb" "bluetooth" ];
kernelParams = [
"zfs.zfs_arc_max=8589934592"
"zfs.zfs_arc_min=1073741824"
];
supportedFilesystems = [ "zfs" ];
zfs = {
requestEncryptionCredentials = true;
@ -46,10 +38,7 @@ with pkgs;
nix = {
settings = {
auto-optimise-store = true;
trusted-users = [
"root"
"coolneng"
];
trusted-users = [ "root" "coolneng" ];
};
gc = {
automatic = true;
@ -87,12 +76,7 @@ with pkgs;
users.users.coolneng = {
isNormalUser = true;
home = "/home/coolneng";
extraGroups = [
"wheel"
"video"
"audio"
"lp"
];
extraGroups = [ "wheel" "video" "audio" "lp" ];
shell = fish;
};
@ -113,25 +97,15 @@ with pkgs;
};
# Use same version of nixpkgs for nix-shell
nix.nixPath =
let
path = toString ./.;
in
[
"nixpkgs=${inputs.nixpkgs}"
"nixos-config=${path}/configuration.nix"
];
nix.nixPath = let path = toString ./.;
in [ "nixpkgs=${inputs.nixpkgs}" "nixos-config=${path}/configuration.nix" ];
# Auto-upgrade the system
system.autoUpgrade = {
enable = true;
dates = "22:30";
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

View File

@ -1,25 +1,16 @@
{
config,
lib,
pkgs,
inputs,
...
}:
{ config, lib, pkgs, inputs, ... }:
with pkgs;
let
# HACK Replace youtube-dl with yt-dlp in mopidy-youtube
mopidy-youtube-yt_dlp = mopidy-youtube.overrideAttrs (old: rec {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
python3.pkgs.yt-dlp
python3.pkgs.ytmusicapi
];
propagatedBuildInputs = old.propagatedBuildInputs
++ [ python3.pkgs.yt-dlp python3.pkgs.ytmusicapi ];
});
soundcloud_token = builtins.readFile ../secrets/soundcloud_token;
in
{
in {
# Configure pipewire as sound server
services.pipewire = {
enable = true;
@ -30,12 +21,9 @@ in
pulse.enable = true;
wireplumber.enable = true;
# Enable pipewire-pulse's audio via TCP
extraConfig.pipewire-pulse.tcp-server = {
extraConfig.pipewire-pulse = {
"pulse.properties" = {
"server.address" = [
"unix:native"
"tcp:127.0.0.1:4713"
];
"server.address" = [ "unix:native" "tcp:127.0.0.1:4713" ];
};
};
};

View File

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
with pkgs;

View File

@ -1,23 +1,12 @@
{
config,
lib,
pkgs,
inputs,
...
}:
{ config, lib, pkgs, inputs, ... }:
with pkgs;
let
custom-mpv = (
mpv-unwrapped.wrapper {
custom-mpv = (mpv-unwrapped.wrapper {
mpv = mpv-unwrapped;
scripts = with mpvScripts; [
sponsorblock-minimal
mpv-cheatsheet
];
}
);
scripts = with mpvScripts; [ sponsorblock-minimal mpv-cheatsheet ];
});
patched-bitwig = bitwig-studio.overrideAttrs (old: rec {
src = "${inputs.local-bitwig}/bitwig-studio.deb";
@ -26,8 +15,7 @@ let
'';
});
in
{
in {
environment.systemPackages = [
# Monitoring
htop
@ -114,7 +102,7 @@ in
shellcheck
shfmt
## Nix
nixfmt-rfc-style
nixfmt
## Python
nodePackages.pyright
black