From 2f6fd3f34f7344aba70905e53209db3e5f29aab1 Mon Sep 17 00:00:00 2001 From: willemml Date: Sun, 24 Sep 2023 21:53:28 -0700 Subject: [PATCH] gptk stuff, exa -> eza --- home-manager/profiles/willem/darwin/base.nix | 26 +++++++++------- .../profiles/willem/darwin/iterm2.nix | 30 ------------------- home-manager/profiles/willem/packages.nix | 4 +++ .../profiles/willem/programs/default.nix | 2 +- .../willem/programs/emacs/default.nix | 7 +---- home-manager/profiles/willem/programs/zsh.nix | 6 ++-- 6 files changed, 25 insertions(+), 50 deletions(-) diff --git a/home-manager/profiles/willem/darwin/base.nix b/home-manager/profiles/willem/darwin/base.nix index 6c7b637..8d2820d 100644 --- a/home-manager/profiles/willem/darwin/base.nix +++ b/home-manager/profiles/willem/darwin/base.nix @@ -20,17 +20,23 @@ pinentry = "${pkgs.pinentry-mac}/bin/pinentry-mac"; }; - programs.zsh.envExtra = '' - export WINEPREFIX="${config.home.homeDirectory}/.gptk_wineprefix" + programs.zsh.envExtra = + /* + 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 - ''; + 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"; } + ''; home.packages = with pkgs; [ diff --git a/home-manager/profiles/willem/darwin/iterm2.nix b/home-manager/profiles/willem/darwin/iterm2.nix index abba0ef..a03f3cf 100644 --- a/home-manager/profiles/willem/darwin/iterm2.nix +++ b/home-manager/profiles/willem/darwin/iterm2.nix @@ -259,36 +259,6 @@ in { "Working Directory" = "/Users/willem"; } // profile_defaults) - ({ - "Columns" = 120; - "Command" = ""; - "Custom Command" = "No"; - "Custom Directory" = "No"; - "Default Bookmark" = "No"; - "Description" = "Default"; - "Disable Window Resizing" = true; - "Guid" = "00A17AC2-1885-4AE2-B941-A47A5D8C36B4"; - "Has Hotkey" = true; - "HotKey Activated By Modifier" = false; - "HotKey Alternate Shortcuts" = {}; - "HotKey Characters Ignoring Modifiers" = " "; - "HotKey Characters" = " "; - "HotKey Key Code" = 49; - "HotKey Modifier Activation" = 3; - "HotKey Modifier Flags" = 1048576; - "HotKey Window Animates" = false; - "HotKey Window AutoHides" = true; - "HotKey Window Dock Click Action" = 0; - "HotKey Window Floats" = true; - "HotKey Window Reopens On Activation" = false; - "Name" = "Hotkey Window"; - "Rows" = 25; - "Screen" = -1; - "Space" = -1; - "Tags" = []; - "Working Directory" = "/Users/willem"; - } - // profile_defaults) ]; }; } diff --git a/home-manager/profiles/willem/packages.nix b/home-manager/profiles/willem/packages.nix index 0d43f6e..c4df51a 100644 --- a/home-manager/profiles/willem/packages.nix +++ b/home-manager/profiles/willem/packages.nix @@ -68,6 +68,7 @@ latest.toolchain targets.thumbv7em-none-eabihf.latest.rust-std ]); + lua_p = pkgs.lua5_4.withPackages (p: with p; [luacheck]); in { home.packages = with pkgs; [ @@ -94,6 +95,8 @@ in { htop iaito jq + lua_p + lua-language-server mu nix-zsh-completions nixfmt @@ -117,6 +120,7 @@ in { spotify-tui spotifyd sqlite + stylua texinfo texliveset tldr diff --git a/home-manager/profiles/willem/programs/default.nix b/home-manager/profiles/willem/programs/default.nix index 28c55ce..cea35a5 100644 --- a/home-manager/profiles/willem/programs/default.nix +++ b/home-manager/profiles/willem/programs/default.nix @@ -14,7 +14,7 @@ nix-direnv = {enable = true;}; }; - exa = { + eza = { enable = true; enableAliases = true; }; diff --git a/home-manager/profiles/willem/programs/emacs/default.nix b/home-manager/profiles/willem/programs/emacs/default.nix index 31c38aa..e4ed9bd 100644 --- a/home-manager/profiles/willem/programs/emacs/default.nix +++ b/home-manager/profiles/willem/programs/emacs/default.nix @@ -19,12 +19,6 @@ sha256 = "sha256-6aX2S4cUop1rdxweIF5f1qrgNmYd1mtWgT9T1Q1s2h8="; }; }; - mu4e = epkgs.trivialBuild { - pname = "mu4e"; - version = pkgs.mu.version; - - src = "${pkgs.mu}/share/emacs/site-lisp/mu4e"; - }; mu4e-accounts = epkgs.trivialBuild { pname = "mu4e-accounts"; version = "0.1"; @@ -117,6 +111,7 @@ ivy-bibtex lean4-mode lsp-mode + lua-mode magit magit-section meow diff --git a/home-manager/profiles/willem/programs/zsh.nix b/home-manager/profiles/willem/programs/zsh.nix index 890c241..487ba90 100644 --- a/home-manager/profiles/willem/programs/zsh.nix +++ b/home-manager/profiles/willem/programs/zsh.nix @@ -47,7 +47,7 @@ direnv allow fi if [[ ! -e shell.nix ]] && [[ ! -e default.nix ]]; then - cat > default.nix <<'EOF' + cat > default.nix < {}; mkShell { nativeBuildInputs = [ @@ -56,7 +56,7 @@ ]; } EOF - ${config.home.sessionVariables.EDITOR} default.nix + '${config.home.sessionVariables.EDITOR}' default.nix fi } @@ -67,7 +67,7 @@ echo "use flake" > .envrc direnv allow fi - ${config.home.sessionVariables.EDITOR} flake.nix + '${config.home.sessionVariables.EDITOR}' flake.nix } '';