From ec0f5e8e55f9004613902fded943a8afa1b02a7f Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Tue, 3 Dec 2024 16:05:21 -0500 Subject: [PATCH] Trying to get macos to work --- dot_config/flake/flake.nix | 8 +++- dot_config/flake/home/common.nix | 42 +-------------------- dot_config/flake/home/hinge/hinge.nix | 13 +++++++ run_once_before_decrypt-private-key.sh.tmpl | 4 +- 4 files changed, 24 insertions(+), 43 deletions(-) create mode 100644 dot_config/flake/home/hinge/hinge.nix diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 063169c..839f39e 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -21,7 +21,7 @@ } @ inputs: let inherit (self) outputs; - system = "x86_64-linux"; + system = "aarch64-darwin"; in rec { pkgs = import nixpkgs { inherit system; @@ -57,6 +57,12 @@ extraSpecialArgs = {inherit inputs outputs;}; modules = [./home/mal/mal.nix]; }; + + "tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration{ + inherit pkgs; + extraSpecialArgs = {inherit inputs outputs; }; + modules = [./home/hinge/hinge.nix]; + }; }; }; } diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix index e528254..459d7a4 100644 --- a/dot_config/flake/home/common.nix +++ b/dot_config/flake/home/common.nix @@ -32,11 +32,10 @@ ]; }; - fonts.fontconfig.enable = true; home.packages = with pkgs; [ # Fonts - (nerdfonts.override {fonts = ["JetBrainsMono"];}) + #(nerdfonts.override {fonts = ["JetBrainsMono"];}) unstable.nix-output-monitor @@ -48,15 +47,7 @@ restic libnotify - distrobox - - wl-clipboard - usbutils - - yadm - # Shell - bash starship btop ripgrep @@ -125,36 +116,7 @@ shellWrapperName = "y"; }; - services.darkman = { - enable = true; - package = pkgs.unstable.darkman; - settings = { - lat = 45.408; - lng = -74.159; - }; - - darkModeScripts = { - helix-editor = '' - sed -i 's/theme = ".*"/theme = "catppuccin_macchiato"/' $HOME/.config/helix/config.toml - ''; - - alacritty = '' - ln -fs ~/.config/alacritty/themes/catppuccin_macchiato.toml ~/.config/alacritty/themes/_active.toml - touch ~/.config/alacritty/alacritty.toml - ''; - }; - - lightModeScripts = { - helix-editor = '' - sed -i 's/theme = ".*"/theme = "catppuccin_latte"/' $HOME/.config/helix/config.toml - ''; - - alacritty = '' - ln -fs ~/.config/alacritty/themes/catppuccin_latte.toml ~/.config/alacritty/themes/_active.toml - touch ~/.config/alacritty/alacritty.toml - ''; - }; - }; + home.stateVersion = "23.11"; programs.home-manager.enable = true; diff --git a/dot_config/flake/home/hinge/hinge.nix b/dot_config/flake/home/hinge/hinge.nix new file mode 100644 index 0000000..4a283eb --- /dev/null +++ b/dot_config/flake/home/hinge/hinge.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # imports = [../common.nix]; + + home.packages = with pkgs; [ + ]; +} diff --git a/run_once_before_decrypt-private-key.sh.tmpl b/run_once_before_decrypt-private-key.sh.tmpl index f5e65fb..e968e5b 100644 --- a/run_once_before_decrypt-private-key.sh.tmpl +++ b/run_once_before_decrypt-private-key.sh.tmpl @@ -1,7 +1,7 @@ #!/bin/sh if [ ! -f "/home/tyler/.config/chezmoi/key.txt" ]; then - mkdir -p "/home/tyler/.config/chezmoi" + mkdir -p "${HOME}/.config/chezmoi" chezmoi age decrypt --output "${HOME}/.config/chezmoi/key.txt" --passphrase "{{ .chezmoi.sourceDir }}/key.txt.age" - chmod 600 "/home/tyler/.config/chezmoi/key.txt" + chmod 600 "${HOME}/.config/chezmoi/key.txt" fi