diff --git a/flake.lock b/flake.lock index 786f1f6..b020a1a 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1744289235, - "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", + "lastModified": 1745357003, + "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", + "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1745523430, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "type": "github" }, "original": { @@ -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": 1746317522, + "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6b75d69b6994ba68ec281bd36faebcc56097800", + "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b", "type": "github" }, "original": { @@ -486,11 +486,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1746317522, + "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b", "type": "github" }, "original": { @@ -536,11 +536,11 @@ ] }, "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", + "lastModified": 1745948457, + "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "rev": "ac903e80b33ba6a88df83d02232483d99f327573", "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": 1746310409, + "narHash": "sha256-ZyPR16VvBPFD31v2gXKNzj9OfoURnJw94eOb8HPhRF0=", "ref": "refs/heads/main", - "rev": "225e13c3cc83308175f0a9aa18cfa31324155034", - "revCount": 6003, + "rev": "adbae0f74d951e06c575bad3c81a944027dfe413", + "revCount": 6072, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -689,11 +689,11 @@ ] }, "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "lastModified": 1745951494, + "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", "type": "github" }, "original": { @@ -718,11 +718,11 @@ ] }, "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", + "lastModified": 1745357019, + "narHash": "sha256-q/C3qj9FWHQenObXuw/nGIT8iIsWFjgmcQYcA+ZfpPs=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", + "rev": "397600c42b8d7a443a5b4e92aa15f46650a90f18", "type": "github" }, "original": { @@ -737,11 +737,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1744513377, - "narHash": "sha256-2ocy+qAVxTBmaK8MpAy7mpKIH+DYEzwf+KzXZX83oZ4=", + "lastModified": 1745885816, + "narHash": "sha256-yuIb6/gGcII+2YgtTLcYdga0pcL63B18xQ/oitOhg7k=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "42943b3def85d8787d703778951944c8e791202b", + "rev": "0c82ce9704c8063be8d8f60443071c91943eb68c", "type": "github" }, "original": { @@ -783,11 +783,11 @@ ] }, "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", + "lastModified": 1745975815, + "narHash": "sha256-s3GzsRxBL/N/xYgUXZhQh4t62uR1BN4zxXgWBtJ3lWM=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", + "rev": "05878d9470c9e5cbc8807813f9ec2006627a0ca0", "type": "github" }, "original": { @@ -877,11 +877,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744850482, - "narHash": "sha256-0AfVLRrAFQQeLhCwa0YzWhKtSLVB4E0oB0MVVDTaW2w=", + "lastModified": 1746274470, + "narHash": "sha256-W0HZ4vkhY6RFXUFT1FDHmejINpaKg2NPdh+mEsm6GkM=", "owner": "kaylorben", "repo": "nixcord", - "rev": "6f1450221c3a8fea3a1b49338b0b8deca96a30b5", + "rev": "c1a3a9e0ea2668b01f875e53fd0df1c1fc38c9f1", "type": "github" }, "original": { @@ -892,11 +892,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1746341346, + "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", "type": "github" }, "original": { @@ -924,11 +924,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -972,11 +972,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "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": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "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": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "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": 1746332226, + "narHash": "sha256-vCUDNzs+Baz3JldS8uiYXIlCu1W4FL0Qe3z0dY9Z/2E=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "44ed9eb751a6966ffb291edbda2e9bebd3ebcd4a", + "rev": "2cce21a18638b9b77914af06266f8f8dcced3f3b", "type": "github" }, "original": { @@ -1369,11 +1369,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744668092, - "narHash": "sha256-XDmpI3ywMkypsHKRF2am6BzZ5OjwpQMulAe8L87Ek8U=", + "lastModified": 1746331108, + "narHash": "sha256-iaBTiEmpjbIzEtGPXJguhqFyeeF50N3bu7HAusORR1c=", "owner": "danth", "repo": "stylix", - "rev": "38aff11a7097f4da6b95d4c4d2c0438f25a08d52", + "rev": "b631dffa61e04b6d13ef6f1d86020e1e7df4153e", "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": { @@ -1675,11 +1675,11 @@ ] }, "locked": { - "lastModified": 1744644585, - "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", + "lastModified": 1745871725, + "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", + "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", "type": "github" }, "original": { @@ -1694,11 +1694,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1744841864, - "narHash": "sha256-KytcQDopqwkBy65UaRdL9Aq/knlaZ7di9Qc1YPMsm58=", + "lastModified": 1746350330, + "narHash": "sha256-8L7+rAUZWmD3cCW0ggdFM9N1uGxFFTp2L86JgPAZll4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9ac562b3d3b8dc06d0663e0028eff8c66ff8b390", + "rev": "5c102e1af59678450d031e2688e5e052fd60b732", "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 7b28512..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"; @@ -104,8 +63,9 @@ in { wireguard-import = "nmcli connection import type wireguard file"; notes = - "nvim ~/nextcloud/notes/index.md --cmd 'cd ~/nextcloud/notes' -c ':Telescope find_files'"; + "nvim ~/nextcloud/notes/index.md --cmd 'cd ~/nextcloud/notes' -c ':lua Snacks.picker.smart()'"; note = "notes"; + tmp = "nvim /tmp/$(date | sed 's/ //g;s/\\.//g').md"; nix-shell = "nix-shell --command zsh"; @@ -128,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\\" + } + + ''; }; } diff --git a/home/programs/thunar/default.nix b/home/programs/thunar/default.nix index 08176d0..b294b64 100644 --- a/home/programs/thunar/default.nix +++ b/home/programs/thunar/default.nix @@ -11,7 +11,7 @@ in { xfce.thunar-volman xfce.thunar-media-tags-plugin p7zip - unar + xarchiver ]; gtk = { diff --git a/home/scripts/system/default.nix b/home/scripts/system/default.nix index 621b3be..cee7e0f 100644 --- a/home/scripts/system/default.nix +++ b/home/scripts/system/default.nix @@ -16,16 +16,16 @@ let pkill wofi else wofi -p " Apps" --show drun & - # Quit when not focused anymore - sleep 0.2 - while true; do - window=$(hyprctl activewindow | grep "wofi") - if [[ ! $window ]]; then - pkill wofi - break - fi - sleep 0.2 - done + # # Quit when not focused anymore + # sleep 0.2 + # while true; do + # window=$(hyprctl activewindow | grep "wofi") + # if [[ ! $window ]]; then + # pkill wofi + # break + # fi + # sleep 0.2 + # done fi ''; diff --git a/home/system/hyprland/keyboard-backlight.nix b/home/system/hyprland/keyboard-backlight.nix index 5831f7c..7555ff6 100644 --- a/home/system/hyprland/keyboard-backlight.nix +++ b/home/system/hyprland/keyboard-backlight.nix @@ -28,6 +28,6 @@ let sleep 2 done ''; -in { - wayland.windowManager.hyprland.settings.exec-once = [ keyboard-backlight ]; -} + + command = "bash ${keyboard-backlight}/bin/keyboard-backlight &"; +in { wayland.windowManager.hyprland.settings.exec-once = [ command ]; } diff --git a/home/system/mime/default.nix b/home/system/mime/default.nix index d400110..c507bad 100644 --- a/home/system/mime/default.nix +++ b/home/system/mime/default.nix @@ -12,6 +12,7 @@ let pdf = [ "zathura.desktop" ]; terminal = [ "kitty.desktop" ]; discord = [ "discord.desktop" ]; + archive = [ "xarchiver.desktop" ]; }; mimeMap = { @@ -68,12 +69,12 @@ let ]; pdf = [ "application/pdf" ]; terminal = [ "terminal" ]; - # archive = [ - # "application/zip" - # "application/rar" - # "application/7z" - # "application/*tar" - # ]; + archive = [ + "application/zip" + "application/rar" + "application/7z" + "application/*tar" + ]; discord = [ "x-scheme-handler/discord" ]; }; diff --git a/nixos/nix.nix b/nixos/nix.nix index cbb9c0d..fabb277 100644 --- a/nixos/nix.nix +++ b/nixos/nix.nix @@ -27,13 +27,11 @@ in { "https://hyprland.cachix.org" "https://nix-community.cachix.org" - "https://cache.garnix.io" "https://numtide.cachix.org" ]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" ]; }; diff --git a/nixos/omen.nix b/nixos/omen.nix index 68ed813..246b188 100644 --- a/nixos/omen.nix +++ b/nixos/omen.nix @@ -37,11 +37,11 @@ in { "w /sys/devices/platform/hp-wmi/rgb_zones/zone01 0660 root omen-rgb -" "w /sys/devices/platform/hp-wmi/rgb_zones/zone02 0660 root omen-rgb -" "w /sys/devices/platform/hp-wmi/rgb_zones/zone03 0660 root omen-rgb -" - ]; services.udev.extraRules = '' SUBSYSTEM=="platform", KERNEL=="hp-wmi", ACTION=="add", \ + RUN+="${pkgs.coreutils-full}/bin/sleep 2", \ RUN+="${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone00", \ RUN+="${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone00", \ RUN+="${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone01", \ diff --git a/server-modules/glance.nix b/server-modules/glance.nix index bbea28d..33ce9de 100644 --- a/server-modules/glance.nix +++ b/server-modules/glance.nix @@ -92,6 +92,52 @@ in { type = "search"; search-engine = "duckduckgo"; } + { + type = "bookmarks"; + groups = [ + { + title = ""; + color = "200 50 50"; + links = [ + { + title = "Search NixOS"; + url = "https://search-nixos.hadi.diy"; + } + { + title = "ProtonMail"; + url = "https://proton.me/mail"; + } + { + title = "Github"; + url = "https://github.com"; + } + { + title = "Youtube"; + url = "https://youtube.com"; + } + { + title = "Figma"; + url = "https://figma.com"; + } + ]; + } + { + title = "Misc"; + color = "200 50 50"; + links = [ + { + title = "Cobalt (Downloader)"; + url = "https://cobalt.tools/"; + } + { + title = "Mazanoke (Image optimizer)"; + url = "https://mazanoke.com/"; + } + ]; + } + + ]; + } { type = "server-stats"; servers = [{ @@ -178,36 +224,6 @@ in { } ]; } - { - type = "split-column"; - widgets = [ - { - type = "repository"; - repository = "anotherhadi/nixy"; - pull-requests-limit = 5; - issues-limit = 3; - } - { - type = "repository"; - repository = "anotherhadi/awesome-wallpapers"; - pull-requests-limit = 5; - issues-limit = 3; - } - { - type = "repository"; - repository = "anotherhadi/search-nixos"; - pull-requests-limit = 5; - issues-limit = 3; - } - { - type = "repository"; - repository = "anotherhadi/search-nixos-api"; - pull-requests-limit = 5; - issues-limit = 3; - } - ]; - } - { type = "hacker-news"; } ]; } ]; diff --git a/themes/nixy.nix b/themes/nixy.nix index 1c446d8..2ee404a 100644 --- a/themes/nixy.nix +++ b/themes/nixy.nix @@ -4,12 +4,12 @@ type = lib.types.attrs; default = { rounding = 20; - gaps-in = 12; - gaps-out = 12 * 2; + gaps-in = 10; + gaps-out = 10 * 2; active-opacity = 0.96; inactive-opacity = 0.92; blur = true; - border-size = 4; + border-size = 3; animation-speed = "fast"; # "fast" | "medium" | "slow" fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none" textColorOnWallpaper = @@ -17,8 +17,8 @@ bar = { # Hyprpanel position = "top"; # "top" | "bottom" - transparent = false; - transparentButtons = true; + transparent = true; + transparentButtons = false; floating = true; }; }; @@ -30,7 +30,7 @@ # See https://tinted-theming.github.io/tinted-gallery/ for more schemes base16Scheme = { - base00 = "0c0e0f"; # Default Background + base00 = "09090B"; # Default Background base01 = "1c1e1f"; # Lighter Background (Used for status bars, line number and folding marks) base02 = "313244"; # Selection Background @@ -48,7 +48,7 @@ base0C = "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes base0D = - "c4a7e7"; # Functions, Methods, Attribute IDs, Headings, Accent color + "c5afd4"; # Functions, Methods, Attribute IDs, Headings, Accent color base0E = "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed base0F = @@ -86,8 +86,8 @@ polarity = "dark"; image = pkgs.fetchurl { url = - "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/vanilla_pink_purple.png"; - sha256 = "sha256-JJIsoC3MaUB378RfogU7BDuXOuy7Vk048CwfyNe9FYg="; + "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/black-grey-and-white.png"; + sha256 = "sha256-NQo6sEt7qt82sI8yCxNwSs0+NnWx17oko7MHSap34DI="; }; }; }