diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a623a31 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.guide/ +/.guide/ +/.guide +.guide/README.md diff --git a/.guide/README.md b/.guide/README.md deleted file mode 100644 index b39f61b..0000000 --- a/.guide/README.md +++ /dev/null @@ -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 :) diff --git a/core/packages.nix b/core/packages.nix index c14276a..43894eb 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -1,9 +1,7 @@ { inputs, outputs, lib, config, pkgs, ... }: { - ## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ## find a better home for these please <3 fonts = { packages = with pkgs; [ @@ -12,12 +10,9 @@ terminus_font_ttf (nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) ]; - fontDir.enable = true; - fontconfig = { defaultFonts = { - monospace = [ "TerminusTTF" ]; @@ -27,12 +22,9 @@ sansSerif = [ "spleen-32x64" ]; - }; }; - }; - ## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- nixpkgs = { @@ -58,12 +50,12 @@ ]; }; - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake + ## This will add each flake input as a registry + ## To make nix3 commands consistent with your flake 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 - # Making legacy nix commands consistent as well, awesome! + ## This will additionally add your inputs to the system's legacy channels + ## Making legacy nix commands consistent as well, awesome! nix.nixPath = ["/etc/nix/path"]; environment.etc = diff --git a/flake.nix b/flake.nix index e6c3b26..aea0883 100644 --- a/flake.nix +++ b/flake.nix @@ -1,22 +1,22 @@ { - description = "SerenityOS v0.3.7"; + description = "SerenityOS v0.3.8"; inputs = { - # Nixpkgs - # there was a way to have unstable as an overlay, - # will set it back up, lazy rn, for now pick one + ## 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"; hardware.url = "github:nixos/nixos-hardware"; - # declarative disks + ## declarative disks disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - # declarative dots + ## declarative dots home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -48,7 +48,7 @@ } @ inputs: let inherit (self) outputs; in { - # Available through 'nixos-rebuild --flake .#your-hostname' + ## Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { diff --git a/home/users/u-coffee.nix b/home/users/u-coffee.nix index 5a504f4..3c9909f 100644 --- a/home/users/u-coffee.nix +++ b/home/users/u-coffee.nix @@ -8,7 +8,6 @@ }: { imports = [ - inputs.home-manager.nixosModules.default ../home.nix ]; diff --git a/home/users/u-serenity.nix b/home/users/u-serenity.nix index 5f5722c..ec86341 100644 --- a/home/users/u-serenity.nix +++ b/home/users/u-serenity.nix @@ -8,7 +8,6 @@ }: { imports = [ - # inputs.home-manager.nixosModules.default ../home.nix ]; diff --git a/home/users/u-template.nix b/home/users/u-template.nix index acc412c..db1b60c 100644 --- a/home/users/u-template.nix +++ b/home/users/u-template.nix @@ -10,7 +10,6 @@ { imports = [ - inputs.home-manager.nixosModules.default ../home.nix ]; diff --git a/home/users/users.nix b/home/users/users.nix index 9ca3b3a..f31a6a4 100644 --- a/home/users/users.nix +++ b/home/users/users.nix @@ -14,29 +14,29 @@ ]; users.users = { - + # TEMPLATE = { - # description = "TEMPLATE"; - # isNormalUser = true; - ## be sure to change this with 'passwd' - # initialPassword = "password"; - # shell = pkgs.fish; - # extraGroups = [ - # "wheel" - # "networkmanager" - # ]; + # 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" - # ]; + # description = "Coffee Beans"; + # isNormalUser = true; + # ## be sure to change this with 'passwd' + # initialPassword = "password"; + # shell = pkgs.fish; + # extraGroups = [ + # "wheel" + # "networkmanager" + # ]; # }; serenity = { @@ -60,19 +60,19 @@ users = { # TEMPLATE = { - # imports = [ ./u-template.nix ]; - # home = { - # username = "TEMPLATE"; - # homeDirectory = "/home/TEMPLATE"; - # }; + # imports = [ ./u-template.nix ]; + # home = { + # username = "TEMPLATE"; + # homeDirectory = "/home/TEMPLATE"; + # }; # }; # coffee = { - # imports = [ ./u-coffee.nix ]; - # home = { - # username = "coffee"; - # homeDirectory = "/home/coffee"; - # }; + # imports = [ ./u-coffee.nix ]; + # home = { + # username = "coffee"; + # homeDirectory = "/home/coffee"; + # }; # }; serenity = {