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

3
TODO.md Normal file
View file

@ -0,0 +1,3 @@
To do list:
- uhhhhhh

3
USAGE.md Normal file
View file

@ -0,0 +1,3 @@
Steps to use:
- uhhhh

View file

@ -10,13 +10,9 @@
{
imports = [
inputs.home-manager.nixosModules.home-manager
## semi-modularised config
./packages.nix
#./fonts.nix
./misc.nix
./system-packages.nix
../home/users
];
## locale is common across machines
@ -56,6 +52,9 @@
];
};
## apparently prevents getting stuck at shutdown
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
## disable these cuz they cause problems (thx sasha)
## see: https://github.com/NixOS/nixpkgs/issues/180175
systemd.services = {

View file

@ -1,26 +0,0 @@
{ inputs, outputs, lib, config, pkgs, ... }:
{
fonts = {
packages = with pkgs; [
spleen
terminus_font
terminus_font_ttf
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
];
fontDir.enable = true;
fontconfig = {
defaultFonts = {
serif = [ "spleen-32x64" ];
sansSerif = [ "spleen-32x64" ];
monospace = [ "TerminusTTF" ];
};
};
};
}

View file

@ -5,13 +5,11 @@
# Include the results of the hardware scan.
./hardware-config.nix
# "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
# ./disko-config.nix
# ./network-config.nix
../../core/configuration.nix
../../config.nix
];
# powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
services.fstrim.enable = true;
nix = {
# settings = {

View file

@ -6,13 +6,48 @@
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
./boot-config.nix
./disko-config.nix
];
#boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
#boot.initrd.kernelModules = [ ];
#boot.kernelModules = [ "kvm-intel" ];
#boot.extraModulePackages = [ ];
# Enable swap on luks
boot = {
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
initrd = {
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ ];
systemd.enable = true;
secrets = {
"/boot/crypto_keyfile.bin" = null;
};
luks = {
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96" = {
device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
#keyFile = "/boot/crypto_keyfile.bin";
};
};
};
loader = {
efi = {
canTouchEfiVariables = true;
#efiSysMountPoint = "/boot/efi";
};
#systemd-boot = {
#enable = false;
#configurationLimit = 10;
#};
grub = {
enable = true;
#efiSupport = true;
#efiInstallAsRemovable = true;
device = "/dev/sda";
#useOSProber = true;
enableCryptodisk = true;
};
};
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea";
@ -25,7 +60,7 @@
#fsType = "btrfs";
#options = [ "subvol=@" ];
#};
#boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
swapDevices = [ ];
@ -63,8 +98,8 @@
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
#networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
#networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

@ -3,11 +3,10 @@
{
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
# "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
./disko-config.nix
# ./network-configuration.nix
../../core/configuration.nix
./hardware-config.nix
#${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
#./network-configuration.nix
../../config.nix
];

View file

@ -1,21 +0,0 @@
{ inputs, outputs, lib, config, pkgs, ... }:
{
programs.hyprland = {
enable = true;
xwayland.enable = true;
};
services.xserver = {
enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
};
## apparently prevents getting stuck at shutdown
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
}

View file

@ -3,7 +3,7 @@
{
imports = [
./fonts.nix
#./file.nix
];
nixpkgs = {
@ -45,19 +45,55 @@
})
config.nix.registry;
fonts = {
packages = with pkgs; [
spleen
terminus_font
terminus_font_ttf
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
];
fontDir.enable = true;
fontconfig = {
defaultFonts = {
serif = [ "spleen-32x64" ];
sansSerif = [ "spleen-32x64" ];
monospace = [ "TerminusTTF" ];
};
};
};
programs = {
git.enable = true;
fish.enable = true;
gnome-disks.enable = true;
gnupg.agent = {
enable = true;
enableSSHSupport = true;
#pinentryPackage = [ ];
};
hyprland = {
enable = true;
xwayland.enable = true;
};
};
services.gvfs.enable = true;
services.xserver = {
enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
};
services.flatpak.enable = true;
environment.systemPackages = with pkgs; [
## filsesystems
@ -67,8 +103,6 @@
exfatprogs
btrfs-progs
ntfs2btrfs
udiskie
gparted
## tools
fd
@ -95,7 +129,6 @@
libsecret
git-crypt
undervolt
pavucontrol
## nixos
nix-tree
@ -110,6 +143,9 @@
## temporary/desktop
waybar
udiskie
gparted
pavucontrol
#polkit-gnome
gnome.seahorse
polkit-kde-agent

View file

@ -1,5 +1,5 @@
{
description = "SerenityOS v0.3.9";
description = "SerenityOS v0.6.0";
inputs = {
@ -64,7 +64,7 @@
#"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
#disko.nixosModules.disko
#sops-nix.nixosModules.sops
#./hosts/iso/configuration.nix
#./hosts/iso/config.nix
#];
#specialArgs = {inherit inputs outputs;};
#};
@ -75,7 +75,7 @@
modules = [
disko.nixosModules.disko
sops-nix.nixosModules.sops
./hosts/persephone/configuration.nix
./hosts/persephone/config.nix
];
};
@ -85,7 +85,7 @@
modules = [
disko.nixosModules.disko
sops-nix.nixosModules.sops
./hosts/hades/configuration.nix
./hosts/hades/config.nix
];
};

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";
};
};
};
};
}

View file

@ -1,48 +0,0 @@
{ inputs, outputs, config, lib, pkgs, ... }:
{
imports = [
];
# Enable swap on luks
boot = {
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
initrd = {
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ ];
systemd.enable = true;
secrets = {
"/boot/crypto_keyfile.bin" = null;
};
luks = {
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96" = {
device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
#keyFile = "/boot/crypto_keyfile.bin";
};
};
};
loader = {
efi = {
canTouchEfiVariables = true;
#efiSysMountPoint = "/boot/efi";
};
#systemd-boot = {
#enable = false;
#configurationLimit = 10;
#};
grub = {
enable = true;
#efiSupport = true;
#efiInstallAsRemovable = true;
device = "/dev/sda";
#useOSProber = true;
enableCryptodisk = true;
};
};
};
}