Merge pull request #1423 from Mic92/merge-when-green-joerg

update flakes
Mic92 · Jan 4, 2025 · da055c5 · da055c5
2 parents dbbc5a2 + 04a379e
commit da055c5
Show file tree

Hide file tree

Showing 42 changed files with 323 additions and 267 deletions.
diff --git a/darwin/evo/configuration.nix b/darwin/evo/configuration.nix
@@ -23,8 +23,8 @@
     ../modules/alacritty.nix
   ];
 
-  clan.core.clanDir = ../..;
-  clan.core.machineName = "evo";
+  clan.core.settings.directory = ../..;
+  clan.core.settings.machine.name = "evo";
   sops.age.keyFile = "/Library/Application Support/sops-nix/age-key.txt";
 
   # fix vim repeat key

diff --git a/darwin/modules/clan/metadata.nix b/darwin/modules/clan/metadata.nix
@@ -1,46 +1,78 @@
 { lib, pkgs, ... }:
+let
+  inherit (lib) mkOption types;
+in
 {
   options.clan.core = {
-    clanName = lib.mkOption {
-      type = lib.types.str;
+    settings = mkOption {
       description = ''
-        the name of the clan
-      '';
-    };
-    machineIcon = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      description = ''
-        the location of the machine icon
-      '';
-    };
-    machineDescription = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      default = null;
-      description = ''
-        the description of the machine
-      '';
-    };
-    clanDir = lib.mkOption {
-      type = lib.types.path;
-      default = ./.;
-      description = ''
-        the location of the flake repo, used to calculate the location of facts and secrets
-      '';
-    };
-    clanIcon = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      description = ''
-        the location of the clan icon
-      '';
-    };
-    machineName = lib.mkOption {
-      type = lib.types.str;
-      default = "nixos";
-      description = ''
-        the name of the machine
+        Settings of the clan.
+
+        This is a read-only attribute-set available to the machines of the clan.
       '';
+      type = types.submodule {
+        options = {
+          directory = mkOption {
+            type = types.path;
+            description = ''
+              the location of the flake repo, used to calculate the location of facts and secrets
+            '';
+          };
+          name = lib.mkOption {
+            type = lib.types.str;
+            description = ''
+              the name of the clan
+            '';
+            # Set by the flake, so it's read-only in the maschine
+            readOnly = true;
+          };
+          icon = lib.mkOption {
+            type = lib.types.nullOr lib.types.path;
+            description = ''
+              the location of the clan icon
+            '';
+            # Set by the flake, so it's read-only in the maschine
+            readOnly = true;
+          };
+          machine = mkOption {
+            description = ''
+              Settings of the machine.
+
+              This is a read-only attribute-set available to the machines of the clan.
+            '';
+            default = { };
+            type = types.submodule {
+              options = {
+                name = mkOption {
+                  type = types.str;
+                  default = "nixos";
+                  description = ''
+                    the name of the machine
+                  '';
+                };
+                icon = lib.mkOption {
+                  type = lib.types.nullOr lib.types.path;
+                  default = null;
+                  description = ''
+                    the location of the machine icon
+                  '';
+                };
+                description = lib.mkOption {
+                  type = lib.types.nullOr lib.types.str;
+                  default = null;
+                  description = ''
+                    the description of the machine
+                  '';
+                };
+              };
+            };
+          };
+        };
+      };
     };
+
+    # TODO: Move this into settings.clanPkgs ?
+    # This could also be part of the public interface to allow users to override the internal packages
     clanPkgs = lib.mkOption {
       defaultText = "self.packages.${pkgs.system}";
       internal = true;

diff --git a/darwin/modules/clan/sops.nix b/darwin/modules/clan/sops.nix
@@ -5,8 +5,8 @@
   ...
 }:
 let
-  secretsDir = config.clan.core.clanDir + "/sops/secrets";
-  groupsDir = config.clan.core.clanDir + "/sops/groups";
+  secretsDir = config.clan.core.settings.directory + "/sops/secrets";
+  groupsDir = config.clan.core.settings.directory + "/sops/groups";
 
   # My symlink is in the nixos module detected as a directory also it works in the repl. Is this because of pure evaluation?
   containsSymlink =
@@ -16,7 +16,8 @@ let
 
   containsMachine =
     parent: name: type:
-    type == "directory" && containsSymlink "${parent}/${name}/machines/${config.clan.core.machineName}";
+    type == "directory"
+    && containsSymlink "${parent}/${name}/machines/${config.clan.core.settings.machine.name}";
 
   containsMachineOrGroups =
     name: type:
@@ -53,7 +54,7 @@ in
     );
 
     sops.age.keyFile = lib.mkIf (builtins.pathExists (
-      config.clan.core.clanDir + "/sops/secrets/${config.clan.core.machineName}-age.key/secret"
+      config.clan.core.clanDir + "/sops/secrets/${config.clan.core.settings.machine.name}-age.key/secret"
     )) (lib.mkDefault "/var/lib/sops-nix/key.txt");
   };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -74,7 +74,7 @@
     flake-registry.url = "github:NixOS/flake-registry";
     flake-registry.flake = false;
 
-    nix-darwin.url = "github:Mic92/nix-darwin/ssh";
+    nix-darwin.url = "github:LnL7/nix-darwin";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
     #srvos.url = "github:numtide/srvos/impure-derivations";

diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./common.nix
@@ -29,7 +29,6 @@
 
     arandr
     signal-desktop
-    inputs.nur-packages.packages.${pkgs.hostPlatform.system}.pandoc-bin
     adwaita-icon-theme
     hicolor-icon-theme
     graphicsmagick
@@ -40,7 +39,7 @@
     hunspell
     hunspellDicts.en-gb-ise
     dino
-    foot
+    ghostty
     screen-message
     sshfs-fuse
     sshuttle
@@ -91,30 +90,6 @@
         --mode=block \
         ${pkgs.jellyfin-media-player}/bin/jellyfinmediaplayer
     '')
-    #(retroarch.override {
-    #  cores = [
-    #    libretro.bsnes-hd
-    #    libretro.mupen64plus
-    #    libretro.beetle-psx-hw
-    #    libretro.dolphin
-    #    #libretro.pcsx2
-    #  ];
-    #})
-
-    (pkgs.writeScriptBin "rhasspy-play" ''
-      #!${pkgs.runtimeShell}
-      set -eux -o pipefail
-      export PATH=${pkgs.pulseaudioFull}/bin:$PATH
-      sink=alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink
-
-      if pamixer --get-mute --sink="$sink"; then
-          pamixer --sink=$sink --unmute
-          paplay --device=$sink
-          pamixer --sink=$sink --mute
-      else
-          paplay --device=$sink
-      fi
-    '')
 
     nixos-shell
     nerd-fonts.fira-code

diff --git a/home/.config/ghostty/config b/home/.config/ghostty/config
@@ -0,0 +1,10 @@
+font-family = ""
+font-family = "FiraCode Nerd Font"
+window-decoration = false
+window-height = 4000
+window-width = 4000
+clipboard-read = allow
+clipboard-write = allow
+
+#theme = light:"Builtin Solarized Light",dark:"Builtin Solarized Dark"
+theme = Builtin Solarized Light
diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json
@@ -55,7 +55,7 @@
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "29b33efc802a304b1cf13ab200915d4e9e67373d" },
   "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
-  "nvim-treesitter": { "branch": "master", "commit": "0c26a5c4bc407fdbca545ab25cf6084fd069444b" },
+  "nvim-treesitter": { "branch": "master", "commit": "5d18ef22dc63624e90aa7b6dbc17f2c3856ae716" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
   "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
@@ -71,7 +71,7 @@
   "smart-splits.nvim": { "branch": "master", "commit": "00fba7a0e912a8d82da91a3b6b11d641fa500bd8" },
   "spaceless.nvim": { "branch": "main", "commit": "8d46bc098dba18d4e19bce89bf19aab5007ef767" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
   "venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" },

diff --git a/home/.config/nvim/treesitter-rev b/home/.config/nvim/treesitter-rev
@@ -1 +1 @@
-0c26a5c4bc407fdbca545ab25cf6084fd069444b
+5d18ef22dc63624e90aa7b6dbc17f2c3856ae716
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0c26a5c4bc407fdbca545ab25cf6084fd069444b
		5d18ef22dc63624e90aa7b6dbc17f2c3856ae716