diff --git a/flake.lock b/flake.lock index 58e234d..252b292 100644 --- a/flake.lock +++ b/flake.lock @@ -257,11 +257,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771574726, - "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", + "lastModified": 1771903837, + "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", + "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", "type": "github" }, "original": { @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1771752521, - "narHash": "sha256-rRBRfLL+ANP/kbk1wROm6MwMTUfLoSK0VyYscUj3EkM=", + "lastModified": 1771943164, + "narHash": "sha256-xsCmSyRH3Qzxoud9ruuNNWb/23qOqJUcmE36xE7bGs8=", "owner": "nix-community", "repo": "NUR", - "rev": "2f1833b131987d12afd049e9fb0faea6dad4bcb4", + "rev": "771f8e7c9a1a9989cdf89e40111623f4ca5e3b42", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1771752521, - "narHash": "sha256-rRBRfLL+ANP/kbk1wROm6MwMTUfLoSK0VyYscUj3EkM=", + "lastModified": 1771943164, + "narHash": "sha256-xsCmSyRH3Qzxoud9ruuNNWb/23qOqJUcmE36xE7bGs8=", "owner": "nix-community", "repo": "NUR", - "rev": "2f1833b131987d12afd049e9fb0faea6dad4bcb4", + "rev": "771f8e7c9a1a9989cdf89e40111623f4ca5e3b42", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771626923, - "narHash": "sha256-Mn6oeKrY+Sw6kH0jK+hp5QQH4MTcqwBRQL/ScZDNcz8=", + "lastModified": 1771787992, + "narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=", "owner": "danth", "repo": "stylix", - "rev": "b09847414b50c65788936199918272377f70fb91", + "rev": "30054cca073b49b42a71289edec858f535b27fe9", "type": "github" }, "original": { diff --git a/home/conf/xonsh/xonshrc b/home/conf/xonsh/xonshrc index 60cda0e..bfb69df 100644 --- a/home/conf/xonsh/xonshrc +++ b/home/conf/xonsh/xonshrc @@ -13,8 +13,8 @@ aliases["nixos-dry"] = "sudo nixos-rebuild dry-build --flake @('.#' + $(hostname aliases["init-python"] = "nix flake update --flake templates && nix flake init -t 'templates#python' && direnv allow" # utilities -aliases["ls"] = "exa" -aliases["ll"] = "exa -lah" +aliases["ls"] = "lsd" +aliases["ll"] = "lsd -lah" aliases["grep"] = "rg" aliases["op"] = "xdg-open" diff --git a/home/wm/sway.nix b/home/wm/sway.nix index 0c40c78..ffb4556 100644 --- a/home/wm/sway.nix +++ b/home/wm/sway.nix @@ -287,7 +287,24 @@ replace = "{{pubip}} "; } { - regex = ";(?P\\S+) "; + trigger = ":gw2hs "; + replace = "Full Homestead ^w^ "; + } + { + regex = ":format (?P\\S+) (?P\\S+) "; + replace = "{{format_text}} "; + vars = [ + { + name = "format_text"; + type = "shell"; + params = { + cmd = "${pkgs.python3}/bin/python3 /home/alisceon/.nixos_config/util/format_text.py $ESPANSO_ALPHABET $ESPANSO_TEXT"; + }; + } + ]; + } + { + regex = ";;(?P\\S+) "; replace = "{{emoji}} "; vars = [ { @@ -299,10 +316,6 @@ } ]; } - { - trigger = ":gw2hs "; - replace = "Full Homestead ^w^ "; - } ]; }; global_vars = { diff --git a/hosts/common/base.nix b/hosts/common/base.nix index 48ca9fb..df3c8db 100644 --- a/hosts/common/base.nix +++ b/hosts/common/base.nix @@ -82,7 +82,6 @@ btop # system monitor ripgrep # grep replacement fd # find replacement - eza # ls replacement nh # nix helper jq # JSON processor ncdu @@ -95,6 +94,7 @@ file nix-tree unzip + lsd # Shells bash diff --git a/hosts/common/stylix.nix b/hosts/common/stylix.nix index 029a6ac..714376b 100644 --- a/hosts/common/stylix.nix +++ b/hosts/common/stylix.nix @@ -4,7 +4,24 @@ stylix = { enable = true; autoEnable = true; enableReleaseChecks = false; - base16Scheme = "${pkgs.base16-schemes}/share/themes/selenized-black.yaml"; + base16Scheme = { # based on https://github.com/tinted-theming/schemes/blob/spec-0.11/base16/selenized-black.yaml + base00 = "#181818"; + base01 = "#252525"; + base02 = "#3b3b3b"; + base03 = "#777777"; + base04 = "#777777"; + base05 = "#b9b9b9"; + base06 = "#dedede"; + base07 = "#dedede"; + base08 = "#ed4a46"; + base09 = "#e67f43"; + base0A = "#dbb32d"; + base0B = "#70b433"; + base0C = "#3fc5b7"; + base0D = "#a580e2"; + base0E = "#368aeb"; + base0F = "#eb6eb7"; + }; polarity = "dark"; fonts = { diff --git a/util/format_text.py b/util/format_text.py new file mode 100644 index 0000000..3ea5e99 --- /dev/null +++ b/util/format_text.py @@ -0,0 +1,42 @@ +import sys + +# Introducing the Alisceon Reduces Emoji Set + +ALPHABETS = { + "emoji": { + #Emoji Letter + "a": "🇦", + "b": "🇧", + "c": "🇨", + "d": "🇩", + "e": "🇪", + "f": "🇫", + "g": "🇬", + "h": "🇭", + "i": "🇮", + "j": "🇯", + "k": "🇰", + "l": "🇱", + "m": "🇲", + "n": "🇳", + "o": "🇴", + "p": "🇵", + "q": "🇶", + "r": "🇷", + "s": "🇸", + "t": "🇹", + "u": "🇺", + "v": "🇻", + "w": "🇼", + "x": "🇽", + "y": "🇾", + "z": "🇿", + } +} + +out = [] +if len(sys.argv) > 2: + alphabet = ALPHABETS.get(sys.argv[1], {}) + for letter in " ".join(sys.argv[2:]): + out.append(alphabet.get(letter, "")) +print("​".join(out)) \ No newline at end of file diff --git a/util/get_emoji.py b/util/get_emoji.py index f696d25..0e9b6a9 100644 --- a/util/get_emoji.py +++ b/util/get_emoji.py @@ -380,34 +380,6 @@ EMOJI = { "flag_za": "🇿🇦", "flag_zm": "🇿🇲", "flag_zw": "🇿🇼", - - #Letter - "a": "🇦", - "b": "🇧", - "c": "🇨", - "d": "🇩", - "e": "🇪", - "f": "🇫", - "g": "🇬", - "h": "🇭", - "i": "🇮", - "j": "🇯", - "k": "🇰", - "l": "🇱", - "m": "🇲", - "n": "🇳", - "o": "🇴", - "p": "🇵", - "q": "🇶", - "r": "🇷", - "s": "🇸", - "t": "🇹", - "u": "🇺", - "v": "🇻", - "w": "🇼", - "x": "🇽", - "y": "🇾", - "z": "🇿", } out = [] @@ -416,7 +388,6 @@ if len(sys.argv) > 1: emname = emname.lower() em = EMOJI.get(emname, "") if not em: - #uses a 0 width space for joiner - em = "​".join([EMOJI.get(letter, "") for letter in emname]) + em = emname out.append(em) print(" ".join(out)) \ No newline at end of file