diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json index 07c89e0..6425c15 100644 --- a/files/.config/configstore/update-notifier-npm.json +++ b/files/.config/configstore/update-notifier-npm.json @@ -1,4 +1,4 @@ { "optOut": false, - "lastUpdateCheck": 1615367685427 + "lastUpdateCheck": 1616428132450 } \ No newline at end of file diff --git a/files/.config/wezterm/colors/gruvbox.toml b/files/.config/wezterm/colors/gruvbox.toml new file mode 100644 index 0000000..67db097 --- /dev/null +++ b/files/.config/wezterm/colors/gruvbox.toml @@ -0,0 +1,18 @@ +# Gruvbox +[colors] +foreground = "#ebdbb2" +background = "#282828" +cursor_bg = "#8ec07c" +cursor_border = "#8ec07c" +cursor_fg = "#282828" +selection_bg = "#e6d4a3" +selection_fg = "#534a42" + + + +ansi = ["#282828", "#cc241d", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2"] +brights = ["#98971a", "#d79921", "#458588", "#b16286", "#689d6a", "#a89984", "#928374", "#fb4934"] + +[[tab_bar]] +background = "#282828" +active_tab.bg_color = "#8ec07c" diff --git a/files/.config/wezterm/wezterm.lua b/files/.config/wezterm/wezterm.lua new file mode 100644 index 0000000..0ea032c --- /dev/null +++ b/files/.config/wezterm/wezterm.lua @@ -0,0 +1,65 @@ +local wezterm = require 'wezterm' +return { + color_scheme = "gruvbox", + font = wezterm.font("Terminus (TTF)"), + + + hide_tab_bar_if_only_one_tab = true, + scrollback_lines=5000, + line_height=0.91, + + window_padding = { + left = 20, + right = 20, + top = 20, + bottom = 20, + }, + + leader = { key="a", mods="CTRL", timeout_milliseconds=500 }, + keys = { + {key="+", mods="CTRL", action="IncreaseFontSize"}, + {key="t", mods="LEADER", action=wezterm.action{SpawnTab="CurrentPaneDomain"}}, + {key="c", mods="LEADER", action=wezterm.action{CloseCurrentTab={confirm=false}}}, + {key="l", mods="LEADER", action=wezterm.action{ActivateTabRelative=1}}, + {key="h", mods="LEADER", action=wezterm.action{ActivateTabRelative=-1}}, + {key="v", mods="LEADER", action=wezterm.action{SplitVertical={domain="CurrentPaneDomain"}}}, + {key="b", mods="LEADER", action=wezterm.action{SplitHorizontal={domain="CurrentPaneDomain"}}}, + {key="n", mods="LEADER", action="SpawnWindow"}, + {key="f", mods="LEADER", action="TogglePaneZoomState"}, + {key="p", mods="LEADER", action="ShowLauncher"}, + {key="s", mods="LEADER", action=wezterm.action{Search={CaseInSensitiveString=""}}}, + {key="LeftArrow", mods="CTRL", action=wezterm.action{ActivatePaneDirection="Left"}}, + {key="RightArrow", mods="CTRL", action=wezterm.action{ActivatePaneDirection="Right"}}, + {key="DownArrow", mods="CTRL", action=wezterm.action{ActivatePaneDirection="Down"}}, + {key="UpArrow", mods="CTRL", action=wezterm.action{ActivatePaneDirection="Up"}}, + }, + colors = { + background = "#282828", + foreground = "#ebdbb2", + cursor_bg = "#8ec07c", + cursor_border = "#8ec07c", + cursor_fg = "#282828", + selection_bg = "#e6d4a3", + selection_fg = "#534a42", + ansi = {"#282828", "#cc241d", "#98971a", "#d79921", "#458588", "#b16286", "#689d6a", "#a89984"}, + brights = {"#928374", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2"}, + + tab_bar = { + background = "#282828", + active_tab = { + bg_color = "#689D6A", + fg_color = "#282828" + }, + inactive_tab = { + bg_color = "#3C3836", + fg_color = "#8ec07c" + }, + + inactive_tab_hover = { + bg_color = "#1d2021", + fg_color = "#8ec07c", + italic = false + } + } + } +} diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs index 7f170c6..9b8c20d 100644 --- a/files/.xmonad/lib/Config.hs +++ b/files/.xmonad/lib/Config.hs @@ -110,7 +110,8 @@ import Data.List (find) myModMask = mod4Mask myLauncher = Rofi.asCommand def ["-show run"] -myTerminal = "alacritty" +--myTerminal = "alacritty" +myTerminal = "wezterm" useSharedWorkspaces = False {-| adds the scripts-directory path to the filename of a script |-} diff --git a/files/nix-stuff/nixpkgs/modules/base.nix b/files/nix-stuff/nixpkgs/modules/base.nix index da206a5..68b90cb 100644 --- a/files/nix-stuff/nixpkgs/modules/base.nix +++ b/files/nix-stuff/nixpkgs/modules/base.nix @@ -34,6 +34,8 @@ in cnix = "cd ~/nixpkgs/ && nvim home.nix && cd -"; cvim = "cd ~/.config/nvim/ && nvim init.vim && cd -"; + ra = "ranger"; + gaa = "git add --all"; gc = "git commit -m "; gp = "git push"; diff --git a/files/nix-stuff/nixpkgs/modules/desktop.nix b/files/nix-stuff/nixpkgs/modules/desktop.nix index 37c3449..cf7b513 100644 --- a/files/nix-stuff/nixpkgs/modules/desktop.nix +++ b/files/nix-stuff/nixpkgs/modules/desktop.nix @@ -19,7 +19,6 @@ in bashtop cool-retro-term gromit-mpx - dragon-drop polybarFull discord pinta diff --git a/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix b/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix index d54b244..14c34b8 100644 --- a/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix +++ b/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix @@ -195,6 +195,7 @@ in { name = "history-substring-search"; src = sources.zsh-history-substring-search; } { name = "zsh-abbr"; src = sources.zsh-abbr; } { name = "fast-syntax-highlighting"; src = sources.fast-syntax-highlighting; } + { name = "wd"; src = sources.wd; } ]; }; }; diff --git a/files/nix-stuff/nixpkgs/modules/term/zsh/nix/sources.json b/files/nix-stuff/nixpkgs/modules/term/zsh/nix/sources.json index ed9d5c5..6f79117 100644 --- a/files/nix-stuff/nixpkgs/modules/term/zsh/nix/sources.json +++ b/files/nix-stuff/nixpkgs/modules/term/zsh/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "http://zdharma.org", "owner": "zdharma", "repo": "fast-syntax-highlighting", - "rev": "865566ce48cfd9bb5cdbaf5b1a74b0a675f4ccd4", - "sha256": "00d6nssh73k26w69fdp8iff1xghyr8ziy5w5a2li0z9lvm6j0nik", + "rev": "a62d721affc771de2c78201d868d80668a84c1e1", + "sha256": "0kwrkxkgsx9cchdrp9jg3p47y6h9w6dgv6zqapzczmx7slgmf4p3", "type": "tarball", - "url": "https://github.com/zdharma/fast-syntax-highlighting/archive/865566ce48cfd9bb5cdbaf5b1a74b0a675f4ccd4.tar.gz", + "url": "https://github.com/zdharma/fast-syntax-highlighting/archive/a62d721affc771de2c78201d868d80668a84c1e1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "fzf-tab": { @@ -17,10 +17,10 @@ "homepage": null, "owner": "Aloxaf", "repo": "fzf-tab", - "rev": "d92299baafdf197c93a88e54f9bbc1c8bb31d427", - "sha256": "046fbhp5777iwl6n901db84bbmxbjgnh5gv9yqy9x15s8ikagzdl", + "rev": "0c36bdcf6a80ec009280897f07f56969f94d377e", + "sha256": "0ymp9ky0jlkx9b63jajvpac5g3ll8snkf8q081g0yw42b9hwpiid", "type": "tarball", - "url": "https://github.com/Aloxaf/fzf-tab/archive/d92299baafdf197c93a88e54f9bbc1c8bb31d427.tar.gz", + "url": "https://github.com/Aloxaf/fzf-tab/archive/0c36bdcf6a80ec009280897f07f56969f94d377e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -29,10 +29,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "f73bf8d584148677b01859677a63191c31911eae", - "sha256": "0jlmrx633jvqrqlyhlzpvdrnim128gc81q5psz2lpp2af8p8q9qs", + "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e", + "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/f73bf8d584148677b01859677a63191c31911eae.tar.gz", + "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -41,10 +41,22 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs-channels", - "rev": "289466dd6a11c65a7de4a954d6ebf66c1ad07652", - "sha256": "0r5ja052s86fr54fm1zlhld3fwawz2w1d1gd6vbvpjrpjfyajibn", + "rev": "75f4ba05c63be3f147bcc2f7bd4ba1f029cedcb1", + "sha256": "157c64220lf825ll4c0cxsdwg7cxqdx4z559fdp7kpz0g6p8fhhr", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/289466dd6a11c65a7de4a954d6ebf66c1ad07652.tar.gz", + "url": "https://github.com/NixOS/nixpkgs-channels/archive/75f4ba05c63be3f147bcc2f7bd4ba1f029cedcb1.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "wd": { + "branch": "master", + "description": ":rocket: Jump to custom directories in zsh", + "homepage": "", + "owner": "mfaerevaag", + "repo": "wd", + "rev": "38afa73ca85a557aef89438ad9fd60b5b41cdbc7", + "sha256": "08y6f6b9231h1nhvc1gamvhrkd00r69m5m2cng991pb8iykmag97", + "type": "tarball", + "url": "https://github.com/mfaerevaag/wd/archive/38afa73ca85a557aef89438ad9fd60b5b41cdbc7.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "zsh-abbr": { @@ -53,10 +65,10 @@ "homepage": "", "owner": "olets", "repo": "zsh-abbr", - "rev": "703ba651e4f9c0ae18402e2462177e6253585386", - "sha256": "0aln7ashadbgharfn4slhimbw624ai82p4yizsxwvz70y4dv0wpg", + "rev": "28e3543cbfbc66e6e569fe2a3f681820d6d73188", + "sha256": "0y1hi20s51fws9m18b3lbpcbja2b39lj729a4kyvipv7irwilhgw", "type": "tarball", - "url": "https://github.com/olets/zsh-abbr/archive/703ba651e4f9c0ae18402e2462177e6253585386.tar.gz", + "url": "https://github.com/olets/zsh-abbr/archive/28e3543cbfbc66e6e569fe2a3f681820d6d73188.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "zsh-abbrev-alias": { @@ -65,10 +77,10 @@ "homepage": "", "owner": "momo-lab", "repo": "zsh-abbrev-alias", - "rev": "ae2997ea7c1519861ff6712b84379b8d03de4f39", - "sha256": "1b5miqli5b5n893k0qd5lxb9w73md4sz1i8g9wzlhyqg4sasxvnx", + "rev": "b9fecabca3798785f262976d5ffb315a134e1344", + "sha256": "0gcc9017yyz0kf7lwqaqgaxw23pl5icwsx44w4fkhx8whqn5yxw1", "type": "tarball", - "url": "https://github.com/momo-lab/zsh-abbrev-alias/archive/ae2997ea7c1519861ff6712b84379b8d03de4f39.tar.gz", + "url": "https://github.com/momo-lab/zsh-abbrev-alias/archive/b9fecabca3798785f262976d5ffb315a134e1344.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "zsh-autosuggestions": {