[NixOS] Host docs.railbird.ai

kubernets WIP
2024-08-19 14:31:17 -06:00 · 2024-08-18 21:33:58 -06:00
41 changed files with 186 additions and 171 deletions
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -1,5 +1,5 @@
 { config, pkgs, forEachUser, makeEnable, realUsers, ... }:
-makeEnable config "myModules.base" true {
+makeEnable config "modules.base" true {
  nixpkgs.config.permittedInsecurePackages = [
    "openssl-1.0.2u"
    "electron-12.2.3"
@@ -59,9 +59,6 @@ makeEnable config "myModules.base" true {
  services.locate.enable = true;

  virtualisation.docker.enable = true;
-  virtualisation.docker.enableNvidia = true;
-  hardware.nvidia-container-toolkit.enable = true;
-  hardware.nvidia.open = false;

  hardware.keyboard.zsa.enable = true;

--- a/nixos/ben.nix
+++ b/nixos/ben.nix
@@ -1,5 +1,5 @@
 { pkgs, inputs, config, makeEnable, ... }:
-makeEnable config "myModules.ben" true {
+makeEnable config "modules.ben" true {
  home-manager.backupFileExtension = "backup"; # Add this line
  home-manager.users.ben = {
    programs.zsh = {
--- a/nixos/cache-server.nix
+++ b/nixos/cache-server.nix
@@ -1,10 +1,10 @@
 { config, lib, ... }:
 with lib;
-let cfg = config.myModules.cache-server;
+let cfg = config.modules.cache-server;
 in
 {
  options = {
-    myModules.cache-server = {
+    modules.cache-server = {
      enable = mkEnableOption "nix cache server";
      port = mkOption {
        type = types.int;
--- a/nixos/code.nix
+++ b/nixos/code.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, ... }:
-makeEnable config "myModules.code" true {
+makeEnable config "modules.code" true {
  programs.direnv = {
    enable = true;
    nix-direnv.enable = true;
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -21,6 +21,7 @@
    ./internet-computer.nix
    ./kat.nix
    ./keybase.nix
+    ./kubernetes.nix
    ./nix.nix
    ./nixified.ai.nix
    ./options.nix
@@ -42,17 +43,17 @@
  };

  config = lib.mkIf config.features.full.enable {
-    myModules.base.enable = true;
-    myModules.desktop.enable = true;
-    myModules.plasma.enable = true;
-    myModules.gnome.enable = false;
-    myModules.xmonad.enable = true;
-    myModules.extra.enable = true;
-    myModules.electron.enable = true;
-    myModules.code.enable = true;
-    myModules.games.enable = true;
-    myModules.syncthing.enable = true;
-    myModules.fonts.enable = true;
-    myModules.nixified-ai.enable = false;
+    modules.base.enable = true;
+    modules.desktop.enable = true;
+    modules.plasma.enable = true;
+    modules.gnome.enable = false;
+    modules.xmonad.enable = true;
+    modules.extra.enable = true;
+    modules.electron.enable = true;
+    modules.code.enable = true;
+    modules.games.enable = true;
+    modules.syncthing.enable = true;
+    modules.fonts.enable = true;
+    modules.nixified-ai.enable = false;
  };
 }
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -1,5 +1,5 @@
 { config, pkgs, makeEnable, ... }:
-makeEnable config "myModules.desktop" true {
+makeEnable config "modules.desktop" true {
  imports = [
    ./fonts.nix
  ];
@@ -70,6 +70,7 @@ makeEnable config "myModules.desktop" true {
    networkmanagerapplet
    notify-osd-customizable
    okular
+    picom
    pinentry
    psensor
    quassel
--- a/nixos/electron.nix
+++ b/nixos/electron.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, forEachUser, ... }:
-makeEnable config "myModules.electron" false {
+makeEnable config "modules.electron" false {
  environment.systemPackages = with pkgs; [
    element-desktop
    # bitwarden
--- a/nixos/extra.nix
+++ b/nixos/extra.nix
@@ -1,5 +1,5 @@
 { config, pkgs, makeEnable, ... }:
-makeEnable config "myModules.extra" false {
+makeEnable config "modules.extra" false {
  services.expressvpn.enable = true;
  programs.hyprland.enable = true;

--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -781,11 +781,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724435763,
-        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
        "type": "github"
      },
      "original": {
@@ -959,11 +959,11 @@
        "nixpkgs-regression": "nixpkgs-regression"
      },
      "locked": {
-        "lastModified": 1724874960,
-        "narHash": "sha256-cmmNq/tFU4MZYU5RAuUVt1NGt5e6RMaMsvJtU5ybEJI=",
+        "lastModified": 1723343056,
+        "narHash": "sha256-ixvBNplVIqUqvshVi5azgPiGIFXlXDmahDcoP/guuTE=",
        "owner": "NixOS",
        "repo": "nix",
-        "rev": "b89eca9aecc69d4dfc0f0afd9353c126eb7b5858",
+        "rev": "18485d2d53622c6ec7beab80c77efbd49ed682e2",
        "type": "github"
      },
      "original": {
@@ -1016,11 +1016,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1724664098,
-        "narHash": "sha256-4SgV4jCoN5RffR1Mtn3HI1cjgHmARh+rZrpVlBclj9U=",
+        "lastModified": 1723124175,
+        "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "345dfa06658a37873ca18aa205f409e4aaf1caa6",
+        "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
        "type": "github"
      },
      "original": {
@@ -1079,11 +1079,11 @@
    },
    "nixpkgs-regression_2": {
      "locked": {
-        "lastModified": 1725042541,
-        "narHash": "sha256-2ItfpRi49hr3LrHnWLBqEFrnKbREHnWjgyrJzaPnjkI=",
+        "lastModified": 1723405223,
+        "narHash": "sha256-VSHY8GQ64AseobyeoVkJl+ZDaWPGzKs+CG6RfDM159o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "963ea288f4a82f4945813037d4e8d1bfd149c3e5",
+        "rev": "938253e0f8d5c98c4515a10cc388239cc1431db8",
        "type": "github"
      },
      "original": {
@@ -1094,11 +1094,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1723688146,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "lastModified": 1721548954,
+        "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
        "type": "github"
      },
      "original": {
@@ -1126,11 +1126,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1724316499,
-        "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
+        "lastModified": 1722087241,
+        "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
+        "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
        "type": "github"
      },
      "original": {
@@ -1142,16 +1142,16 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1725043766,
-        "narHash": "sha256-iNXaq3XJkLDc9Fhs1dWi9Fj/pmMbVZ2PV33ME3JhcUI=",
-        "owner": "colonelpanic8",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f53b146e86208b06645bfabf5527d47f0b0c6c5e",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
        "type": "github"
      },
      "original": {
-        "owner": "colonelpanic8",
-        "ref": "with-cursor",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -1300,11 +1300,11 @@
        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1723672467,
-        "narHash": "sha256-6GbCvAboNKot15sHrYJqONIyu9T5OUokEubghgPHLUw=",
+        "lastModified": 1722639965,
+        "narHash": "sha256-ZRe5Z5s/UNaXI2piyncQ3YrFl5q3GryZAfFTyeJ/vhM=",
        "ref": "refs/heads/master",
-        "rev": "e067ec9b790bbe76d8bff667c072e2e19cd68fa7",
-        "revCount": 76,
+        "rev": "9a92b83c3ad376620db3556c33e51a4300c5badd",
+        "revCount": 73,
        "type": "git",
        "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
      },
@@ -1593,11 +1593,11 @@
    },
    "unstable": {
      "locked": {
-        "lastModified": 1724819573,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
        "type": "github"
      },
      "original": {
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -6,7 +6,7 @@
    nixos-hardware = { url = "github:colonelpanic8/nixos-hardware/add-g834jzr"; };

    nixpkgs = {
-      url = "github:colonelpanic8/nixpkgs/with-cursor";
+      url = "github:NixOS/nixpkgs/nixos-unstable";
    };

    home-manager = {
--- a/nixos/fonts.nix
+++ b/nixos/fonts.nix
@@ -1,5 +1,5 @@
 { pkgs, makeEnable, config, ... }:
-makeEnable config "myModules.fonts" true {
+makeEnable config "modules.fonts" true {
  # Enable the gtk icon cache
  gtk.iconCache.enable = true;

--- a/nixos/games.nix
+++ b/nixos/games.nix
@@ -1,5 +1,5 @@
 { config, pkgs, makeEnable, ... }:
-makeEnable config "myModules.games" false {
+makeEnable config "modules.games" false {
  environment.systemPackages = with pkgs; [
    steam
    # heroic
--- a/nixos/gitea-runner.nix
+++ b/nixos/gitea-runner.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, ... }:
-makeEnable config "myModules.gitea-runner" false {
+makeEnable config "modules.gitea-runner" false {
  age.secrets.gitea-runner-token = {
    file = ./secrets/gitea-runner-token.${config.networking.hostName}.age;
    group = "docker";
--- a/nixos/gitea.nix
+++ b/nixos/gitea.nix
@@ -1,5 +1,5 @@
 { config, makeEnable, ... }:
-makeEnable config "myModules.gitea" false {
+makeEnable config "modules.gitea" false {

  services.gitea = {
    enable = true;
--- a/nixos/gnome.nix
+++ b/nixos/gnome.nix
@@ -1,5 +1,5 @@
 { config, makeEnable, ... }:
-makeEnable config "myModules.gnome" false {
+makeEnable config "modules.gnome" false {
  services.xserver = {
    desktopManager.gnome.enable = true;
    displayManager.gdm.enable = true;
--- a/nixos/kat.nix
+++ b/nixos/kat.nix
@@ -1,11 +1,10 @@
 { pkgs, inputs, config, makeEnable, ... }:
-makeEnable config "myModules.kat" false {
+makeEnable config "modules.kat" false {
  environment.systemPackages = with pkgs; [
    bitwarden
    obsidian
    obs-studio
    ffmpeg
-    code-cursor
  ];

  environment.extraInit = ''
--- a/nixos/kubernetes.nix
+++ b/nixos/kubernetes.nix
@@ -0,0 +1,19 @@
+{ pkgs, config, makeEnable, ... }:
+makeEnable config "modules.railbirdKubernetesNode" true {
+  environment.etc."kubernetes/ca.crt" = {
+    text = builtins.readFile (pkgs.writeText "ca.crt" (builtins.fromBase64 "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVMVENDQXBXZ0F3SUJBZ0lSQUxOeE9UN0o3Ti9lSzZlZHA5TGJLQUl3RFFZSktvWklodmNOQVFFTEJRQXcKTHpFdE1Dc0dBMVVFQXhNa00ySTJOMk0yTnpndE56STVNeTAwWVRJekxUZzNaV0l0WTJOaU1UWmpZV0ZrTXpGbQpNQ0FYRFRJek1USXlPVEU1TlRRME1sb1lEekl3TlRNeE1qSXhNakExTkRReVdqQXZNUzB3S3dZRFZRUURFeVF6CllqWTNZelkzT0MwM01qa3pMVFJoTWpNdE9EZGxZaTFqWTJJeE5tTmhZV1F6TVdZd2dnR2lNQTBHQ1NxR1NJYjMKRFFFQkFRVUFBNElCandBd2dnR0tBb0lCZ1FDVVlVdVRycERid1VTMkIzU1lVb2E3TEk1bWk4Tk5yMGxEZTF3NAozeVBwVm51NnVidm5UTm0yai92ODhIWXdFamxwcEVnNEhqaFA3WUVKOGdzR2RnVUNwSWFQV1RwaWZWbUE3RTRvCjJEYkpEaWVQa2tVR2tOTDB3aENDbE9PY08waHl4ZGs5UG9sNXdSemNpMGw2elNhbEU2REI0ckpybUI1UHBsL0EKdDJLQVZWcXB3YnlubWJpanI0eVpoN0JwN0xmYUlyRnRobHYyWlBFakxmUEx6N1l0aEJ3OS9pVXQ5NG1MTXlXWgpCcHlnQTV5L0NvY1FRbm5GTW5VMW8wZVVkMzdZTDd6RXJmSXh4L0FtTDEwU3EwcWRGWGlZT0pKcXViVVJiZFM4CkRaNmR5SGRYK1VseFBsczJSbHg5bkRhaU5HRkpkenFISnpEZE9sek4za2tkRFFvTzh4VWRIOWVrRlU3ck93a1AKNU5wdWJTd3JkMUZPR0hoK0VrbnVnbkVRRDRPaXAvWVE3SVVqM0FmbTVBZzJsYTlrNFdKUmdqQUNia1EyK2s5SQpzRm1QbW1NVkhuOW5lcENNaVlRTWpYN0FwWncwaXNEUGVWSzVFdVFlSW1ndTd1Tm9WOFI1VndHMFhvQkNYejRTClVxWXYxMXVFc01xRnUwN1p3bHpuc3hubTB1RUNBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdJRU1BOEcKQTFVZEV3RUIvd1FGTUFNQkFmOHdIUVlEVlIwT0JCWUVGSTczR3pubWVFQ0pPZHhKQUV6bWpoWWdHVkt0TUEwRwpDU3FHU0liM0RRRUJDd1VBQTRJQmdRQW0xOXpsbTNXVmVQZmxBNlpoL0Z4dkU4TWlyckpGNmptSnpSckJDRU01CkR3a1NtWTNkdk9OcUNZZWVOYjQreFdYV1E4ZVZLVmxQZGtvVzNWN0g1eG5KNjNkWFJOTjJsUTNKcFNURzMreVAKT21wNlhHWTltbWF0ZEh3eVY3TjRoMTBhS0VXQXVSaHkxNDhzZEpaTFlqMExiUjQycENWWWhFUDREM1FqN0tqTgpQSmUrY1I4TlNwaVltREg1eTg4SnF1Ynp0ajVOVmNEai9pTjloLzcvR2FqYlU2bENnTi9TeFpnaTljTkdqeFNiCkpIRkhFMk1wM3o5c2pzaWVUWE1wbExxSzA0NVRRMklCcW5KeU1kS2t2U05rUlVDYnoyeVhkaUlPS3R2VTRseTAKaDg4NHo5UDVKUTlieGUrNmN3WUM0a3kzRzVXWU1uKytSVXN1Q2s0U2NzcmJadE05anBLbnovVHlnTWRWVEM1dwpTaXE2T0hLdEFuaDhBeDFMRUtpY2c5RkxkNk9EeFIzT1ZLdStmVVBWNFhIQVdKbm12RWxHbGl2am5lSGlFK09MCmR6Z2IvQ2ZCRUdIWUJWYzJQRElod0JtVWRvRVovdDNVanZtU0k0NlpibFlwV29kSnZMRndnZTJIeFNpdlJsTFcKVWgvb1BXWDVOL0NIOUkzNEhUQWhJNDg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"));
+    mode = "0644";
+  };
+  services.kubernetes = {
+    roles = ["node"];
+    kubelet = {
+      extraOpts = "--cloud-provider=external";
+      registerNode = true;
+      kubeconfig = {
+        server = "https://34.31.205.230";
+        caFile = "/etc/kubernetes/ca.crt";
+      };
+    };
+  };
+}
+
--- a/nixos/machines/adele.nix
+++ b/nixos/machines/adele.nix
@@ -6,16 +6,16 @@
    inputs.nixos-hardware.nixosModules.dell-xps-17-9700-nvidia
  ];

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = true;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
-  myModules.gitea-runner.enable = false;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = true;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.gitea-runner.enable = false;

  hardware.enableRedistributableFirmware = true;

--- a/nixos/machines/bencbox.nix
+++ b/nixos/machines/bencbox.nix
@@ -8,10 +8,10 @@
    sublime
    vlc
  ];
-  myModules.desktop.enable = false;
-  myModules.plasma.enable = false;
+  modules.desktop.enable = false;
+  modules.plasma.enable = false;
  imalison.nixOverlay.enable = false;
-  myModules.wsl.enable = true;
+  modules.wsl.enable = true;

  networking.hostName = "bencbox";

--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -13,25 +13,25 @@ in
    extraGroups = ["syncthing"];
  };

-  myModules.raspberry-pi.enable = true;
+  modules.raspberry-pi.enable = true;

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = false;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
-  myModules.cache-server = {
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = false;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.cache-server = {
    enable = false;
    host-string = biskcomp-nginx-hostnames;
    port = 80;
    path = "/nix-cache";
  };
-  myModules.gitea.enable = true;
-  myModules.gitea-runner.enable = false;
+  modules.gitea.enable = true;
+  modules.gitea-runner.enable = false;

  services.vaultwarden = {
    enable = true;
--- a/nixos/machines/david-blade.nix
+++ b/nixos/machines/david-blade.nix
@@ -5,15 +5,15 @@
    ../configuration.nix
  ];

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = false;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = false;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;

  hardware.enableRedistributableFirmware = true;

--- a/nixos/machines/dean-zephyrus.nix
+++ b/nixos/machines/dean-zephyrus.nix
@@ -5,10 +5,10 @@
  ];
  services.xserver.enable = true;
  environment.systemPackages = with pkgs; [sublime];
-  myModules.desktop.enable = false;
-  myModules.plasma.enable = false;
+  modules.desktop.enable = false;
+  modules.plasma.enable = false;
  imalison.nixOverlay.enable = false;
-  myModules.wsl.enable = true;
+  modules.wsl.enable = true;

  networking.hostName = "dean-zephyrus";

--- a/nixos/machines/jay-lenovo-wsl.nix
+++ b/nixos/machines/jay-lenovo-wsl.nix
@@ -5,7 +5,7 @@
  ];

  imalison.nixOverlay.enable = false;
-  myModules.wsl.enable = true;
+  modules.wsl.enable = true;

  networking.hostName = "jay-lenovo-wsl";

--- a/nixos/machines/jay-lenovo.nix
+++ b/nixos/machines/jay-lenovo.nix
@@ -11,7 +11,6 @@
    android-studio
    linuxPackages_latest.perf
    zenmonitor
-    code-cursor
  ];

  hardware.enableRedistributableFirmware = true;
@@ -27,7 +26,7 @@
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;

-  myModules.postgres.enable = true;
+  modules.postgres.enable = true;

  networking.networkmanager.enable = true;

--- a/nixos/machines/jimi-hendnix.nix
+++ b/nixos/machines/jimi-hendnix.nix
@@ -5,17 +5,17 @@
    ../configuration.nix
  ];

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = true;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
-  myModules.gitea-runner.enable = true;
-  myModules.postgres.enable = true;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = true;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.gitea-runner.enable = true;
+  modules.postgres.enable = true;

  hardware.enableRedistributableFirmware = true;

--- a/nixos/machines/nixquick.nix
+++ b/nixos/machines/nixquick.nix
@@ -5,13 +5,12 @@
  ];

  features.full.enable = true;
-  myModules.cache-server = {
+  modules.cache-server = {
    enable = true;
    port = 3090;
  };
-  myModules.gitea-runner.enable = true;
-  myModules.vscode.enable = true;
-  myModules.kat.enable = true;
+  modules.gitea-runner.enable = true;
+  modules.vscode.enable = true;

  networking.hostName = "nixquick";

--- a/nixos/machines/railbird-sf.nix
+++ b/nixos/machines/railbird-sf.nix
@@ -55,15 +55,15 @@
  };

  features.full.enable = false;
-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = false;
-  myModules.gnome.enable = true;
-  myModules.code.enable = true;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.plasma.enable = false;
-  myModules.gitea-runner.enable = true;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = false;
+  modules.gnome.enable = true;
+  modules.code.enable = true;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.plasma.enable = false;
+  modules.gitea-runner.enable = true;

  fileSystems."/" =
    { device = "/dev/disk/by-uuid/a317d456-6f84-41ee-a149-8e466e414aae";
--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -7,13 +7,13 @@

  features.full.enable = true;
  # Needed for now because monitors have different refresh rates
-  myModules.xmonad.picom.vSync.enable = false;
-  myModules.cache-server = {
+  modules.xmonad.picom.vSync.enable = false;
+  modules.cache-server = {
    enable = true;
    port = 3090;
  };
-  myModules.gitea-runner.enable = true;
-  myModules.postgres.enable = true;
+  modules.gitea-runner.enable = true;
+  modules.postgres.enable = true;

  boot.loader.systemd-boot.configurationLimit = 5;

--- a/nixos/machines/strixi-minaj-wsl.nix
+++ b/nixos/machines/strixi-minaj-wsl.nix
@@ -4,7 +4,7 @@
    ../configuration.nix
  ];

-  myModules.wsl.enable = true;
+  modules.wsl.enable = true;

  networking.hostName = "strixi-minaj-wsl";

--- a/nixos/machines/strixi-minaj.nix
+++ b/nixos/machines/strixi-minaj.nix
@@ -6,16 +6,16 @@
    inputs.nixos-hardware.nixosModules.asus-rog-strix-g834jzr
  ];

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = true;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
-  myModules.gitea-runner.enable = false;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = true;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.gitea-runner.enable = false;

  hardware.enableRedistributableFirmware = true;

--- a/nixos/nixified.ai.nix
+++ b/nixos/nixified.ai.nix
@@ -1,5 +1,5 @@
 { inputs, config, specialArgs, ... }:
-specialArgs.makeEnable config "myModules.nixified-ai" false {
+specialArgs.makeEnable config "modules.nixified-ai" false {
  imports = [
    inputs.nixified-ai.nixosModules.invokeai
  ];
--- a/nixos/options.nix
+++ b/nixos/options.nix
@@ -1,6 +1,6 @@
 { lib, ... }: {
  options = {
-    myModules.xmonad.picom.vSync.enable = lib.mkOption {
+    modules.xmonad.picom.vSync.enable = lib.mkOption {
      default = true;
      type = lib.types.bool;
    };
--- a/nixos/plasma.nix
+++ b/nixos/plasma.nix
@@ -1,5 +1,5 @@
 { config, makeEnable, ... }:
-makeEnable config "myModules.plasma" true {
+makeEnable config "modules.plasma" true {
  services.displayManager.sddm.enable = true;
  services.xserver = {
    desktopManager.plasma5.enable = true;
--- a/nixos/postgres.nix
+++ b/nixos/postgres.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, realUsers, ... }:
-makeEnable config "myModules.postgres" true {
+makeEnable config "modules.postgres" true {
  services.postgresql = {
    enable = true;
    package = pkgs.postgresql_15;
--- a/nixos/rabbitmq.nix
+++ b/nixos/rabbitmq.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, realUsers, ... }:
-makeEnable config "myModules.rabbitmq" true {
+makeEnable config "modules.rabbitmq" true {
  services.rabbitmq = {
    enable = true;
  };
--- a/nixos/raspberry-pi.nix
+++ b/nixos/raspberry-pi.nix
@@ -1,6 +1,6 @@
 { config, pkgs, inputs, makeEnable, ... }:

-makeEnable config "myModules.raspberry-pi" false {
+makeEnable config "modules.raspberry-pi" false {
  imports = [
    inputs.nixos-hardware.nixosModules.raspberry-pi-4
  ];
--- a/nixos/secrets/ryzen-shine-kubernetes-token.age
+++ b/nixos/secrets/ryzen-shine-kubernetes-token.age
--- a/nixos/syncthing.nix
+++ b/nixos/syncthing.nix
@@ -21,7 +21,7 @@ let
  };
  allDevices = builtins.attrNames devices;
 in
-makeEnable config "myModules.syncthing" true {
+makeEnable config "modules.syncthing" true {
  system.activationScripts.syncthingPermissions = {
    text = ''
      chown -R syncthing:syncthing /var/lib/syncthing
--- a/nixos/vscode.nix
+++ b/nixos/vscode.nix
@@ -1,5 +1,5 @@
 { inputs, config, makeEnable, forEachUser, ... }:
-makeEnable config "myModules.vscode" true {
+makeEnable config "modules.vscode" true {
  home-manager.users = forEachUser {
    imports = [inputs.vscode-server.homeModules.default];
    services.vscode-server.enable = true;
--- a/nixos/wsl.nix
+++ b/nixos/wsl.nix
@@ -1,13 +1,13 @@
 { config, inputs, pkgs, makeEnable, ... }:
-makeEnable config "myModules.wsl" false {
+makeEnable config "modules.wsl" false {
  imports = [
    inputs.nixos-wsl.nixosModules.wsl
  ];

-  myModules.base.enable = false;
-  myModules.desktop.enable = false;
-  myModules.xmonad.enable = false;
-  myModules.plasma.enable = false;
+  modules.base.enable = false;
+  modules.desktop.enable = false;
+  modules.xmonad.enable = false;
+  modules.plasma.enable = false;

  # Update timezone automatically
  services.tzupdate.enable = true;
--- a/nixos/xmonad.nix
+++ b/nixos/xmonad.nix
@@ -1,5 +1,5 @@
 { config, pkgs, inputs, forEachUser, makeEnable, ... }:
-makeEnable config "myModules.xmonad" true  {
+makeEnable config "modules.xmonad" true  {
  nixpkgs.overlays = with inputs; [
    xmonad.overlay
    xmonad-contrib.overlay
@@ -25,7 +25,7 @@ makeEnable config "myModules.xmonad" true  {
    # Haskell Desktop
    haskellPackages.xmonad
    haskellPackages.imalison-xmonad
-    # haskellPackages.notifications-tray-icon
+    haskellPackages.notifications-tray-icon
    haskellPackages.gtk-sni-tray
    haskellPackages.status-notifier-item
    haskellPackages.dbus-hslogger
@@ -80,7 +80,7 @@ makeEnable config "myModules.xmonad" true  {

    services.picom = {
      enable = true;
-      vSync = config.myModules.xmonad.picom.vSync.enable;
+      vSync = config.modules.xmonad.picom.vSync.enable;
      backend = "glx";
      extraArgs = ["--experimental-backends"];

@@ -137,21 +137,21 @@ makeEnable config "myModules.xmonad" true  {
      };
    };

-    # systemd.user.services.notifications-tray-icon = {
-    #   Unit = {
-    #     Description = "Notifications tray icon";
-    #     After = [ "graphical-session-pre.target" "tray.target" ];
-    #     PartOf = [ "graphical-session.target" ];
-    #   };
+    systemd.user.services.notifications-tray-icon = {
+      Unit = {
+        Description = "Notifications tray icon";
+        After = [ "graphical-session-pre.target" "tray.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };

-    #   Install = { WantedBy = [ "graphical-session.target" ]; };
+      Install = { WantedBy = [ "graphical-session.target" ]; };

-    #   Service = {
-    #     ExecStart = "${pkgs.haskellPackages.notifications-tray-icon}/bin/notifications-tray-icon  --github-token-pass dfinity-github-api-token";
-    #     Restart = "always";
-    #     RestartSec = 3;
-    #   };
-    # };
+      Service = {
+        ExecStart = "${pkgs.haskellPackages.notifications-tray-icon}/bin/notifications-tray-icon  --github-token-pass dfinity-github-api-token";
+        Restart = "always";
+        RestartSec = 3;
+      };
+    };

    systemd.user.services.shutter = {
      Unit = {
Author	SHA1	Message	Date
Ivan Malison	f0707ed8c2	[NixOS] Host docs.railbird.ai	2024-08-19 14:31:17 -06:00
Ivan Malison	43aeab6fda	kubernets WIP	2024-08-18 21:33:58 -06:00