1
Fork 0

Use Nil and Nixfmt for formatting and run it through everything.

This commit is contained in:
Bauke 2024-02-29 22:27:30 +01:00
parent 72a2e56864
commit 9484124fed
Signed by: Bauke
GPG Key ID: C1C0F29952BCF558
9 changed files with 77 additions and 33 deletions

View File

@ -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 = {

View File

@ -1,6 +1,6 @@
# Configuration for programs and services.
{ pkgs, ... }:
{ ... }:
{
programs = {

View File

@ -8,7 +8,10 @@
users.bauke = {
description = "Bauke";
extraGroups = [ "docker" "wheel" ];
extraGroups = [
"docker"
"wheel"
];
isNormalUser = true;
};
};

View File

@ -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 = {

View File

@ -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

View File

@ -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)" ];

View File

@ -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 = {

View File

@ -8,7 +8,13 @@
users.bauke = {
description = "Bauke";
extraGroups = [ "adbusers" "networkmanager" "plugdev" "vboxusers" "wheel" ];
extraGroups = [
"adbusers"
"networkmanager"
"plugdev"
"vboxusers"
"wheel"
];
isNormalUser = true;
};
};

View File

@ -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)