From 4337efd9b57b977d6ef75234089de15e3eec7513 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 21:24:32 +1000 Subject: [PATCH 01/12] uhhh --- .gitignore | 4 ++++ README.md | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .gitignore 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/README.md b/README.md index 64ebb3a..e8b5950 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,6 @@ Hey there, if you're not muis or one of muir headmates, feel free to do as you wish with these configs :) - -if you&'re a headmate, read [this](.guide/README.md) - To Do: > in order of priority From 3ab1b3c5ae8460ebb3af337bd33f32941a81b48c Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 21:33:19 +1000 Subject: [PATCH 02/12] updated: README.md --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e8b5950..9b432b6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Hey there, -if you're not muis or one of muir headmates, feel free to do as you wish with these configs :) + To Do: > in order of priority @@ -10,21 +10,18 @@ To Do: - [ ] become more learn-ed in the ways of nix-fu - [ ] get flake to actually build - - [ ] repair #hyprland-merge after merge with updated #core + - [ ] keep branches synced - [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 - - [X] merge updated aspects of core branch into hyprland branch - [ ] hybrid shared/multi-user home-manager configuration - - [ ] functional + - [ ] functional? - [ ] build minimal fallback gnome branch - [ ] per host hardware configurations - [ ] Hades - - [ ] adjust Hades' configs - [X] Proserpina - [ ] per host themes From a0f2900288940ea6db1bbf2596806bd8b224df48 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 21:35:43 +1000 Subject: [PATCH 03/12] removed .guide/ --- .guide/README.md | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 .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 :) From 8b2e16d8746fe4b28888e406966860ae2c6bbb39 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 21:38:17 +1000 Subject: [PATCH 04/12] changed: commenting style in flake.nix --- flake.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 87d3c0d..cbcc1e7 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"; @@ -34,7 +34,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 { From e743ff7e497d994f84d107735f30dacec5a7114f Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 21:46:49 +1000 Subject: [PATCH 05/12] changed: commenting style in home dir --- core/packages.nix | 16 +++-------- home/users/u-coffee.nix | 1 - home/users/u-serenity.nix | 1 - home/users/u-template.nix | 1 - home/users/users.nix | 58 +++++++++++++++++++-------------------- 5 files changed, 33 insertions(+), 44 deletions(-) diff --git a/core/packages.nix b/core/packages.nix index b7320a7..89aabe7 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 = lib.mapAttrs' 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 = { From ad17513c8983795b0b644b81a25562552f20dbdb Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 10 Apr 2024 09:56:15 +1000 Subject: [PATCH 06/12] changed: removed ./display.nix import --- core/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/configuration.nix b/core/configuration.nix index f0cd43a..324fe59 100644 --- a/core/configuration.nix +++ b/core/configuration.nix @@ -13,7 +13,7 @@ ## semi-modularised config ./packages - ./display + # ./display ../home/users ]; From e70fe0f9db50a84b54acfa298de22bcb598e9c57 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 10 Apr 2024 10:16:31 +1000 Subject: [PATCH 07/12] updated README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9b432b6..ae98b01 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ Hey there, feel free to do as you wish with these configs :) +This is the "core" branch, for building on top of, +for muir actually "in-use" branch, +[click here](https://codeberg.org/serenity-F/nixdots/src/branch/hyprland) + To Do: > in order of priority From 7054107bbd23691ff380132b63d30a5cd21aaabf Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 10 Apr 2024 10:32:59 +1000 Subject: [PATCH 08/12] updated README.md --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ae98b01..a050c15 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Hey there, feel free to do as you wish with these configs :) +Heavily WIP, and at this point, still mostly stolen code.Heavily WIP, and at this point, still mostly stolen code. + This is the "core" branch, for building on top of, for muir actually "in-use" branch, [click here](https://codeberg.org/serenity-F/nixdots/src/branch/hyprland) @@ -34,7 +36,7 @@ To Do: --- -WIP Flake Structure +Cursory flake structure ``` . @@ -43,13 +45,15 @@ WIP Flake Structure │ └── packages ├── flake ├── home -│ ├── git │ └── users └── hosts ├── hades └── proserpina ``` --- + +Full flake structure + ``` . ├── core @@ -61,9 +65,9 @@ WIP Flake Structure │ ├── git.nix │ ├── home.nix │ └── users -│ ├── -coffee.nix -│ ├── -serenity.nix -│ ├── -template.nix +│ ├── u-coffee.nix +│ ├── u-serenity.nix +│ ├── u-template.nix │ └── users.nix └── hosts ├── hades From 0e79a903d955696a1a3b4466c5fa50ff45fcb1a8 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 10 Apr 2024 15:52:42 +1000 Subject: [PATCH 09/12] fixed: typo --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a050c15..a1036cc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ Hey there, feel free to do as you wish with these configs :) -Heavily WIP, and at this point, still mostly stolen code.Heavily WIP, and at this point, still mostly stolen code. +Heavily WIP, and at this point, still mostly stolen code. + This is the "core" branch, for building on top of, for muir actually "in-use" branch, From 2cfa755d497bc8186d977a267cc3dec70a3dff31 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 10 Apr 2024 16:11:43 +1000 Subject: [PATCH 10/12] updated: README.md --- README.md | 67 ++++++++++++++++--------------------------------------- 1 file changed, 19 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index a1036cc..4351782 100644 --- a/README.md +++ b/README.md @@ -1,84 +1,55 @@ Hey there, feel free to do as you wish with these configs :) -Heavily WIP, and at this point, still mostly stolen code. +Heavily WIP, and at this point, still mostly stolen code. This is the "core" branch, for building on top of, for muir actually "in-use" branch, [click here](https://codeberg.org/serenity-F/nixdots/src/branch/hyprland) -To Do: +> Checklist: -> in order of priority +in order of priority - - [ ] learn home manager (seriously wtf ???) + - [X] flake builds + - [ ] home/ and core/ packages & programs fully separated + - [ ] #core changes synced across other branches - - [ ] become more learn-ed in the ways of nix-fu - - - [ ] get flake to actually build - - [ ] keep branches synced - - - [X] build "core" branch for all variant flakes to build upon - - [ ] finish separating home/ and core/ packages & programs - - - [ ] hybrid shared/multi-user home-manager configuration - - [ ] functional? - - - [ ] build minimal fallback gnome branch + - [X] hybrid multi-user home-manager configuration + - [ ] functional - [ ] per host hardware configurations - [ ] Hades - [X] Proserpina - - - [ ] per host themes - - [ ] Hades - - [ ] Proserpina - + --- -Cursory flake structure - -``` -. -├── core -│ ├── configuration -│ └── packages -├── flake -├── home -│ └── users -└── hosts - ├── hades - └── proserpina -``` ---- - -Full flake structure +All branches in this are supersets of this one, +but much more subject to change. Feel free to +clone the repo and use `tree` to explore other +branches; here is the core structure: ``` . ├── core │ ├── configuration.nix │ └── packages.nix -├── flake.lock ├── flake.nix ├── home │ ├── git.nix │ ├── home.nix │ └── users -│ ├── u-coffee.nix -│ ├── u-serenity.nix -│ ├── u-template.nix -│ └── users.nix └── hosts - ├── hades + ├── hades │ ├── configuration.nix - │ ├── disko-config.nix │ ├── hardware-configuration.nix - │ └── network-configuration.nix + │ ├── network-configuration.nix + │ └── disko-config.nix └── proserpina ├── configuration.nix - ├── disko-config.nix ├── hardware-configuration.nix - └── network-configuration.nix + ├── network-configuration.nix + └── disko-config.nix + ``` From cffb1b6f060ed1575c62f841790c1880b0580b30 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 10 Apr 2024 16:16:25 +1000 Subject: [PATCH 11/12] updated: README.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4351782..2491839 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,15 @@ Hey there, -feel free to do as you wish with these configs :) +feel free to do as you wish with these configs. :) Heavily WIP, and at this point, still mostly stolen code. This is the "core" branch, for building on top of, -for muir actually "in-use" branch, -[click here](https://codeberg.org/serenity-F/nixdots/src/branch/hyprland) +for the actively used branch, +[click here.](https://codeberg.org/serenity-F/nixdots/src/branch/hyprland) > Checklist: -in order of priority - - [X] flake builds - [ ] home/ and core/ packages & programs fully separated - [ ] #core changes synced across other branches From 7565f989c915ab1ff5421231bffeae4fb03badce Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 10 Apr 2024 16:18:02 +1000 Subject: [PATCH 12/12] updated: README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2491839..281e646 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ This is the "core" branch, for building on top of, for the actively used branch, [click here.](https://codeberg.org/serenity-F/nixdots/src/branch/hyprland) +--- + > Checklist: - [X] flake builds