From 7fd2751288e665b6fb4d61e3b94cfe1ac0e2cf6c Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 03:21:36 +1000 Subject: [PATCH 1/6] updated readme --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 653dad9..64ebb3a 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,6 @@ To Do: - [ ] Hades - [ ] Proserpina - - [ ] merge old branches back into "trunk" branch 'core' - --- WIP Flake Structure From a4744fc5bfeb28a2dc2982e801a3c571ece84d0d Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 16:57:00 +1000 Subject: [PATCH 2/6] changed: core/configuration.nix, moving packages stuff to core/packages, and making easier to use it commonly across potential future configs uwu --- core/configuration.nix | 84 +++++++++++------------------------------- 1 file changed, 21 insertions(+), 63 deletions(-) diff --git a/core/configuration.nix b/core/configuration.nix index 6bae715..e6e79b3 100644 --- a/core/configuration.nix +++ b/core/configuration.nix @@ -9,74 +9,23 @@ { imports = [ - - # home-manager inputs.home-manager.nixosModules.home-manager - # also split up configuration.nix and import pieces: + ## semi-modularised config + ./packages + ./display ../home/users - ./packages.nix ]; - security = { - rtkit.enable = true; - sudo.execWheelOnly = true; - }; - + ## locale is common across machines time.timeZone = "Australia/Brisbane"; i18n.defaultLocale = "en_GB.UTF-8"; - nixpkgs = { - # add overlays here - overlays = [ - # to use overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # configure nixpkgs instance - config = { - allowUnfree = true; - permittedInsecurePackages = [ - ]; - }; - }; - - # 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! - nix.nixPath = ["/etc/nix/path"]; - environment.etc = - lib.mapAttrs' - (name: value: { - name = "nix/path/${name}"; - value.source = value.flake; - }) - config.nix.registry; - - nix.settings = { - cores = 0; - auto-optimise-store = true; - allowed-users = [ "@wheel" ]; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; - + ## gotta have sound, this too is common sound.enable = true; hardware.pulseaudio.enable = false; - services.pipewire = { - + services.pipewire = { enable = true; jack.enable = true; pulse.enable = true; @@ -85,18 +34,27 @@ # lowLatency.enable = true; }; - # disable these cuz they cause problems - # see: https://github.com/NixOS/nixpkgs/issues/180175 + ## genuinely dunno what these do hey, like isnt sudo + ## already restricted to @wheel only? & wut is rtkit + security = { + rtkit.enable = true; + sudo.execWheelOnly = true; + }; + + ## disable these cuz they cause problems (thx sasha) + ## see: https://github.com/NixOS/nixpkgs/issues/180175 systemd.services = { networkManager-wait-online.enable = lib.mkForce false; systemd-networkd-wait-online.enable = lib.mkForce false; }; - + ## autoupgrades ? disabled for now, need to read into # system.autoUpgrade = { - # enable = true; - # channel = ""; + # enable = true; + # channel = ""; # }; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + + ## https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.11"; + } From ca8fde8263cf417f1d3ca7f3945ecf8dde630442 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 17:02:38 +1000 Subject: [PATCH 3/6] added: 'packages stuff' to core/packages.nix --- core/packages.nix | 147 ++++++++++++++++++++++++++++++---------------- 1 file changed, 98 insertions(+), 49 deletions(-) diff --git a/core/packages.nix b/core/packages.nix index f53fe5c..0baf80e 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -1,56 +1,9 @@ -{ pkgs, ... }: +{ inputs, outputs, lib, config, pkgs, ... }: { - programs = { - traceroute.enable = true; - starship.enable = true; - fish.enable = true; - git.enable = true; - - firefox.enable = true; - - }; - - environment.systemPackages = with pkgs; [ - - ## nixos - # nix-tree - # nix-init - # nix-index - # nixpkgs-review - # nix-output-monitor - - ## filsesystem - udiskie - ntfs3g - xfsprogs - - ## tools - fd - bc - gcc - tldr - wget - curl - file - zip - unzip - gnupg - blueman - busybox - ripgrep - killall - usbutils - pciutils - xdg_utils - moreutils - libsecret - git-crypt - ]; - + ## find a better home for these please <3 fonts = { - packages = with pkgs; [ spleen terminus_font @@ -78,4 +31,100 @@ }; + nix.settings = { + cores = 0; + auto-optimise-store = true; + allowed-users = [ "@wheel" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + + nixpkgs = { + + ## configure nixpkgs instance + config = { + allowUnfree = true; + permittedInsecurePackages = [ + ]; + }; + + ## add overlays here + overlays = [ + ## to use overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + ## or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + }; + + # 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! + nix.nixPath = ["/etc/nix/path"]; + environment.etc = + lib.mapAttrs' + (name: value: { + name = "nix/path/${name}"; + value.source = value.flake; + }) + config.nix.registry; + + programs = { + traceroute.enable = true; + starship.enable = true; + fish.enable = true; + git.enable = true; + + firefox.enable = true; + + }; + + environment.systemPackages = with pkgs; [ + + ## filsesystem + udiskie + ntfs3g + xfsprogs + + ## tools + fd + bc + gcc + tldr + wget + curl + file + zip + unzip + gnupg + blueman + busybox + ripgrep + killall + usbutils + pciutils + xdg_utils + moreutils + libsecret + git-crypt + + ## nixos + # nix-tree + # nix-init + # nix-index + # nixpkgs-review + # nix-output-monitor + + ]; + } From 990bbb51b7d553e7bc7602fea78c873358abd3cf Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 17:07:07 +1000 Subject: [PATCH 4/6] moved: nix.settings block from core/packages to core/configuration.nix --- core/configuration.nix | 14 ++++++++++++++ core/packages.nix | 14 ++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/core/configuration.nix b/core/configuration.nix index e6e79b3..f0cd43a 100644 --- a/core/configuration.nix +++ b/core/configuration.nix @@ -19,6 +19,7 @@ ]; ## locale is common across machines + ## crikey ! time.timeZone = "Australia/Brisbane"; i18n.defaultLocale = "en_GB.UTF-8"; @@ -41,6 +42,19 @@ sudo.execWheelOnly = true; }; + ## settings for nix + nix.settings = { + ## use all cores during build + cores = 0; + auto-optimise-store = true; + allowed-users = [ "@wheel" ]; + ## enable flakes uwu + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + ## disable these cuz they cause problems (thx sasha) ## see: https://github.com/NixOS/nixpkgs/issues/180175 systemd.services = { diff --git a/core/packages.nix b/core/packages.nix index 0baf80e..b7320a7 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -2,6 +2,8 @@ { + ## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + ## find a better home for these please <3 fonts = { packages = with pkgs; [ @@ -30,16 +32,8 @@ }; }; - - nix.settings = { - cores = 0; - auto-optimise-store = true; - allowed-users = [ "@wheel" ]; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; + + ## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- nixpkgs = { From 7507ef37ec4557d84b3300bd2fd9f0310669708c Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 19:53:44 +1000 Subject: [PATCH 5/6] changed: email address --- home/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/git.nix b/home/git.nix index b367e79..8d12d47 100644 --- a/home/git.nix +++ b/home/git.nix @@ -2,7 +2,7 @@ programs.git = { enable = true; userName = "serenity-F"; - userEmail = "serenity-amalgam@protonmail.com"; # CHANGEME + userEmail = "serenity-F@noreply.codeberg.org"; # CHANGEME extraConfig = { init.defaultBranch = "main"; # Automatically track remote branch From fd4fbdbb3da9ec007712aeb611c1818d15ae65ea Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 19:54:27 +1000 Subject: [PATCH 6/6] updated: 'SerenityOS' version num. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b3fee3c..87d3c0d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "SerenityOS v0.3.65"; + description = "SerenityOS v0.3.7"; inputs = {