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 = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
## semi-modularised config ## semi-modularised config
./packages.nix ./system-packages.nix
#./fonts.nix
./misc.nix
../home/users ../home/users
]; ];
## locale is common across machines ## 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) ## disable these cuz they cause problems (thx sasha)
## see: https://github.com/NixOS/nixpkgs/issues/180175 ## see: https://github.com/NixOS/nixpkgs/issues/180175
systemd.services = { 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. # Include the results of the hardware scan.
./hardware-config.nix ./hardware-config.nix
# "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" # "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
# ./disko-config.nix ../../config.nix
# ./network-config.nix
../../core/configuration.nix
]; ];
# powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; services.fstrim.enable = true;
nix = { nix = {
# settings = { # settings = {

View file

@ -6,13 +6,48 @@
{ {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (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" ]; # Enable swap on luks
#boot.initrd.kernelModules = [ ]; boot = {
#boot.kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
#boot.extraModulePackages = [ ]; 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."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea"; { device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea";
@ -63,8 +98,8 @@
# still possible to use this option, but it's recommended to use it in conjunction # 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`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; #networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; #networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
} }

View file

@ -3,11 +3,10 @@
{ {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-config.nix
# "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" #${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
./disko-config.nix #./network-configuration.nix
# ./network-configuration.nix ../../config.nix
../../core/configuration.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 = [ imports = [
./fonts.nix #./file.nix
]; ];
nixpkgs = { nixpkgs = {
@ -45,19 +45,55 @@
}) })
config.nix.registry; 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 = { programs = {
git.enable = true; git.enable = true;
fish.enable = true; fish.enable = true;
gnome-disks.enable = true; gnome-disks.enable = true;
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
#pinentryPackage = [ ]; #pinentryPackage = [ ];
}; };
hyprland = {
enable = true;
xwayland.enable = true;
};
}; };
services.gvfs.enable = true; services.gvfs.enable = true;
services.xserver = {
enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
};
services.flatpak.enable = true; services.flatpak.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## filsesystems ## filsesystems
@ -67,8 +103,6 @@
exfatprogs exfatprogs
btrfs-progs btrfs-progs
ntfs2btrfs ntfs2btrfs
udiskie
gparted
## tools ## tools
fd fd
@ -95,7 +129,6 @@
libsecret libsecret
git-crypt git-crypt
undervolt undervolt
pavucontrol
## nixos ## nixos
nix-tree nix-tree
@ -110,6 +143,9 @@
## temporary/desktop ## temporary/desktop
waybar waybar
udiskie
gparted
pavucontrol
#polkit-gnome #polkit-gnome
gnome.seahorse gnome.seahorse
polkit-kde-agent polkit-kde-agent

View file

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

View file

@ -1,4 +1,5 @@
{ {
self,
inputs, inputs,
outputs, outputs,
lib, lib,
@ -8,12 +9,18 @@
}: { }: {
imports = [ imports = [
./hyprland
#./themes
./git.nix ./git.nix
./fish.nix
./kitty.nix ./kitty.nix
# ./starship.nix #./lazygit.nix
./neofetch.nix ./neofetch.nix
./scripts/anotherhadi
#../sway
../hyprland
]; ];
home = { home = {
@ -43,7 +50,6 @@
micro micro
btop btop
## multimedia & games ## multimedia & games
neural-amp-modeler-lv2 neural-amp-modeler-lv2
#evolutionWithPlugins # or #evolutionWithPlugins # or
@ -86,6 +92,7 @@
]; ];
stateVersion = "23.11"; stateVersion = "23.11";
}; };
programs = { programs = {
@ -94,27 +101,21 @@
fish.enable = true; fish.enable = true;
git.enable = true; git.enable = true;
firefox.enable = true; firefox.enable = true;
neovim = { neovim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
}; };
}; };
services = { services = {
kdeconnect = { kdeconnect = {
enable = true; enable = true;
indicator = true; indicator = true;
}; };
gnome-keyring = { gnome-keyring = {
enable = true; enable = true;
# components = [ #components = [ ];
# ];
}; };
}; };
systemd.user.startServices = "sd-switch"; 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 = [ imports = [
./theme ../common/themes
./hyprland.nix ./hyprland.nix
./hyprpaper.nix ./hyprpaper.nix

View file

@ -10,7 +10,48 @@
{ {
imports = [ 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 = [ imports = [
../home.nix ../common
]; ];
home = { 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;
};
};
};
}