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
|
||||
label = "SerenityOS";
|
||||
version = "SerenityOS_0.9.0"; # proper versioning system before v1.0.0?
|
||||
primaryUser = "serenity"; # used for admin purposes
|
||||
userDesc = "Serenity Amalgam";
|
||||
homeDir = "/home/${primaryUser}"; # for easy configuration
|
||||
disksPath = "${homeDir}/"; # for easy disk navigation
|
||||
#flakePath = "${homeDir}/flakes/nixdots/"; # current path to flake - unused
|
||||
flakePath = "${homeDir}/SerenityOS/"; # for v1.0.0 release
|
||||
wallpapersPath = "${homeDir}/Pictures/Wallpapers";
|
||||
user = "serenity"; # used for admin purposes
|
||||
userDescription = "Serenity";
|
||||
homeDirectory = "/home/${user}"; # for easy configuration
|
||||
#disksPath = "${homeDirectory}/"; # for easy disk navigation
|
||||
flakePath = "${homeDirectory}/${label}";
|
||||
wallpapersPath = "${homeDirectory}/Pictures/Wallpapers";
|
||||
wallpaper = "${wallpapersPath}/almondBlossoms-VanGogh.jpg";
|
||||
avatarsPath = "${homeDirectory}/Pictures/Avatars";
|
||||
avatar = "${avatarsPath}/avatar1.jpg";
|
||||
|
||||
in {
|
||||
|
||||
|
|
@ -153,10 +153,11 @@
|
|||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
inherit niri noctalia;
|
||||
inherit label version;
|
||||
inherit flakePath disksPath;
|
||||
inherit primaryUser userDesc homeDir;
|
||||
inherit label flakePath;
|
||||
inherit user userDescription;
|
||||
inherit homeDirectory;
|
||||
inherit wallpapersPath wallpaper;
|
||||
inherit avatarsPath avatar;
|
||||
};
|
||||
modules = [
|
||||
./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}";
|
||||
|
||||
|
|
@ -20,8 +27,8 @@ in {
|
|||
|
||||
## System-level user declarations
|
||||
users.users = {
|
||||
${primaryUser} = {
|
||||
description = "${userDesc}";
|
||||
${user} = {
|
||||
description = "${userDescription}";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" "gamemode" "audio" ];
|
||||
#hashedPasswordFile = config.sops.secrets.loginPassword.path;
|
||||
|
|
@ -35,14 +42,15 @@ in {
|
|||
verbose = true; # enables verbose output on activation
|
||||
extraSpecialArgs = { # passes in specialArgs from flake.nix
|
||||
inherit inputs outputs;
|
||||
inherit label version;
|
||||
inherit flakePath disksPath;
|
||||
inherit primaryUser homeDir;
|
||||
inherit wallpapersPath wallpaper;
|
||||
inherit hostname;
|
||||
inherit label flakePath;
|
||||
inherit user userDescription;
|
||||
inherit homeDirectory;
|
||||
inherit wallpapersPath wallpaper;
|
||||
inherit avatarsPath avatar;
|
||||
};
|
||||
users = {
|
||||
${primaryUser} = {
|
||||
${user} = {
|
||||
imports = [
|
||||
## Home configuration -
|
||||
## currently all users share the same home
|
||||
|
|
@ -50,22 +58,27 @@ in {
|
|||
## home directories. Additional modules
|
||||
## can be declared alongside `u-username/default.nix`
|
||||
## and then imported in this section.
|
||||
#./theme
|
||||
#./resources/theme
|
||||
./desktop
|
||||
./programs
|
||||
./scripts
|
||||
];
|
||||
home = {
|
||||
stateVersion = "24.11"; # IMPORTANT
|
||||
#programs.home-manager.enable = true;
|
||||
#systemd.user.startServices = "sd-switch";
|
||||
username = "${primaryUser}"; # passes username from `flake.nix`
|
||||
homeDirectory = "${homeDir}"; # passes homedir from `flake.nix`
|
||||
username = "${user}"; # passes username from `flake.nix`
|
||||
homeDirectory = "${homeDirectory}"; # passes homedir from `flake.nix`
|
||||
file."avatar" = {
|
||||
source = ./resources/avatars;
|
||||
target = "${avatarsPath}";
|
||||
recursive = true;
|
||||
};
|
||||
file."Wallpapers" = { # copies wallpapers
|
||||
source = ./resources/wallpapers; # from flake directory
|
||||
target = "${wallpapersPath}"; # to home directory
|
||||
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} = {
|
||||
# import the home manager module
|
||||
imports = [ inputs.noctalia.homeModules.default ];
|
||||
|
|
@ -10,7 +19,7 @@
|
|||
# configure noctalia here
|
||||
|
||||
general = {
|
||||
avatarImage = "/home/${primaryUser}/avatar.jpg";
|
||||
avatarImage = "${avatar}";
|
||||
radiusRatio = 0.2;
|
||||
showSessionButtonOnLockScreen = false;
|
||||
showHibernateOnLockScreen = true;
|
||||
|
|
@ -24,7 +33,7 @@
|
|||
colorSchemes = { predefinedScheme = "Monochrome"; };
|
||||
|
||||
wallpaper = {
|
||||
directory = "/home/${primaryUser}/Pictures/Wallpapers";
|
||||
directory = "${wallpapersPath}";
|
||||
hideWallpaperFilenames = true;
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
|
@ -11,17 +11,15 @@
|
|||
## Import shared program configs
|
||||
./web
|
||||
./git
|
||||
./obs
|
||||
./sync
|
||||
./chat
|
||||
./yazi
|
||||
./btop
|
||||
./fish
|
||||
./nvim
|
||||
./misc
|
||||
./music
|
||||
./fetch
|
||||
#./fetch
|
||||
./kitty
|
||||
./fastfetch
|
||||
./multimedia
|
||||
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,13 @@
|
|||
|
||||
{
|
||||
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
peaclock # neat terminal clock applet
|
||||
cmatrix # funky terminal matrix rain
|
||||
];
|
||||
};
|
||||
|
||||
programs.fastfetch = {
|
||||
enable = true;
|
||||
package = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
home = { packages = with pkgs; [ kitty ]; };
|
||||
|
||||
programs.alacritty.enable = true;
|
||||
#programs.alacritty.enable = true;
|
||||
|
||||
## Enables kitty via home-manager
|
||||
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 = {
|
||||
packages = with pkgs; [
|
||||
|
||||
## Image and Video playback and production
|
||||
#obs-studio # Screen sharing
|
||||
inkscape # Vector image editing
|
||||
#inkscape # Vector image editing
|
||||
#shotcut # Video editing
|
||||
#blender # 3D modelling
|
||||
gimp # Image editor
|
||||
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