From 8260e6f7fd9eaa6ce87abe0ec0fdc0f7e9e91ef5 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Sat, 26 Apr 2025 18:27:20 +0200 Subject: [PATCH] update flake --- flake.lock | 132 ++++++++++---------- home/programs/discord/default.nix | 2 +- home/programs/shell/zsh.nix | 198 +++++++++++++++--------------- 3 files changed, 164 insertions(+), 168 deletions(-) diff --git a/flake.lock b/flake.lock index 786f1f6..1f86293 100644 --- a/flake.lock +++ b/flake.lock @@ -129,15 +129,15 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", - "owner": "SenchoPens", + "lastModified": 1745452037, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "owner": "awwpotato", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "985d704b4ff9f75627f279ef091b2899f8456690", "type": "github" }, "original": { - "owner": "SenchoPens", + "owner": "awwpotato", "repo": "base16.nix", "type": "github" } @@ -194,11 +194,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -465,11 +465,11 @@ ] }, "locked": { - "lastModified": 1744833442, - "narHash": "sha256-BBMWW2m64Grcc5FlXz74+vdkUyCJOfUGnl+VcS/4x44=", + "lastModified": 1745555634, + "narHash": "sha256-lhVyVn1utb2UVTbyKJ6mfKB7wLTjrj14OlebvO0WU2s=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6b75d69b6994ba68ec281bd36faebcc56097800", + "rev": "98f4fef7fd7b4a77245db12e33616023162bc6d9", "type": "github" }, "original": { @@ -486,11 +486,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1745439012, + "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8", "type": "github" }, "original": { @@ -565,11 +565,11 @@ ] }, "locked": { - "lastModified": 1743953322, - "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", + "lastModified": 1745015490, + "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", + "rev": "60754910946b4e2dc1377b967b7156cb989c5873", "type": "github" }, "original": { @@ -594,11 +594,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1744849150, - "narHash": "sha256-LW9Xdm/00Vb9CezDNFuXznGACl+Q83gR7AfeXDSKE9Y=", + "lastModified": 1745541469, + "narHash": "sha256-gUEbWrANtqPENt5VnT7Rnav34WshJXFmlDPxXWMn41A=", "ref": "refs/heads/main", - "rev": "225e13c3cc83308175f0a9aa18cfa31324155034", - "revCount": 6003, + "rev": "41f5f67f6c8675ec48d893007ca93f8bf6c0049a", + "revCount": 6026, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -877,11 +877,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744850482, - "narHash": "sha256-0AfVLRrAFQQeLhCwa0YzWhKtSLVB4E0oB0MVVDTaW2w=", + "lastModified": 1745545091, + "narHash": "sha256-300Y7RoU/wefVDmit6b89HvhBk6h8l1t9VVDo0diEK4=", "owner": "kaylorben", "repo": "nixcord", - "rev": "6f1450221c3a8fea3a1b49338b0b8deca96a30b5", + "rev": "f5dd48df2e39d2b2cf9b5bad20997e88704f6a5e", "type": "github" }, "original": { @@ -892,11 +892,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -924,11 +924,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { @@ -972,11 +972,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -1020,11 +1020,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -1036,11 +1036,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -1068,11 +1068,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -1115,11 +1115,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1743884191, - "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "lastModified": 1745459908, + "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", "type": "github" }, "original": { @@ -1313,11 +1313,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { @@ -1334,11 +1334,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1744682091, - "narHash": "sha256-zudMf0YW3mB0f2XnWPAjYdKioJPaJQchhO4bCeBOZAI=", + "lastModified": 1745151211, + "narHash": "sha256-qFXfTdO1yvW6DmUPfVLIJgDHfkSd5yimZWvBMrlP/ow=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "44ed9eb751a6966ffb291edbda2e9bebd3ebcd4a", + "rev": "1dd4328f82115887901a685ecd9fa6e1d1db2d0c", "type": "github" }, "original": { @@ -1369,11 +1369,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744668092, - "narHash": "sha256-XDmpI3ywMkypsHKRF2am6BzZ5OjwpQMulAe8L87Ek8U=", + "lastModified": 1745541960, + "narHash": "sha256-CnkPq3sjuxB2HC93JVSotfMCF3dDrdKo3e4JOImKiLs=", "owner": "danth", "repo": "stylix", - "rev": "38aff11a7097f4da6b95d4c4d2c0438f25a08d52", + "rev": "4846adbc2a0334687c024aed0ca77ecd93ccdb0d", "type": "github" }, "original": { @@ -1523,11 +1523,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1742851696, - "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -1539,11 +1539,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -1576,11 +1576,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { @@ -1694,11 +1694,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1744841864, - "narHash": "sha256-KytcQDopqwkBy65UaRdL9Aq/knlaZ7di9Qc1YPMsm58=", + "lastModified": 1745550347, + "narHash": "sha256-y3ojr4sqs4cbtHNrzTK1JVoTFfyGzS+m8U5nzgHcj2U=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9ac562b3d3b8dc06d0663e0028eff8c66ff8b390", + "rev": "855ad6c6bb50dc52f496375e9f031fd0305ea7b8", "type": "github" }, "original": { diff --git a/home/programs/discord/default.nix b/home/programs/discord/default.nix index 5560d5b..105c2d9 100644 --- a/home/programs/discord/default.nix +++ b/home/programs/discord/default.nix @@ -1,6 +1,6 @@ # Discord is a popular chat application. { inputs, ... }: { - imports = [ inputs.nixcord.homeManagerModules.nixcord ]; + imports = [ inputs.nixcord.homeModules.nixcord ]; programs.nixcord = { enable = true; diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix index 195cd8b..25e7925 100644 --- a/home/programs/shell/zsh.nix +++ b/home/programs/shell/zsh.nix @@ -17,46 +17,6 @@ in { }; historySubstringSearch.enable = true; - initExtraFirst = - #bash - '' - bindkey -e - ${if fetch == "neofetch" then - pkgs.neofetch + "/bin/neofetch" - else if fetch == "nerdfetch" then - "nerdfetch" - else if fetch == "pfetch" then - "echo; ${pkgs.pfetch}/bin/pfetch" - else - ""} - - function sesh-sessions() { - session=$(sesh list -t -c | fzf --height 70% --reverse) - [[ -z "$session" ]] && return - sesh connect $session - } - - function chatgptlist(){ - for arg in "$@"; do - echo "$arg:" - echo "\`\`\`" - cat "$arg" - echo "\`\`\`" - echo - done - } - - - function n4c() { - nix develop --no-write-lock-file --refresh "github:anotherhadi/nix4cyber#''${1:-all}" - } - - zle -N sesh-sessions - bindkey -M emacs '\es' sesh-sessions - bindkey -M vicmd '\es' sesh-sessions - bindkey -M viins '\es' sesh-sessions - ''; - history = { ignoreDups = true; save = 10000; @@ -95,7 +55,6 @@ in { sl = "ls"; open = "${pkgs.xdg-utils}/bin/xdg-open"; icat = "${pkgs.kitty}/bin/kitty +kitten icat"; - ssh = "kitty +kitten ssh"; cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain"; @@ -129,77 +88,114 @@ in { gcm = "git commit -m"; }; - initExtra = '' - # search history based on what's typed in the prompt - autoload -U history-search-end - zle -N history-beginning-search-backward-end history-search-end - zle -N history-beginning-search-forward-end history-search-end - bindkey "^[OA" history-beginning-search-backward-end - bindkey "^[OB" history-beginning-search-forward-end + initContent = # bash + '' + bindkey -e + ${if fetch == "neofetch" then + pkgs.neofetch + "/bin/neofetch" + else if fetch == "nerdfetch" then + "nerdfetch" + else if fetch == "pfetch" then + "echo; ${pkgs.pfetch}/bin/pfetch" + else + ""} - # General completion behavior - zstyle ':completion:*' completer _extensions _complete _approximate + function sesh-sessions() { + session=$(sesh list -t -c | fzf --height 70% --reverse) + [[ -z "$session" ]] && return + sesh connect $session + } - # Use cache - zstyle ':completion:*' use-cache on - zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache" + function chatgptlist(){ + for arg in "$@"; do + echo "$arg:" + echo "\`\`\`" + cat "$arg" + echo "\`\`\`" + echo + done + } - # Complete the alias - zstyle ':completion:*' complete true - # Autocomplete options - zstyle ':completion:*' complete-options true + function n4c() { + nix develop --no-write-lock-file --refresh "github:nix4cyber/n4c#''${1:-all}" -c zsh + } - # Completion matching control - zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' - zstyle ':completion:*' keep-prefix true + zle -N sesh-sessions + bindkey -M emacs '\es' sesh-sessions + bindkey -M vicmd '\es' sesh-sessions + bindkey -M viins '\es' sesh-sessions - # Group matches and describe - zstyle ':completion:*' menu select - zstyle ':completion:*' list-grouped false - zstyle ':completion:*' list-separator ''' - zstyle ':completion:*' group-name ''' - zstyle ':completion:*' verbose yes - zstyle ':completion:*:matches' group 'yes' - zstyle ':completion:*:warnings' format '%F{red}%B-- No match for: %d --%b%f' - zstyle ':completion:*:messages' format '%d' - zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b' - zstyle ':completion:*:descriptions' format '[%d]' + # search history based on what's typed in the prompt + autoload -U history-search-end + zle -N history-beginning-search-backward-end history-search-end + zle -N history-beginning-search-forward-end history-search-end + bindkey "^[OA" history-beginning-search-backward-end + bindkey "^[OB" history-beginning-search-forward-end - # Colors - zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS} + # General completion behavior + zstyle ':completion:*' completer _extensions _complete _approximate - # case insensitive tab completion - zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories - zstyle ':completion:*:*:cd:*:directory-stack' menu yes select - zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand' - zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands - zstyle ':completion:*' special-dirs true - zstyle ':completion:*' squeeze-slashes true + # Use cache + zstyle ':completion:*' use-cache on + zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache" - # Sort - zstyle ':completion:*' sort false - zstyle ":completion:*:git-checkout:*" sort false - zstyle ':completion:*' file-sort modification - zstyle ':completion:*:eza' sort false - zstyle ':completion:complete:*:options' sort false - zstyle ':completion:files' sort false + # Complete the alias + zstyle ':completion:*' complete true - ${lib.optionalString config.services.gpg-agent.enable '' - gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg) - export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh" - ''} + # Autocomplete options + zstyle ':completion:*' complete-options true - # Allow foot to pipe command output - function precmd { - if ! builtin zle; then - print -n "\e]133;D\e\\" - fi - } - function preexec { - print -n "\e]133;C\e\\" - } + # Completion matching control + zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' + zstyle ':completion:*' keep-prefix true - ''; + # Group matches and describe + zstyle ':completion:*' menu select + zstyle ':completion:*' list-grouped false + zstyle ':completion:*' list-separator ''' + zstyle ':completion:*' group-name ''' + zstyle ':completion:*' verbose yes + zstyle ':completion:*:matches' group 'yes' + zstyle ':completion:*:warnings' format '%F{red}%B-- No match for: %d --%b%f' + zstyle ':completion:*:messages' format '%d' + zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b' + zstyle ':completion:*:descriptions' format '[%d]' + + # Colors + zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS} + + # case insensitive tab completion + zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories + zstyle ':completion:*:*:cd:*:directory-stack' menu yes select + zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand' + zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands + zstyle ':completion:*' special-dirs true + zstyle ':completion:*' squeeze-slashes true + + # Sort + zstyle ':completion:*' sort false + zstyle ":completion:*:git-checkout:*" sort false + zstyle ':completion:*' file-sort modification + zstyle ':completion:*:eza' sort false + zstyle ':completion:complete:*:options' sort false + zstyle ':completion:files' sort false + + ${lib.optionalString config.services.gpg-agent.enable '' + gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg) + export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh" + ''} + + # Allow foot to pipe command output + function precmd { + if ! builtin zle; then + print -n "\e]133;D\e\\" + fi + } + function preexec { + print -n "\e]133;C\e\\" + } + + ''; }; }