This commit is contained in:
serenity-F 2025-01-09 20:02:31 +10:00
parent 6c180bbb00
commit 38928b05ea
40 changed files with 94 additions and 249 deletions

View file

@ -8,8 +8,7 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
## Semi-modularised config ## Semi-modularised config
./packages.nix # system-level packages - needs tidying ./modules/shared # additional modules to import
./modules # additional modules to import
../home # user-level packages in ../home/programs/ ../home # user-level packages in ../home/programs/
]; ];

View file

@ -3,10 +3,16 @@
{ {
imports = [ imports = [
## Host specific config files ## Host-specific config files
./modules ./disko.nix
./network.nix
./hardware.nix
## Shared 'core' config options ## Shared 'core' config options
../../../core ../../../core
## Host-specific core modules
../../../core/modules/optional/zfs.nix
../../../core/modules/optional/gaming.nix
../../../core/modules/optional/jellyfin.nix
]; ];

View file

@ -1,17 +0,0 @@
{ ... }:
{
imports = [
## Selected host modules for import
./hardware.nix # hardware configuration
./network.nix # network configuration
## Additional core modules to import
../../../modules/jellyfin.nix # temporary for config purposes
../../../modules/gaming.nix # didnt work in home-manager :(
../../../modules/zfs.nix # ZFS config
];
}

View file

@ -1,18 +0,0 @@
{ ... }:
{
imports = [
## Selected modules for import
./network.nix # network/internet config
## Selected core modules for import
../../../core/modules/display.nix # display stuff
../../../core/modules/regreet.nix # regreet customisation
../../../core/modules/desktop.nix # didnt work in home-manager :(
../../../core/modules/audio.nix # sound configuration
];
}

View file

@ -1,20 +0,0 @@
{ ... }:
{
imports = [
## Selected modules for import
#./hardware.nix # hardware configuration
./network.nix # network configuration
./zfs.nix # zfs configuration
## Selected core modules for import
../../../core/modules/audio.nix
../../../core/modules/display.nix
../../../core/modules/desktop.nix
../../../core/modules/jellyfin.nix
];
}

View file

@ -1,68 +0,0 @@
## ZFS Support NixOS module
## temporary location while we figure out how ZFS works,
## eventually this will be embedded into the flake in a better way
{ lib, pkgs, ... }:
let
## This 'let' binding creates an attribute set
## called "LatestZfsLinux", which we can call as
## a package to specify when building our kernel.
latestZfsLinux = lib.pipe pkgs.linuxKernel.packages [
builtins.attrValues
(builtins.filter (
kPkgs:
(builtins.tryEval kPkgs).success
&& kPkgs ? kernel
&& kPkgs.kernel.pname == "linux"
&& !kPkgs.zfs.meta.broken
))
(builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)))
lib.last
];
in
{
imports = [
];
## Enable zfs in kernel and boot
boot = {
kernelPackages = latestZfsLinux;
supportedFilesystems = [ "zfs" ];
zfs = {
extraPools = [ "orcus" ];
forceImportRoot = false;
};
};
#fileSystems."/home/serenity/Disks/Orcus" = {
#device = "orcus";
#fsType = "zfs";
#options = [ "users" ];
#};
environment.systemPackages = with pkgs; [
zfs
];
## Enable trim for ZFS SSDs
services = {
zfs = {
## Trim for SSSds with ZFS
#trim.enable = true;
## Autoscrub data integrity ZFS service,
## more to be added soon
autoScrub = {
enable = true;
};
};
};
networking = {
hostId = "603b0c8b";
};
}

View file

@ -1,20 +0,0 @@
{ ... }:
{
imports = [
## Selected host modules for import
./hardware.nix # hardware configuration
./network.nix # network configuration
## Selected core modules for import
../../../core/modules/display.nix # display stuff
../../../core/modules/regreet.nix # regreet customisation
../../../core/modules/desktop.nix # didnt work in home-manager :(
../../../core/modules/misc.nix # exactly what it says
../../../core/modules/audio.nix # sound configuration
];
}

View file

@ -1,13 +0,0 @@
{ config, lib, ... }:
let hostname = config.networking.hostName;
in {
imports = [
## Semi-modularised config
./sync.nix # syncthing and gitwatch settings
./misc.nix # stuff that doesn't work in `/home` :(
./audio.nix # musnix and ... audio ... config
./display.nix # declarations for display management
];
}

View file

@ -1,31 +0,0 @@
{ pkgs, ... }:
{
## Dunno if i did this right, but possible needed for keyring/polkit stuff ?
security.pam.services.serenity.enableGnomeKeyring = true;
programs = {
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; # virtual webcam
plugins = with pkgs.obs-studio-plugins; [
droidcam-obs # enables droidcam integration
];
};
};
services = {
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
};
}

14
core/modules/shared/default.nix Executable file
View file

@ -0,0 +1,14 @@
{ ... }:
{
imports = [
## Semi-modularised config
./sync.nix # Syncthing and gitwatch settings
./audio.nix # Musnix and ... audio ... config
./display.nix # Display configs
./regreet.nix # Login greeter config
./packages.nix # All system-level packages here
];
}

View file

@ -1,9 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [
./regreet.nix # the greeter(s) to keep this file tidy.
];
boot = { boot = {
bootspec.enable = true; bootspec.enable = true;
@ -47,7 +44,8 @@
}; };
}; };
xdg.mime.enable = true; # may be unneeded here as already declared in `home/desktop/xdg-mime.nix` xdg.mime.enable =
true; # may be unneeded here as already declared in `home/desktop/xdg-mime.nix`
services = { services = {
xserver.enable = true; # xserver still needed for xwayland stuff xserver.enable = true; # xserver still needed for xwayland stuff
@ -118,4 +116,31 @@
}; };
}; };
## Dunno if i did this right, but possible needed for keyring/polkit stuff ?
security.pam.services.serenity.enableGnomeKeyring = true;
programs = {
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; # virtual webcam
plugins = with pkgs.obs-studio-plugins;
[
droidcam-obs # enables droidcam integration
];
};
};
services = {
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
};
} }

View file

@ -9,10 +9,6 @@ in {
## Modules ## Modules
inputs.home-manager.nixosModules.default # home-manager module inputs.home-manager.nixosModules.default # home-manager module
#../../home # home-manager configuration
## Users
#./u-username.nix
## User themes - ## User themes -
## to set a different theme for a user, ## to set a different theme for a user,
@ -63,7 +59,7 @@ in {
## home directories. Additional modules ## home directories. Additional modules
## can be declared alongside `u-username/default.nix` ## can be declared alongside `u-username/default.nix`
## and then imported in this section. ## and then imported in this section.
./home.nix ./programs
]; ];
home = { home = {
username = "${primaryUser}"; username = "${primaryUser}";

View file

@ -1,21 +0,0 @@
{ ... }:
{
imports = [
## Import desktop configs
./desktop
## Import program configs
./programs
## Import user themes
./resources/themes
./resources/themes/SerenityOS.nix
];
## Enabling home-manager
programs.home-manager.enable = true; # Declarative dots
systemd.user.startServices = "sd-switch";
home.stateVersion = "24.11";
}

View file

@ -4,15 +4,23 @@
imports = [ imports = [
## Import WM/Desktop config
./desktop
## Import program configs ## Import program configs
./terminal ./terminal
./chat ./chat
./web ./web
./obs ./obs
## Import user themes
../resources/themes
../resources/themes/SerenityOS.nix
]; ];
home.packages = with pkgs; [ home = {
packages = with pkgs; [
## Temp. ## Temp.
themix-gui # GTK theme maker themix-gui # GTK theme maker
@ -44,5 +52,10 @@
gimp # Image editor gimp # Image editor
vlc # Multimedia player vlc # Multimedia player
]; ];
stateVersion = "24.11";
};
programs.home-manager.enable = true; # Declarative dots
system.user.startServices = "sd-switch";
} }