From d07c5f8c52f66aadd4f59993c85ab4a93f221f4e Mon Sep 17 00:00:00 2001 From: willemml Date: Fri, 17 Nov 2023 22:23:04 -0800 Subject: [PATCH] Removes unused packages and darwin shell init --- home/darwin/default.nix | 24 +----------------------- home/default.nix | 2 +- home/programs/zsh.nix | 19 ------------------- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/home/darwin/default.nix b/home/darwin/default.nix index 559844d..0d438d0 100644 --- a/home/darwin/default.nix +++ b/home/darwin/default.nix @@ -34,36 +34,14 @@ sh */ '' - export WINEPREFIX="${config.home.homeDirectory}/.gptk_wineprefix" - if [ "$(arch)" = "arm64" ]; then eval "$(/opt/homebrew/bin/brew shellenv)" - wine-gptk(){ arch -x86_64 /bin/zsh -c "WINEESYNC=1 \$(brew --prefix game-porting-toolkit)/bin/wine64 $@"; } else eval "$(/usr/local/bin/brew shellenv)" - wine-gptk(){ WINEESYNC=1 $(brew --prefix game-porting-toolkit)/bin/wine64 "$@"; } fi - - gptk-steam(){ wine-gptk "${config.home.homeDirectory}/.gptk_wineprefix/drive_c/Program\ Files\ \(x86\)/Steam/steam.exe"; } ''; - programs.emacs.extraPackages = epkgs: - with epkgs; [ - swift-mode - company-sourcekit - ]; - - home.packages = with pkgs; - [ - colima - pngpaste - spoof-mac - ] - ++ (let - pkgs_x86_only = pkgs // {system = "x86_64-darwin";}; - in (with pkgs_x86_only; [ - gcc-arm-embedded - ])); + home.packages = [pkgs.colima]; targets.darwin = { defaults = { diff --git a/home/default.nix b/home/default.nix index 3961ecf..766bddd 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,7 +5,7 @@ pkgs, ... }: let - emacsCommand = "emacsclient -c -nw"; + emacsCommand = "${config.programs.emacs.finalPackage}/bin/emacsclient -nw"; in rec { imports = [ ./modules/emacs.nix diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index 570aaea..07ae1c6 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -41,25 +41,6 @@ } fi - nixifypy() { - if [ ! -e ./.envrc ]; then - echo "use nix" > .envrc - direnv allow - fi - if [[ ! -e shell.nix ]] && [[ ! -e default.nix ]]; then - cat > default.nix < {}; - mkShell { - nativeBuildInputs = [ - bashInteractive - (pkgs.python310.withPackages (p: with p; [ ])) - ]; - } - EOF - '${config.home.sessionVariables.EDITOR}' default.nix - fi - } - flakify() { if [ ! -e flake.nix ]; then nix flake new -t github:nix-community/nix-direnv .