Changes

lccambiaghi · Apr 10, 2023 · af73d81 · af73d81
1 parent 53e8c1e
commit af73d81
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 65 deletions.
diff --git a/darwin/brew.nix b/darwin/brew.nix
@@ -1,14 +1,5 @@
 { config, ... }:
 
-let
-  user_name = "luca";
-
-
-  # /Users/cambiaghiluca/git/ran_optimization/.direnv/python-3.9.16/bin/python
-  # cd ~/Downloads && mkdir homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C homebrew && sudo mv homebrew /usr/local/homebrew
-
-
-in
 {
   environment.shellInit = ''
     eval "$(${config.homebrew.brewPrefix}/brew shellenv)"
@@ -26,6 +17,7 @@ in
       "automake"
       "autogen"
       "autoconf"
+      "gcc"
       # "mas"
       # "libomp"
       # "openblas"
@@ -36,8 +28,10 @@ in
       "qemu"
       # "msodbcsql17"
       # "mssql-tools"
+      "ruff"
+      "tree-sitter"
       "unixodbc"
-      ##### cross compilation 
+      ##### cross compilation
       # "ldid"
       # "docbook-xsl"
       # "po4a"
@@ -53,6 +47,7 @@ in
       # "dash"
       "docker"
       "dozer"
+      "gifox"
       # "microsoft-edge"
       # "emacs-app-good"
       "firefox"
@@ -90,7 +85,7 @@ in
       # "railwaycat/emacsmacport"
     ];
     extraConfig = ''
-        brew "d12frosted/homebrew-emacs-plus/emacs-plus@29", args: ["with-xwidgets", "with-native-comp"]
+        brew "d12frosted/homebrew-emacs-plus/emacs-plus@29", args: ["with-xwidgets", "with-native-comp", "with-no-frame-refocus"]
     '';
     # cask_args appdir: "~/Applications", require_sha: true
   };

diff --git a/darwin/default.nix b/darwin/default.nix
@@ -77,7 +77,6 @@
   # services.keybase.enable = true;
   # services.lorri.enable = true;
 
-
   ################
   # environment #
   ################
@@ -103,8 +102,8 @@
       # "$HOME/.emacs.d/bin"
       # "$HOME/git/doom-emacs/bin"
       "/opt/homebrew/bin"
-      "$HOME/bin"
       "/usr/local/homebrew/bin"
+      # "$HOME/bin"
     ];
     variables = {
       EDITOR = "emacsclient";

diff --git a/flake.lock b/flake.lock
diff --git a/home/default.nix b/home/default.nix
@@ -20,8 +20,8 @@ let
 
 in
 {
-  imports = [ 
-    ./dotfiles 
+  imports = [
+    ./dotfiles
     ./programs
     # ./python
     ./clojure
@@ -63,7 +63,7 @@ in
       # niv # Nix dependency management
       # nixpkgs-fmt
       nodejs # node and npm
-      # nodePackages.pyright
+      nodePackages.pyright
       # nodePackages.prettier
       # pandoc
       # pinentry_mac # Necessary for GPG

diff --git a/home/programs/default.nix b/home/programs/default.nix
@@ -85,18 +85,18 @@ Host *
 Host *
   AddKeysToAgent yes
   IdentityFile ~/.ssh/id_ed25519_prod
-      ''; 
+      '';
       # hashKnownHosts = true;
       # userKnownHostsFile = "${xdg.configHome}/ssh/known_hosts";
       matchBlocks = {
         "w3vm" = {
-          hostname = "35.187.84.239";
+          hostname = "104.155.108.203";
           # port = 443;
           user = "cambiaghi.luca";
           # identityFile = "$HOME/.ssh/id_rsa.pub";
         };
         "prodw3vm" = {
-          hostname = "35.187.84.239";
+          hostname = "104.155.108.203";
           user = "prod";
         };
       };

diff --git a/home/programs/shells/fish.nix b/home/programs/shells/fish.nix
@@ -5,7 +5,7 @@ let
 in
 
 {
-  
+
   # echo "$HOME/.nix-profile/bin/fish" | sudo tee -a /etc/shells
   # sudo chsh -s "/run/current-system/sw/bin/fish" "$USER"
   programs.fish = {
@@ -81,11 +81,36 @@ in
       scan_timeout = 10;
       # git_status.format = "";
       git_status.disabled = true;
-      kubernetes.disabled = false;
       kubernetes.format = "on [⛵ $context \($namespace\)](dimmed green) ";
       kubernetes.context_aliases = {
         "core-dev-west-1" = "dev";
       };
+      battery.disabled = true;
+      buf.disabled = true;
+      c.disabled = true;
+      cobol.disabled = true;
+      conda.disabled = true;
+      docker_context.disabled = true;
+      dotnet.disabled = true;
+      elixir.disabled = true;
+      elm.disabled = true;
+      erlang.disabled = true;
+      fennel.disabled = true;
+      gcloud.disabled = true;
+      go.disabled = true;
+      gradle.disabled = true;
+      haskell.disabled = true;
+      haxe.disabled = true;
+      helm.disabled = true;
+      kotlin.disabled = true;
+      kubernetes.disabled = true;
+      lua.disabled = true;
+      meson.disabled = true;
+      nim.disabled = true;
+      nodejs.disabled = true;
+      ocaml.disabled = true;
+      perl.disabled = true;
+      php.disabled = true;
       package.disabled = true;
       # python.format = "via [🐍 ( \($virtualenv\))]($style) ";
       python.disabled = true;
@@ -99,18 +124,14 @@ in
         "$git_commit"
         "$git_status"
         "$kubernetes"
-        "$hg_branch"
-        "$docker_context"
         "$package"
-        "$cmake"
         "$python"
         "$nix_shell"
         "$memory_usage"
         "$custom"
         "$cmd_duration"
         "$line_break"
         "$jobs"
-        "$battery"
         "$time"
         "$status"
         "$shell"

diff --git a/readme.org b/readme.org
@@ -1,8 +1,9 @@
 #+TITLE: Luca's nix configuration
-#+STARTUP: content
-#+HTML_HEAD: <script>var clicky_site_ids = clicky_site_ids || []; clicky_site_ids.push(101260027);</script>
-#+HTML_HEAD: <script async src="//static.getclicky.com/js"></script>
-#+STARTUP: content
+#+SLUG: nix
+#+DATE: <2019-10-26>
+#+AUTHOR: Luca Cambiaghi
+#+STARTUP: show2levels
+#+OPTIONS: toc:nil num:nil ^:nil
 
 * Introduction
 ** This repository
@@ -334,11 +335,10 @@ Reference: https://sixty-north.com/blog/pyenv-apple-silicon.html
 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 alias brew86="arch -x86_64 /usr/local/bin/brew"
 
-brew86 install openssl readline sqlite3 xz zlib
-CFLAGS="-I$(brew86 --prefix openssl)/include" \
-LDFLAGS="-L$(brew86 --prefix openssl)/lib" \
-pyenv86 install 3.9.16
+brew86 install openssl readline sqlite3 xz zlib python@3.9
+# CFLAGS="-I$(brew86 --prefix openssl)/include" LDFLAGS="-L$(brew86 --prefix openssl)/lib" pyenv86 install 3.9.16
 #+end_src
+
 * References
 - https://github.com/malob/nixpkgs
 - https://github.com/kclejeune/system