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 # desktop supermodule declaration
flake.nixosModules.desktop = { flake.nixosModules.desktop =
{ ... }:
{
# modules to include # modules to include
imports = [ imports = [

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -3,7 +3,11 @@
{ {
# terminal supermodule # terminal supermodule
flake.nixosModules.terminal = { pkgs, ... }: { flake.nixosModules.terminal =
{ pkgs, ... }:
{
# list of modules to include # list of modules to include
imports = [ 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 # needed for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];

View file

@ -3,11 +3,24 @@
{ {
# defines a custom fish module # defines a custom fish module
flake.nixosModules.fish = { pkgs, ... }: { flake.nixosModules.fish =
{ pkgs, ... }:
{
# for home manager functionality # for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ]; 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 options
home-manager.users.serenity = { home-manager.users.serenity = {

View file

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

View file

@ -4,6 +4,7 @@
# defines a custom helix module # defines a custom helix module
flake.nixosModules.helix = flake.nixosModules.helix =
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
@ -11,14 +12,18 @@
# needed for home manager functionality # needed for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ]; 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 options
home-manager.users.serenity = { home-manager.users.serenity = {
# redundancy, not sure this is needed?
home.packages = with pkgs; [
helix
];
programs.helix = { programs.helix = {
# enables helix # enables helix

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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