diff --git a/SwarselSystems.org b/SwarselSystems.org index c98448b..1408905 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -4710,19 +4710,19 @@ Also, the system state version is set here. No need to touch it. **** ssh #+begin_src nix :tangle profiles/server/common/nixos/ssh.nix - _: + { self, ... }: { services.openssh = { enable = true; settings.PermitRootLogin = "yes"; }; users.users.swarsel.openssh.authorizedKeys.keyFiles = [ - ../../../secrets/keys/authorized_keys - ../../../secrets/keys/mysticant.pub + self + /secrets/keys/authorized_keys + self + /secrets/keys/magicant.pub ]; users.users.root.openssh.authorizedKeys.keyFiles = [ - ../../../secrets/keys/authorized_keys - ../../../secrets/keys/mysticant.pub + self + /secrets/keys/authorized_keys + self + /secrets/keys/magicant.pub ]; } @@ -5760,7 +5760,7 @@ Also, the system state version is set here. No need to touch it. **** monitoring #+begin_src nix :tangle profiles/server/common/nixos/monitoring.nix - { lib, config, ... }: + { self, lib, config, ... }: { config = lib.mkIf config.swarselsystems.server.monitoring { @@ -5832,7 +5832,7 @@ Also, the system state version is set here. No need to touch it. globalConfig = { scrape_interval = "10s"; }; - webConfigFile = ../../../programs/server/prometheus/web.config; + webConfigFile = self + /programs/server/prometheus/web.config; scrapeConfigs = [ { job_name = "node"; @@ -6162,25 +6162,24 @@ This smashes Atmosphere 1.3.2 on the switch, which is what I am currenty using. Options that I need specifically at work. There are more options at [[#h:f0b2ea93-94c8-48d8-8d47-6fe58f58e0e6][Work]] (home-manager side). #+begin_src nix :tangle profiles/optional/nixos/work.nix - { pkgs, config, ... }: + { self, pkgs, config, ... }: + let + owner + "swarsel"; + sopsFile = self + /secrets/work/secrets.yaml; { sops = { secrets = { clad = { - owner = "swarsel"; - sopsFile = ../../../secrets/work/secrets.yaml; + inherit owner sopsfile; }; dcad = { - owner = "swarsel"; - sopsFile = ../../../secrets/work/secrets.yaml; + inherit owner sopsfile; }; wsad = { - owner = "swarsel"; - sopsFile = ../../../secrets/work/secrets.yaml; + inherit owner sopsfile; }; imbad = { - owner = "swarsel"; - sopsFile = ../../../secrets/work/secrets.yaml; + inherit owner sopsfile; }; }; }; diff --git a/index.html b/index.html index 174011a..454a016 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- +-This file has 49106 words spanning 12869 lines and was last revised on 2024-12-05 02:52:40 +0100. +This file has 49107 words spanning 12868 lines and was last revised on 2024-12-05 03:13:42 +0100.
@@ -411,7 +411,7 @@ This section defines my Emacs configuration. For a while, I considered to use ry
-My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2024-12-05 02:52:40 +0100) +My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2024-12-05 03:13:42 +0100)
@@ -1129,10 +1129,10 @@ Nix on Android also demands an own flake output, which is provided here.
-mysticant = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
+magicant = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
pkgs = pkgsFor.aarch64-linux;
modules = [
- ./profiles/mysticant
+ ./profiles/magicant
];
};
@@ -1158,7 +1158,7 @@ This section mainly exists house different `configuration.nix` files for system
-- live (ISO)
+ - live (ISO)
{ inputs, outputs, config, pkgs, lib, ... }:
@@ -1541,7 +1541,7 @@ in
-- Winters (Server)
+ - Winters (Server)
{ self, inputs, outputs, config, ... }:
@@ -1622,7 +1622,7 @@ in
-- nbm-imba-166 (MacBook Pro)
+ - nbm-imba-166 (MacBook Pro)
{ self, inputs, outputs, ... }:
@@ -1662,7 +1662,7 @@ in
-- Magicant (Phone)
+ - Magicant (Phone)
@@ -2911,7 +2911,7 @@ writeShellApplication {
-- screenshare
+ - screenshare
@@ -3119,7 +3119,7 @@ in
-- Input
+ - Input
{ lib, ... }:
@@ -3435,7 +3435,7 @@ These are some extra options that will be used if the machine also runs NixOS. F
-- darwin
+ - darwin
{ lib, ... }:
@@ -3548,7 +3548,7 @@ These are system-level settings specific to NixOS machines. All settings that ar
-- Imports, non-server settings
+ - Imports, non-server settings
This section is for setting things that should be used on hosts that are using the default NixOS configuration. This means that servers should NOT import this, as much of these imported modules are user-configured.
@@ -3608,7 +3608,7 @@ This section is for setting things that should be used on hosts that are using t
-- General NixOS settings (enable home-manager module, stateVersion)
+ - General NixOS settings (enable home-manager module, stateVersion)
Also, we disable the warnings that trigger when rebuilding with a dirty flake. At this point, I am also disabling channels and pinning the flake registry - the latter lets me use the local version of nixpkgs for commands like nix shell (without it, we will always download the newest version of nixpkgs for these commands).
@@ -3649,7 +3649,7 @@ Also, the system state version is set here. No need to touch it.
First, we enable the use of home-manager as a NixoS modul.
@@ -5147,7 +5147,7 @@ A friend of mine used this service and I used to make fun of him. But I have to
I am using distrobox to quickly circumvent isses that I cannot immediately solve on NixOS. It is always the goal to quickly get things working on NixOS, but this prevents me from getting completely stuck. @@ -5170,7 +5170,7 @@ I am using distrobox to quickly circumvent isses that I cannot immediately solve
This turns off the display when the lid is closed. @@ -5209,12 +5209,12 @@ This turns off the display when the lid is closed.
{ lib, config, ... }:
@@ -5292,7 +5292,7 @@ in
{ pkgs, ... }:
@@ -5309,7 +5309,7 @@ in
{ config, ... }:
@@ -5325,7 +5325,7 @@ in
{ pkgs, ... }:
@@ -5381,7 +5381,7 @@ in
{ pkgs, config, ... }:
@@ -5423,22 +5423,22 @@ in
_:
+{ self, ... }:
{
services.openssh = {
enable = true;
settings.PermitRootLogin = "yes";
};
users.users.swarsel.openssh.authorizedKeys.keyFiles = [
- ../../../secrets/keys/authorized_keys
- ../../../secrets/keys/mysticant.pub
+ self + /secrets/keys/authorized_keys
+ self + /secrets/keys/magicant.pub
];
users.users.root.openssh.authorizedKeys.keyFiles = [
- ../../../secrets/keys/authorized_keys
- ../../../secrets/keys/mysticant.pub
+ self + /secrets/keys/authorized_keys
+ self + /secrets/keys/magicant.pub
];
}
@@ -5446,7 +5446,7 @@ in
{ pkgs, lib, config, ... }:
@@ -5495,7 +5495,7 @@ in
{ pkgs, lib, config, ... }:
@@ -5546,7 +5546,7 @@ in
{ pkgs, lib, config, ... }:
@@ -5646,7 +5646,7 @@ in
{ lib, config, ... }:
@@ -5687,7 +5687,7 @@ in
{ pkgs, lib, config, ... }:
@@ -5745,7 +5745,7 @@ in
{ config, lib, pkgs, sops, ... }:
@@ -6070,7 +6070,7 @@ in
{ pkgs, lib, config, ... }:
@@ -6120,7 +6120,7 @@ in
{ lib, config, ... }:
@@ -6176,7 +6176,7 @@ in
{ lib, config, ... }:
@@ -6233,7 +6233,7 @@ in
{ pkgs, lib, config, ... }:
@@ -6373,7 +6373,7 @@ in
{ lib, config, ... }:
@@ -6484,7 +6484,7 @@ in
{ lib, config, ... }:
@@ -6499,10 +6499,10 @@ in
{ lib, config, ... }:
+{ self, lib, config, ... }:
{
config = lib.mkIf config.swarselsystems.server.monitoring {
@@ -6574,7 +6574,7 @@ in
globalConfig = {
scrape_interval = "10s";
};
- webConfigFile = ../../../programs/server/prometheus/web.config;
+ webConfigFile = self + /programs/server/prometheus/web.config;
scrapeConfigs = [
{
job_name = "node";
@@ -6666,7 +6666,7 @@ in
{ pkgs, lib, config, ... }:
@@ -6708,7 +6708,7 @@ in
{ lib, config, ... }:
@@ -6746,12 +6746,12 @@ in
This sets the VirtualBox configuration. Guest should not be enabled if not direly needed, it will make rebuilds unbearably slow.
@@ -6931,25 +6931,24 @@ Options that I need specifically at work. There are more options at
-{ pkgs, config, ... }:
+{ self, pkgs, config, ... }:
+let
+ owner + "swarsel";
+ sopsFile = self + /secrets/work/secrets.yaml;
{
sops = {
secrets = {
clad = {
- owner = "swarsel";
- sopsFile = ../../../secrets/work/secrets.yaml;
+ inherit owner sopsfile;
};
dcad = {
- owner = "swarsel";
- sopsFile = ../../../secrets/work/secrets.yaml;
+ inherit owner sopsfile;
};
wsad = {
- owner = "swarsel";
- sopsFile = ../../../secrets/work/secrets.yaml;
+ inherit owner sopsfile;
};
imbad = {
- owner = "swarsel";
- sopsFile = ../../../secrets/work/secrets.yaml;
+ inherit owner sopsfile;
};
};
};
@@ -7111,7 +7110,7 @@ This section sets up all the imports that are used in the home-manager section.
Again, we adapt nix to our needs, enable the home-manager command for non-NixOS machines (NixOS machines are using it as a module) and setting user information that I always keep the same.
@@ -8215,7 +8214,7 @@ Here we set some aliases (some of them should be shellApplications instead) as w
_: @@ -8423,7 +8422,7 @@ Here we set some aliases (some of them should be shellApplications instead) as w
@@ -9808,12 +9807,12 @@ This service changes the screen hue at night. I am not sure if that really does
This section should be used in order to symlink already existing configuration files using `home.file` and setting session variables using `home.sessionVariables`. @@ -9860,12 +9859,12 @@ As for the `home.sessionVariables`, it should be noted that environment variable
This section sets up all the imports that are used in the home-manager section.
@@ -10579,10 +10578,10 @@ This tangles the flake.nix file; This block only needs to be touched when updati
nixOnDroidConfigurations = {
- mysticant = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
+ magicant = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
pkgs = pkgsFor.aarch64-linux;
modules = [
- ./profiles/mysticant
+ ./profiles/magicant
];
};
@@ -11334,7 +11333,7 @@ This formats the org code block at point in accordance to the
@@ -11706,8 +11705,8 @@ When Emacs compiles stuff, it often shows a bunch of warnings that I do not need
(setq garbage-collection-messages t) @@ -12952,8 +12951,8 @@ This adds a rudimentary nix-mode to Emacs. I have not really tried this out, as
This adds support for Hashicorp Configuration Language. I need this at work. @@ -12970,8 +12969,8 @@ This adds support for Hashicorp Configuration Language. I need this at work.
This adds support for Groovy, which I specifically need to work with Jenkinsfiles. I need this at work. @@ -12988,8 +12987,8 @@ This adds support for Groovy, which I specifically need to work with Jenkinsfile
This adds support for Dockerfiles. I need this at work. @@ -13004,8 +13003,8 @@ This adds support for Dockerfiles. I need this at work.
This adds support for Terraform configuration files. I need this at work. @@ -13100,8 +13099,8 @@ This mode is not automatically activated anywhere because I only rarely need it.
@@ -13850,8 +13849,8 @@ The following block is mostly inspired from -4.4.32. eglot
++4.4.32. eglot
After having tried out
lsp-modeandlsp-bridgefor a while each, I must say thateglotfeels the most clean and fast to me. @@ -13893,8 +13892,8 @@ After having tried outlsp-modeandlsp-bridgefor a w
This brings back warnings and errors on the sideline for eglot; a feature that I have been missing from lsp-mode for a while.
@@ -14519,8 +14518,8 @@ This sets up the dashboard, which is really quite useless. But, it
@@ -14643,7 +14642,7 @@ Prints a reasuring message to proove good faith."