massive clean-up/restructure

This commit is contained in:
serenity-F 2024-09-11 23:51:42 +10:00
parent 54da646c04
commit b13498571e
No known key found for this signature in database
48 changed files with 166 additions and 236 deletions

View file

@ -1,19 +1,26 @@
{
{
self,
inputs,
outputs,
lib,
config,
pkgs,
pkgs,
...
}: {
imports = [
./hyprland
./git.nix
./kitty.nix
# ./starship.nix
./neofetch.nix
./scripts/anotherhadi
#./themes
./git.nix
./fish.nix
./kitty.nix
#./lazygit.nix
./neofetch.nix
#../sway
../hyprland
];
home = {
@ -42,7 +49,6 @@
kitty
micro
btop
## multimedia & games
neural-amp-modeler-lv2
@ -74,7 +80,7 @@
steam # (needs config via home.programs.steam)
gimp
vlc
## chat & web
# schildichat
lagrange
@ -86,6 +92,7 @@
];
stateVersion = "23.11";
};
programs = {
@ -94,27 +101,21 @@
fish.enable = true;
git.enable = true;
firefox.enable = true;
neovim = {
enable = true;
defaultEditor = true;
};
};
services = {
kdeconnect = {
enable = true;
indicator = true;
};
gnome-keyring = {
enable = true;
# components = [
# ];
#components = [ ];
};
};
systemd.user.startServices = "sd-switch";

View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

View file

@ -10,7 +10,7 @@
imports = [
./theme
../common/themes
./hyprland.nix
./hyprpaper.nix

View file

@ -10,7 +10,48 @@
{
imports = [
./users.nix
inputs.home-manager.nixosModules.default
];
users.users = {
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
serenity = {
description = "Serenity Amalgam";
isNormalUser = true;
## be sure to change this with 'passwd'
initialPassword = "password";
shell = pkgs.fish;
extraGroups = [
"wheel"
"networkmanager"
];
};
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
home-manager = {
extraSpecialArgs = { inherit inputs outputs; };
useGlobalPkgs = true;
useUserPackages = true;
users = {
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
serenity = {
imports = [ ./u-serenity.nix ];
home = {
username = "serenity";
homeDirectory = "/home/serenity";
};
};
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
};
}

View file

@ -1,21 +0,0 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [
../home.nix
];
home = {
packages = with pkgs; [
];
};
}

View file

@ -8,7 +8,7 @@
}: {
imports = [
../home.nix
../common
];
home = {

View file

@ -1,69 +0,0 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}:
{
imports = [
inputs.home-manager.nixosModules.default
];
users.users = {
# coffee = {
# description = "Coffee Beans";
# isNormalUser = true;
## be sure to change this with 'passwd'
# initialPassword = "password";
# shell = pkgs.fish;
# extraGroups = [
# "wheel"
# "networkmanager"
# ];
# };
serenity = {
description = "Serenity Amalgam";
isNormalUser = true;
## be sure to change this with 'passwd'
initialPassword = "password";
shell = pkgs.fish;
extraGroups = [
"wheel"
"networkmanager"
];
};
};
home-manager = {
extraSpecialArgs = { inherit inputs outputs; };
useGlobalPkgs = true;
useUserPackages = true;
users = {
# coffee = {
# imports = [ ./u-coffee.nix ];
# home = {
# username = "coffee";
# homeDirectory = "/home/coffee";
# };
# };
serenity = {
imports = [ ./u-serenity.nix ];
home = {
username = "serenity";
homeDirectory = "/home/serenity";
};
};
};
};
}