Use Nil and Nixfmt for formatting and run it through everything.
This commit is contained in:
parent
72a2e56864
commit
9484124fed
|
@ -1,6 +1,6 @@
|
||||||
# The main configuration file.
|
# The main configuration file.
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -12,7 +12,10 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
settings.experimental-features = [ "flakes" "nix-command" ];
|
settings.experimental-features = [
|
||||||
|
"flakes"
|
||||||
|
"nix-command"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Configuration for programs and services.
|
# Configuration for programs and services.
|
||||||
|
|
||||||
{ pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs = {
|
programs = {
|
||||||
|
|
|
@ -8,7 +8,10 @@
|
||||||
|
|
||||||
users.bauke = {
|
users.bauke = {
|
||||||
description = "Bauke";
|
description = "Bauke";
|
||||||
extraGroups = [ "docker" "wheel" ];
|
extraGroups = [
|
||||||
|
"docker"
|
||||||
|
"wheel"
|
||||||
|
];
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# The main configuration file.
|
# The main configuration file.
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -15,7 +15,10 @@
|
||||||
musnix.enable = true;
|
musnix.enable = true;
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
settings.experimental-features = [ "flakes" "nix-command" ];
|
settings.experimental-features = [
|
||||||
|
"flakes"
|
||||||
|
"nix-command"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|
|
@ -144,13 +144,21 @@
|
||||||
xorg.libXcursor
|
xorg.libXcursor
|
||||||
zam-plugins
|
zam-plugins
|
||||||
(callPackage ./samrewritten.nix { })
|
(callPackage ./samrewritten.nix { })
|
||||||
(unstable.clonehero.overrideAttrs ({ postInstall ? "", ... }: {
|
(unstable.clonehero.overrideAttrs (
|
||||||
|
{
|
||||||
|
postInstall ? "",
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
# Remove the built-in songs from Clone Hero.
|
# Remove the built-in songs from Clone Hero.
|
||||||
postInstall = postInstall + ''
|
postInstall =
|
||||||
|
postInstall
|
||||||
|
+ ''
|
||||||
rm -rf "$out/share/clonehero/StreamingAssets/songs"
|
rm -rf "$out/share/clonehero/StreamingAssets/songs"
|
||||||
mkdir "$out/share/clonehero/StreamingAssets/songs"
|
mkdir "$out/share/clonehero/StreamingAssets/songs"
|
||||||
'';
|
'';
|
||||||
}))
|
}
|
||||||
|
))
|
||||||
(wrapOBS {
|
(wrapOBS {
|
||||||
plugins = with obs-studio-plugins; [
|
plugins = with obs-studio-plugins; [
|
||||||
input-overlay
|
input-overlay
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
{ lib
|
{
|
||||||
, stdenv
|
lib,
|
||||||
, fetchFromGitHub
|
stdenv,
|
||||||
, pkg-config
|
fetchFromGitHub,
|
||||||
, curl
|
pkg-config,
|
||||||
, glibmm
|
curl,
|
||||||
, gtkmm3
|
glibmm,
|
||||||
, steam
|
gtkmm3,
|
||||||
, yajl
|
steam,
|
||||||
|
yajl,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -21,7 +22,13 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ curl glibmm gtkmm3 steam yajl ];
|
buildInputs = [
|
||||||
|
curl
|
||||||
|
glibmm
|
||||||
|
gtkmm3
|
||||||
|
steam
|
||||||
|
yajl
|
||||||
|
];
|
||||||
|
|
||||||
installFlags = [ "PREFIX=$(out)" ];
|
installFlags = [ "PREFIX=$(out)" ];
|
||||||
|
|
||||||
|
|
|
@ -23,9 +23,19 @@
|
||||||
fonts = {
|
fonts = {
|
||||||
fontconfig = {
|
fontconfig = {
|
||||||
defaultFonts = {
|
defaultFonts = {
|
||||||
monospace = [ "Hasklig" "Victor Mono" "DejaVu Sans Mono" ];
|
monospace = [
|
||||||
sansSerif = [ "Inter" "DejaVu Sans" ];
|
"Hasklig"
|
||||||
serif = [ "Inter" "DejaVu Sans" ];
|
"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
|
# specified twice. To make it work, right-click the NetworkManager tray
|
||||||
# icon and toggle "Enable Networking", then check "/etc/resolv.conf" that
|
# icon and toggle "Enable Networking", then check "/etc/resolv.conf" that
|
||||||
# this IP is at the top.
|
# this IP is at the top.
|
||||||
insertNameservers = [
|
insertNameservers = [ "192.168.0.202" ];
|
||||||
"192.168.0.202"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
nameservers = [
|
nameservers = [ "192.168.0.202" ];
|
||||||
"192.168.0.202"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
security = {
|
security = {
|
||||||
|
|
|
@ -8,7 +8,13 @@
|
||||||
|
|
||||||
users.bauke = {
|
users.bauke = {
|
||||||
description = "Bauke";
|
description = "Bauke";
|
||||||
extraGroups = [ "adbusers" "networkmanager" "plugdev" "vboxusers" "wheel" ];
|
extraGroups = [
|
||||||
|
"adbusers"
|
||||||
|
"networkmanager"
|
||||||
|
"plugdev"
|
||||||
|
"vboxusers"
|
||||||
|
"wheel"
|
||||||
|
];
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -76,6 +76,14 @@
|
||||||
"liveServer.settings.wait": 1000,
|
"liveServer.settings.wait": 1000,
|
||||||
// Nix (ID: jnoortheen.nix-ide)
|
// Nix (ID: jnoortheen.nix-ide)
|
||||||
"nix.enableLanguageServer": true,
|
"nix.enableLanguageServer": true,
|
||||||
|
"nix.serverPath": "nil",
|
||||||
|
"nix.serverSettings": {
|
||||||
|
"nil": {
|
||||||
|
"formatting": {
|
||||||
|
"command": ["nixfmt"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
// Nix Environment Selector (ID: arrterian.nix-env-selector)
|
// Nix Environment Selector (ID: arrterian.nix-env-selector)
|
||||||
"nixEnvSelector.nixFile": "${workspaceRoot}/flake.nix",
|
"nixEnvSelector.nixFile": "${workspaceRoot}/flake.nix",
|
||||||
// vscode-pdf (ID: tomoki1207.pdf)
|
// vscode-pdf (ID: tomoki1207.pdf)
|
||||||
|
|
Loading…
Reference in New Issue