tidying
This commit is contained in:
parent
7050f0cb7c
commit
988c0fe1c9
9 changed files with 72 additions and 83 deletions
23
flake.nix
23
flake.nix
|
|
@ -133,15 +133,15 @@
|
||||||
|
|
||||||
## Universal variable declarations
|
## Universal variable declarations
|
||||||
label = "SerenityOS";
|
label = "SerenityOS";
|
||||||
version = "SerenityOS_0.9.0"; # proper versioning system before v1.0.0?
|
user = "serenity"; # used for admin purposes
|
||||||
primaryUser = "serenity"; # used for admin purposes
|
userDescription = "Serenity";
|
||||||
userDesc = "Serenity Amalgam";
|
homeDirectory = "/home/${user}"; # for easy configuration
|
||||||
homeDir = "/home/${primaryUser}"; # for easy configuration
|
#disksPath = "${homeDirectory}/"; # for easy disk navigation
|
||||||
disksPath = "${homeDir}/"; # for easy disk navigation
|
flakePath = "${homeDirectory}/${label}";
|
||||||
#flakePath = "${homeDir}/flakes/nixdots/"; # current path to flake - unused
|
wallpapersPath = "${homeDirectory}/Pictures/Wallpapers";
|
||||||
flakePath = "${homeDir}/SerenityOS/"; # for v1.0.0 release
|
|
||||||
wallpapersPath = "${homeDir}/Pictures/Wallpapers";
|
|
||||||
wallpaper = "${wallpapersPath}/almondBlossoms-VanGogh.jpg";
|
wallpaper = "${wallpapersPath}/almondBlossoms-VanGogh.jpg";
|
||||||
|
avatarsPath = "${homeDirectory}/Pictures/Avatars";
|
||||||
|
avatar = "${avatarsPath}/avatar1.jpg";
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
|
|
@ -153,10 +153,11 @@
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs outputs;
|
inherit inputs outputs;
|
||||||
inherit niri noctalia;
|
inherit niri noctalia;
|
||||||
inherit label version;
|
inherit label flakePath;
|
||||||
inherit flakePath disksPath;
|
inherit user userDescription;
|
||||||
inherit primaryUser userDesc homeDir;
|
inherit homeDirectory;
|
||||||
inherit wallpapersPath wallpaper;
|
inherit wallpapersPath wallpaper;
|
||||||
|
inherit avatarsPath avatar;
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
./core/hosts/hades
|
./core/hosts/hades
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,12 @@
|
||||||
{ inputs, outputs, config, pkgs, label, version, flakePath, disksPath
|
{
|
||||||
, primaryUser, userDesc, homeDir, wallpapersPath, wallpaper, ... }:
|
inputs, outputs, config, pkgs,
|
||||||
|
label, flakePath,
|
||||||
|
user, userDescription,
|
||||||
|
homeDirectory,
|
||||||
|
wallpapersPath, wallpaper,
|
||||||
|
avatarsPath, avatar,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
let hostname = "${config.networking.hostName}";
|
let hostname = "${config.networking.hostName}";
|
||||||
|
|
||||||
|
|
@ -20,8 +27,8 @@ in {
|
||||||
|
|
||||||
## System-level user declarations
|
## System-level user declarations
|
||||||
users.users = {
|
users.users = {
|
||||||
${primaryUser} = {
|
${user} = {
|
||||||
description = "${userDesc}";
|
description = "${userDescription}";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "networkmanager" "gamemode" "audio" ];
|
extraGroups = [ "wheel" "networkmanager" "gamemode" "audio" ];
|
||||||
#hashedPasswordFile = config.sops.secrets.loginPassword.path;
|
#hashedPasswordFile = config.sops.secrets.loginPassword.path;
|
||||||
|
|
@ -35,14 +42,15 @@ in {
|
||||||
verbose = true; # enables verbose output on activation
|
verbose = true; # enables verbose output on activation
|
||||||
extraSpecialArgs = { # passes in specialArgs from flake.nix
|
extraSpecialArgs = { # passes in specialArgs from flake.nix
|
||||||
inherit inputs outputs;
|
inherit inputs outputs;
|
||||||
inherit label version;
|
|
||||||
inherit flakePath disksPath;
|
|
||||||
inherit primaryUser homeDir;
|
|
||||||
inherit wallpapersPath wallpaper;
|
|
||||||
inherit hostname;
|
inherit hostname;
|
||||||
|
inherit label flakePath;
|
||||||
|
inherit user userDescription;
|
||||||
|
inherit homeDirectory;
|
||||||
|
inherit wallpapersPath wallpaper;
|
||||||
|
inherit avatarsPath avatar;
|
||||||
};
|
};
|
||||||
users = {
|
users = {
|
||||||
${primaryUser} = {
|
${user} = {
|
||||||
imports = [
|
imports = [
|
||||||
## Home configuration -
|
## Home configuration -
|
||||||
## currently all users share the same home
|
## currently all users share the same home
|
||||||
|
|
@ -50,22 +58,27 @@ in {
|
||||||
## home directories. Additional modules
|
## home directories. Additional modules
|
||||||
## can be declared alongside `u-username/default.nix`
|
## can be declared alongside `u-username/default.nix`
|
||||||
## and then imported in this section.
|
## and then imported in this section.
|
||||||
#./theme
|
#./resources/theme
|
||||||
./desktop
|
./desktop
|
||||||
./programs
|
./programs
|
||||||
./scripts
|
./scripts
|
||||||
];
|
];
|
||||||
home = {
|
home = {
|
||||||
|
stateVersion = "24.11"; # IMPORTANT
|
||||||
#programs.home-manager.enable = true;
|
#programs.home-manager.enable = true;
|
||||||
#systemd.user.startServices = "sd-switch";
|
#systemd.user.startServices = "sd-switch";
|
||||||
username = "${primaryUser}"; # passes username from `flake.nix`
|
username = "${user}"; # passes username from `flake.nix`
|
||||||
homeDirectory = "${homeDir}"; # passes homedir from `flake.nix`
|
homeDirectory = "${homeDirectory}"; # passes homedir from `flake.nix`
|
||||||
|
file."avatar" = {
|
||||||
|
source = ./resources/avatars;
|
||||||
|
target = "${avatarsPath}";
|
||||||
|
recursive = true;
|
||||||
|
};
|
||||||
file."Wallpapers" = { # copies wallpapers
|
file."Wallpapers" = { # copies wallpapers
|
||||||
source = ./resources/wallpapers; # from flake directory
|
source = ./resources/wallpapers; # from flake directory
|
||||||
target = "${wallpapersPath}"; # to home directory
|
target = "${wallpapersPath}"; # to home directory
|
||||||
recursive = true; # think this is important, icr
|
recursive = true; # think this is important, icr
|
||||||
};
|
};
|
||||||
stateVersion = "24.11"; # IMPORTANT
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,13 @@
|
||||||
{ pkgs, inputs, primaryUser, ... }: {
|
{
|
||||||
|
config, pkgs, inputs,
|
||||||
|
user, userDescription,
|
||||||
|
homeDirectory,
|
||||||
|
wallpapersPath, wallpaper,
|
||||||
|
avatarsPath, avatar,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
home-manager.users.${primaryUser} = {
|
home-manager.users.${primaryUser} = {
|
||||||
# import the home manager module
|
# import the home manager module
|
||||||
imports = [ inputs.noctalia.homeModules.default ];
|
imports = [ inputs.noctalia.homeModules.default ];
|
||||||
|
|
@ -10,7 +19,7 @@
|
||||||
# configure noctalia here
|
# configure noctalia here
|
||||||
|
|
||||||
general = {
|
general = {
|
||||||
avatarImage = "/home/${primaryUser}/avatar.jpg";
|
avatarImage = "${avatar}";
|
||||||
radiusRatio = 0.2;
|
radiusRatio = 0.2;
|
||||||
showSessionButtonOnLockScreen = false;
|
showSessionButtonOnLockScreen = false;
|
||||||
showHibernateOnLockScreen = true;
|
showHibernateOnLockScreen = true;
|
||||||
|
|
@ -24,7 +33,7 @@
|
||||||
colorSchemes = { predefinedScheme = "Monochrome"; };
|
colorSchemes = { predefinedScheme = "Monochrome"; };
|
||||||
|
|
||||||
wallpaper = {
|
wallpaper = {
|
||||||
directory = "/home/${primaryUser}/Pictures/Wallpapers";
|
directory = "${wallpapersPath}";
|
||||||
hideWallpaperFilenames = true;
|
hideWallpaperFilenames = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -11,17 +11,15 @@
|
||||||
## Import shared program configs
|
## Import shared program configs
|
||||||
./web
|
./web
|
||||||
./git
|
./git
|
||||||
./obs
|
|
||||||
./sync
|
./sync
|
||||||
./chat
|
./chat
|
||||||
./yazi
|
./yazi
|
||||||
./btop
|
./btop
|
||||||
./fish
|
./fish
|
||||||
./nvim
|
./nvim
|
||||||
./misc
|
#./fetch
|
||||||
./music
|
|
||||||
./fetch
|
|
||||||
./kitty
|
./kitty
|
||||||
|
./fastfetch
|
||||||
./multimedia
|
./multimedia
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,13 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
home = {
|
||||||
|
packages = with pkgs; [
|
||||||
|
peaclock # neat terminal clock applet
|
||||||
|
cmatrix # funky terminal matrix rain
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
programs.fastfetch = {
|
programs.fastfetch = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = with pkgs; [
|
package = with pkgs; [
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
home = { packages = with pkgs; [ kitty ]; };
|
home = { packages = with pkgs; [ kitty ]; };
|
||||||
|
|
||||||
programs.alacritty.enable = true;
|
#programs.alacritty.enable = true;
|
||||||
|
|
||||||
## Enables kitty via home-manager
|
## Enables kitty via home-manager
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
|
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
imports = [
|
|
||||||
./homestuck.nix # small module to add a .desktop entry for The Unofficial Homestuck Collection
|
|
||||||
];
|
|
||||||
|
|
||||||
home = {
|
|
||||||
packages = with pkgs; [
|
|
||||||
cmatrix # funky terminal matrix rain
|
|
||||||
peaclock # neat terminal clock applet
|
|
||||||
themix-gui # for creating themes
|
|
||||||
nexusmods-app-unfree # skyrim mods lol
|
|
||||||
orca-slicer # 3d printing slicer
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
{ disksPath, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
homestuckIcon = pkgs.fetchurl {
|
|
||||||
url = ''
|
|
||||||
https://static.wikia.nocookie.net/mspaintadventures/images/2/2d/Sburb_Logo.svg
|
|
||||||
'';
|
|
||||||
hash = "sha256-AYt3Yln3xXGQW+QRJtn1vQfP7G5UYLOqAT+3BVnEVWo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
## ${homestuckPath} requires you to complete the regular setup requirements
|
|
||||||
## detailed at https://homestuck.giovanh.com/unofficial-homestuck-collection
|
|
||||||
homestuckPath = "${disksPath}/Tartarus/homosuck/Homestuck-2.5.7.AppImage";
|
|
||||||
|
|
||||||
in {
|
|
||||||
|
|
||||||
xdg.desktopEntries = {
|
|
||||||
homestuck = {
|
|
||||||
name = "The Unofficial Homestuck Collection";
|
|
||||||
icon = "${homestuckIcon}";
|
|
||||||
exec = "appimage-run ${homestuckPath}";
|
|
||||||
categories = [ "Game" ];
|
|
||||||
genericName = "Homestuck";
|
|
||||||
mimeType = [ ];
|
|
||||||
terminal = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -2,17 +2,26 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
./obs.nix
|
||||||
|
./music.nix
|
||||||
|
./music-production.nix
|
||||||
|
];
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
|
||||||
## Image and Video playback and production
|
## Image and Video playback and production
|
||||||
#obs-studio # Screen sharing
|
#inkscape # Vector image editing
|
||||||
inkscape # Vector image editing
|
|
||||||
#shotcut # Video editing
|
#shotcut # Video editing
|
||||||
#blender # 3D modelling
|
#blender # 3D modelling
|
||||||
gimp # Image editor
|
gimp # Image editor
|
||||||
vlc # Multimedia player
|
vlc # Multimedia player
|
||||||
|
|
||||||
|
## Miscellaneous
|
||||||
|
themix-gui # for creating gtk themes
|
||||||
|
orca-slicer # 3d printing slicer
|
||||||
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue