Merge pull request #2 from ocfox/home-haumea

darwin/default.nix

@@ -1,14 +1,23 @@
-{ username, nixpkgs, darwin, inputs, ... }:
+{ username
+, darwin
+, inputs
+, home
+, ...
+}:
+let
+  silverfox = { pkgs, username, ... }@args: inputs.haumea.lib.load {
+    src = ./silverfox;
+    inputs = args // {
+      inherit inputs;
+    };
+    transformer = inputs.haumea.lib.transformers.liftDefault;
+  };
+in
 darwin.lib.darwinSystem {
   system = "aarch64-darwin";
   modules = [
-    ./configuration.nix
+    silverfox
     inputs.home-manager.darwinModules.home-manager
-    {
-      nixpkgs.config.allowUnfree = true;
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.users.${username} = import ./home.nix;
-    }
   ];
+  specialArgs = { inherit inputs username home; };
 }

darwin/configuration.nix → darwin/silverfox/default.nix

@@ -1,43 +1,26 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   nix.settings.trusted-users = [
     "@admin"
   ];
-  nix.configureBuildUsers = true;
 
-  users.users.ocfox.shell = pkgs.fish;
+  nix.configureBuildUsers = true;
 
   nix.extraOptions = ''
     auto-optimise-store = true
     experimental-features = nix-command flakes
-  '' + lib.optionalString (pkgs.system == "aarch64-darwin") ''
     extra-platforms = x86_64-darwin aarch64-darwin
   '';
 
-  programs.fish.enable = true;
+  nixpkgs.config.allowUnfree = true;
 
-  homebrew = {
-    enable = true;
-
-    taps = [
-      "koekeishiya/formulae"
-    ];
-
-    brews = [
-      "yabai"
-      "skhd"
-    ];
-  };
+  programs.fish.enable = true;
 
   services.nix-daemon.enable = true;
 
-  environment.systemPackages = with pkgs; [
-    kitty
-  ];
-
-  environment.shells = with pkgs; [ fish ];
+  environment.shells = [ pkgs.fish ];
 
-  programs.nix-index.enable = true;
+  users.users.ocfox.shell = pkgs.fish;
 
   fonts.fontDir.enable = true;
 
@@ -46,17 +29,14 @@
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
   ];
 
-  nixpkgs.overlays = [
-    (self: super: {
-      neovim = super.neovim.override {
-        viAlias = true;
-        vimAlias = true;
-      };
-    })
+  environment.systemPackages = with pkgs; [
+    coreutils
+    git
+    curl
+    wget
+    ripgrep
+    lazygit
   ];
 
-  system.keyboard.enableKeyMapping = true;
-  system.keyboard.remapCapsLockToEscape = true;
-
   security.pam.enableSudoTouchIdAuth = true;
 }

darwin/silverfox/home-manager.nix

@@ -0,0 +1,15 @@
+{ username
+, home
+, inputs
+}:
+{
+  useGlobalPkgs = true;
+  useUserPackages = true;
+  users.${username} = {
+    imports = [
+      home.default
+      home.darwin
+    ];
+  };
+  extraSpecialArgs = { inherit username; };
+}

flake.nix

@@ -10,21 +10,37 @@
     } @ inputs:
     let
       username = "ocfox";
-      home-manager = { pkgs, ... }@args: haumea.lib.load {
-        src = ./home;
-        inputs = args // {
-          inherit inputs;
+      home = {
+        default = { pkgs, ... }@args: haumea.lib.load {
+          src = ./home;
+          inputs = args // {
+            inherit inputs;
+          };
+          transformer = haumea.lib.transformers.liftDefault;
+        };
+        desktop = { pkgs, ... }@args: haumea.lib.load {
+          src = ./home-desktop;
+          inputs = args // {
+            inherit inputs;
+          };
+          transformer = haumea.lib.transformers.liftDefault;
+        };
+        darwin = { pkgs, ... }@args: haumea.lib.load {
+          src = ./home-darwin;
+          inputs = args // {
+            inherit inputs;
+          };
+          transformer = haumea.lib.transformers.liftDefault;
         };
-        transformer = haumea.lib.transformers.liftDefault;
       };
     in
     {
       nixosConfigurations = import ./hosts {
-        inherit self nixpkgs inputs username home-manager;
+        inherit self nixpkgs inputs username home;
       };
 
-      darwinConfigurations.sliverfox = import ./hosts/sliverfox {
-        inherit self nixpkgs darwin inputs username;
+      darwinConfigurations.silverfox = import ./darwin {
+        inherit self nixpkgs darwin inputs username home;
       };
 
       ferrucyon = import ./iso {

home-darwin/home/default.nix

@@ -0,0 +1,3 @@
+{
+  stateVersion = "23.05";
+}

home-darwin/home/packages.nix

@@ -0,0 +1,5 @@
+{ pkgs }:
+with pkgs;
+[
+  hello
+]

home-darwin/programs/fish.nix

@@ -0,0 +1,7 @@
+{
+  functions = {
+    rebuild = ''
+      darwin-rebuild switch --use-remote-sudo --flake $HOME/nixos#silverfox
+    '';
+  };
+}

home-darwin/programs/git.nix

@@ -0,0 +1 @@
+{ }

home-darwin/programs/kitty.nix

@@ -0,0 +1,3 @@
+{
+  font.size = 20;
+}

home-desktop/home/default.nix

@@ -0,0 +1,12 @@
+{ pkgs }:
+{
+  pointerCursor = {
+    size = 24;
+    gtk.enable = true;
+    x11.enable = true;
+    package = pkgs.apple-cursor;
+    name = "macOS-Monterey";
+  };
+
+  stateVersion = "23.05";
+}

home-desktop/home/packages.nix

@@ -0,0 +1,98 @@
+{ lib
+, pkgs
+}:
+with pkgs;
+[
+  bitwarden
+  wl-clipboard
+  swayidle
+  showmethekey
+  element-desktop
+  qbittorrent
+  tdesktop
+  firefox-wayland
+
+  ncspot
+  sptlrx
+  playerctl
+  cava
+  vlc
+  wf-recorder
+
+  nur.repos.linyinfeng.wemeet
+  nur.repos.linyinfeng.icalingua-plus-plus
+  nur.repos.xddxdd.qq
+
+  texlive.combined.scheme-medium
+  (
+    pkgs.writeShellScriptBin "record-status" ''
+      #!/usr/bin/env bash
+      pid=`pgrep wf-recorder`
+      status=$?
+
+      if [ $status != 0 ]
+      then
+        echo '';
+      else
+        echo '';
+      fi;
+    ''
+  )
+
+  (
+    pkgs.writeShellScriptBin "screen-recorder-toggle" ''
+      #!/usr/bin/env bash
+      pid=`${pkgs.procps}/bin/pgrep wf-recorder`
+      status=$?
+
+      if [ $status != 0 ]
+      then
+        ${lib.getExe pkgs.wf-recorder} -g "$(${lib.getExe pkgs.slurp})" -f $HOME/Videos/record/$(date +'recording_%Y-%m-%d-%H%M%S.mp4');
+      else
+        ${pkgs.procps}/bin/pkill --signal SIGINT wf-recorder
+      fi;
+    ''
+  )
+
+  (
+    pkgs.writeShellScriptBin "power-menu" ''
+      #!/usr/bin/env bash
+      options="shutdown\nreboot\nsuspend\nexit sway"
+
+      selection="$(${pkgs.coreutils}/bin/echo -e $options | \
+                   ${lib.getExe pkgs.bemenu} -i -l 4 -c -W 0.3)"
+
+      case $selection in
+      	shutdown) ${pkgs.systemd}/bin/systemctl poweroff
+      		exit 0
+      		;;
+      	reboot) ${pkgs.systemd}/bin/systemctl reboot
+      		exit 0
+      		;;
+      	suspend) ${pkgs.systemd}/bin/systemctl suspend
+      		exit 0
+      		;;
+      esac''
+  )
+  (
+    writeShellScriptBin "mac-shot" ''
+      file=/tmp/xxx.png
+      ${lib.getExe sway-contrib.grimshot} --notify save area /tmp/src.png >> /dev/null 2>&1
+
+      ${imagemagick}/bin/convert /tmp/src.png \
+        \( +clone -alpha extract \
+        -draw 'fill black polygon 0,0 0,8 8,0 fill white circle 8,8 8,0' \
+        \( +clone -flip \) -compose Multiply -composite \
+        \( +clone -flop \) -compose Multiply -composite \
+        \) -alpha off -compose CopyOpacity -composite /tmp/output.png
+
+      ${imagemagick}/bin/convert /tmp/output.png -bordercolor none -border 20 \
+      \( +clone -background black -shadow 80x8+15+15 \) \
+        +swap -background transparent -layers merge +repage $file
+
+      ${wl-clipboard}/bin/wl-copy -t image/png < $file
+      ${libnotify}/bin/notify-send "macshot copied"
+      rm /tmp/src.png /tmp/output.png
+    ''
+  )
+]

home-desktop/programs/default.nix

@@ -0,0 +1,11 @@
+{ pkgs }:
+{
+  chromium = {
+    enable = true;
+    commandLineArgs = [ "--enable-features=UseOzonePlatform" "-ozone-platform=wayland" "--gtk-version=4" ];
+  };
+  obs-studio = {
+    enable = true;
+    plugins = with pkgs; [ obs-studio-plugins.wlrobs ];
+  };
+}

home-desktop/programs/fish.nix

@@ -0,0 +1,13 @@
+{
+  interactiveShellInit = ''
+    if test (id --user $USER) = 1000 && test (tty) = "/dev/tty1"
+      exec sway
+    end
+  '';
+
+  functions = {
+    rebuild = ''
+      nixos-rebuild switch --use-remote-sudo --flake $HOME/nixos#whitefox
+    '';
+  };
+}

home-desktop/programs/git.nix

@@ -0,0 +1,6 @@
+{
+  signing = {
+    signByDefault = true;
+    key = "939EF8A5CED87F505BB5B2D024BC27385F70234F";
+  };
+}

home-desktop/programs/kitty.nix

@@ -0,0 +1,3 @@
+{
+  font.size = 10;
+}

home/home/default.nix

@@ -1,12 +1,3 @@
-{ pkgs }:
 {
-  pointerCursor = {
-    size = 24;
-    gtk.enable = true;
-    x11.enable = true;
-    package = pkgs.apple-cursor;
-    name = "macOS-Monterey";
-  };
-
   stateVersion = "23.05";
 }