From 1787d206c21e68dd28c71bc6b03dabe09837c8c6 Mon Sep 17 00:00:00 2001 From: jasmine Date: Thu, 6 Mar 2025 13:38:29 +0800 Subject: [PATCH 1/2] feat: update ssh key configuration --- home-manager/sajenim/features/cli/ssh.nix | 1 + home-manager/sajenim/features/cli/zsh.nix | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/home-manager/sajenim/features/cli/ssh.nix b/home-manager/sajenim/features/cli/ssh.nix index 106d709..de91753 100644 --- a/home-manager/sajenim/features/cli/ssh.nix +++ b/home-manager/sajenim/features/cli/ssh.nix @@ -29,6 +29,7 @@ "turing" = { hostname = "turing.une.edu.au"; user = "jwils254"; + identityFile = "/home/sajenim/.ssh/jwils254_sk"; }; }; }; diff --git a/home-manager/sajenim/features/cli/zsh.nix b/home-manager/sajenim/features/cli/zsh.nix index ce9bafb..59b9876 100644 --- a/home-manager/sajenim/features/cli/zsh.nix +++ b/home-manager/sajenim/features/cli/zsh.nix @@ -24,20 +24,13 @@ shellAliases = { c = "clear"; r = "cd ~/.repositories"; - p = "cd ~/.print"; d = "cd ~/.repositories/dotfiles.nix"; la = "ls -a"; ll = "ls -l"; tt = "wezterm cli set-tab-title "; deploy-viridian = "nixos-rebuild switch --flake .#viridian --target-host viridian --use-remote-sudo"; mount-backup = "sshfs viridian:/srv/shares/sajenim /home/sajenim/.backup"; - }; - - # An attribute set that adds to named directory hash table - dirHashes = { - # QMK Keymaps - crkbd = "$HOME/.github/qmk_keymaps/keyboards/crkbd/keymaps/sajenim"; - kchrn = "$HOME/.github/qmk_keymaps/keyboards/keychron/q4/ansi_v2/keymaps/sajenim"; + mount-turing = "sshfs turing:/home/jwils254 /home/sajenim/.turing"; }; # Install plugins @@ -60,6 +53,7 @@ path+=('/home/sajenim/.repositories/sysadmin.sh/bin') bindkey "^[[1;5C" forward-word bindkey "^[[1;5D" backward-word + export _JAVA_AWT_WM_NONREPARENTING=1 export PATH PROMPT='%F{blue}%n@%m %F{cyan}%~ %F{red}♥ %f'; ''; From 0f6f431cd41ecc6b0d4403602207210cd659cd9e Mon Sep 17 00:00:00 2001 From: jasmine Date: Thu, 6 Mar 2025 16:12:43 +0800 Subject: [PATCH 2/2] chore: refactor --- home-manager/sajenim/features/cli/zsh.nix | 1 - overlays/default.nix | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/home-manager/sajenim/features/cli/zsh.nix b/home-manager/sajenim/features/cli/zsh.nix index 59b9876..25fd98c 100644 --- a/home-manager/sajenim/features/cli/zsh.nix +++ b/home-manager/sajenim/features/cli/zsh.nix @@ -53,7 +53,6 @@ path+=('/home/sajenim/.repositories/sysadmin.sh/bin') bindkey "^[[1;5C" forward-word bindkey "^[[1;5D" backward-word - export _JAVA_AWT_WM_NONREPARENTING=1 export PATH PROMPT='%F{blue}%n@%m %F{cyan}%~ %F{red}♥ %f'; ''; diff --git a/overlays/default.nix b/overlays/default.nix index 7bfcb4c..26e6eb8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,9 +7,13 @@ # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays modifications = final: prev: { - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); + logisim-evolution = prev.logisim-evolution.overrideAttrs (oldAttrs: { + postInstall = + (oldAttrs.postInstall or "") + + '' + wrapProgram $out/bin/logisim-evolution --set _JAVA_AWT_WM_NONREPARENTING 1 + ''; + }); }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will