chore: commented and formatted code

This commit is contained in:
serenity-F 2026-09-18 03:25:02 +10:00
parent 23e49c9974
commit eda9b3c5d0
No known key found for this signature in database
12 changed files with 95 additions and 95 deletions

View file

@ -1,24 +1,30 @@
{ self, inputs, ... }: { { self, inputs, ... }:
{
# desktop supermodule
flake.nixosModules.desktop = { flake.nixosModules.desktop = {
# modules to include # modules to include
imports = [ imports = [
#greeter
# session management
#self.nixosModules.${greeter}
# window manager
self.nixosModules.niri self.nixosModules.niri
# desktop shell/status bar
self.nixosModules.noctalia self.nixosModules.noctalia
#stylix
# theme management
#self.nixosModules.stylix
# for home manager functionality # for home manager functionality
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
# home manager modules for niri and noctalia
#inputs.niri.homeModules.niri
#inputs.noctalia.homeModules.default
]; ];
#programs.foo = bar;
}; };
} }

View file

@ -1,37 +1,20 @@
{ self, inputs, ... }: { { self, inputs, ... }: {
# module declaration # niri window manager module declaration
flake.nixosModules.niri = flake.nixosModules.niri =
{ pkgs, ... }: { pkgs, ... }:
let
#username = config.userOptions.username;
in
{ {
imports = [ # for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
# for home manager functionality
inputs.home-manager.nixosModules.home-manager
# for noctalia shell atop niri
#self.nixosModules.noctalia
# packages for desktop environment
environment.systemPackages = with pkgs; [
#foo
#bar
]; ];
environment = {
# packages for desktop environment
systemPackages = with pkgs; [
#foo
#bar
];
};
# session management # session management
programs.uwsm = { programs.uwsm = {
enable = true; enable = true;
@ -45,6 +28,7 @@
# niri settings # niri settings
home-manager.users.serenity = { home-manager.users.serenity = {
# for home manager functionality
imports = [ inputs.niri.homeModules.niri ]; imports = [ inputs.niri.homeModules.niri ];
programs.niri = { programs.niri = {

View file

@ -2,6 +2,7 @@
{ {
# noctalia shell module declaration
flake.nixosModules.noctalia = flake.nixosModules.noctalia =
{ pkgs, ... }: { pkgs, ... }:
@ -13,8 +14,9 @@
# home manager options # home manager options
home-manager.users.serenity = { home-manager.users.serenity = {
# for noctalia home manager configuration # for noctalia home manager functionality
imports = [ inputs.noctalia.homeModules.default ]; imports = [ inputs.noctalia.homeModules.default ];
programs.noctalia = { programs.noctalia = {
# enables noctalia # enables noctalia
@ -26,8 +28,10 @@
general = { }; general = { };
# for calendar/weather
location = { }; location = { };
# NOT YET IMPLEMENTED
#colorSchemes.predefinedscheme = "foobar"; #colorSchemes.predefinedscheme = "foobar";
# no want dock :( # no want dock :(
@ -35,6 +39,7 @@
enabled = false; enabled = false;
}; };
# status bar settings
bar = { }; bar = { };
}; };

View file

@ -1,15 +1,20 @@
{ inputs, ... }: { { inputs, ... }: {
# module declaration # gaming module declaration
flake.nixosModules.gaming = { pkgs, ... }: { flake.nixosModules.gaming = { inputs, pkgs, ... }: {
# options declarations # options declarations
#programs.whatever = {}; #programs.whatever = {};
# steam # steam settings
programs.steam = { }; programs.steam = {
# packages to include # enables steam
enable = true;
};
# other packages to include
environment.systemPackages = with pkgs; [ ]; environment.systemPackages = with pkgs; [ ];
}; };

View file

@ -1,8 +1,4 @@
{ { self, inputs, ... }:
self,
inputs,
...
}:
{ {
@ -14,16 +10,21 @@
# home manager # home manager
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
# terminal emulator # terminal emulator
self.nixosModules.kitty self.nixosModules.kitty
# text editor # text editor
self.nixosModules.helix self.nixosModules.helix
# file manager # file manager
#self.modules.yazi #self.nixosModules.yazi
# shell and prompt # shell and prompt
#self.modules.fish #self.nixosModules.fish
# version control # version control
#self.modules.git #self.nixosModules.git
]; ];

View file

@ -1,10 +1,5 @@
{ { self, inputs, ... }:
self,
inputs,
pkgs,
lib,
...
}:
{ {
# defines a custom helix module # defines a custom helix module
@ -13,10 +8,12 @@
{ {
# needed for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager.users.serenity = { home-manager.users.serenity = {
# redundancy, not sure this is needed?
home.packages = with pkgs; [ home.packages = with pkgs; [
helix helix
]; ];

View file

@ -1,14 +1,10 @@
{ self, ... }: { self, inputs, ... }:
{ {
# defines a module # host module declaration
flake.nixosModules.hades = flake.nixosModules.hades =
{ { pkgs, lib, ... }:
pkgs,
lib,
...
}:
{ {

View file

@ -8,17 +8,19 @@
# modules that comprise the host specific configuration # modules that comprise the host specific configuration
modules = with self.nixosModules; [ modules = with self.nixosModules; [
# shared system modules
core
# host-specific options # host-specific options
hades hades
hadesHardware hadesHardware
# users to include on host
serenity
# extra modules to include on host # extra modules to include on host
terminal terminal
desktop desktop
#noctalia
# users to include on host
serenity
]; ];

View file

@ -1,7 +1,7 @@
{ ... }: { ... }:
{ {
# defines a module # hardware module declaration
flake.nixosModules.hadesHardware = flake.nixosModules.hadesHardware =
{ {
config, config,
@ -15,6 +15,7 @@
# important i think lol # important i think lol
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
# bootloader
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# shrug # shrug

View file

@ -3,13 +3,6 @@
# module declaration # module declaration
flake.nixosModules.core-packages = { pkgs, ... }: { flake.nixosModules.core-packages = { pkgs, ... }: {
# environment variables
environment.variables = {
EDITOR = "helix";
VISUAL = "helix";
SYSTEMD_EDITOR = "helix";
};
# nix settings # nix settings
nix.settings = { nix.settings = {
@ -26,20 +19,37 @@
# nixpkgs settings # nixpkgs settings
nixpkgs = { nixpkgs = {
# allows crud # allows broken and ideologically impure packages
config = { config = {
allowUnfree = true; allowUnfree = true;
allowBroken = true; allowBroken = true;
}; };
# overlays # nixpkgs overlays
overlays = [ overlays = [
#niri.overlays.niri #niri.overlays.niri
]; ];
}; };
# options declarations # services to include in base system
services = {
# flatpak software
flatpak = {
enable = true;
};
};
# environment variables
environment.variables = {
EDITOR = "helix";
VISUAL = "helix";
SYSTEMD_EDITOR = "helix";
};
# core programs to include in base system
programs = { programs = {
# necessary terminal programs # necessary terminal programs
@ -65,16 +75,7 @@
# to run an elf binary not compiled for nixos. # to run an elf binary not compiled for nixos.
environment.stub-ld.enable = true; environment.stub-ld.enable = true;
services = { # core packages to include in base system
# flatpak software
flatpak = {
enable = true;
};
};
# packages to include
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# nix utilities # nix utilities
@ -128,6 +129,7 @@
libsecret libsecret
git-crypt git-crypt
undervolt undervolt
]; ];
}; };

View file

@ -5,10 +5,6 @@
flake.nixosModules.core = flake.nixosModules.core =
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let
in
{ {
# other modules to load # other modules to load

View file

@ -2,9 +2,6 @@
{ {
# necessary for home manager function
#imports = [ inputs.home-manager.nixosModules.home-manager ];
# user module declaration # user module declaration
flake.nixosModules.serenity = flake.nixosModules.serenity =
@ -15,9 +12,10 @@
# necessary for home manager function # necessary for home manager function
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
# needed or nix yells at me
programs.fish.enable = true; programs.fish.enable = true;
# user declaration # nixos user declaration
users.users.serenity = { users.users.serenity = {
# remember to change this # remember to change this
@ -30,12 +28,13 @@
"networkmanager" "networkmanager"
]; ];
# dont hardcode this # dont hardcode this ?
# catgirl shell # catgirl shell
shell = pkgs.fish; shell = pkgs.fish;
}; };
# not entirely sure this is necessary tbh
environment.systemPackages = with pkgs; [ home-manager ]; environment.systemPackages = with pkgs; [ home-manager ];
# home manager settings # home manager settings
@ -43,12 +42,18 @@
verbose = true; verbose = true;
overwriteBackup = true; overwriteBackup = true;
backupFileExtension = ".bak"; backupFileExtension = ".bak";
# need to disable soon ?
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
# home manager user declaration
users.serenity = { users.serenity = {
home.stateVersion = "24.11"; home.stateVersion = "24.11";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
imports = [ ];
# user specific modules to include
#imports = [ ];
}; };
}; };