chore: tidying formatting and comments

This commit is contained in:
serenity-F 2026-09-22 17:32:27 +10:00
parent 33adf953e2
commit d51e338b1d
No known key found for this signature in database
20 changed files with 854 additions and 787 deletions

View file

@ -2,8 +2,12 @@
{
# desktop supermodule
flake.nixosModules.desktop = {
# desktop supermodule declaration
flake.nixosModules.desktop =
{ ... }:
{
# modules to include
imports = [

View file

@ -1,12 +1,11 @@
{ self, inputs, ... }: {
{ self, inputs, ... }:
{
# niri window manager module declaration
flake.nixosModules.niri =
{
pkgs,
lib,
...
}:
{ pkgs, lib, ... }:
{
@ -43,7 +42,11 @@
};
# niri personalisation
home-manager.users.serenity = { config, ... }: {
home-manager.users.serenity =
{ config, ... }:
{
# for niri home manager module
imports = [ inputs.niri.homeModules.niri ];

View file

@ -4,6 +4,7 @@
# noctalia shell module declaration
flake.nixosModules.noctalia =
{ pkgs, ... }:
{

View file

@ -1,7 +1,13 @@
{ self, inputs, ... }: {
{ self, inputs, ... }:
{
# wofi launcher module declaration
flake.nixosModules.wofi = { config, ... }: {
flake.nixosModules.wofi =
{ config, ... }:
{
# for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];

View file

@ -1,13 +1,17 @@
{ inputs, ... }: {
{ inputs, ... }:
{
# general gaming module declaration
flake.nixosModules.gaming =
{
inputs,
pkgs,
user,
...
}:
{
# 32bit graphics support

View file

@ -1,7 +1,13 @@
{ inputs, ... }: {
{ inputs, ... }:
{
# general multimedia module declaration
flake.nixosModules.multimedia = { pkgs, ... }: {
flake.nixosModules.multimedia =
{ pkgs, ... }:
{
# for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];

View file

@ -1,7 +1,13 @@
{ inputs, ... }: {
{ inputs, ... }:
{
# general music module declaration
flake.nixosModules.music = { pkgs, ... }: {
flake.nixosModules.music =
{ pkgs, ... }:
{
# for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
@ -28,7 +34,11 @@
};
# music production module declaration
flake.nixosModules.music-production = { pkgs, musnix, ... }: {
flake.nixosModules.music-production =
{ pkgs, musnix, ... }:
{
# for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];

View file

@ -3,11 +3,17 @@
{
# defines a custom btop module
flake.nixosModules.btop = { ... }: {
flake.nixosModules.btop =
{ pkgs, ... }:
{
# for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
environment.systemPackages = with pkgs; [ btop ];
# home manager options
home-manager.users.serenity = {

View file

@ -3,7 +3,11 @@
{
# terminal supermodule
flake.nixosModules.terminal = { pkgs, ... }: {
flake.nixosModules.terminal =
{ pkgs, ... }:
{
# list of modules to include
imports = [

View file

@ -1,6 +1,13 @@
{ self, inputs, ... }: {
{ self, inputs, ... }:
flake.nixosModules.fetch = { pkgs, ... }: {
{
# fetch module declaration
flake.nixosModules.fetch =
{ pkgs, ... }:
{
# needed for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];

View file

@ -3,11 +3,24 @@
{
# defines a custom fish module
flake.nixosModules.fish = { pkgs, ... }: {
flake.nixosModules.fish =
{ pkgs, ... }:
{
# for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
# adding shell packages to system, unsure if necessary
environment.systemPackages = with pkgs; [
fish # primary shell
bash # backup shell
];
# system level fish declaration
programs.fish.enable = true;
# home manager options
home-manager.users.serenity = {

View file

@ -3,11 +3,18 @@
{
# defines a custom git module
flake.nixosModules.git = { ... }: {
flake.nixosModules.git =
{ pkgs, ... }:
{
# for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
# system level git declaration
programs.git.enable = true;
# home manager options
home-manager.users.serenity = {

View file

@ -4,6 +4,7 @@
# defines a custom helix module
flake.nixosModules.helix =
{ lib, pkgs, ... }:
{
@ -11,14 +12,18 @@
# needed for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
# editor variables
environment.variables = {
EDITOR = "helix";
VISUAL = "helix";
SYSTEMD_EDITOR = "helix";
};
environment.systemPackages = with pkgs; [ helix ];
# home manager options
home-manager.users.serenity = {
# redundancy, not sure this is needed?
home.packages = with pkgs; [
helix
];
programs.helix = {
# enables helix

View file

@ -3,7 +3,11 @@
{
# defines a custom kitty module
flake.nixosModules.kitty = { pkgs, ... }: {
flake.nixosModules.kitty =
{ pkgs, ... }:
{
# needed for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];

View file

@ -3,7 +3,11 @@
{
# yazi module declaration
flake.nixosModules.yazi = { ... }: {
flake.nixosModules.yazi =
{ ... }:
{
# for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];

View file

@ -4,6 +4,7 @@
# host module declaration
flake.nixosModules.hades =
{ pkgs, lib, ... }:
{

View file

@ -3,6 +3,7 @@
{
# hardware module declaration
flake.nixosModules.hadesHardware =
{
config,
lib,

View file

@ -1,75 +1,58 @@
{ inputs, ... }: {
{ inputs, ... }:
# module declaration
flake.nixosModules.core-packages = { pkgs, ... }: {
{
# system packages module declaration
flake.nixosModules.core-packages =
{ pkgs, ... }:
{
# nix settings
nix.settings = {
# for packages not in nixpkgs
#substituters = [
#"name.here"
#];
# keys to sign aforementioned packages
#trusted-public-keys = [
#"name.here"
#];
};
# nixpkgs settings
nixpkgs = {
# allows broken and ideologically impure packages
config = {
allowUnfree = true;
allowBroken = true;
};
# nixpkgs overlays
overlays = [
#niri.overlays.niri
];
};
# services to include in base system
services = {
# flatpak software
flatpak = {
# flatpak
services.flatpak = {
enable = true;
};
};
# environment variables
environment.variables = {
EDITOR = "helix";
VISUAL = "helix";
SYSTEMD_EDITOR = "helix";
};
# core programs to include in base system
programs = {
# necessary terminal programs
git.enable = true;
fish.enable = true;
gnupg.agent = {
enable = true;
enableSSHSupport = true;
#pinentryPackage = [ ];
};
# binary support
nix-ld.enable = true;
appimage = {
enable = true;
binfmt = true;
};
};
# installs a stub elf loader to print an error
@ -95,17 +78,10 @@
exfatprogs
btrfs-progs
# shells
fish
bash
# core tools
btop
helix
# compat tools
steam-run
android-cli
android-tools
magic-wormhole
# cli tools
fd
@ -131,6 +107,7 @@
libsecret
git-crypt
undervolt
magic-wormhole
];

View file

@ -2,7 +2,9 @@
{
# common module declaration
flake.nixosModules.core =
{ lib, pkgs, ... }:
{

View file

@ -1,4 +1,6 @@
{ inputs, ... }: {
{ inputs, ... }:
{
# needed for home manager functionality
imports = [ inputs.home-manager.flakeModules.home-manager ];