From 1642de788ccac8098d944066184a0c71b7a8e537 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Fri, 2 Jun 2023 22:11:08 +0900
Subject: fix(darwin/kompakt-darwin): fixup

---
 darwin/default.nix                      |  4 +-
 darwin/kompakt-darwin/configuration.nix | 66 +++++++++++++++++++++++++++++++++
 darwin/kompakt/configuration.nix        | 66 ---------------------------------
 3 files changed, 68 insertions(+), 68 deletions(-)
 create mode 100644 darwin/kompakt-darwin/configuration.nix
 delete mode 100644 darwin/kompakt/configuration.nix

(limited to 'darwin')

diff --git a/darwin/default.nix b/darwin/default.nix
index 3144894..5ab7fb7 100644
--- a/darwin/default.nix
+++ b/darwin/default.nix
@@ -1,8 +1,8 @@
 { self, darwin, unstable, ... } @ inputs:
 
 {
-  kompakt = self.lib.mkDarwin {
-    name = "kompakt";
+  kompakt-darwin = self.lib.mkDarwin {
+    name = "kompakt-darwin";
     system = "aarch64-darwin";
     nixpkgs = unstable;
   };
diff --git a/darwin/kompakt-darwin/configuration.nix b/darwin/kompakt-darwin/configuration.nix
new file mode 100644
index 0000000..7080e77
--- /dev/null
+++ b/darwin/kompakt-darwin/configuration.nix
@@ -0,0 +1,66 @@
+{ config, pkgs, lib, ... }:
+
+{
+  nix = {
+    settings.substituters = [
+      "https://cache.nixos.org/"
+    ];
+    settings.trusted-public-keys = [
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+    ];
+
+    settings.trusted-users = [
+      "@admin"
+    ];
+
+    settings.auto-optimise-store = lib.mkDefault true;
+    configureBuildUsers = true;
+    gc.automatic = lib.mkDefault true;
+    gc.options = lib.mkDefault "--delete-older-than 10d";
+    extraOptions = ''
+      experimental-features = nix-command flakes
+      extra-platforms = x86_64-darwin aarch64-darwin
+    '';
+  };
+
+  # List packages installed in system profile. To search by name, run:
+  # $ nix-env -qaP | grep wget
+  environment.systemPackages =
+    [
+      pkgs.vim
+    ];
+
+  # Use a custom configuration.nix location.
+  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
+  # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
+
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
+  # nix.package = pkgs.nix;
+
+  users.users.sefidel = {
+    name = "sefidel";
+    home = "/Users/sefidel";
+  };
+
+  # Create /etc/zshrc that loads the nix-darwin environment.
+  programs.zsh.enable = true; # default shell on catalina
+  # programs.fish.enable = true;
+
+  # Make applications pop up in finder/spotlight
+  system.activationScripts.applications.text = pkgs.lib.mkForce (
+    ''
+      echo "setting up ~/Applications..." >&2
+      rm -rf ~/Applications/Nix\ Apps
+      mkdir -p ~/Applications/Nix\ Apps
+      for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do
+        src="$(/usr/bin/stat -f%Y "$app")"
+        cp -r "$src" ~/Applications/Nix\ Apps
+      done
+    ''
+  );
+
+  # Used for backwards compatibility, please read the changelog before changing.
+  # $ darwin-rebuild changelog
+  system.stateVersion = 4;
+}
diff --git a/darwin/kompakt/configuration.nix b/darwin/kompakt/configuration.nix
deleted file mode 100644
index 8507adb..0000000
--- a/darwin/kompakt/configuration.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  nix = {
-    settings.substituters = [
-      "https://cache.nixos.org/"
-    ];
-    settings.trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-    ];
-
-    settings.trusted-users = [
-      "@admin"
-    ];
-
-    settings.auto-optimise-store = lib.mkDefault true;
-    configureBuildUsers = true;
-    gc.automatic = lib.mkDefault true;
-    gc.options = lib.mkDefault "--delete-older-than 10d";
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      extra-platforms = x86_64-darwin aarch64-darwin
-    '';
-  };
-
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
-  environment.systemPackages =
-    [
-      pkgs.vim
-    ];
-
-  # Use a custom configuration.nix location.
-  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
-  # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
-
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  # nix.package = pkgs.nix;
-
-  users.users.o32 = {
-    name = "o32";
-    home = "/Users/o32";
-  };
-
-  # Create /etc/zshrc that loads the nix-darwin environment.
-  programs.zsh.enable = true; # default shell on catalina
-  # programs.fish.enable = true;
-
-  # Make applications pop up in finder/spotlight
-  system.activationScripts.applications.text = pkgs.lib.mkForce (
-    ''
-      echo "setting up ~/Applications..." >&2
-      rm -rf ~/Applications/Nix\ Apps
-      mkdir -p ~/Applications/Nix\ Apps
-      for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do
-        src="$(/usr/bin/stat -f%Y "$app")"
-        cp -r "$src" ~/Applications/Nix\ Apps
-      done
-    ''
-  );
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 4;
-}
-- 
cgit 1.4.1