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,100 +2,104 @@
{ {
# desktop supermodule # desktop supermodule declaration
flake.nixosModules.desktop = { flake.nixosModules.desktop =
# modules to include { ... }:
imports = [
# session management {
#self.nixosModules.${greeter}
# window manager # modules to include
self.nixosModules.niri imports = [
# application launcher # session management
self.nixosModules.wofi #self.nixosModules.${greeter}
# desktop shell/status bar # window manager
self.nixosModules.noctalia self.nixosModules.niri
# theme management # application launcher
#self.nixosModules.stylix self.nixosModules.wofi
# for home manager functionality # desktop shell/status bar
inputs.home-manager.nixosModules.home-manager self.nixosModules.noctalia
]; # theme management
#self.nixosModules.stylix
# for home manager functionality
inputs.home-manager.nixosModules.home-manager
# Boot/GRUB options
boot = {
#bootspec.enable = true;
consoleLogLevel = 3;
initrd = {
verbose = false;
systemd = {
enable = true;
};
};
kernelParams = [
# grub kernel parameters, set to prevent excessive output on boot
#"vga=current" # use current video adapater
#"splash" # unsure ?
"quiet" # quiet log level
"loglevel=3" # minimal output on boot
#"udev.log_priority=3" # more minimising of output on boot
#"rd.systemd.show_status=false" # unsure ?
#"rd.udev.log_level=0" # more minimising of output on boot
#"boot.shell_on_fail" # reboots to basic uefi shell on boot failure
#"i915.fastboot=1" # unsure ?
#"plymouth.debug" # I NEED ANSWERS
#"plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother
#"plymouth.ignore-serial-consoles" # unsure ?
]; ];
loader = {
timeout = 5; # 5 second timeout to default selection
#grub = {
#splashImage = null; # hides splashimage
#timeoutStyle = "hidden"; # hides timeout
#};
};
plymouth = {
# enables plymouth boot animations
enable = false;
extraConfig = "ShowDelay=0";
#theme = "sygil-plymouth";
#themePackages = sygil-plymouth;
#themePackages = with pkgs; [
#(adi1090x-plymouth-themes.override {
#selected_themes = [ "circle" ];
#})
#];
};
};
# I put fonts here because i didn't know where tf else to put them lol # Boot/GRUB options
# duplicate to home-manager config ? boot = {
fonts = { #bootspec.enable = true;
packages = consoleLogLevel = 3;
with pkgs; initrd = {
[ verbose = false;
spleen systemd = {
terminus_font enable = true;
terminus_font_ttf };
nerd-fonts.symbols-only };
] kernelParams = [
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); # grub kernel parameters, set to prevent excessive output on boot
fontDir.enable = true; #"vga=current" # use current video adapater
fontconfig = { #"splash" # unsure ?
defaultFonts = { "quiet" # quiet log level
serif = [ "spleen-32x64" ]; "loglevel=3" # minimal output on boot
sansSerif = [ "spleen-32x64" ]; #"udev.log_priority=3" # more minimising of output on boot
monospace = [ "TerminusTTF" ]; #"rd.systemd.show_status=false" # unsure ?
#"rd.udev.log_level=0" # more minimising of output on boot
#"boot.shell_on_fail" # reboots to basic uefi shell on boot failure
#"i915.fastboot=1" # unsure ?
#"plymouth.debug" # I NEED ANSWERS
#"plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother
#"plymouth.ignore-serial-consoles" # unsure ?
];
loader = {
timeout = 5; # 5 second timeout to default selection
#grub = {
#splashImage = null; # hides splashimage
#timeoutStyle = "hidden"; # hides timeout
#};
};
plymouth = {
# enables plymouth boot animations
enable = false;
extraConfig = "ShowDelay=0";
#theme = "sygil-plymouth";
#themePackages = sygil-plymouth;
#themePackages = with pkgs; [
#(adi1090x-plymouth-themes.override {
#selected_themes = [ "circle" ];
#})
#];
}; };
}; };
};
}; # I put fonts here because i didn't know where tf else to put them lol
# duplicate to home-manager config ?
fonts = {
packages =
with pkgs;
[
spleen
terminus_font
terminus_font_ttf
nerd-fonts.symbols-only
]
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
fontDir.enable = true;
fontconfig = {
defaultFonts = {
serif = [ "spleen-32x64" ];
sansSerif = [ "spleen-32x64" ];
monospace = [ "TerminusTTF" ];
};
};
};
};
} }

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,262 +42,268 @@
}; };
# niri personalisation # niri personalisation
home-manager.users.serenity = { config, ... }: { home-manager.users.serenity =
# for niri home manager module { config, ... }:
imports = [ inputs.niri.homeModules.niri ];
programs.niri = { {
# enables niri within home manager
enable = true;
# use latest nixpkgs version
package = with pkgs; niri;
settings = {
# xwayland implementation # for niri home manager module
xwayland-satellite = { imports = [ inputs.niri.homeModules.niri ];
enable = true;
# use niri-stable matching version
path = lib.getExe pkgs.xwayland-satellite;
};
# environment variables programs.niri = {
environment = { # enables niri within home manager
# display enable = true;
DISPLAY = ":0"; # use latest nixpkgs version
WLR_RENDERER = "vulkan"; package = with pkgs; niri;
NIXOS_OZONE_WL = "1"; settings = {
SDL_VIDEODRIVER = "wayland";
# xdg variables
XDG_SESSION_TYPE = "wayland";
XDG_CURRENT_DESKTOP = "niri";
# qt variables
QT_QPA_PLATFORM = "wayland;xcb";
QT_QPA_PLATFORMTHEME = "qt5ct";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
# native wayland firefox
MOZ_ENABLE_WAYLAND = "1";
};
# display configuration # xwayland implementation
outputs."DP-4" = { xwayland-satellite = {
# display scaling
scale = 1.2;
# window focus?
focus-at-startup = true;
# resolution config
variable-refresh-rate = true;
mode = {
width = 3440;
height = 1440;
refresh = 74.924;
};
# grid position for this display
position = {
x = 0;
y = 0;
};
};
# input settings - keybinds further below
input = {
# window focus
focus-follows-mouse = {
enable = true; enable = true;
max-scroll-amount = "0%"; # use niri-stable matching version
path = lib.getExe pkgs.xwayland-satellite;
}; };
# keyboard and pointing devices
keyboard.numlock = true;
trackpoint = {
enable = true;
};
touchpad = {
enable = true;
natural-scroll = true;
};
mouse = {
enable = true;
natural-scroll = false;
accel-speed = 1.0;
accel-profile = "flat";
};
};
# workspaces # environment variables
workspaces."01sys" = { environment = {
name = "System"; # display
open-on-output = "DP-4"; DISPLAY = ":0";
}; WLR_RENDERER = "vulkan";
NIXOS_OZONE_WL = "1";
# autostart SDL_VIDEODRIVER = "wayland";
spawn-at-startup = [ # xdg variables
{ XDG_SESSION_TYPE = "wayland";
# necessary for xwayland functionality XDG_CURRENT_DESKTOP = "niri";
argv = [ "xwayland-satellite" ]; # qt variables
} QT_QPA_PLATFORM = "wayland;xcb";
{ QT_QPA_PLATFORMTHEME = "qt5ct";
# spawns the desktop shell QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
argv = [ "noctalia" ]; # native wayland firefox
} MOZ_ENABLE_WAYLAND = "1";
{
# spawns a terminal running btop
argv = [
"kitty"
"btop"
];
}
];
# visual settings
prefer-no-csd = true;
overview = {
workspace-shadow.enable = false;
};
animations = {
enable = true;
slowdown = 1.25;
};
layout = {
# remove backdrop colour
background-color = "transparent";
center-focused-column = "never";
# window|window gaps
gaps = 8;
#window|screen edge gaps
struts = {
left = 2;
right = 2;
top = 2;
bottom = 4;
}; };
# using focus ring instead of a border
border.enable = false; # display configuration
# highlights the focused window bounds outputs."DP-4" = {
focus-ring = { # display scaling
enable = true; scale = 1.2;
width = 2; # window focus?
#focus ring colour focus-at-startup = true;
active.gradient = { # resolution config
angle = 45; variable-refresh-rate = true;
from = "#00cdff"; mode = {
to = "#80c8ff"; width = 3440;
height = 1440;
refresh = 74.924;
};
# grid position for this display
position = {
x = 0;
y = 0;
}; };
}; };
# used when increasing window size in steps
preset-column-widths = [ # input settings - keybinds further below
input = {
# window focus
focus-follows-mouse = {
enable = true;
max-scroll-amount = "0%";
};
# keyboard and pointing devices
keyboard.numlock = true;
trackpoint = {
enable = true;
};
touchpad = {
enable = true;
natural-scroll = true;
};
mouse = {
enable = true;
natural-scroll = false;
accel-speed = 1.0;
accel-profile = "flat";
};
};
# workspaces
workspaces."01sys" = {
name = "System";
open-on-output = "DP-4";
};
# autostart
spawn-at-startup = [
{ {
proportion = 0.33; # necessary for xwayland functionality
argv = [ "xwayland-satellite" ];
} }
{ {
proportion = 0.5; # spawns the desktop shell
argv = [ "noctalia" ];
} }
{ {
proportion = 0.67; # spawns a terminal running btop
} argv = [
{ "kitty"
proportion = 1.0; "btop"
];
} }
]; ];
}; # visual settings
prefer-no-csd = true;
layer-rules = [ overview = {
workspace-shadow.enable = false;
# pushes wallpaper set by noctalia to lowest layer };
{ animations = {
matches = [ { namespace = "^noctalia-wallpaper*"; } ]; enable = true;
place-within-backdrop = true; slowdown = 1.25;
} };
layout = {
]; # remove backdrop colour
background-color = "transparent";
window-rules = [ center-focused-column = "never";
# window|window gaps
# sets corner radius for all windows gaps = 8;
{ #window|screen edge gaps
clip-to-geometry = true; struts = {
draw-border-with-background = false; left = 2;
geometry-corner-radius = right = 2;
let top = 2;
radius = 16.0; bottom = 4;
in
{
bottom-left = radius;
bottom-right = radius;
top-left = radius;
top-right = radius;
};
}
# sets sizing and position of floating windows
{
matches = [ { is-floating = true; } ];
opacity = 0.95;
shadow.enable = true;
max-width = 1720;
max-height = 720;
default-floating-position = {
relative-to = "top-left";
x = 1720;
y = 720;
}; };
} # using focus ring instead of a border
border.enable = false;
# rules for specific windows # highlights the focused window bounds
{ focus-ring = {
# kitty opacity enable = true;
matches = [ { app-id = "kitty"; } ]; width = 2;
opacity = 0.95; #focus ring colour
} active.gradient = {
{ angle = 45;
# startup btop spawns on specific workspace from = "#00cdff";
matches = [ to = "#80c8ff";
};
};
# used when increasing window size in steps
preset-column-widths = [
{ {
at-startup = true; proportion = 0.33;
title = "btop"; }
{
proportion = 0.5;
}
{
proportion = 0.67;
}
{
proportion = 1.0;
} }
]; ];
open-on-output = "DP-4";
open-on-workspace = "System";
open-maximized = true;
}
{
# calculator spawns floating
matches = [ { title = "calculator"; } ];
open-floating = true;
open-focused = true;
}
];
# keybinds
hotkey-overlay = {
hide-not-bound = true;
skip-at-startup = true;
};
binds = with config.lib.niri.actions; {
#binds = {
# debug and utility
"Mod+Shift+Slash".action = show-hotkey-overlay; # shows help
"Mod+Shift+Escape" = {
action = toggle-keyboard-shortcuts-inhibit;
allow-inhibiting = false; # ensures niri binds are read
}; };
"Mod+Shift+P".action = power-off-monitors; # turn displays off
"Ctrl+Alt+Delete".action = quit; # log out
# task management layer-rules = [
# terminal # pushes wallpaper set by noctalia to lowest layer
{
matches = [ { namespace = "^noctalia-wallpaper*"; } ];
place-within-backdrop = true;
}
# screen capture ];
# focus controls window-rules = [
# movement controls # sets corner radius for all windows
{
clip-to-geometry = true;
draw-border-with-background = false;
geometry-corner-radius =
let
radius = 16.0;
in
{
bottom-left = radius;
bottom-right = radius;
top-left = radius;
top-right = radius;
};
}
# size controls # sets sizing and position of floating windows
{
matches = [ { is-floating = true; } ];
opacity = 0.95;
shadow.enable = true;
max-width = 1720;
max-height = 720;
default-floating-position = {
relative-to = "top-left";
x = 1720;
y = 720;
};
}
# rules for specific windows
{
# kitty opacity
matches = [ { app-id = "kitty"; } ];
opacity = 0.95;
}
{
# startup btop spawns on specific workspace
matches = [
{
at-startup = true;
title = "btop";
}
];
open-on-output = "DP-4";
open-on-workspace = "System";
open-maximized = true;
}
{
# calculator spawns floating
matches = [ { title = "calculator"; } ];
open-floating = true;
open-focused = true;
}
];
# keybinds
hotkey-overlay = {
hide-not-bound = true;
skip-at-startup = true;
};
binds = with config.lib.niri.actions; {
#binds = {
# debug and utility
"Mod+Shift+Slash".action = show-hotkey-overlay; # shows help
"Mod+Shift+Escape" = {
action = toggle-keyboard-shortcuts-inhibit;
allow-inhibiting = false; # ensures niri binds are read
};
"Mod+Shift+P".action = power-off-monitors; # turn displays off
"Ctrl+Alt+Delete".action = quit; # log out
# task management
# terminal
# screen capture
# focus controls
# movement controls
# size controls
};
}; };
@ -306,8 +311,6 @@
}; };
};
}; };
} }

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,55 +1,61 @@
{ self, inputs, ... }: { { self, inputs, ... }:
{
# wofi launcher module declaration # wofi launcher module declaration
flake.nixosModules.wofi = { config, ... }: { flake.nixosModules.wofi =
# for home manager functionality { config, ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
# home manager options {
home-manager.users.serenity = {
# enables wofi # for home manager functionality
programs.wofi = { imports = [ inputs.home-manager.nixosModules.home-manager ];
enable = true;
# wofi settings # home manager options
settings = { home-manager.users.serenity = {
term = "kitty";
show = "drun"; # enables wofi
width = 500; programs.wofi = {
height = 300; enable = true;
prompt = "Programs";
normal_window = true; # wofi settings
key_exit = "Escape"; settings = {
key_expand = "Tab"; term = "kitty";
layer = "top"; show = "drun";
gtk_dark = true; width = 500;
orientation = "vertical"; height = 300;
halign = "fill"; prompt = "Programs";
line_wrap = "off"; normal_window = true;
dynamic_lines = false; key_exit = "Escape";
allow_markup = true; key_expand = "Tab";
allow_images = true; layer = "top";
image_size = 24; gtk_dark = true;
hide_scroll = true; orientation = "vertical";
hide_search = false; halign = "fill";
exec_search = false; line_wrap = "off";
parse_search = false; dynamic_lines = false;
insensitive = true; allow_markup = true;
no_actions = true; allow_images = true;
sort_order = "default"; image_size = 24;
filter_rate = 100; hide_scroll = true;
## Steam not launching from wofi, but will launch in terminal hide_search = false;
## See: core/modules/gaming.nix exec_search = false;
## https://github.com/ValveSoftware/steam-for-linux/issues/9940 parse_search = false;
disable_prime = false; insensitive = true;
no_actions = true;
sort_order = "default";
filter_rate = 100;
## Steam not launching from wofi, but will launch in terminal
## See: core/modules/gaming.nix
## https://github.com/ValveSoftware/steam-for-linux/issues/9940
disable_prime = false;
};
# NOT YET IMPLEMENTED
# wofi theme
#style = '' '';
}; };
# NOT YET IMPLEMENTED
# wofi theme
#style = '' '';
}; };
}; };
};
} }

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,49 +1,55 @@
{ inputs, ... }: { { inputs, ... }:
{
# general multimedia module declaration # general multimedia module declaration
flake.nixosModules.multimedia = { pkgs, ... }: { flake.nixosModules.multimedia =
# for home manager functionality { pkgs, ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager.users.sernity = { {
# alternative youtube frontend # for home manager functionality
programs.freetube = { imports = [ inputs.home-manager.nixosModules.home-manager ];
enable = true;
settings.defaultQuality = "1080"; home-manager.users.sernity = {
# alternative youtube frontend
programs.freetube = {
enable = true;
settings.defaultQuality = "1080";
};
# other multimedia programs
home.packages = with pkgs; [
#browsing and fileshare
transmission_4-gtk # torrent client
nicotine-plus # p2p media sharing
carburetor # gui for tor proxying
chromium # google browser
#lagrange # gemini network browser
tractor # cli for tor proxying
tor # the onion router
# messaging and social
vesktop
# images
gimp # general image editing
#inkscape # vector image editing
# video
vlc # video player
#shotcut # video editor
# 3d creative
blender # 3d modelling software
orca-slicer # 3d printer slicer
];
}; };
# other multimedia programs
home.packages = with pkgs; [
#browsing and fileshare
transmission_4-gtk # torrent client
nicotine-plus # p2p media sharing
carburetor # gui for tor proxying
chromium # google browser
#lagrange # gemini network browser
tractor # cli for tor proxying
tor # the onion router
# messaging and social
vesktop
# images
gimp # general image editing
#inkscape # vector image editing
# video
vlc # video player
#shotcut # video editor
# 3d creative
blender # 3d modelling software
orca-slicer # 3d printer slicer
];
}; };
};
} }

View file

@ -1,54 +1,64 @@
{ inputs, ... }: { { inputs, ... }:
{
# general music module declaration # general music module declaration
flake.nixosModules.music = { pkgs, ... }: { flake.nixosModules.music =
# for home manager functionality { pkgs, ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager.users.serenity = { {
# audio effects # for home manager functionality
services.easyeffects.enable = true; imports = [ inputs.home-manager.nixosModules.home-manager ];
home.packages = with pkgs; [ home-manager.users.serenity = {
# players # audio effects
spotify # corporate garbage services.easyeffects.enable = true;
strawberry # qt music player
# misc home.packages = with pkgs; [
audacity # audio editing
puddletag # file tagger
]; # players
spotify # corporate garbage
strawberry # qt music player
# misc
audacity # audio editing
puddletag # file tagger
];
};
}; };
};
# music production module declaration # music production module declaration
flake.nixosModules.music-production = { pkgs, musnix, ... }: { flake.nixosModules.music-production =
# for home manager functionality { pkgs, musnix, ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
boot = { }; {
musnix.enable = true; # for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
users.users.serenity.extraGroups = [ "audio" ]; boot = { };
home-manager.users.serenity = {
home.packages = with pkgs; [ musnix.enable = true;
# daws users.users.serenity.extraGroups = [ "audio" ];
bespokesynth home-manager.users.serenity = {
]; home.packages = with pkgs; [
# daws
bespokesynth
];
};
}; };
};
} }

View file

@ -3,25 +3,33 @@
{ {
# defines a custom btop module # defines a custom btop module
flake.nixosModules.btop = { ... }: { flake.nixosModules.btop =
# for home manager functionality { pkgs, ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
# home manager options {
home-manager.users.serenity = {
programs = { # for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
btop = { environment.systemPackages = with pkgs; [ btop ];
# enables btop # home manager options
enable = true; home-manager.users.serenity = {
programs = {
btop = {
# enables btop
enable = true;
# btop settings
settings = {
color_theme = "adapta";
theme_background = false;
};
# btop settings
settings = {
color_theme = "adapta";
theme_background = false;
}; };
}; };
@ -30,6 +38,4 @@
}; };
};
} }

View file

@ -3,37 +3,41 @@
{ {
# terminal supermodule # terminal supermodule
flake.nixosModules.terminal = { pkgs, ... }: { flake.nixosModules.terminal =
# list of modules to include { pkgs, ... }:
imports = [
# home manager {
inputs.home-manager.nixosModules.home-manager
# terminal emulator # list of modules to include
self.nixosModules.kitty imports = [
# text editor # home manager
self.nixosModules.helix inputs.home-manager.nixosModules.home-manager
# for showing off, lol # terminal emulator
self.nixosModules.fetch self.nixosModules.kitty
# file manager # text editor
self.nixosModules.yazi self.nixosModules.helix
# shell and prompt # for showing off, lol
self.nixosModules.fish self.nixosModules.fetch
# system monitor # file manager
self.nixosModules.btop self.nixosModules.yazi
# version control # shell and prompt
self.nixosModules.git self.nixosModules.fish
]; # system monitor
self.nixosModules.btop
}; # version control
self.nixosModules.git
];
};
} }

View file

@ -1,26 +1,33 @@
{ self, inputs, ... }: { { self, inputs, ... }:
flake.nixosModules.fetch = { pkgs, ... }: { {
# needed for home manager functionality # fetch module declaration
imports = [ inputs.home-manager.nixosModules.home-manager ]; flake.nixosModules.fetch =
# home manager options { pkgs, ... }:
home-manager.users.serenity = {
# stuff in those screenshots on r/unixporn {
home.packages = with pkgs; [
peaclock # terminal clock program # needed for home manager functionality
cmatrix # terminal matrix rain imports = [ inputs.home-manager.nixosModules.home-manager ];
];
# home manager options
home-manager.users.serenity = {
# stuff in those screenshots on r/unixporn
home.packages = with pkgs; [
peaclock # terminal clock program
cmatrix # terminal matrix rain
];
# fetch options
programs.fastfetch = {
enable = true;
#settings = { };
};
# fetch options
programs.fastfetch = {
enable = true;
#settings = { };
}; };
}; };
};
} }

View file

@ -3,72 +3,87 @@
{ {
# defines a custom fish module # defines a custom fish module
flake.nixosModules.fish = { pkgs, ... }: { flake.nixosModules.fish =
# for home manager functionality { pkgs, ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
# home manager options {
home-manager.users.serenity = {
# program settings # for home manager functionality
programs = { imports = [ inputs.home-manager.nixosModules.home-manager ];
# starship prompt # adding shell packages to system, unsure if necessary
starship = { environment.systemPackages = with pkgs; [
enable = true; fish # primary shell
}; bash # backup shell
];
# fish shell # system level fish declaration
fish = { programs.fish.enable = true;
# enables fish # home manager options
enable = true; home-manager.users.serenity = {
# shell initialisation # program settings
loginShellInit = ""; programs = {
interactiveShellInit = "";
# fish plugins # starship prompt
plugins = [ starship = {
enable = true;
{
name = "done";
src = pkgs.fishPlugins.done.src;
}
{
name = "puffer";
src = pkgs.fishPlugins.puffer.src;
}
{
name = "autopair";
src = pkgs.fishPlugins.autopair.src;
}
];
# command aliases & abbreviations
shellAbbrs = {
nv = "hx";
nvim = "hx";
trc = "tree -C";
};
shellAliases = {
rbu = "sudo systemctl reboot --firmware-setup";
}; };
# fish functions # fish shell
functions = { fish = {
# enables fish
enable = true;
# shell initialisation
loginShellInit = "";
interactiveShellInit = "";
# fish plugins
plugins = [
{
name = "done";
src = pkgs.fishPlugins.done.src;
}
{
name = "puffer";
src = pkgs.fishPlugins.puffer.src;
}
{
name = "autopair";
src = pkgs.fishPlugins.autopair.src;
}
];
# command aliases & abbreviations
shellAbbrs = {
nv = "hx";
nvim = "hx";
trc = "tree -C";
};
shellAliases = {
rbu = "sudo systemctl reboot --firmware-setup";
};
# fish functions
functions = {
# foo
foo = ''
if bar
printf 'foo'
else
echo loser
end
'';
};
# foo
foo = ''
if bar
printf 'foo'
else
echo loser
end
'';
}; };
}; };
@ -77,6 +92,4 @@
}; };
};
} }

View file

@ -3,51 +3,58 @@
{ {
# defines a custom git module # defines a custom git module
flake.nixosModules.git = { ... }: { flake.nixosModules.git =
# for home manager functionality { pkgs, ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
# home manager options {
home-manager.users.serenity = {
programs = { # for home manager functionality
imports = [ inputs.home-manager.nixosModules.home-manager ];
git = { # system level git declaration
programs.git.enable = true;
# enables git # home manager options
enable = true; home-manager.users.serenity = {
# git settings programs = {
settings = {
# user details git = {
user = {
name = "serenity-F";
email = "serenity-F@noreply.codeberg.org";
#path to signing key # enables git
signingKey = "/home/serenity/.ssh/id_ed25519.pub"; enable = true;
# git settings
settings = {
# user details
user = {
name = "serenity-F";
email = "serenity-F@noreply.codeberg.org";
#path to signing key
signingKey = "/home/serenity/.ssh/id_ed25519.pub";
};
# use ssh keys for auth
gpg.format = "ssh";
commit.gpgSign = true;
# use 'main' as default branch
init.defaultBranch = "main";
# automatically track remote branch
push.autoSetupRemote = true;
}; };
# use ssh keys for auth
gpg.format = "ssh";
commit.gpgSign = true;
# use 'main' as default branch
init.defaultBranch = "main";
# automatically track remote branch
push.autoSetupRemote = true;
}; };
}; };
}; };
}; };
};
} }

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,82 +3,86 @@
{ {
# defines a custom kitty module # defines a custom kitty module
flake.nixosModules.kitty = { pkgs, ... }: { flake.nixosModules.kitty =
# needed for home manager functionality { pkgs, ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
# home manager options {
home-manager.users.serenity = {
# packages to include # needed for home manager functionality
home.packages = with pkgs; [ imports = [ inputs.home-manager.nixosModules.home-manager ];
kitty
];
# cli fuzzy finder # home manager options
programs.fzf = { home-manager.users.serenity = {
enable = true;
enableFishIntegration = true;
};
programs.kitty = { # packages to include
home.packages = with pkgs; [
kitty
];
# enables kitty # cli fuzzy finder
enable = true; programs.fzf = {
enable = true;
# kitty integrations enableFishIntegration = true;
enableGitIntegration = true;
shellIntegration.enableFishIntegration = true;
# font settings
font = {
name = "spleen 32x64";
size = 12;
}; };
# kitty settings programs.kitty = {
settings = {
# sets fish as the default shell # enables kitty
shell = "${pkgs.fish}/bin/fish"; enable = true;
# misc. settings # kitty integrations
url_style = "curly"; enableGitIntegration = true;
disable_ligutures = "never"; shellIntegration.enableFishIntegration = true;
scrollback_lines = 10000;
enable_audio_bell = false;
update_check_interval = 0;
# cursor settings # font settings
cursor_shape = "Underline"; font = {
cursor_shape_unfocused = "unchanged"; name = "spleen 32x64";
cursor_underline_thickness = 1; size = 12;
cursor_trail = 1; };
# window settings # kitty settings
window_padding_width = 5; settings = {
remember_window_size = "no";
initial_window_width = 1200;
initial_window_height = 600;
confirm_os_window_close = "0";
hide_window_decorations = true;
show_window_resize_notification = false;
# Colours # sets fish as the default shell
# NOT YET IMPLEMENTED shell = "${pkgs.fish}/bin/fish";
# misc. settings
url_style = "curly";
disable_ligutures = "never";
scrollback_lines = 10000;
enable_audio_bell = false;
update_check_interval = 0;
# cursor settings
cursor_shape = "Underline";
cursor_shape_unfocused = "unchanged";
cursor_underline_thickness = 1;
cursor_trail = 1;
# window settings
window_padding_width = 5;
remember_window_size = "no";
initial_window_width = 1200;
initial_window_height = 600;
confirm_os_window_close = "0";
hide_window_decorations = true;
show_window_resize_notification = false;
# Colours
# NOT YET IMPLEMENTED
};
# misecellaneous kitty config
extraConfig = ''
window_padding_width 0 20
'';
}; };
# misecellaneous kitty config
extraConfig = ''
window_padding_width 0 20
'';
}; };
}; };
};
} }

View file

@ -3,40 +3,46 @@
{ {
# yazi module declaration # yazi module declaration
flake.nixosModules.yazi = { ... }: { flake.nixosModules.yazi =
# for home manager functionality { ... }:
imports = [ inputs.home-manager.nixosModules.home-manager ];
# home manager options {
home-manager.users.serenity = {
# yazi settings # for home manager functionality
programs = { imports = [ inputs.home-manager.nixosModules.home-manager ];
yazi = { # home manager options
home-manager.users.serenity = {
# enables yazi # yazi settings
enable = true; programs = {
# shell integration yazi = {
shellWrapperName = "y";
enableFishIntegration = true;
# yazi settings # enables yazi
settings = { enable = true;
log.enabled = false;
mgr = { # shell integration
show_hidden = true; shellWrapperName = "y";
linemode = "none"; enableFishIntegration = true;
sort_by = "mtime";
sort_reverse = false; # yazi settings
sort_dir_first = true; settings = {
log.enabled = false;
mgr = {
show_hidden = true;
linemode = "none";
sort_by = "mtime";
sort_reverse = false;
sort_dir_first = true;
};
}; };
};
# NOT YET IMPLEMENTED # NOT YET IMPLEMENTED
#theme = { }; #theme = { };
};
}; };
@ -44,6 +50,4 @@
}; };
};
} }

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,139 +1,116 @@
{ inputs, ... }: { { inputs, ... }:
# module declaration {
flake.nixosModules.core-packages = { pkgs, ... }: {
# nix settings # system packages module declaration
nix.settings = { flake.nixosModules.core-packages =
# for packages not in nixpkgs { pkgs, ... }:
#substituters = [
#"name.here"
#];
# keys to sign aforementioned packages {
#trusted-public-keys = [
#"name.here"
#];
}; # nix settings
nix.settings = {
# nixpkgs settings # for packages not in nixpkgs
nixpkgs = { #substituters = [
#"name.here"
# allows broken and ideologically impure packages #];
config = { # keys to sign aforementioned packages
allowUnfree = true; #trusted-public-keys = [
allowBroken = true; #"name.here"
#];
}; };
# nixpkgs overlays # nixpkgs settings
overlays = [ nixpkgs = {
#niri.overlays.niri # allows broken and ideologically impure packages
config = {
allowUnfree = true;
allowBroken = true;
};
# nixpkgs overlays
overlays = [
#niri.overlays.niri
];
};
# flatpak
services.flatpak = {
enable = true;
};
# core programs to include in base system
programs = {
# necessary terminal programs
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
# message in the event that a user attempts
# to run an elf binary not compiled for nixos.
environment.stub-ld.enable = true;
# core packages to include in base system
environment.systemPackages = with pkgs; [
# nix utilities
nvd
nix-tree
nix-init
nix-index
nix-prefetch
nix-output-monitor
# filesystem
ddrutility
smartmontools
ntfs3g
exfatprogs
btrfs-progs
# compat tools
steam-run
android-cli
android-tools
# cli tools
fd
bc
zip
icu
doas
tldr
wget
curl
file
tree
unzip
gnupg
s-tui
udiskie
busybox
ripgrep
killall
usbutils
pciutils
moreutils
libsecret
git-crypt
undervolt
magic-wormhole
]; ];
}; };
# 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 = {
# 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
# message in the event that a user attempts
# to run an elf binary not compiled for nixos.
environment.stub-ld.enable = true;
# core packages to include in base system
environment.systemPackages = with pkgs; [
# nix utilities
nvd
nix-tree
nix-init
nix-index
nix-prefetch
nix-output-monitor
# filesystem
ddrutility
smartmontools
ntfs3g
exfatprogs
btrfs-progs
# shells
fish
bash
# core tools
btop
helix
steam-run
android-cli
android-tools
magic-wormhole
# cli tools
fd
bc
zip
icu
doas
tldr
wget
curl
file
tree
unzip
gnupg
s-tui
udiskie
busybox
ripgrep
killall
usbutils
pciutils
moreutils
libsecret
git-crypt
undervolt
];
};
} }

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 ];