From 52f8feb010b1f50689cb6772c1ddcb0694359694 Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Fri, 29 Sep 2023 14:59:38 -0400 Subject: [PATCH] fixes --- NOTES | 2 +- home-manager/_mixins/cli/default.nix | 2 -- home-manager/_mixins/cli/fish.nix | 5 +++- home-manager/_mixins/cli/signal.nix | 6 ++++ home-manager/_mixins/desktop/alacritty.nix | 4 +++ home-manager/_mixins/desktop/signal.nix | 3 ++ home-manager/_mixins/users/gburd/default.nix | 29 +++++++++++++++++--- home-manager/_mixins/users/gburd/desktop.nix | 13 +++++---- 8 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 home-manager/_mixins/cli/signal.nix create mode 100644 home-manager/_mixins/desktop/alacritty.nix create mode 100644 home-manager/_mixins/desktop/signal.nix diff --git a/NOTES b/NOTES index 53c341f..73815c6 100644 --- a/NOTES +++ b/NOTES @@ -127,5 +127,5 @@ TODO: EXAMPLE COMMANDS: * nh os switch --ask -* nix run github:viperML/nh os switch --ask --nom . +* nix run github:viperML/nh -- os switch --ask --nom . * clear; sudo nixos-rebuild dry-activate --flake .#floki diff --git a/home-manager/_mixins/cli/default.nix b/home-manager/_mixins/cli/default.nix index be06a2e..0739842 100644 --- a/home-manager/_mixins/cli/default.nix +++ b/home-manager/_mixins/cli/default.nix @@ -39,7 +39,5 @@ ltex-ls # Spell checking LSP tly # Tally counter - - # inputs.nh.default # nixos-rebuild and home-manager CLI wrapper ]; } diff --git a/home-manager/_mixins/cli/fish.nix b/home-manager/_mixins/cli/fish.nix index f4017ae..1233e3d 100644 --- a/home-manager/_mixins/cli/fish.nix +++ b/home-manager/_mixins/cli/fish.nix @@ -30,7 +30,8 @@ in snr = "sudo nixos-rebuild --flake ."; snrs = "sudo nixos-rebuild --flake . switch"; hm = "home-manager --flake ."; - hms = "home-manager --flake . switch"; + hms = "home-manager -b bkup --flake .gburd@$(hostmname) switch"; + nh-ask = "nix run github:viperML/nh -- os switch --ask --nom ." ls = mkIf hasExa "eza"; exa = mkIf hasExa "eza"; @@ -45,6 +46,8 @@ in mutt = mkIf hasNeomutt "neomutt"; m = mutt; + locate = "plocate"; + cik = mkIf hasKitty "clone-in-kitty --type os-window"; ck = cik; }; diff --git a/home-manager/_mixins/cli/signal.nix b/home-manager/_mixins/cli/signal.nix new file mode 100644 index 0000000..d6812f4 --- /dev/null +++ b/home-manager/_mixins/cli/signal.nix @@ -0,0 +1,6 @@ +{ desktop, lib, pkgs, ... }: { + imports = [ ] ++ lib.optionals (desktop != null) [ + ../desktop/signal.nix + ]; + home.packages = [ pkgs.signal-cli ]; +} diff --git a/home-manager/_mixins/desktop/alacritty.nix b/home-manager/_mixins/desktop/alacritty.nix new file mode 100644 index 0000000..9795f2f --- /dev/null +++ b/home-manager/_mixins/desktop/alacritty.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.alacritty ]; +} diff --git a/home-manager/_mixins/desktop/signal.nix b/home-manager/_mixins/desktop/signal.nix new file mode 100644 index 0000000..67ca2cd --- /dev/null +++ b/home-manager/_mixins/desktop/signal.nix @@ -0,0 +1,3 @@ +{ desktop, lib, pkgs, ... }: { + home.packages = [ pkgs.signal-desktop ]; +} diff --git a/home-manager/_mixins/users/gburd/default.nix b/home-manager/_mixins/users/gburd/default.nix index 1d59496..52aad2f 100644 --- a/home-manager/_mixins/users/gburd/default.nix +++ b/home-manager/_mixins/users/gburd/default.nix @@ -1,10 +1,6 @@ { inputs, config, pkgs, username, ... }: { imports = [ inputs.impermanence.nixosModules.home-manager.impermanence - ../../services/keybase.nix - ../../desktop/protonmail-bridge.nix - ../../desktop/jetbrains-idea-ultimate.nix - ../../desktop/jetbrains-clion.nix ../../pass ../../cli ../../nvim @@ -23,6 +19,7 @@ "Pictures" "Videos" ".local/bin" + ".config" ]; allowOther = true; }; @@ -68,6 +65,29 @@ iso="nixos-desktop/nixos.iso" ''; + file.".local/share/applications/emacs.desktop".text = '' + [Desktop Entry] + Version=1.0 + Categories=Utility;Development;TextEditor; + Comment=View and edit files + Exec=env XLIB_SKIP_ARGB_VISUALS=1 emacs -c -a "" %F + #Exec=/usr/bin/emacsclient -c -a "" %F + GenericName=Text Editor + Icon=/usr/share/icons/hicolor/scalable/apps/emacs.svg + MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; + Name=Emacs (Client) + Name[en_US]=Emacs (Client)% + StartupWMClass=Emacs + Terminal=false + TryExec=emacs + Type=Application + ''; + + file.".inputrc".text = '' + "\C-v": "" + set enable-bracketed-paste off + ''; + # A Modern Unix experience # https://jvns.ca/blog/2022/04/12/a-list-of-new-ish--command-line-tools/ packages = with pkgs; [ @@ -128,6 +148,7 @@ yq-go # Terminal `jq` for YAML emacs + plocate ]; sessionVariables = { # PAGER = "moar"; diff --git a/home-manager/_mixins/users/gburd/desktop.nix b/home-manager/_mixins/users/gburd/desktop.nix index 2ab1ae8..8359f20 100644 --- a/home-manager/_mixins/users/gburd/desktop.nix +++ b/home-manager/_mixins/users/gburd/desktop.nix @@ -2,18 +2,21 @@ with lib.hm.gvariant; { imports = [ + ../../cli/signal.nix + ../../desktop/alacritty.nix ../../desktop/audio-recorder.nix ../../desktop/celluloid.nix ../../desktop/dconf-editor.nix - ../../desktop/emote.nix ../../desktop/gitkraken.nix ../../desktop/gnome-sound-recorder.nix + ../../desktop/jetbrains-clion.nix + ../../desktop/jetbrains-idea-ultimate.nix ../../desktop/meld.nix - ../../desktop/sublime.nix - ../../desktop/sublime-merge.nix + ../../desktop/protonmail-bridge.nix ../../desktop/rhythmbox.nix - ../../desktop/sakura.nix - ../../desktop/tilix.nix + ../../desktop/sublime-merge.nix + ../../desktop/sublime.nix + ../../services/keybase.nix ]; dconf.settings = {