diff --git a/.bauke/nix/azedia/configuration.nix b/.bauke/nix/azedia/configuration.nix index e8eceef..a316cc9 100644 --- a/.bauke/nix/azedia/configuration.nix +++ b/.bauke/nix/azedia/configuration.nix @@ -1,6 +1,6 @@ # The main configuration file. -{ config, pkgs, ... }: +{ ... }: { imports = [ @@ -12,7 +12,10 @@ ]; nix = { - settings.experimental-features = [ "flakes" "nix-command" ]; + settings.experimental-features = [ + "flakes" + "nix-command" + ]; }; nixpkgs = { diff --git a/.bauke/nix/azedia/programs-services.nix b/.bauke/nix/azedia/programs-services.nix index 06289b3..d8ce29c 100644 --- a/.bauke/nix/azedia/programs-services.nix +++ b/.bauke/nix/azedia/programs-services.nix @@ -1,6 +1,6 @@ # Configuration for programs and services. -{ pkgs, ... }: +{ ... }: { programs = { diff --git a/.bauke/nix/azedia/users.nix b/.bauke/nix/azedia/users.nix index f22ca45..480404e 100644 --- a/.bauke/nix/azedia/users.nix +++ b/.bauke/nix/azedia/users.nix @@ -8,7 +8,10 @@ users.bauke = { description = "Bauke"; - extraGroups = [ "docker" "wheel" ]; + extraGroups = [ + "docker" + "wheel" + ]; isNormalUser = true; }; }; diff --git a/.bauke/nix/stardust/configuration.nix b/.bauke/nix/stardust/configuration.nix index 0a16587..d080ead 100644 --- a/.bauke/nix/stardust/configuration.nix +++ b/.bauke/nix/stardust/configuration.nix @@ -1,6 +1,6 @@ # The main configuration file. -{ config, pkgs, ... }: +{ config, ... }: { imports = [ @@ -15,7 +15,10 @@ musnix.enable = true; nix = { - settings.experimental-features = [ "flakes" "nix-command" ]; + settings.experimental-features = [ + "flakes" + "nix-command" + ]; }; nixpkgs = { diff --git a/.bauke/nix/stardust/packages.nix b/.bauke/nix/stardust/packages.nix index 055656b..c265815 100644 --- a/.bauke/nix/stardust/packages.nix +++ b/.bauke/nix/stardust/packages.nix @@ -144,13 +144,21 @@ xorg.libXcursor zam-plugins (callPackage ./samrewritten.nix { }) - (unstable.clonehero.overrideAttrs ({ postInstall ? "", ... }: { - # Remove the built-in songs from Clone Hero. - postInstall = postInstall + '' - rm -rf "$out/share/clonehero/StreamingAssets/songs" - mkdir "$out/share/clonehero/StreamingAssets/songs" - ''; - })) + (unstable.clonehero.overrideAttrs ( + { + postInstall ? "", + ... + }: + { + # Remove the built-in songs from Clone Hero. + postInstall = + postInstall + + '' + rm -rf "$out/share/clonehero/StreamingAssets/songs" + mkdir "$out/share/clonehero/StreamingAssets/songs" + ''; + } + )) (wrapOBS { plugins = with obs-studio-plugins; [ input-overlay diff --git a/.bauke/nix/stardust/samrewritten.nix b/.bauke/nix/stardust/samrewritten.nix index 1d80fe9..1933ebc 100644 --- a/.bauke/nix/stardust/samrewritten.nix +++ b/.bauke/nix/stardust/samrewritten.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, curl -, glibmm -, gtkmm3 -, steam -, yajl +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + curl, + glibmm, + gtkmm3, + steam, + yajl, }: stdenv.mkDerivation rec { @@ -21,7 +22,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ curl glibmm gtkmm3 steam yajl ]; + buildInputs = [ + curl + glibmm + gtkmm3 + steam + yajl + ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/.bauke/nix/stardust/system.nix b/.bauke/nix/stardust/system.nix index d43102d..19880d7 100644 --- a/.bauke/nix/stardust/system.nix +++ b/.bauke/nix/stardust/system.nix @@ -23,9 +23,19 @@ fonts = { fontconfig = { defaultFonts = { - monospace = [ "Hasklig" "Victor Mono" "DejaVu Sans Mono" ]; - sansSerif = [ "Inter" "DejaVu Sans" ]; - serif = [ "Inter" "DejaVu Sans" ]; + monospace = [ + "Hasklig" + "Victor Mono" + "DejaVu Sans Mono" + ]; + sansSerif = [ + "Inter" + "DejaVu Sans" + ]; + serif = [ + "Inter" + "DejaVu Sans" + ]; }; }; @@ -83,13 +93,9 @@ # specified twice. To make it work, right-click the NetworkManager tray # icon and toggle "Enable Networking", then check "/etc/resolv.conf" that # this IP is at the top. - insertNameservers = [ - "192.168.0.202" - ]; + insertNameservers = [ "192.168.0.202" ]; }; - nameservers = [ - "192.168.0.202" - ]; + nameservers = [ "192.168.0.202" ]; }; security = { diff --git a/.bauke/nix/stardust/users.nix b/.bauke/nix/stardust/users.nix index 0981dcd..c952149 100644 --- a/.bauke/nix/stardust/users.nix +++ b/.bauke/nix/stardust/users.nix @@ -8,7 +8,13 @@ users.bauke = { description = "Bauke"; - extraGroups = [ "adbusers" "networkmanager" "plugdev" "vboxusers" "wheel" ]; + extraGroups = [ + "adbusers" + "networkmanager" + "plugdev" + "vboxusers" + "wheel" + ]; isNormalUser = true; }; }; diff --git a/.config/VSCodium/User/settings.json b/.config/VSCodium/User/settings.json index 8b0a43f..5f8eafb 100644 --- a/.config/VSCodium/User/settings.json +++ b/.config/VSCodium/User/settings.json @@ -76,6 +76,14 @@ "liveServer.settings.wait": 1000, // Nix (ID: jnoortheen.nix-ide) "nix.enableLanguageServer": true, + "nix.serverPath": "nil", + "nix.serverSettings": { + "nil": { + "formatting": { + "command": ["nixfmt"] + } + } + }, // Nix Environment Selector (ID: arrterian.nix-env-selector) "nixEnvSelector.nixFile": "${workspaceRoot}/flake.nix", // vscode-pdf (ID: tomoki1207.pdf)