From 3a5e1df0689d33957a12dcb3fd77ddeeaba3077a Mon Sep 17 00:00:00 2001 From: sefidel Date: Fri, 22 Sep 2023 17:45:20 +0900 Subject: chore: 2nd darwin cleanup --- home/profiles/base/config/zsh-darwin-gpg-ssh.nix | 4 ---- home/profiles/base/default.nix | 22 ------------------- home/profiles/browsing/default.nix | 5 +---- home/profiles/communication/default.nix | 5 +---- home/profiles/development/default.nix | 12 +++++------ home/profiles/research/default.nix | 4 +--- lib/default.nix | 1 - lib/mk_home.nix | 27 +----------------------- packages/darwin.nix | 5 ----- 9 files changed, 9 insertions(+), 76 deletions(-) delete mode 100644 home/profiles/base/config/zsh-darwin-gpg-ssh.nix delete mode 100644 packages/darwin.nix diff --git a/home/profiles/base/config/zsh-darwin-gpg-ssh.nix b/home/profiles/base/config/zsh-darwin-gpg-ssh.nix deleted file mode 100644 index 06bc1f7..0000000 --- a/home/profiles/base/config/zsh-darwin-gpg-ssh.nix +++ /dev/null @@ -1,4 +0,0 @@ -'' - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - gpgconf --launch gpg-agent -'' diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index 318031f..1be9e21 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -59,9 +59,6 @@ in (pkgs.writeShellScriptBin "0x0" (import ./scripts/0x0.nix)) (pkgs.writeShellScriptBin "airport" (import ./scripts/airport.nix)) - ] ++ lib.optionals (pkgs.stdenv.isDarwin) [ - pkgs.iterm2 - pkgs.rsync ]; @@ -138,18 +135,12 @@ in ]; shellAliases = config.programs.zshell.aliases; - } // lib.optionalAttrs (pkgs.stdenv.isDarwin) { - initExtra = import ./config/zsh-darwin-gpg-ssh.nix; }; zshell.aliases = { vim = "nvim"; nvimdiff = "nvim -d"; pardl = "aria2c -c -s 16 -x 16 -k 1M -j 1"; - } // lib.optionalAttrs (pkgs.stdenv.isDarwin) { - # /nixos/modules/config/shells-environment.nix - clear = "clear && printf '\\e[3J'"; - l = "ls -alh"; }; zoxide = { @@ -231,18 +222,5 @@ in ''; }; }; - - home.file."${config.programs.gpg.homedir}/gpg-agent.conf".text = lib.mkIf pkgs.stdenv.isDarwin '' - default-cache-ttl 3600 - default-cache-ttl-ssh 3600 - pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac - allow-preset-passphrase - enable-ssh-support - ''; - - home.file."${config.programs.gpg.homedir}/sshcontrol".text = lib.mkIf pkgs.stdenv.isDarwin '' - 3C79004101E524D10B94F9EE9D3744F4B25F8795 - 159371696FD285FF0811692FBFAA6E4AF017CDDE - ''; }; } diff --git a/home/profiles/browsing/default.nix b/home/profiles/browsing/default.nix index 1fd5e8f..30a804d 100644 --- a/home/profiles/browsing/default.nix +++ b/home/profiles/browsing/default.nix @@ -16,10 +16,7 @@ in }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ lynx ] ++ pkgs.lib.optionals (pkgs.stdenv.isLinux) [ - # TODO: currently broken/doesn't support Darwin - pkgs.firefox - ]; + home.packages = with pkgs; [ firefox lynx ]; programs.qutebrowser = { enable = true; diff --git a/home/profiles/communication/default.nix b/home/profiles/communication/default.nix index d8c2a47..45f8815 100644 --- a/home/profiles/communication/default.nix +++ b/home/profiles/communication/default.nix @@ -404,22 +404,19 @@ in slack discord-canary schildichat-desktop + nheko (weechat.override { configure = { availablePlugins, ... }: { plugins = [ (availablePlugins.python.withPackages (ps: with ps; [ potr pycrypto - (if pkgs.stdenv.isDarwin then pync else [ ]) ])) availablePlugins.perl availablePlugins.lua ]; }; }) - ] ++ pkgs.lib.optionals (pkgs.stdenv.isLinux) [ - # TODO: currently broken/doesn't support Darwin - pkgs.nheko ]; nixpkgs.allowedUnfree = [ "slack" "discord-canary" ]; diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index 60ab329..e8cef87 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -215,10 +215,13 @@ in '') pkgs.bfg-repo-cleaner - pkgs.diffoscopeMinimal + pkgs.clang-tools pkgs.colmena + pkgs.diffoscopeMinimal pkgs.du-dust pkgs.deploy-rs + pkgs.dnsutils + pkgs.gdb # TODO: https://github.com/cli/cli/issues/4955 pkgs.gh pkgs.git-annex @@ -228,6 +231,7 @@ in pkgs.ouch pkgs.tcpdump pkgs.tokei + pkgs.valgrind pkgs.mtr pkgs.nil pkgs.nixpkgs-fmt @@ -253,12 +257,6 @@ in # pkgs.lispPackages.clwrapper (pkgs.python3.withPackages (ps: with ps; [ pynvim ])) pkgs.gopls - ] ++ pkgs.lib.optionals (pkgs.stdenv.isLinux) [ - # TODO: currently broken/doesn't support Darwin - pkgs.clang-tools - pkgs.dnsutils - pkgs.gdb - pkgs.valgrind ]; }; } diff --git a/home/profiles/research/default.nix b/home/profiles/research/default.nix index ef9c4f1..111a98c 100644 --- a/home/profiles/research/default.nix +++ b/home/profiles/research/default.nix @@ -51,12 +51,10 @@ in }; home.packages = [ + pkgs.kicad pkgs.ltex-ls pkgs.pandoc pkgs.texlive.combined.scheme-small - ] ++ pkgs.lib.optionals (pkgs.stdenv.isLinux) [ - # TODO: currently broken/doesn't support Darwin - pkgs.kicad ]; }; } diff --git a/lib/default.nix b/lib/default.nix index 704a15e..b75be10 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -3,7 +3,6 @@ inputs: { mkSystem = import ./mk_system.nix inputs; mkHome = import ./mk_home.nix inputs; - mkDarwin = import ./mk_darwin.nix inputs; nixosConfigurationsAsPackages = import ./nixos_configurations_as_packages.nix inputs; homeConfigurationsAsPackages = import ./home_configurations_as_packages.nix inputs; } diff --git a/lib/mk_home.nix b/lib/mk_home.nix index 899be0f..925fdbe 100644 --- a/lib/mk_home.nix +++ b/lib/mk_home.nix @@ -15,34 +15,9 @@ let home = { inherit username; - homeDirectory = if pkgs.stdenv.isDarwin then "/Users/${username}" else "/home/${username}"; + homeDirectory = "/home/${username}"; stateVersion = version; }; - - # Make applications pop up in finder/spotlight - disabledModules = [ "targets/darwin/linkapps.nix" ]; - home.activation = lib.mkIf pkgs.stdenv.isDarwin { - copyApplications = - let - apps = pkgs.buildEnv { - name = "home-manager-applications"; - paths = config.home.packages; - pathsToLink = "/Applications"; - }; - in - lib.hm.dag.entryAfter [ "writeBoundary" ] '' - baseDir="$HOME/Applications/Home Manager Apps" - if [ -d "$baseDir" ]; then - rm -rf "$baseDir" - fi - mkdir -p "$baseDir" - for appFile in ${apps}/Applications/*; do - target="$baseDir/$(basename "$appFile")" - $DRY_RUN_CMD cp ''${VERBOSE_ARG:+-v} -fHRL "$appFile" "$baseDir" - $DRY_RUN_CMD chmod ''${VERBOSE_ARG:+-v} -R +w "$target" - done - ''; - }; }; in home-manager.lib.homeManagerConfiguration { diff --git a/packages/darwin.nix b/packages/darwin.nix deleted file mode 100644 index a7c91dc..0000000 --- a/packages/darwin.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ self, neovim, ... } @ inputs: - -{ - "neovim" = neovim.packages.aarch64-darwin.neovim; -} -- cgit 1.4.1