1
Fork 0

Compare commits

..

No commits in common. "0d9ea92d0a51f98ee50c9d03791bf0939f28c19b" and "ea282a5569fc9da5e294869ad09141bab57331e7" have entirely different histories.

12 changed files with 34 additions and 90 deletions

View File

@ -1,6 +1,6 @@
# The main configuration file. # The main configuration file.
{ ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
@ -12,10 +12,7 @@
]; ];
nix = { nix = {
settings.experimental-features = [ settings.experimental-features = [ "flakes" "nix-command" ];
"flakes"
"nix-command"
];
}; };
nixpkgs = { nixpkgs = {

View File

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

View File

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

View File

@ -1,6 +1,6 @@
# The main configuration file. # The main configuration file.
{ config, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
@ -15,10 +15,7 @@
musnix.enable = true; musnix.enable = true;
nix = { nix = {
settings.experimental-features = [ settings.experimental-features = [ "flakes" "nix-command" ];
"flakes"
"nix-command"
];
}; };
nixpkgs = { nixpkgs = {

View File

@ -77,9 +77,7 @@
metersLv2 metersLv2
mod-arpeggiator-lv2 mod-arpeggiator-lv2
mpv mpv
nil
nitrogen nitrogen
unstable.nixfmt-rfc-style
nix-output-monitor nix-output-monitor
nodejs nodejs
nodePackages.pnpm nodePackages.pnpm
@ -144,21 +142,13 @@
xorg.libXcursor xorg.libXcursor
zam-plugins zam-plugins
(callPackage ./samrewritten.nix { }) (callPackage ./samrewritten.nix { })
(unstable.clonehero.overrideAttrs ( (unstable.clonehero.overrideAttrs ({ postInstall ? "", ... }: {
{
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

View File

@ -30,10 +30,7 @@
nssmdns = true; nssmdns = true;
}; };
picom = { picom.enable = true;
enable = true;
package = pkgs.picom-next;
};
pipewire = { pipewire = {
alsa.enable = true; alsa.enable = true;

View File

@ -1,13 +1,12 @@
{ { lib
lib, , stdenv
stdenv, , fetchFromGitHub
fetchFromGitHub, , pkg-config
pkg-config, , curl
curl, , glibmm
glibmm, , gtkmm3
gtkmm3, , steam
steam, , yajl
yajl,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,13 +21,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [ curl glibmm gtkmm3 steam yajl ];
curl
glibmm
gtkmm3
steam
yajl
];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];

View File

@ -23,19 +23,9 @@
fonts = { fonts = {
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
monospace = [ monospace = [ "Hasklig" "Victor Mono" "DejaVu Sans Mono" ];
"Hasklig" sansSerif = [ "Inter" "DejaVu Sans" ];
"Victor Mono" serif = [ "Inter" "DejaVu Sans" ];
"DejaVu Sans Mono"
];
sansSerif = [
"Inter"
"DejaVu Sans"
];
serif = [
"Inter"
"DejaVu Sans"
];
}; };
}; };
@ -93,9 +83,13 @@
# 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 = [ "192.168.0.202" ]; insertNameservers = [
"192.168.0.202"
];
}; };
nameservers = [ "192.168.0.202" ]; nameservers = [
"192.168.0.202"
];
}; };
security = { security = {

View File

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

View File

@ -76,14 +76,6 @@
"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)

View File

@ -1,2 +0,0 @@
[global]
warn_timeout = "1m"

View File

@ -1,5 +1,3 @@
double_click_delay = 250
[icons.overrides] [icons.overrides]
bear = "🐻" bear = "🐻"
bunny = "🐇" bunny = "🐇"
@ -22,9 +20,6 @@ hide_when_empty = true
[[block.click]] [[block.click]]
button = "left" button = "left"
cmd = "xdg-open https://rss.azedia.lan" cmd = "xdg-open https://rss.azedia.lan"
[[block.click]]
button = "double_left"
update = true
[[block]] [[block]]
block = "time" block = "time"