merged + tweaks

This commit is contained in:
Serenity-F 2024-04-09 02:35:52 +10:00
commit 414e3cd9a6
18 changed files with 613 additions and 58 deletions

27
.guide/README.md Normal file
View file

@ -0,0 +1,27 @@
# What do?
Hi there, if you are not a member of the Serenity Amalgam,
feel free to do as you wish with these configs.
---
Otherwise if you& are a member of the Serenity Amalgam,
then please follow this guide to enroll an account.
To get started, add a user by typing
`micro home/users/users.nix`, copy the template in the
'users.users' block and adjust it to match, then repeat
with the 'home-manager' block below that, then finally
add a $-username.nix file in home/users by copying the
existing template and adding whatever you& wish.
A suite of programs and applications has been provided
via a shared home.nix file, as well as a common config
across machines and users.
If you& would like to see what is included by default,
then Serenity's account is considered common/shared by
all members of the amalgam.
Please do not add or remove entries outside of these
mentioned locations,
thankyou& <3

102
README.md
View file

@ -2,60 +2,98 @@ To Do:
> in order of priority > in order of priority
- [ ] learn home manager (seriously wtf ???) - [ ] learn home manager (seriously wtf ???)
- [ ] become more learn-ed in the ways of nix-fu - [ ] become more learn-ed in the ways of nix-fu
- [X] build hyprland **branch** - [ ] get flake to actually build
- [ ] get it working, stable, etc - [ ] repair config after merge with updated #core branch
- [ ] build minimal fallback gnome branch
- [ ] get flake to actually build - [X] build "core" branch for all variant flakes to build upon
- [ ] finish separating home/ and core/ packages & programs
- [ ] change one 'branch' & respective git branch at a time
- [ ] merge updated aspects of core branch into hyprland branch
- [ ] hybrid shared/multi-user home-manager configuration
- [ ] functional
- [ ] build minimal fallback gnome branch
- [ ] per host hardware configurations - [ ] per host hardware configurations
- [ ] Hades - [ ] Hades
- [ ] adjust Hades' configs
- [X] Proserpina - [X] Proserpina
- [ ] (+ per host theming) - [ ] per host themes
- [ ] Hades
- [ ] Proserpina
--- ---
WIP Flake structure WIP Flake Structure
``` ```
. .
├── README.md
├── core ├── core
│ ├── configuration │ ├── configuration
│ ├── packages │ └── packages
├── flake
├── home
│ ├── git
│ ├── fish
│ ├── kitty
│ ├── hyprland
│ ├── theme
│ │ └── resources
│ └── users │ └── users
└── hosts
├── hades
└── proserpina
```
---
```
.
├── core
│ ├── configuration.nix
│ └── packages.nix
├── flake.lock ├── flake.lock
├── flake.nix ├── flake.nix
├── home ├── home
│ ├── home.nix │ ├── home.nix
│ ├── git.nix
│ ├── fish.nix
│ ├── kitty.nix
│ ├── hyprland │ ├── hyprland
│ │ ├── dunst │ │ ├── hyprcursor.nix
│ │ ├── hyprcursor │ │ ├── hyprpaper.nix
│ │ ├── hypridle │ │ ├── hypridle.nix
│ │ ├── hyprland │ │ ├── hyprland.nix
│ │ ├── hyprlock │ │ ├── hyprlock.nix
│ │ ├── hyprpaper │ │ ├── wlogout.nix
│ │ ├── waybar │ │ ├── waybar.nix
│ │ ├── wlogout │ │ ├── wofi.nix
│ │ └── wofi │ │ └── dunst.nix
│ ├── git │ ├── theme
│ ├── fish │ │ ├── SerenityOS.nix
│ ├── kitty │ │ ├── config
│ └── theme │ │ │ └── template.nix
│ ├── SerenityOS │ │ └── resources
│ ├── config │ │ ├── icons
│ └── resources │ │ └── wallpapers
│ ├── icons │ └── users
│ └── wallpapers │ ├── users.nix
│ ├── u-template.nix
│ ├── u-coffee.nix
│ └── u-serenity.nix
└── hosts └── hosts
├── hades
│ ├─ configuration.nix
│ ├─ disko-config.nix
│ ├── hardware-configuration.nix
│ └── network-configuration.nix
└── proserpina └── proserpina
├── configuration ├── configuration.nix
├── disko-config ├── disko-config.nix
├── hardware-configuration ├── hardware-configuration.nix
└── network-configuration └── network-configuration.nix
``` ```

View file

@ -14,7 +14,7 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
# also split up configuration.nix and import pieces: # also split up configuration.nix and import pieces:
./users.nix ../home/users
./packages.nix ./packages.nix
]; ];
@ -75,7 +75,7 @@
]; ];
}; };
# services.flatpak.enable = true; services.flatpak.enable = true;
boot.binfmt.registrations.appimage = { boot.binfmt.registrations.appimage = {
wrapInterpreterInShell = false; wrapInterpreterInShell = false;

View file

@ -3,7 +3,6 @@
{ {
programs = { programs = {
# hyprland.enable = true;
traceroute.enable = true; traceroute.enable = true;
starship.enable = true; starship.enable = true;
fish.enable = true; fish.enable = true;
@ -16,7 +15,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## nixos ## nixos
appimage-run
# nix-tree # nix-tree
# nix-init # nix-init
# nix-index # nix-index
@ -27,6 +25,7 @@
udiskie udiskie
ntfs3g ntfs3g
xfsprogs xfsprogs
<<<<<<< HEAD
## compositor ## compositor
waybar waybar
@ -50,6 +49,18 @@
tldr tldr
wget wget
curl curl
=======
## tools
fd
bc
gcc
tldr
wget
curl
file
zip
>>>>>>> origin/core-merge
unzip unzip
gnupg gnupg
blueman blueman
@ -63,16 +74,6 @@
libsecret libsecret
git-crypt git-crypt
## web browsers
# tor-browser-bundle-bin
# lagrange
# firefox
## misc, libraries, maybe more,
# qt5-wayland
# qt6-wayland
glib
]; ];
fonts = { fonts = {

42
flake.lock generated
View file

@ -1,5 +1,6 @@
{ {
"nodes": { "nodes": {
<<<<<<< HEAD
"base16-schemes": { "base16-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -16,6 +17,8 @@
"type": "github" "type": "github"
} }
}, },
=======
>>>>>>> origin/core-merge
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -36,6 +39,7 @@
"type": "github" "type": "github"
} }
}, },
<<<<<<< HEAD
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -59,6 +63,15 @@
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
=======
"hardware": {
"locked": {
"lastModified": 1712566108,
"narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465",
>>>>>>> origin/core-merge
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +87,19 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1712390667, "lastModified": 1712390667,
"narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b787726a8413e11b074cde42704b4af32d95545c", "rev": "b787726a8413e11b074cde42704b4af32d95545c",
=======
"lastModified": 1712462372,
"narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
>>>>>>> origin/core-merge
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,6 +108,7 @@
"type": "github" "type": "github"
} }
}, },
<<<<<<< HEAD
"hyprcursor": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
@ -315,6 +337,22 @@
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
=======
"nixpkgs": {
"locked": {
"lastModified": 1712439257,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
>>>>>>> origin/core-merge
} }
}, },
"root": { "root": {
@ -322,6 +360,7 @@
"disko": "disko", "disko": "disko",
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager", "home-manager": "home-manager",
<<<<<<< HEAD
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
@ -428,6 +467,9 @@
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"type": "github" "type": "github"
=======
"nixpkgs": "nixpkgs"
>>>>>>> origin/core-merge
} }
} }
}, },

View file

@ -1,9 +1,12 @@
{ {
description = "SerenityOS v0.3.61"; description = "SerenityOS v0.3.65";
inputs = { inputs = {
# Nixpkgs # Nixpkgs
# there was a way to have unstable as an overlay,
# will set it back up, lazy rn, for now pick one
# nixpkgs.url = "nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";
@ -70,3 +73,4 @@
}; };
} }

View file

@ -8,6 +8,7 @@
}: { }: {
imports = [ imports = [
<<<<<<< HEAD
./hyprland ./hyprland
./theme ./theme
./kitty.nix ./kitty.nix
@ -16,16 +17,45 @@
]; ];
home = { home = {
username = "serenity";
homeDirectory = "/home/serenity";
packages = with pkgs; [ packages = with pkgs; [
vlc ## nixos
vscode appimage-run
discord
firefox ## desktop
obsidian
xfce.thunar xfce.thunar
# gnome.nautilus ?
## web browsers
firefox
lagrange
tor
## chat & comms
discord
# fractal
# schildichat
## personal
obsidian
## terminal & coding
vscode
micro
kitty
## utility
# insert terminal utility here
## novelty
pipes
cbonsai
hyfetch
cmatrix
peaclock
## misc, libraries, maybe more,
# qt5-wayland
# qt6-wayland
glib
]; ];
stateVersion = "23.11"; stateVersion = "23.11";

16
home/users/default.nix Normal file
View file

@ -0,0 +1,16 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}:
{
imports = [
./users.nix
];
}

22
home/users/u-coffee.nix Normal file
View file

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

22
home/users/u-serenity.nix Normal file
View file

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

24
home/users/u-template.nix Normal file
View file

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

89
home/users/users.nix Normal file
View file

@ -0,0 +1,89 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}:
{
imports = [
inputs.home-manager.nixosModules.default
];
users.users = {
# TEMPLATE = {
# description = "TEMPLATE";
# isNormalUser = true;
## be sure to change this with 'passwd'
# initialPassword = "password";
# shell = pkgs.fish;
# extraGroups = [
# "wheel"
# "networkmanager"
# ];
# };
# 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 = {
# TEMPLATE = {
# imports = [ ./u-template.nix ];
# home = {
# username = "TEMPLATE";
# homeDirectory = "/home/TEMPLATE";
# };
# };
# coffee = {
# imports = [ ./u-coffee.nix ];
# home = {
# username = "coffee";
# homeDirectory = "/home/coffee";
# };
# };
serenity = {
imports = [ ./u-serenity.nix ];
home = {
username = "serenity";
homeDirectory = "/home/serenity";
};
};
};
};
}

View file

@ -0,0 +1,74 @@
{ inputs, outputs, config, lib, pkgs, ... }:
{
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
];
# Enable swap on luks
boot = {
loader = {
systemd-boot = {
enable = true;
configurationLimit = 5;
};
efi = {
canTouchEfiVariables = true;
# efiSysMountPoint = "/boot/efi";
};
};
initrd = {
systemd.enable = true;
secrets = {
# "crypto_keyfile.bin" = null;
};
luks = {
# devices."luks-DISK_UUID" = {
# device = "/dev/disk/by-uuid/DISK_UUID";
# keyfile = "/crypto_keyfile.bin";
# };
};
};
};
services.fstrim.enable = true;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware = {
cpu.intel.updateMicrocode = true;
enableAllFirmware = false;
bluetooth.enable = true;
opengl = {
enable = true;
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};
};
nix = {
# settings = {
# };
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 2d";
persistent = true;
};
};
}

View file

@ -0,0 +1,66 @@
{
disko.devices = {
disk = {
sda = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
ESP = {
size = "512M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"defaults"
];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "pomegranate";
# disable settings.keyFile if you want to use interactive password entry
#passwordFile = "/tmp/secret.key"; # Interactive
settings = {
allowDiscards = true;
#keyFile = "/tmp/secret.key";
};
# additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/home" = {
mountpoint = "/home";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ];
};
};
};
};
};
};
};
};
};
};
}

View file

@ -0,0 +1,29 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
# ./disko-config.sh
./disko-config.nix
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# 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;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -0,0 +1,72 @@
{ pkgs, lib, config, ... }:
{
imports = [
# ./file.nix
];
networking = {
hostName = "proserpina";
wireless.enable = false;
networkmanager = {
enable = true;
};
# nameservers = [
# "1.1.1.1"
# ];
};
# networking.proxy = {
# default = "https://user:password@proxy:port/";
# noProxy = "127.0.0.1, localhost, internal.comain";
# };
networking.firewall = {
enable = false;
# checkReversePath = "loose";
# allowedTCPPorts = [ 22000 21027 25565 ];
# allowedUDPPorts = [ 22000 21027 41641 51820 ];
# allowedTCPPortRanges = [
# { from = 9999; to = 9999; } # KDE COnnect
# { from = 9999; to = 9999; } # Nicotine+
# ];
# allowedUDPPortRanges = [
# { from = 9999; to = 9999; } # KDE COnnect
# ];
# interfaces."DEVICENAME".allowedTCPPorts = [ 22999 ]
};
services.syncthing = {
enable = false;
dataDir = "/home/serenity/";
configDir = "/home/serenity/.config/syncthing";
user = "serenity";
settings.devices = {
# hades.id = "DEVICE_ID";
# proserpina.id = "DEVICE_ID";
# hecate.id = "DEVICE_ID";
};
settings.folders = {
# "FOLDER_ID" = {
# path = "/home/serenity/Documents/Notes";
# devices = [ "hecate" "hades" "proserpina" ];
# };
# "FOLDER_ID" = {
# path = "/home/serenity/Documents/Notes";
# devices = [ "hecate" "hades" "proserpina" ];
# };
# "FOLDER_ID" = {
# path = "/home/serenity/Documents/Notes";
# devices = [ "hecate" "hades" "proserpina" ];
# };
};
};
}

View file

@ -7,7 +7,6 @@
# "${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 ./disko-config.nix
# ./network-configuration.nix # ./network-configuration.nix
../../core/configuration.nix ../../core/configuration.nix
]; ];
@ -80,6 +79,5 @@
}; };
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

View file

@ -7,6 +7,7 @@
imports = imports =
[ [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
./disko-config.nix
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];