From 85521a1666437191d802dd4022586f542449b071 Mon Sep 17 00:00:00 2001 From: zackartz Date: Thu, 23 May 2024 20:48:19 +0000 Subject: [PATCH] fix spotify --- homes/x86_64-linux/zack@earth/default.nix | 16 ++++ modules/home/apps/music/spotify/default.nix | 7 +- modules/home/apps/tools/bat/default.nix | 27 +++++++ modules/home/apps/tools/direnv/default.nix | 27 +++++++ modules/home/apps/tools/neovim/lazy-lock.json | 53 +++++++------ modules/home/apps/tools/skim/default.nix | 27 +++++++ modules/home/apps/tools/tealdeer/default.nix | 30 ++++++++ .../shells/zsh/{config/zsh => }/aliases.nix | 0 modules/home/shells/zsh/config/default.nix | 75 ------------------- modules/home/shells/zsh/config/starship.nix | 26 ------- .../home/shells/zsh/config/zsh/default.nix | 71 ------------------ modules/home/shells/zsh/config/zsh/tools.nix | 59 --------------- modules/home/shells/zsh/default.nix | 66 ++++++++++++++++ modules/nixos/protocols/wayland/default.nix | 1 - 14 files changed, 223 insertions(+), 262 deletions(-) create mode 100644 modules/home/apps/tools/bat/default.nix create mode 100644 modules/home/apps/tools/direnv/default.nix create mode 100644 modules/home/apps/tools/skim/default.nix create mode 100644 modules/home/apps/tools/tealdeer/default.nix rename modules/home/shells/zsh/{config/zsh => }/aliases.nix (100%) delete mode 100644 modules/home/shells/zsh/config/default.nix delete mode 100644 modules/home/shells/zsh/config/starship.nix delete mode 100644 modules/home/shells/zsh/config/zsh/default.nix delete mode 100644 modules/home/shells/zsh/config/zsh/tools.nix diff --git a/homes/x86_64-linux/zack@earth/default.nix b/homes/x86_64-linux/zack@earth/default.nix index b001863..5960561 100644 --- a/homes/x86_64-linux/zack@earth/default.nix +++ b/homes/x86_64-linux/zack@earth/default.nix @@ -13,6 +13,10 @@ tools.tmux.enable = true; tools.neovim.enable = true; tools.starship.enable = true; + tools.skim.enable = true; + tools.direnv.enable = true; + tools.tealdeer.enable = true; + tools.bat.enable = true; term.kitty.enable = true; @@ -24,12 +28,24 @@ }; }; + shells.zsh.enable = true; + rice.gtk.enable = true; services.lock.enable = true; xdg.enable = true; + programs = { + gpg.enable = true; + man.enable = true; + eza.enable = true; + dircolors = { + enable = true; + enableZshIntegration = true; + }; + }; + # catppuccin.enable = true; home.packages = [ diff --git a/modules/home/apps/music/spotify/default.nix b/modules/home/apps/music/spotify/default.nix index cbba134..f2ef890 100644 --- a/modules/home/apps/music/spotify/default.nix +++ b/modules/home/apps/music/spotify/default.nix @@ -2,19 +2,20 @@ options, config, lib, + inputs, + system, ... }: with lib; with lib.custom; let - cfg = config.shells.zsh; + cfg = config.apps.music.spotify; + spicePkgs = inputs.spicetify-nix.packages.${system}.default; in { options.apps.music.spotify = with types; { enable = mkBoolOpt false "Enable Spotify"; }; config = mkIf cfg.enable { - home.packages = [pkgs.spotify]; - programs.spicetify = { enable = true; theme = spicePkgs.themes.catppuccin; diff --git a/modules/home/apps/tools/bat/default.nix b/modules/home/apps/tools/bat/default.nix new file mode 100644 index 0000000..af2aafd --- /dev/null +++ b/modules/home/apps/tools/bat/default.nix @@ -0,0 +1,27 @@ +{ + options, + config, + lib, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.apps.tools.bat; +in { + options.apps.tools.bat = with types; { + enable = mkBoolOpt false "Enable Bat"; + }; + + config = mkIf cfg.enable { + programs.bat = { + enable = true; + + catppuccin.enable = true; + + config = { + pager = "less -FR"; + }; + }; + }; +} diff --git a/modules/home/apps/tools/direnv/default.nix b/modules/home/apps/tools/direnv/default.nix new file mode 100644 index 0000000..5f77244 --- /dev/null +++ b/modules/home/apps/tools/direnv/default.nix @@ -0,0 +1,27 @@ +{ + options, + config, + lib, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.apps.tools.direnv; +in { + options.apps.tools.direnv = with types; { + enable = mkBoolOpt false "Enable Direnv"; + }; + + config = mkIf cfg.enable { + programs = { + direnv = { + enable = true; + nix-direnv.enable = true; + }; + }; + home.sessionVariables = { + DIRENV_LOG_FORMAT = ""; + }; + }; +} diff --git a/modules/home/apps/tools/neovim/lazy-lock.json b/modules/home/apps/tools/neovim/lazy-lock.json index 5a2c0a8..09c534d 100644 --- a/modules/home/apps/tools/neovim/lazy-lock.json +++ b/modules/home/apps/tools/neovim/lazy-lock.json @@ -3,7 +3,7 @@ "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "blame.nvim": { "branch": "main", "commit": "dedbcdce857f708c63f261287ac7491a893912d0" }, - "bufferline.nvim": { "branch": "main", "commit": "0dfc19b7a15a3bc47b975fcffde03859c46dd097" }, + "bufferline.nvim": { "branch": "main", "commit": "73edc1f2732678e7a681e3d3be49782610914f6b" }, "catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" }, "ccc.nvim": { "branch": "main", "commit": "f388f1981d222967c741fe9927edf9ba5fa3bcbe" }, "charm-freeze.nvim": { "branch": "main", "commit": "3ad4dd739b97d92adb219a5752a8734fc8579055" }, @@ -15,58 +15,57 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "crates.nvim": { "branch": "main", "commit": "d556c00d60c9421c913ee54ff690df2a34f6264e" }, - "diffview.nvim": { "branch": "main", "commit": "9bdd5537575c2ea7925b71ae06585b934beea13d" }, + "diffview.nvim": { "branch": "main", "commit": "0bae1a371ac68be86ead374ee2c4f36bd96bb6c6" }, "document-color.nvim": { "branch": "main", "commit": "74c487f0e5accfaae033755451b9e367220693fd" }, - "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" }, + "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, "dropbar.nvim": { "branch": "master", "commit": "9fc10fa1a34ec3e55b470962e4e94644611bd209" }, "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, + "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "move.nvim": { "branch": "main", "commit": "cccbd4ea9049ca5f99f025ffaddb7392359c7d6a" }, "neo-rename.nvim": { "branch": "master", "commit": "d3f065ab1168fe95ea3ab939fbc659de47e130fc" }, - "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neocord": { "branch": "main", "commit": "aa7a58023166533da83ca7b11c0d2569e45d7381" }, + "neo-tree.nvim": { "branch": "main", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neogit": { "branch": "master", "commit": "b93316d15c590377f50ca61e70e9129e4aa9b848" }, - "neovim-session-manager": { "branch": "master", "commit": "a0b9d25154be573bc0f99877afb3f57cf881cce7" }, - "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, + "neogit": { "branch": "master", "commit": "daebc4bc94bdcfa69d8d75c731878bff758e16fa" }, + "neovim-session-manager": { "branch": "master", "commit": "4376507a99af4a92c85263c30ab8efee0bb2857f" }, + "noice.nvim": { "branch": "main", "commit": "883cd5b638aef23d087c334940112d39ebff0aaa" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, - "nvim-dap-ui": { "branch": "master", "commit": "71bfe9bd6b3465e169b53bea4f83775034d822dd" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" }, - "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" }, - "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, + "nvim-dap": { "branch": "master", "commit": "c65c163daa47e0623dd85d2303fce0c22e52ad01" }, + "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, + "nvim-lspconfig": { "branch": "master", "commit": "2c1877081b237a643e52ebdebaf36c84a2695639" }, + "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-surround": { "branch": "main", "commit": "79aaa42da1f698ed31bcbe7f83081f69dca7ba17" }, - "nvim-treesitter": { "branch": "master", "commit": "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56" }, - "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "cbab9ad88036915beebd13b47e100743ff2ed2d5" }, - "nvim-ufo": { "branch": "main", "commit": "4b4077850d1b3af09f4957b67144943cf3da401a" }, + "nvim-treesitter": { "branch": "master", "commit": "298a9dd4f8a0d95b347a7ebd301849d8b0e3917e" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, + "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, - "overseer.nvim": { "branch": "master", "commit": "7a9b654df4b3b246d05fff857f32e9fb8ddfb013" }, + "overseer.nvim": { "branch": "master", "commit": "31f309692c9dd9162d3f63b5456a7932799c347c" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "rest.nvim": { "branch": "main", "commit": "f96edb54a2940322bc7ed81a1031be04db7d3a99" }, - "rustaceanvim": { "branch": "master", "commit": "66466d4fe0b8988ba9e2932d3c41782c2efb683b" }, - "schemastore.nvim": { "branch": "main", "commit": "de73a884679a2461c53f96035894ef073a5a7f4f" }, + "rustaceanvim": { "branch": "master", "commit": "a73e8618d8518b2a7434e1c21e4da4e66f21f738" }, + "schemastore.nvim": { "branch": "main", "commit": "9a5992a881583d886bfbb46631a09f736f0fae50" }, "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope.nvim": { "branch": "master", "commit": "4aed63995a69e343b068c7469491a8d1592c339f" }, - "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "c6a9196f6e35218b8972717a1557618ec69c8e88" }, + "telescope.nvim": { "branch": "master", "commit": "5665d93988acfbb0747bdbf4f4cb583bcebc8930" }, + "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "699381f502a9c4e8d95925083765768545e994b4" }, "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, "treesj": { "branch": "main", "commit": "e1e82ab4237619d342c7102c9f13d4b9833bfd39" }, - "vim-dadbod": { "branch": "master", "commit": "37523ffe0849b51db07fa7f48430c2aca5420a0e" }, + "vim-dadbod": { "branch": "master", "commit": "fb30422b7bee7e2fa4205a4d226f01477f4fc593" }, "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" }, - "vim-dadbod-ui": { "branch": "master", "commit": "c365064cd5bc625d1aebab6235d504bd91274cdb" }, + "vim-dadbod-ui": { "branch": "master", "commit": "5aa854ee6017e9a3463d3dc8eee5aac93739f021" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, "vim-tmux-navigator": { "branch": "master", "commit": "c600cf10db1bf933aab9e357158bf9b202ecf99b" }, diff --git a/modules/home/apps/tools/skim/default.nix b/modules/home/apps/tools/skim/default.nix new file mode 100644 index 0000000..51a4050 --- /dev/null +++ b/modules/home/apps/tools/skim/default.nix @@ -0,0 +1,27 @@ +{ + options, + config, + lib, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.apps.tools.skim; +in { + options.apps.tools.skim = with types; { + enable = mkBoolOpt false "Enable Skim"; + }; + + config = mkIf cfg.enable { + programs.skim = { + enable = true; + enableZshIntegration = true; + defaultCommand = "rg --files --hidden"; + changeDirWidgetOptions = [ + "--preview 'eza --icons --git --color always -T -L 3 {} | head -200'" + "--exact" + ]; + }; + }; +} diff --git a/modules/home/apps/tools/tealdeer/default.nix b/modules/home/apps/tools/tealdeer/default.nix new file mode 100644 index 0000000..9060a90 --- /dev/null +++ b/modules/home/apps/tools/tealdeer/default.nix @@ -0,0 +1,30 @@ +{ + options, + config, + lib, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.apps.tools.tealdeer; +in { + options.apps.tools.tealdeer = with types; { + enable = mkBoolOpt false "Enable Tealdeer"; + }; + + config = mkIf cfg.enable { + programs.tealdeer = { + enable = true; + settings = { + display = { + compact = false; + use_pager = true; + }; + updates = { + auto_update = true; + }; + }; + }; + }; +} diff --git a/modules/home/shells/zsh/config/zsh/aliases.nix b/modules/home/shells/zsh/aliases.nix similarity index 100% rename from modules/home/shells/zsh/config/zsh/aliases.nix rename to modules/home/shells/zsh/aliases.nix diff --git a/modules/home/shells/zsh/config/default.nix b/modules/home/shells/zsh/config/default.nix deleted file mode 100644 index fe9b545..0000000 --- a/modules/home/shells/zsh/config/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{pkgs, ...}: { - # imports = [./zsh ./zsh/tools.nix ./starship.nix]; - - home.packages = with pkgs; [ - gnumake - # Runs programs without installing them - comma - - # grep replacement - ripgrep - - # ping, but with cool graph - gping - - # dns client - dogdns - - # neofetch but for git repos - onefetch - - # neofetch but for cpu's - cpufetch - - # download from yt and other websites - yt-dlp - - zsh-history - - # man pages for tiktok attention span mfs - tealdeer - - # markdown previewer - glow - - # profiling tool - hyperfine - - imagemagick - ffmpeg-full - - # preview images in terminal - catimg - - # networking stuff - nmap - wget - - # faster find - fd - - # http request thingy - xh - - # generate regex - grex - - # json thingy - jq - - # syncthnig for acoustic people - rsync - - figlet - # Generate qr codes - qrencode - - # script kidde stuff - hcxdumptool - hashcat - - unzip - # tshark - # termshark - ]; -} diff --git a/modules/home/shells/zsh/config/starship.nix b/modules/home/shells/zsh/config/starship.nix deleted file mode 100644 index 1e2bd6d..0000000 --- a/modules/home/shells/zsh/config/starship.nix +++ /dev/null @@ -1,26 +0,0 @@ -{config, ...}: { - programs.starship = { - enable = true; - enableZshIntegration = config.programs.zsh.enable; - settings = { - add_newline = false; - command_timeout = 1000; - scan_timeout = 3; - character = { - error_symbol = "[󰘧](bold red)"; - success_symbol = "[󰘧](bold green)"; - vicmd_symbol = "[󰘧](bold yellow)"; - format = "$symbol [|](bold bright-black) "; - }; - git_commit = {commit_hash_length = 7;}; - line_break.disabled = false; - lua.symbol = "[](blue) "; - python.symbol = "[](blue) "; - hostname = { - ssh_only = true; - format = "[$hostname](bold blue) "; - disabled = false; - }; - }; - }; -} diff --git a/modules/home/shells/zsh/config/zsh/default.nix b/modules/home/shells/zsh/config/zsh/default.nix deleted file mode 100644 index 4ed6daa..0000000 --- a/modules/home/shells/zsh/config/zsh/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit (builtins) concatStringsSep; -in { - home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship"; - - programs.zsh = { - enable = true; - sessionVariables = { - LC_ALL = "en_US.UTF-8"; - ZSH_AUTOSUGGEST_USE_ASYNC = "true"; - SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; - }; - enableAutosuggestions = true; - history = { - save = 2137; - size = 2137; - expireDuplicatesFirst = true; - ignoreDups = true; - ignoreSpace = true; - }; - - initExtra = let - sources = with pkgs; [ - "${zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh" - "${zsh-history}/share/zsh/init.zsh" - "${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh" - "${zsh-f-sy-h}/share/zsh/site-functions/F-Sy-H.plugin.zsh" - "${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh" - "${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh" - "${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh" - ]; - - source = map (source: "source ${source}") sources; - - plugins = concatStringsSep "\n" ([ - "${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin" - ] - ++ source); - in '' - ${plugins} - - bindkey "^[[1;5C" forward-word - bindkey "^[[1;5D" backward-word - ''; - - plugins = [ - { - name = "zsh-tmux"; - file = "zsh-tmux.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "laggardkernel"; - repo = "zsh-tmux"; - rev = "v1.1.0"; - sha256 = "sha256-BB9L84HjUnV1OUIp2U2lHYHEg5q4p/TgqLcsCvInkC8="; - }; - } - ]; - - dirHashes = { - music = "$HOME/Music"; - media = "/run/media/$USER"; - }; - - shellAliases = import ./aliases.nix {inherit pkgs lib config;}; - }; -} diff --git a/modules/home/shells/zsh/config/zsh/tools.nix b/modules/home/shells/zsh/config/zsh/tools.nix deleted file mode 100644 index fa50434..0000000 --- a/modules/home/shells/zsh/config/zsh/tools.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - programs = { - gpg.enable = true; - man.enable = true; - eza.enable = true; - dircolors = { - enable = true; - enableZshIntegration = true; - }; - - skim = { - enable = true; - enableZshIntegration = true; - defaultCommand = "rg --files --hidden"; - changeDirWidgetOptions = [ - "--preview 'eza --icons --git --color always -T -L 3 {} | head -200'" - "--exact" - ]; - }; - direnv = { - enable = true; - nix-direnv.enable = true; - }; - tealdeer = { - enable = true; - settings = { - display = { - compact = false; - use_pager = true; - }; - updates = { - auto_update = true; - }; - }; - }; - # bat = { - # enable = true; - # config = { - # pager = "less -FR"; - # theme = "catppuccin-frappe"; - # }; - # themes = { - # catppuccin-frappe = { - # src = pkgs.fetchFromGitHub { - # owner = "catppuccin"; - # repo = "bat"; - # rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; - # sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; - # }; - # file = "Catppuccin-frappe.tmTheme"; - # }; - # }; - # }; - }; -} diff --git a/modules/home/shells/zsh/default.nix b/modules/home/shells/zsh/default.nix index 711e65b..8bb6ace 100644 --- a/modules/home/shells/zsh/default.nix +++ b/modules/home/shells/zsh/default.nix @@ -2,17 +2,83 @@ options, config, lib, + pkgs, ... }: with lib; with lib.custom; let cfg = config.shells.zsh; + + inherit (builtins) concatStringsSep; in { options.shells.zsh = with types; { enable = mkBoolOpt false "Enable Zsh Configuration"; }; config = mkIf cfg.enable { + home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship"; + + programs.zsh = { + enable = true; + sessionVariables = { + LC_ALL = "en_US.UTF-8"; + ZSH_AUTOSUGGEST_USE_ASYNC = "true"; + SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; + }; + enableAutosuggestions = true; + history = { + save = 2137; + size = 2137; + expireDuplicatesFirst = true; + ignoreDups = true; + ignoreSpace = true; + }; + + initExtra = let + sources = with pkgs; [ + "${zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh" + "${zsh-history}/share/zsh/init.zsh" + "${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh" + "${zsh-f-sy-h}/share/zsh/site-functions/F-Sy-H.plugin.zsh" + "${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh" + "${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh" + "${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh" + ]; + + source = map (source: "source ${source}") sources; + + plugins = concatStringsSep "\n" ([ + "${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin" + ] + ++ source); + in '' + ${plugins} + + bindkey "^[[1;5C" forward-word + bindkey "^[[1;5D" backward-word + ''; + + plugins = [ + { + name = "zsh-tmux"; + file = "zsh-tmux.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "laggardkernel"; + repo = "zsh-tmux"; + rev = "v1.1.0"; + sha256 = "sha256-BB9L84HjUnV1OUIp2U2lHYHEg5q4p/TgqLcsCvInkC8="; + }; + } + ]; + + dirHashes = { + music = "$HOME/Music"; + media = "/run/media/$USER"; + }; + + shellAliases = import ./aliases.nix {inherit pkgs lib config;}; + }; + home.packages = with pkgs; [ gnumake # Runs programs without installing them diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index e21741f..9825c86 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -43,7 +43,6 @@ in { DISABLE_QT5_COMPAT = "0"; GDK_BACKEND = "wayland,x11"; ANKI_WAYLAND = "1"; - DIRENV_LOG_FORMAT = ""; QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_QPA_PLATFORM = "wayland;xcb"; DISABLE_QT_COMPAT = "0";