tidied core/ and core/modules/
This commit is contained in:
parent
0d15bfd67f
commit
4482e2fdd6
9 changed files with 96 additions and 139 deletions
|
|
@ -8,7 +8,8 @@
|
|||
inputs.home-manager.nixosModules.home-manager
|
||||
|
||||
## Semi-modularised config
|
||||
./packages.nix # system-level packages here - needs tidying
|
||||
./packages.nix # system-level packages - needs tidying
|
||||
./modules # additional modules to import
|
||||
../home/users # user-level packages in ../home/programs/
|
||||
|
||||
];
|
||||
|
|
@ -38,7 +39,7 @@
|
|||
sudo.execWheelOnly = true;
|
||||
polkit = {
|
||||
enable = true;
|
||||
#extraConfig = '' '';
|
||||
#extraConfig = '' '';
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -52,12 +53,8 @@
|
|||
download-buffer-size = [ "268435456" ];
|
||||
allowed-users = [ "@wheel" ];
|
||||
## Enable flakes uwu
|
||||
experimental-features = [
|
||||
"pipe-operators"
|
||||
"recursive-nix"
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
experimental-features =
|
||||
[ "pipe-operators" "recursive-nix" "nix-command" "flakes" ];
|
||||
};
|
||||
|
||||
gc = {
|
||||
|
|
@ -68,7 +65,7 @@
|
|||
## and clear junk older than x days
|
||||
options = "--delete-older-than 2d";
|
||||
## No clue what this does lol.
|
||||
#persistent = true;
|
||||
#persistent = true;
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -94,7 +91,7 @@
|
|||
|
||||
## Apparently prevents getting stuck at shutdown
|
||||
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
|
||||
|
||||
|
||||
## Disable these cuz they cause problems (thx sasha)
|
||||
## see: https://github.com/NixOS/nixpkgs/issues/180175
|
||||
systemd.services = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## https://nixos.wiki/wiki/Category:Audio
|
||||
# # https://nixos.wiki/wiki/Category:Audio
|
||||
## https://nixos.wiki/PipeWire
|
||||
## https://github.com/musnix/musnix
|
||||
## https://nixos.wiki/wiki/Audio_production
|
||||
|
|
@ -53,15 +53,9 @@
|
|||
## Musnix for audio production
|
||||
musnix = {
|
||||
enable = true;
|
||||
rtcqs = {
|
||||
enable = true;
|
||||
};
|
||||
rtirq = {
|
||||
enable = true;
|
||||
};
|
||||
kernel = {
|
||||
realtime = true;
|
||||
};
|
||||
rtcqs = { enable = true; };
|
||||
rtirq = { enable = true; };
|
||||
kernel = { realtime = true; };
|
||||
};
|
||||
|
||||
## Using pipewire baybee
|
||||
|
|
|
|||
|
|
@ -5,11 +5,9 @@
|
|||
imports = [
|
||||
|
||||
## Semi-modularised config
|
||||
./jellyfin.nix # unfinished
|
||||
./regreet.nix # unfinished
|
||||
./misc.nix # stuff that doesn't work in home-manager :(
|
||||
./misc.nix # stuff that doesn't work in `/home` :(
|
||||
./audio.nix # musnix and ... audio ... config
|
||||
./display.nix # declarations for display management
|
||||
./gaming.nix # for gaming stuff, ideally would be in home/
|
||||
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,11 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
## planning to have a discrete config file for
|
||||
## the greeter(s) to keep this file tidy.
|
||||
./regreet.nix
|
||||
./regreet.nix # the greeter(s) to keep this file tidy.
|
||||
];
|
||||
|
||||
boot = {
|
||||
|
||||
|
||||
bootspec.enable = true;
|
||||
consoleLogLevel = 0;
|
||||
initrd.verbose = false;
|
||||
|
|
@ -27,11 +25,11 @@
|
|||
timeout = 30;
|
||||
|
||||
#grub = {
|
||||
#theme = "${pkgs.minimal-grub-theme}";
|
||||
#backgroundColor = "#000000";
|
||||
#splashImage = "path/to/image";
|
||||
#font = "${pkgs.spleen}/share/fonts/spleen-32x64";
|
||||
#fontSize = 16;
|
||||
#theme = "${pkgs.minimal-grub-theme}";
|
||||
#backgroundColor = "#000000";
|
||||
#splashImage = "path/to/image";
|
||||
#font = "${pkgs.spleen}/share/fonts/spleen-32x64";
|
||||
#fontSize = 16;
|
||||
#};
|
||||
|
||||
};
|
||||
|
|
@ -40,20 +38,18 @@
|
|||
enable = true;
|
||||
|
||||
#logo = pkgs.fetchurl {
|
||||
#url = "https://nixos.org/logo/nixos-hires.png";
|
||||
#hash = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
|
||||
#url = "https://nixos.org/logo/nixos-hires.png";
|
||||
#hash = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
|
||||
#};
|
||||
#font = "${pkgs.spleen}/share/fonts/spleen-32x64";
|
||||
|
||||
theme = "circuit";
|
||||
themePackages = with pkgs; [
|
||||
(adi1090x-plymouth-themes.override {
|
||||
selected_themes = [
|
||||
"circle"
|
||||
"circuit"
|
||||
];
|
||||
})
|
||||
];
|
||||
themePackages = with pkgs;
|
||||
[
|
||||
(adi1090x-plymouth-themes.override {
|
||||
selected_themes = [ "circle" "circuit" ];
|
||||
})
|
||||
];
|
||||
|
||||
#extraConfig = '''';
|
||||
|
||||
|
|
@ -73,8 +69,8 @@
|
|||
## Standard(?) xwayland implementation
|
||||
xwayland = {
|
||||
enable = true;
|
||||
#package = [ ];
|
||||
#defaultFontPath = "/run/current-system/sw/share/X11/fonts";
|
||||
#package = [ ];
|
||||
#defaultFontPath = "/run/current-system/sw/share/X11/fonts";
|
||||
};
|
||||
|
||||
## enable sway window manager
|
||||
|
|
@ -104,25 +100,25 @@
|
|||
wants = [ "graphical-session.target" ];
|
||||
after = [ "graphical-session.target" ];
|
||||
};
|
||||
|
||||
|
||||
xdg = {
|
||||
portal = {
|
||||
#enable = true;
|
||||
#xdgOpenUsePortal = true;
|
||||
#enable = true;
|
||||
#xdgOpenUsePortal = true;
|
||||
#config = {
|
||||
#common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||
#common.default = [ "gtk" "gnome" ];
|
||||
#sway.default = [ "gtk" "gnome" ];
|
||||
#common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||
#common.default = [ "gtk" "gnome" ];
|
||||
#sway.default = [ "gtk" "gnome" ];
|
||||
#};
|
||||
#configPackages = with pkgs; [
|
||||
#xdg-desktop-portal-gtk
|
||||
#xdg-desktop-portal-wlr
|
||||
#xdg-desktop-portal-gnome
|
||||
#xdg-desktop-portal-gtk
|
||||
#xdg-desktop-portal-wlr
|
||||
#xdg-desktop-portal-gnome
|
||||
#];
|
||||
#extraPortals = with pkgs; [
|
||||
#xdg-desktop-portal-gtk
|
||||
#xdg-desktop-portal-wlr
|
||||
#xdg-desktop-portal-gnome
|
||||
#xdg-desktop-portal-gtk
|
||||
#xdg-desktop-portal-wlr
|
||||
#xdg-desktop-portal-gnome
|
||||
#];
|
||||
};
|
||||
};
|
||||
|
|
@ -158,22 +154,18 @@
|
|||
## I put fonts here because i didn't know where tf else to put them lol
|
||||
## duplicate to home-manager config
|
||||
fonts = {
|
||||
packages = with pkgs; [
|
||||
spleen
|
||||
terminus_font
|
||||
terminus_font_ttf
|
||||
nerd-fonts.symbols-only
|
||||
] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
|
||||
packages = with pkgs;
|
||||
[ spleen terminus_font terminus_font_ttf nerd-fonts.symbols-only ]
|
||||
++ builtins.filter lib.attrsets.isDerivation
|
||||
(builtins.attrValues pkgs.nerd-fonts);
|
||||
fontDir.enable = true;
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
serif = [ "spleen-32x64" ];
|
||||
sansSerif = [ "spleen-32x64" ];
|
||||
sansSerif = [ "spleen-32x64" ];
|
||||
monospace = [ "TerminusTTF" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,10 +8,7 @@
|
|||
## Open tablet driver, for Osu!, mainly.
|
||||
enable = true;
|
||||
## Disable conflicting drivers
|
||||
blacklistedKernelModules = [
|
||||
"hid-uclogic"
|
||||
"wacom"
|
||||
];
|
||||
blacklistedKernelModules = [ "hid-uclogic" "wacom" ];
|
||||
## Enables the daemon via systemd
|
||||
daemon.enable = true;
|
||||
};
|
||||
|
|
@ -20,7 +17,7 @@
|
|||
|
||||
services = {
|
||||
## Enabling flatpak in case i need it
|
||||
#flatpak.enable = true;
|
||||
#flatpak.enable = true;
|
||||
## ratbagd for gaming mouse config
|
||||
ratbagd.enable = true;
|
||||
};
|
||||
|
|
@ -30,12 +27,13 @@
|
|||
systemPackages = with pkgs; [ piper ];
|
||||
## These are important apparently :uh:
|
||||
sessionVariables = {
|
||||
XDG_CACHE_HOME = "$HOME/.cache";
|
||||
XDG_CACHE_HOME = "$HOME/.cache";
|
||||
XDG_CONFIG_HOME = "$HOME/.config";
|
||||
XDG_BIN_HOME = "$HOME/.local/bin";
|
||||
XDG_DATA_HOME = "$HOME/.local/share";
|
||||
XDG_BIN_HOME = "$HOME/.local/bin";
|
||||
XDG_DATA_HOME = "$HOME/.local/share";
|
||||
## Steam needs this to find Proton-GE
|
||||
STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
|
||||
STEAM_EXTRA_COMPAT_TOOLS_PATHS =
|
||||
"\${HOME}/.steam/root/compatibilitytools.d";
|
||||
## Note: this doesn't replace PATH, it just adds this to it
|
||||
PATH = [ "\${XDG_BIN_HOME}" ];
|
||||
SDL_VIDEODRIVER = "wayland";
|
||||
|
|
@ -57,9 +55,7 @@
|
|||
gamemode = {
|
||||
enable = true;
|
||||
settings = {
|
||||
general = {
|
||||
renice = 10;
|
||||
};
|
||||
general = { renice = 10; };
|
||||
## Warning: GPU optimisations have the potential to damage hardware
|
||||
gpu = {
|
||||
apply_gpu_optimisations = "accept-responsibility";
|
||||
|
|
@ -67,8 +63,8 @@
|
|||
amd_performance_level = "high";
|
||||
};
|
||||
custom = {
|
||||
#start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
|
||||
#end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
|
||||
#start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
|
||||
#end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -82,33 +78,28 @@
|
|||
#};
|
||||
## No clue what this is doing
|
||||
package = pkgs.steam.override {
|
||||
extraLibraries = pkgs: [
|
||||
pkgs.xorg.libxcb
|
||||
];
|
||||
## No clue what this shit does
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXScrnSaver
|
||||
libpng
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
stdenv.cc.cc.lib
|
||||
libkrb5
|
||||
keyutils
|
||||
gamemode
|
||||
];
|
||||
extraLibraries = pkgs: [ pkgs.xorg.libxcb ];
|
||||
## No clue what this shit does
|
||||
extraPkgs = pkgs:
|
||||
with pkgs; [
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXScrnSaver
|
||||
libpng
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
stdenv.cc.cc.lib
|
||||
libkrb5
|
||||
keyutils
|
||||
gamemode
|
||||
];
|
||||
};
|
||||
## Not sure we need gamescope here
|
||||
## as it's defined elsewhere but o well
|
||||
extraPackages = with pkgs; [
|
||||
gamescope
|
||||
];
|
||||
extraPackages = with pkgs; [ gamescope ];
|
||||
## Gotta have the glorious eggroll
|
||||
extraCompatPackages = with pkgs; [
|
||||
proton-ge-bin
|
||||
];
|
||||
extraCompatPackages = with pkgs; [ proton-ge-bin ];
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,17 +2,15 @@
|
|||
|
||||
{
|
||||
|
||||
imports = [
|
||||
];
|
||||
imports = [ ];
|
||||
|
||||
programs = {
|
||||
};
|
||||
programs = { };
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
## Jellyfin for home media share
|
||||
jellyfin
|
||||
jellyfin-web
|
||||
jellyfin-ffmpeg
|
||||
];
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,36 +6,26 @@
|
|||
security.pam.services.serenity.enableGnomeKeyring = true;
|
||||
|
||||
programs = {
|
||||
## For when bimbo needs to play with platters and cbf to deal with cli
|
||||
gnome-disks.enable = true;
|
||||
## GTK secrets management
|
||||
seahorse.enable = true;
|
||||
## Use android device as a webcam
|
||||
droidcam.enable = true;
|
||||
obs-studio = {
|
||||
gnome-disks.enable = true; # For when bimbo needs to manage disks
|
||||
seahorse.enable = true; # GTK secrets management
|
||||
droidcam.enable = true; # Use android device as a webcam
|
||||
obs-studio = { # screen capture, recording, and sharing
|
||||
enable = true;
|
||||
enableVirtualCamera = true;
|
||||
enableVirtualCamera = true; # virtual webcam
|
||||
plugins = with pkgs.obs-studio-plugins; [
|
||||
droidcam-obs
|
||||
droidcam-obs # enables droidcam integration
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
services = {
|
||||
## dont think i NEED this tbh
|
||||
libinput.enable = true;
|
||||
## Virtual filesystem, needed this for something i think ?
|
||||
gvfs.enable = true;
|
||||
## Dbus is for ...
|
||||
dbus.enable = true;
|
||||
## no clue
|
||||
upower.enable = true;
|
||||
## for managing disks
|
||||
udisks2.enable = true;
|
||||
## GNOME keyring
|
||||
gnome.gnome-keyring.enable = true;
|
||||
|
||||
libinput.enable = true; # don't think we NEED this tbh - unsure
|
||||
gvfs.enable = true; # virtual filesystem, needed this for ... something
|
||||
dbus.enable = true; # dbus is for ... unsure
|
||||
upower.enable = true; # no clue
|
||||
udisks2.enable = true; # disk management service
|
||||
gnome.gnome-keyring.enable = true; # for sudo prompts and stuff
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ inputs, lib, config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff \
|
||||
/run/current-system "$systemConfig"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs = {
|
||||
|
||||
|
|
@ -136,8 +136,8 @@
|
|||
smartmontools # Tools for monitoring HDD health
|
||||
magic-wormhole # Direct file sharing
|
||||
|
||||
gay # dw abt it
|
||||
blahaj # dw abt this either
|
||||
gay # dw abt it
|
||||
blahaj # dw abt this either
|
||||
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,12 +10,9 @@
|
|||
./syncthing.nix # syncthing configuration
|
||||
./zfs.nix # zfs configuration
|
||||
|
||||
## Selected core modules for import
|
||||
../../../core/modules/display.nix # display stuff
|
||||
#../../../core/modules/regreet.nix # regreet customisation
|
||||
../../../core/modules/misc.nix # didnt work in home-manager :(
|
||||
## Additional core modules to import
|
||||
../../../core/modules/jellyfin.nix
|
||||
../../../core/modules/gaming.nix # didnt work in home-manager :(
|
||||
../../../core/modules/audio.nix # sound configuration
|
||||
|
||||
];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue