This commit is contained in:
blahai 2025-02-01 01:32:26 +02:00
parent ffae125fcf
commit d6c098bbbe
No known key found for this signature in database
23 changed files with 92 additions and 587 deletions

View file

@ -1,5 +0,0 @@
{
imports = [
./programs
];
}

View file

@ -1,7 +0,0 @@
{
imports = [
./defaults.nix
./shells.nix
./top-level.nix
];
}

View file

@ -1,93 +0,0 @@
{lib, ...}: let
inherit (lib.options) mkOption;
inherit (lib.types) enum nullOr;
in {
options.olympus.programs.defaults = {
shell = mkOption {
type = enum [
"bash"
"fish"
];
default = "bash";
};
terminal = mkOption {
type = enum [
"alacritty"
"kitty"
"wezterm"
"foot"
];
default = "wezterm";
};
fileManager = mkOption {
type = enum [
"cosmic-files"
"thunar"
"dolphin"
"nemo"
"nautilus"
];
default = "nautilus";
};
browser = mkOption {
type = enum [
"firefox"
"floorp"
"chromium"
"thorium"
];
default = "floorp";
};
editor = mkOption {
type = enum [
"nvim"
];
default = "nvim";
};
launcher = mkOption {
type = nullOr (enum [
"rofi"
"wofi"
"cosmic-launcher"
]);
default = "wofi";
};
bar = mkOption {
type = nullOr (enum [
"waybar"
"ags"
]);
default = "ags";
};
screenLocker = mkOption {
type = nullOr (enum [
"hyprlock"
"swaylock"
"gtklock"
"cosmic-greeter"
]);
default = "hyprlock";
description = ''
The lockscreen module to be loaded by hjem.
'';
};
noiseSuppressor = mkOption {
type = nullOr (enum [
"rnnoise"
"noisetorch"
]);
default = "rnnoise";
description = ''
The noise suppressor to be used for desktop systems with sound enabled.
'';
};
};
}

View file

@ -1,16 +0,0 @@
{
lib,
pkgs,
...
}: let
inherit (lib.programs) mkProgram;
in {
options.olympus.programs = {
bash = mkProgram pkgs "bash" {
enable.default = true;
package.default = pkgs.bashInteractive;
};
fish = mkProgram pkgs "fish" {};
};
}

View file

@ -1,32 +0,0 @@
{
lib,
config,
...
}: let
inherit (lib.options) mkEnableOption;
cfg = config.olympus.programs;
in {
# these are options that will cause a mass rebuild by enabling multiple packages
options.olympus.programs = {
cli = {
enable =
mkEnableOption "Enable CLI programs"
// {
default = true;
};
modernShell.enable = mkEnableOption "Enable programs for a more modern shell";
};
tui.enable =
mkEnableOption "Enable TUI programs"
// {
default = cfg.cli.enable;
};
gui.enable = mkEnableOption "Enable GUI programs";
pentesting.enable = mkEnableOption "Enable packages designed for pentesting";
notes.enable = mkEnableOption "Enable note-taking programs";
};
}

View file

@ -1,18 +1,25 @@
{
lib,
self,
self',
pkgs,
config,
inputs,
inputs',
...
}: let
inherit (lib.modules) mkDefault;
inherit (lib.modules) mkIf;
inherit (lib.attrsets) genAttrs;
inherit (lib.options) mkEnableOption;
in {
hjem = {
users = genAttrs config.olympus.system.users (name: ./${name});
options.olympus.system.enableHjem =
mkEnableOption "Should hjem be enabled"
// {
default = true;
};
clobberByDefault = true;
config = mkIf config.olympus.system.enableHjem {
hjem = {
users = genAttrs config.olympus.system.users (name: ./${name});
clobberByDefault = true;
specialArgs = {inherit inputs;};
};
};
}

View file

@ -1 +0,0 @@
{}

17
home/pingu/alacritty.nix Normal file
View file

@ -0,0 +1,17 @@
{
hjem.users.pingu.rum.programs.alacritty = {
enable = true;
settings = {
window = {
dimensions = {
lines = 28;
columns = 101;
};
padding = {
x = 6;
y = 3;
};
};
};
};
}

View file

@ -1,6 +1,5 @@
{
imports = [
#./packages
#./system
./alacritty.nix # this is a test for hjem-rum
];
}

View file

@ -1,5 +0,0 @@
{
imports = [
./shell
];
}

View file

@ -1,5 +0,0 @@
{
imports = [
./fish.nix
];
}

View file

@ -1,96 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.modules) mkIf;
in {
home.packages = with pkgs; [
neofetch
];
programs = mkIf config.olympus.programs.fish.enable {
fish = {
enable = true;
interactiveShellInit = ''
function fish_greeting
if test -z $DEVSHELL_NIX;
echo The time is (set_color purple; date +%T; set_color purple)
if test -z $SSH_CLIENT;
fastfetch
else
neofetch
end
end
end
'';
shellAliases = {
"ls" = "eza -l -a --group-directories-first --icons";
"grep" = "rg -p";
"rg" = "rg -p";
"cp" = "cp -rv";
":q" = "exit";
":qa" = "pkill fish";
".." = "z ..";
".2" = "z ../..";
".3" = "z ../../..";
".4" = "z ../../../..";
".5" = "z ../../../../..";
".r" = "z /";
".h" = "z ~";
".c" = "z ~/.config/";
".a" = "z ~/.config/ags/";
".n" = "z ~/.config/nixos/";
".d" = "z ~/Documents/";
".C" = "z ~/Documents/code/";
".D" = "z ~/Downloads/";
".p" = "z ~/Pictures/";
# git
"gc" = "git clone";
"gp" = "git push";
"ga" = "git add";
"gan" = "git add -N .";
"gcm" = "git commit -m";
"fetch" = "clear ; fastfetch --logo ~/Downloads/gay.png --logo-width 32";
"hvim" = "z ~/.config/hypr/ ; nvim ; z";
"fvim" = "nvim ~/.config/fish/config.fish";
"se" = "sudoedit";
"vim" = "nvim";
"nvide" = "env -u WAYLAND_DISPLAY neovide --multigrid";
"transcat" = "queercat -b -f 1 -v 0.45 -h 0.45";
"clock" = "tty-clock -s -C 5 -D -c -b";
};
functions = {
os-age = ''
stat / | awk '/Birth: /{print $2 " " substr($3,1,5)}'
'';
build-iso = ''
cd ~/.config/nixos
nix build .#nixosConfigurations.epimetheus.config.system.build.isoImage
'';
# Credit for these 3
# https://www.reddit.com/r/linux/comments/1fq0za8/comment/lp1ybdn
disks = ''
lsblk -o NAME,MOUNTPOINT,FSTYPE,FSUSE%,SIZE
'';
gr = ''
set GROOT (git rev-parse --show-toplevel 2>/dev/null); and cd $GROOT; or return $argv
'';
mkcd = ''
mkdir -p -- $argv[1] && cd $argv; or return $status
'';
};
};
};
}

View file

@ -1,7 +0,0 @@
{
imports = [
./cli
./gui
./misc
];
}

View file

@ -1 +0,0 @@
{}

View file

@ -1 +0,0 @@
{}

View file

@ -1,5 +0,0 @@
{
imports = [
./env.nix
];
}

View file

@ -1 +0,0 @@
{}

View file

@ -1 +0,0 @@
{}