From 01d5d0e4ddd340c0640f4006f1810309ccfadd9e Mon Sep 17 00:00:00 2001 From: takeokunn Date: Sat, 23 Dec 2023 23:00:05 +0900 Subject: [PATCH] update --- modules/fish/conf.d/mac.fish | 12 ++++++++---- modules/fish/conf.d/nix.fish | 1 + modules/fish/conf.d/roswell.fish | 3 +++ modules/nix/home.nix | 27 +++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 modules/fish/conf.d/roswell.fish diff --git a/modules/fish/conf.d/mac.fish b/modules/fish/conf.d/mac.fish index 2bda865..e9b2d35 100644 --- a/modules/fish/conf.d/mac.fish +++ b/modules/fish/conf.d/mac.fish @@ -33,11 +33,11 @@ end if test (uname) = "Darwin" # libgccjit - set -x NATIVE_FULL_AOT 1 + set -gx NATIVE_FULL_AOT 1 # editor - set -x EDITOR "emacs -nw" - set -x HOMEBREW_EDITOR "emacs -nw" + set -gx EDITOR "emacs -nw" + set -gx HOMEBREW_EDITOR "emacs -nw" # path fish_add_path /usr/local/sbin @@ -50,5 +50,9 @@ if test (uname) = "Darwin" # emacs alias emacs 'emacs -nw' - set -xg LSP_USE_PLISTS true + set -gx LSP_USE_PLISTS true + + # compiler + set -gx C clang + set -gx CXX clang++ end diff --git a/modules/fish/conf.d/nix.fish b/modules/fish/conf.d/nix.fish index 51235a0..e2996e2 100644 --- a/modules/fish/conf.d/nix.fish +++ b/modules/fish/conf.d/nix.fish @@ -8,4 +8,5 @@ end if type -q nix set -x NIXPKGS_ALLOW_UNFREE 1 + set -x NIXPKGS_ALLOW_INSECURE 1 end diff --git a/modules/fish/conf.d/roswell.fish b/modules/fish/conf.d/roswell.fish new file mode 100644 index 0000000..de45e23 --- /dev/null +++ b/modules/fish/conf.d/roswell.fish @@ -0,0 +1,3 @@ +if type -q ros + fish_add_path $HOME/.roswell/bin +end diff --git a/modules/nix/home.nix b/modules/nix/home.nix index f50b671..3468789 100644 --- a/modules/nix/home.nix +++ b/modules/nix/home.nix @@ -8,8 +8,10 @@ home.packages = with pkgs; [ # for lanaguage + clojure deno gauche + go guile jsonnet lua @@ -23,6 +25,13 @@ vlang zig + # for language specific + tfsec + tflint + tfupdate + terraform-ls + php83Packages.composer + # for gnupg pinentry gnupg22 @@ -32,20 +41,30 @@ automake binutils bison + boost cmake coreutils gnutls icu + libcxx + libcxxrt libgccjit libiconv + libllvm libmng libpng + librsvg libxml2 + libzip + meson pkg-config + stunnel + sqldef texinfo # for essential tools bat + csvq eza fd fzf @@ -55,6 +74,7 @@ htop jq peco + pv ripgrep rlwrap tmux @@ -63,8 +83,10 @@ # for basic tools actionlint + awscli bettercap exiftool + extract_url direnv ffmpeg gping @@ -84,9 +106,13 @@ sqlite terminal-notifier tig + tokei + unixtools.procps + unixtools.watch # for editor emacs + editorconfig-core-c micro nano neovim @@ -101,6 +127,7 @@ # for jokes asciiquarium + cmatrix gibo sl