tidied core/ and core/modules/

This commit is contained in:
serenity-F 2024-12-27 00:23:44 +10:00
parent 0d15bfd67f
commit 4482e2fdd6
9 changed files with 96 additions and 139 deletions

View file

@ -8,7 +8,8 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
## Semi-modularised config ## 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/ ../home/users # user-level packages in ../home/programs/
]; ];
@ -38,7 +39,7 @@
sudo.execWheelOnly = true; sudo.execWheelOnly = true;
polkit = { polkit = {
enable = true; enable = true;
#extraConfig = '' ''; #extraConfig = '' '';
}; };
}; };
@ -52,12 +53,8 @@
download-buffer-size = [ "268435456" ]; download-buffer-size = [ "268435456" ];
allowed-users = [ "@wheel" ]; allowed-users = [ "@wheel" ];
## Enable flakes uwu ## Enable flakes uwu
experimental-features = [ experimental-features =
"pipe-operators" [ "pipe-operators" "recursive-nix" "nix-command" "flakes" ];
"recursive-nix"
"nix-command"
"flakes"
];
}; };
gc = { gc = {
@ -68,7 +65,7 @@
## and clear junk older than x days ## and clear junk older than x days
options = "--delete-older-than 2d"; options = "--delete-older-than 2d";
## No clue what this does lol. ## No clue what this does lol.
#persistent = true; #persistent = true;
}; };
}; };

View file

@ -1,4 +1,4 @@
## https://nixos.wiki/wiki/Category:Audio # # https://nixos.wiki/wiki/Category:Audio
## https://nixos.wiki/PipeWire ## https://nixos.wiki/PipeWire
## https://github.com/musnix/musnix ## https://github.com/musnix/musnix
## https://nixos.wiki/wiki/Audio_production ## https://nixos.wiki/wiki/Audio_production
@ -53,15 +53,9 @@
## Musnix for audio production ## Musnix for audio production
musnix = { musnix = {
enable = true; enable = true;
rtcqs = { rtcqs = { enable = true; };
enable = true; rtirq = { enable = true; };
}; kernel = { realtime = true; };
rtirq = {
enable = true;
};
kernel = {
realtime = true;
};
}; };
## Using pipewire baybee ## Using pipewire baybee

View file

@ -5,11 +5,9 @@
imports = [ imports = [
## Semi-modularised config ## Semi-modularised config
./jellyfin.nix # unfinished ./misc.nix # stuff that doesn't work in `/home` :(
./regreet.nix # unfinished ./audio.nix # musnix and ... audio ... config
./misc.nix # stuff that doesn't work in home-manager :(
./display.nix # declarations for display management ./display.nix # declarations for display management
./gaming.nix # for gaming stuff, ideally would be in home/
]; ];

View file

@ -2,9 +2,7 @@
{ {
imports = [ imports = [
## planning to have a discrete config file for ./regreet.nix # the greeter(s) to keep this file tidy.
## the greeter(s) to keep this file tidy.
./regreet.nix
]; ];
boot = { boot = {
@ -27,11 +25,11 @@
timeout = 30; timeout = 30;
#grub = { #grub = {
#theme = "${pkgs.minimal-grub-theme}"; #theme = "${pkgs.minimal-grub-theme}";
#backgroundColor = "#000000"; #backgroundColor = "#000000";
#splashImage = "path/to/image"; #splashImage = "path/to/image";
#font = "${pkgs.spleen}/share/fonts/spleen-32x64"; #font = "${pkgs.spleen}/share/fonts/spleen-32x64";
#fontSize = 16; #fontSize = 16;
#}; #};
}; };
@ -40,20 +38,18 @@
enable = true; enable = true;
#logo = pkgs.fetchurl { #logo = pkgs.fetchurl {
#url = "https://nixos.org/logo/nixos-hires.png"; #url = "https://nixos.org/logo/nixos-hires.png";
#hash = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; #hash = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
#}; #};
#font = "${pkgs.spleen}/share/fonts/spleen-32x64"; #font = "${pkgs.spleen}/share/fonts/spleen-32x64";
theme = "circuit"; theme = "circuit";
themePackages = with pkgs; [ themePackages = with pkgs;
(adi1090x-plymouth-themes.override { [
selected_themes = [ (adi1090x-plymouth-themes.override {
"circle" selected_themes = [ "circle" "circuit" ];
"circuit" })
]; ];
})
];
#extraConfig = ''''; #extraConfig = '''';
@ -73,8 +69,8 @@
## Standard(?) xwayland implementation ## Standard(?) xwayland implementation
xwayland = { xwayland = {
enable = true; enable = true;
#package = [ ]; #package = [ ];
#defaultFontPath = "/run/current-system/sw/share/X11/fonts"; #defaultFontPath = "/run/current-system/sw/share/X11/fonts";
}; };
## enable sway window manager ## enable sway window manager
@ -107,22 +103,22 @@
xdg = { xdg = {
portal = { portal = {
#enable = true; #enable = true;
#xdgOpenUsePortal = true; #xdgOpenUsePortal = true;
#config = { #config = {
#common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; #common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
#common.default = [ "gtk" "gnome" ]; #common.default = [ "gtk" "gnome" ];
#sway.default = [ "gtk" "gnome" ]; #sway.default = [ "gtk" "gnome" ];
#}; #};
#configPackages = with pkgs; [ #configPackages = with pkgs; [
#xdg-desktop-portal-gtk #xdg-desktop-portal-gtk
#xdg-desktop-portal-wlr #xdg-desktop-portal-wlr
#xdg-desktop-portal-gnome #xdg-desktop-portal-gnome
#]; #];
#extraPortals = with pkgs; [ #extraPortals = with pkgs; [
#xdg-desktop-portal-gtk #xdg-desktop-portal-gtk
#xdg-desktop-portal-wlr #xdg-desktop-portal-wlr
#xdg-desktop-portal-gnome #xdg-desktop-portal-gnome
#]; #];
}; };
}; };
@ -158,12 +154,10 @@
## I put fonts here because i didn't know where tf else to put them lol ## I put fonts here because i didn't know where tf else to put them lol
## duplicate to home-manager config ## duplicate to home-manager config
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs;
spleen [ spleen terminus_font terminus_font_ttf nerd-fonts.symbols-only ]
terminus_font ++ builtins.filter lib.attrsets.isDerivation
terminus_font_ttf (builtins.attrValues pkgs.nerd-fonts);
nerd-fonts.symbols-only
] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
fontDir.enable = true; fontDir.enable = true;
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
@ -174,6 +168,4 @@
}; };
}; };
} }

View file

@ -8,10 +8,7 @@
## Open tablet driver, for Osu!, mainly. ## Open tablet driver, for Osu!, mainly.
enable = true; enable = true;
## Disable conflicting drivers ## Disable conflicting drivers
blacklistedKernelModules = [ blacklistedKernelModules = [ "hid-uclogic" "wacom" ];
"hid-uclogic"
"wacom"
];
## Enables the daemon via systemd ## Enables the daemon via systemd
daemon.enable = true; daemon.enable = true;
}; };
@ -20,7 +17,7 @@
services = { services = {
## Enabling flatpak in case i need it ## Enabling flatpak in case i need it
#flatpak.enable = true; #flatpak.enable = true;
## ratbagd for gaming mouse config ## ratbagd for gaming mouse config
ratbagd.enable = true; ratbagd.enable = true;
}; };
@ -30,12 +27,13 @@
systemPackages = with pkgs; [ piper ]; systemPackages = with pkgs; [ piper ];
## These are important apparently :uh: ## These are important apparently :uh:
sessionVariables = { sessionVariables = {
XDG_CACHE_HOME = "$HOME/.cache"; XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config"; XDG_CONFIG_HOME = "$HOME/.config";
XDG_BIN_HOME = "$HOME/.local/bin"; XDG_BIN_HOME = "$HOME/.local/bin";
XDG_DATA_HOME = "$HOME/.local/share"; XDG_DATA_HOME = "$HOME/.local/share";
## Steam needs this to find Proton-GE ## 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 ## Note: this doesn't replace PATH, it just adds this to it
PATH = [ "\${XDG_BIN_HOME}" ]; PATH = [ "\${XDG_BIN_HOME}" ];
SDL_VIDEODRIVER = "wayland"; SDL_VIDEODRIVER = "wayland";
@ -57,9 +55,7 @@
gamemode = { gamemode = {
enable = true; enable = true;
settings = { settings = {
general = { general = { renice = 10; };
renice = 10;
};
## Warning: GPU optimisations have the potential to damage hardware ## Warning: GPU optimisations have the potential to damage hardware
gpu = { gpu = {
apply_gpu_optimisations = "accept-responsibility"; apply_gpu_optimisations = "accept-responsibility";
@ -67,8 +63,8 @@
amd_performance_level = "high"; amd_performance_level = "high";
}; };
custom = { custom = {
#start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; #start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
#end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; #end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
}; };
}; };
}; };
@ -82,33 +78,28 @@
#}; #};
## No clue what this is doing ## No clue what this is doing
package = pkgs.steam.override { package = pkgs.steam.override {
extraLibraries = pkgs: [ extraLibraries = pkgs: [ pkgs.xorg.libxcb ];
pkgs.xorg.libxcb ## No clue what this shit does
]; extraPkgs = pkgs:
## No clue what this shit does with pkgs; [
extraPkgs = pkgs: with pkgs; [ xorg.libXcursor
xorg.libXcursor xorg.libXi
xorg.libXi xorg.libXinerama
xorg.libXinerama xorg.libXScrnSaver
xorg.libXScrnSaver libpng
libpng libpulseaudio
libpulseaudio libvorbis
libvorbis stdenv.cc.cc.lib
stdenv.cc.cc.lib libkrb5
libkrb5 keyutils
keyutils gamemode
gamemode ];
];
}; };
## Not sure we need gamescope here ## Not sure we need gamescope here
## as it's defined elsewhere but o well ## as it's defined elsewhere but o well
extraPackages = with pkgs; [ extraPackages = with pkgs; [ gamescope ];
gamescope
];
## Gotta have the glorious eggroll ## Gotta have the glorious eggroll
extraCompatPackages = with pkgs; [ extraCompatPackages = with pkgs; [ proton-ge-bin ];
proton-ge-bin
];
}; };
}; };

View file

@ -2,17 +2,15 @@
{ {
imports = [ imports = [ ];
];
programs = { programs = { };
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## Jellyfin for home media share ## Jellyfin for home media share
jellyfin jellyfin
jellyfin-web jellyfin-web
jellyfin-ffmpeg jellyfin-ffmpeg
]; ];
} }

View file

@ -6,36 +6,26 @@
security.pam.services.serenity.enableGnomeKeyring = true; security.pam.services.serenity.enableGnomeKeyring = true;
programs = { programs = {
## For when bimbo needs to play with platters and cbf to deal with cli gnome-disks.enable = true; # For when bimbo needs to manage disks
gnome-disks.enable = true; seahorse.enable = true; # GTK secrets management
## GTK secrets management droidcam.enable = true; # Use android device as a webcam
seahorse.enable = true; obs-studio = { # screen capture, recording, and sharing
## Use android device as a webcam
droidcam.enable = true;
obs-studio = {
enable = true; enable = true;
enableVirtualCamera = true; enableVirtualCamera = true; # virtual webcam
plugins = with pkgs.obs-studio-plugins; [ plugins = with pkgs.obs-studio-plugins; [
droidcam-obs droidcam-obs # enables droidcam integration
]; ];
}; };
}; };
services = { services = {
## dont think i NEED this tbh libinput.enable = true; # don't think we NEED this tbh - unsure
libinput.enable = true; gvfs.enable = true; # virtual filesystem, needed this for ... something
## Virtual filesystem, needed this for something i think ? dbus.enable = true; # dbus is for ... unsure
gvfs.enable = true; upower.enable = true; # no clue
## Dbus is for ... udisks2.enable = true; # disk management service
dbus.enable = true; gnome.gnome-keyring.enable = true; # for sudo prompts and stuff
## no clue
upower.enable = true;
## for managing disks
udisks2.enable = true;
## GNOME keyring
gnome.gnome-keyring.enable = true;
}; };
} }

View file

@ -1,4 +1,4 @@
{ inputs, lib, config, pkgs, ... }: { pkgs, ... }:
{ {

View file

@ -10,12 +10,9 @@
./syncthing.nix # syncthing configuration ./syncthing.nix # syncthing configuration
./zfs.nix # zfs configuration ./zfs.nix # zfs configuration
## Selected core modules for import ## Additional core modules to import
../../../core/modules/display.nix # display stuff ../../../core/modules/jellyfin.nix
#../../../core/modules/regreet.nix # regreet customisation
../../../core/modules/misc.nix # didnt work in home-manager :(
../../../core/modules/gaming.nix # didnt work in home-manager :( ../../../core/modules/gaming.nix # didnt work in home-manager :(
../../../core/modules/audio.nix # sound configuration
]; ];