synced with changes to #core

This commit is contained in:
Serenity-F 2024-04-10 16:28:00 +10:00
commit afa88ddda6
8 changed files with 44 additions and 90 deletions

4
.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
.guide/
/.guide/
/.guide
.guide/README.md

View file

@ -1,39 +0,0 @@
# 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
When you& make any changes, be sure to type
`git add --all` and then `git commit -m "$MSG"`
where `$MSG` is a short description of what you&
changed. Then you& can type `git push` to sync it.
If you& plan to make any changes to the "core"
directory or files contained within it, please be
sure to type `git switch core` & `git pull`
before doing so, then merge the changes into the
hyprland branch from there, this is to ensure muir
git tree stays clean, please help ensure this :)

View file

@ -1,9 +1,7 @@
{ inputs, outputs, lib, config, pkgs, ... }: { inputs, outputs, lib, config, pkgs, ... }:
{ {
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
## find a better home for these please <3 ## find a better home for these please <3
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
@ -12,12 +10,9 @@
terminus_font_ttf terminus_font_ttf
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) (nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
]; ];
fontDir.enable = true; fontDir.enable = true;
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
monospace = [ monospace = [
"TerminusTTF" "TerminusTTF"
]; ];
@ -27,12 +22,9 @@
sansSerif = [ sansSerif = [
"spleen-32x64" "spleen-32x64"
]; ];
}; };
}; };
}; };
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
nixpkgs = { nixpkgs = {
@ -58,12 +50,12 @@
]; ];
}; };
# This will add each flake input as a registry ## This will add each flake input as a registry
# To make nix3 commands consistent with your flake ## To make nix3 commands consistent with your flake
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs); nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
# This will additionally add your inputs to the system's legacy channels ## This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome! ## Making legacy nix commands consistent as well, awesome!
nix.nixPath = ["/etc/nix/path"]; nix.nixPath = ["/etc/nix/path"];
environment.etc = environment.etc =

View file

@ -1,22 +1,22 @@
{ {
description = "SerenityOS v0.3.7"; description = "SerenityOS v0.3.8";
inputs = { inputs = {
# Nixpkgs ## Nixpkgs
# there was a way to have unstable as an overlay, ## there was a way to have unstable as an overlay,
# will set it back up, lazy rn, for now pick one ## will set it back up, lazy rn, for now pick one
# nixpkgs.url = "nixpkgs/nixos-23.11"; # 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";
# declarative disks ## declarative disks
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# declarative dots ## declarative dots
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -48,7 +48,7 @@
} @ inputs: let } @ inputs: let
inherit (self) outputs; inherit (self) outputs;
in { in {
# Available through 'nixos-rebuild --flake .#your-hostname' ## Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = { nixosConfigurations = {
proserpina = nixpkgs.lib.nixosSystem { proserpina = nixpkgs.lib.nixosSystem {

View file

@ -8,7 +8,6 @@
}: { }: {
imports = [ imports = [
inputs.home-manager.nixosModules.default
../home.nix ../home.nix
]; ];

View file

@ -8,7 +8,6 @@
}: { }: {
imports = [ imports = [
# inputs.home-manager.nixosModules.default
../home.nix ../home.nix
]; ];

View file

@ -10,7 +10,6 @@
{ {
imports = [ imports = [
inputs.home-manager.nixosModules.default
../home.nix ../home.nix
]; ];

View file

@ -14,29 +14,29 @@
]; ];
users.users = { users.users = {
# TEMPLATE = { # TEMPLATE = {
# description = "TEMPLATE"; # description = "TEMPLATE";
# isNormalUser = true; # isNormalUser = true;
## be sure to change this with 'passwd' # ## be sure to change this with 'passwd'
# initialPassword = "password"; # initialPassword = "password";
# shell = pkgs.fish; # shell = pkgs.fish;
# extraGroups = [ # extraGroups = [
# "wheel" # "wheel"
# "networkmanager" # "networkmanager"
# ]; # ];
# }; # };
# coffee = { # coffee = {
# description = "Coffee Beans"; # description = "Coffee Beans";
# isNormalUser = true; # isNormalUser = true;
## be sure to change this with 'passwd' # ## be sure to change this with 'passwd'
# initialPassword = "password"; # initialPassword = "password";
# shell = pkgs.fish; # shell = pkgs.fish;
# extraGroups = [ # extraGroups = [
# "wheel" # "wheel"
# "networkmanager" # "networkmanager"
# ]; # ];
# }; # };
serenity = { serenity = {
@ -60,19 +60,19 @@
users = { users = {
# TEMPLATE = { # TEMPLATE = {
# imports = [ ./u-template.nix ]; # imports = [ ./u-template.nix ];
# home = { # home = {
# username = "TEMPLATE"; # username = "TEMPLATE";
# homeDirectory = "/home/TEMPLATE"; # homeDirectory = "/home/TEMPLATE";
# }; # };
# }; # };
# coffee = { # coffee = {
# imports = [ ./u-coffee.nix ]; # imports = [ ./u-coffee.nix ];
# home = { # home = {
# username = "coffee"; # username = "coffee";
# homeDirectory = "/home/coffee"; # homeDirectory = "/home/coffee";
# }; # };
# }; # };
serenity = { serenity = {