From b272097422799d89100e6277b8d9f1fa9db54099 Mon Sep 17 00:00:00 2001 From: subcrip Date: Sat, 20 Jul 2024 00:38:37 +0800 Subject: [PATCH] backup --- .tmux.conf | 7 ++- .vimrc | 2 +- contour.yml | 2 +- dotback | 3 ++ home-manager/home.nix | 84 ++++++++++++++++++++++++++++++++ hypr/hyprland.conf | 1 + hypr/hyprpaper.conf | 4 +- nvim/lazy-lock.json | 42 ++++++++-------- nvim/lua/config.lua | 14 ++---- tmux-powerline/themes/default.sh | 4 +- 10 files changed, 125 insertions(+), 38 deletions(-) create mode 100644 home-manager/home.nix diff --git a/.tmux.conf b/.tmux.conf index 8a65218..7878ef0 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,11 +1,14 @@ -set -g default-terminal "xterm-kitty" -set -g terminal-overrides "xterm-kitty" +# Don't set this when not using Kitty, like in Contour Terminal. +# set -g default-terminal "xterm-kitty" +# set -g terminal-overrides "xterm-kitty" + # true colours support # set -ga terminal-overrides ",*256col*:Tc" set -ga terminal-overrides ",xterm-256color:Tc" set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' set-option -g default-shell /home/linuxbrew/.linuxbrew/bin/zsh setw -g mode-keys vi + # underscore colours - needs tmux-3.0 set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' set-option -g status-position top diff --git a/.vimrc b/.vimrc index fad5843..f3787f3 100644 --- a/.vimrc +++ b/.vimrc @@ -4,12 +4,12 @@ set backspace=indent,eol,start set history=50 set ruler set nomodeline +set clipboard=unnamed,unnamedplus syntax on set number set relativenumber set cursorline -set clipboard=unnamed,unnamedplus set expandtab set tabstop=4 set softtabstop=4 diff --git a/contour.yml b/contour.yml index 3a89bf1..cfcd01c 100644 --- a/contour.yml +++ b/contour.yml @@ -721,7 +721,7 @@ profiles: # Defaults to "emoji". emoji: "BerkeleyMono Nerd Font" - draw_bold_text_with_bright_colors: false + draw_bold_text_with_bright_colors: true # Terminal cursor display configuration cursor: diff --git a/dotback b/dotback index 8589a80..92b236a 100755 --- a/dotback +++ b/dotback @@ -17,3 +17,6 @@ cp $HOME/.var/app/org.contourterminal.Contour/config/contour/contour.yml . # Tmux cp $HOME/.tmux.conf . cp $HOME/.config/tmux-powerline . -r + +# Nix +cp $HOME/.config/home-manager . -r diff --git a/home-manager/home.nix b/home-manager/home.nix new file mode 100644 index 0000000..e629f94 --- /dev/null +++ b/home-manager/home.nix @@ -0,0 +1,84 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "user"; + home.homeDirectory = "/home/user"; + + # This value determines the Home Manager release that your configuration is + # compatible with. This helps avoid breakage when a new Home Manager release + # introduces backwards incompatible changes. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "24.05"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + home.packages = [ + pkgs.mtr + pkgs.neovim + pkgs.htop + + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ]; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + # Home Manager can also manage your environment variables through + # 'home.sessionVariables'. These will be explicitly sourced when using a + # shell provided by Home Manager. If you don't want to manage your shell + # through Home Manager then you have to manually source 'hm-session-vars.sh' + # located at either + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/user/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + # EDITOR = "emacs"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + + programs.helix = { + enable = true; + }; + + programs.btop = { + enable = true; + }; +} diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index a7130a7..96653b3 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -230,6 +230,7 @@ bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle bind = $mainMod, M, fullscreen, 1 bind = $mainMod, F, fullscreen, 0 +bind = $mainMod, P, pin # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf index 5d26e19..73fed8d 100644 --- a/hypr/hyprpaper.conf +++ b/hypr/hyprpaper.conf @@ -1,2 +1,2 @@ -preload = /home/user/Pictures/archlinux.jpg -wallpaper = ,/home/user/Pictures/archlinux.jpg +preload = /home/user/Pictures/cheatsheet.png +wallpaper = ,/home/user/Pictures/cheatsheet.png diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index df0dddd..41dd569 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -23,19 +23,19 @@ "eslint.nvim": { "branch": "main", "commit": "158f2289907d377018752fcfe0d61b746dc11767" }, "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "fzf-lua": { "branch": "main", "commit": "975534f4861e2575396716225c1202572645583d" }, + "fzf-lua": { "branch": "main", "commit": "6b5c48fe40695c0b1df61c1bbf7fdcfca04c7e16" }, "git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" }, - "gitsigns.nvim": { "branch": "main", "commit": "7178d1a430dcfff8a4c92d78b9e39e0297a779c0" }, + "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, "goto-preview": { "branch": "main", "commit": "1519ea3512828c944eed5b2bbb66a8f8deb92447" }, "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" }, "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" }, "hlargs.nvim": { "branch": "main", "commit": "cc0d9ee75e5ffba730393049119361b9e3a5b1b6" }, "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "1d451b4c2ce957da05e2123ce1a001804fc7ea96" }, - "lazydev.nvim": { "branch": "main", "commit": "cea5d0fb556cdc35122d9cae772e7e0ed65b4505" }, + "lazy.nvim": { "branch": "main", "commit": "9a374a0fb4d3ac42dac4a129d4bead7252473c77" }, + "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, "leetcode.nvim": { "branch": "master", "commit": "02fb2c855658ad6b60e43671f6b040c812181a1d" }, - "legendary.nvim": { "branch": "master", "commit": "3a7a91ef7b2d95bcda088d7a80c84a0fffa1850c" }, + "legendary.nvim": { "branch": "master", "commit": "0705f207ba79ee3c687fc77c451faeeb4828d5ad" }, "listish.nvim": { "branch": "master", "commit": "3bc4bb02036f3802c6428c6232633d3192ac3604" }, "lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" }, "lspkind.nvim": { "branch": "master", "commit": "67ec67c68f05ca41dab0d426c9e7c94ad86085f9" }, @@ -43,30 +43,30 @@ "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown-toc.nvim": { "branch": "main", "commit": "75eabbdcb921f402b2e5b476e1a797a1004cdeaa" }, "marks.nvim": { "branch": "master", "commit": "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "melange-nvim": { "branch": "master", "commit": "800490ee87ce3e1b4afe751ff81f2864cb01937d" }, "modicator.nvim": { "branch": "main", "commit": "d1d327fd4bdfc3af4cfdf83b85c2eaefa71de7a8" }, - "neogit": { "branch": "master", "commit": "a20031fb5d7d12148764764059243135085e5c9b" }, - "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" }, + "neogit": { "branch": "master", "commit": "af1d8d88f426a4da63c913f3b81a37350dbe8d02" }, + "none-ls.nvim": { "branch": "main", "commit": "4c6605b2ec5dfe4c9694ade0c730c234d1039019" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "08bd34bf0ed79723f62764c7f9ca70516d461d0d" }, + "nvim-lspconfig": { "branch": "master", "commit": "e26da408cf955afa8e9ddbadd510e84ea8976cd7" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-neoclip.lua": { "branch": "main", "commit": "709c97fabec9da7d04f7d2f5e207423af8c02871" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-numbertoggle": { "branch": "main", "commit": "c5827153f8a955886f1b38eaea6998c067d2992f" }, "nvim-origami": { "branch": "main", "commit": "5d6b63bab5406e439937b04fc4ead201ba8dc88f" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "465840f8c14126e5193d777bbff94036eb875bd5" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f56a1430f21334868a86eb980b12e0af55690e98" }, + "nvim-treesitter": { "branch": "master", "commit": "d9ea5035d4138e49ccd08a9480882dcb94ea164d" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "oil.nvim": { "branch": "master", "commit": "10fbfdd37b6904c0776c5db1a27ab47eecba335e" }, + "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" }, "outline.nvim": { "branch": "main", "commit": "2175b6da5b7b5be9de14fd3f54383a17f5e4609c" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "prettier.nvim": { "branch": "main", "commit": "d98e732cb73690b07c00c839c924be1d1d9ac5c2" }, @@ -82,16 +82,16 @@ "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" }, - "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" }, - "trouble.nvim": { "branch": "main", "commit": "4453fea6bb597830fbd58d2c484612f37b97bd8c" }, - "twilight.nvim": { "branch": "main", "commit": "da4fe0a9e1397ecd9b012c52fb34313fbd3b862f" }, + "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, + "trouble.nvim": { "branch": "main", "commit": "ad8ef38666834e9e438f84bd446657445bc2a71e" }, + "twilight.nvim": { "branch": "main", "commit": "38dc017474ef05605ca14a2577e01e09f0db7133" }, "vim-cursorword": { "branch": "master", "commit": "34852083276c1fd9ff4cccaf052111e7d5a2472e" }, - "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, + "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-markdown": { "branch": "master", "commit": "a657e697376909c41475a686eeef7fc7a4972d94" }, "vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" }, "vim-prosession": { "branch": "master", "commit": "4b8323d4e9b74afe9132a34b2d7ea6cfa9461550" }, "vim-visual-multi": { "branch": "master", "commit": "38b0e8d94a5499ccc17d6159763d32c79f53417b" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "vim-wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" }, - "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" } -} \ No newline at end of file + "which-key.nvim": { "branch": "main", "commit": "6e61b0904e9c038b6c511c43591ae2d811b4975e" } +} diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua index 0f38d36..193d80d 100644 --- a/nvim/lua/config.lua +++ b/nvim/lua/config.lua @@ -27,7 +27,7 @@ vim.cmd("set foldexpr=nvim_treesitter#foldexpr()") vim.cmd("set foldlevelstart=99") vim.cmd("set list") vim.cmd("set listchars=trail:█") --- vim.cmd("set guicursor=i:ver25-blinkon500-blinkoff500,a:ver25-iCursor") +vim.cmd("set guicursor=n-v-c:block,i:ver25,a:blinkon0") vim.cmd("set noshowmode") vim.diagnostic.config({ update_in_insert = true, @@ -91,10 +91,6 @@ local plugins = { -- Additional lua configuration, makes nvim stuff amazing! -- 'folke/neodev.nvim', }, - opts = { - inlay_hints = { enabled = true, }, - codelens = { enabled = true, }, - }, config = function(_, servers) for server, opts in pairs(servers) do require('lspconfig')[server].setup(opts) @@ -729,8 +725,8 @@ vim.keymap.set("v", "", ">gv") vim.keymap.set("v", "", "t', 'TodoTelescope') vim.keymap.set('n', 'm', 'Tele marks') -vim.keymap.set('v', "", "dpV`]") -vim.keymap.set('v', "", "dkPV`]") +vim.keymap.set('v', "", "dpV`]", {noremap=true}) +vim.keymap.set('v', "", "dkPV`]", {noremap=true}) vim.keymap.set('n', '', 'Legendary', {noremap=true}) vim.keymap.set({'n', 'v', 'x'}, 'h', 'HopWord') vim.keymap.set('n', 'dd', 'Trouble diagnostics toggle focus=true filter.buf=0'); @@ -742,7 +738,7 @@ vim.keymap.set('n', '', 'Neogit kind=split_above', {noremap=true}) vim.keymap.set({'v', 'x'}, 'cc', 'CodeSnap', {noremap=true}); vim.keymap.set('n', '', 'PopupSaveas', {noremap=true}); vim.keymap.set('n', '', 'Telescope undo', {noremap=true}) -vim.keymap.set('n', '', 'i{A}%li$ik^', {noremap=true}) +vim.keymap.set('i', '', '{A}%li$ik^i', {noremap=true}) vim.keymap.set('n', '', 'd0il', {noremap=true}) vim.keymap.set('i', '', '', {noremap=true}) vim.keymap.set('n', '', 'Telescope help_tags', {noremap=true}) @@ -1132,7 +1128,7 @@ require("telescope").setup { } vim.env.SRC_ENDPOINT = 'https://sourcegraph.com/' -vim.env.SRC_ACCESS_TOKEN = '' -- TODO: fill in the token before using it +vim.env.SRC_ACCESS_TOKEN = 'sgp_a0d7ccb4f752ea73_673739e1b3db9ed9ea88367c11b0e4745a5fa809' require('sg').setup {} diff --git a/tmux-powerline/themes/default.sh b/tmux-powerline/themes/default.sh index e61512b..cf2f2b5 100644 --- a/tmux-powerline/themes/default.sh +++ b/tmux-powerline/themes/default.sh @@ -107,9 +107,9 @@ if [ -z "$TMUX_POWERLINE_LEFT_STATUS_SEGMENTS" ]; then #"mode_indicator 165 0" #"ifstat 30 255" #"ifstat_sys 30 255" - "lan_ip 24 255 ${TMUX_POWERLINE_SEPARATOR_RIGHT_THIN}" + "lan_ip 24 255" #"vpn 24 255 ${TMUX_POWERLINE_SEPARATOR_RIGHT_THIN}" - "wan_ip 24 255" + # "wan_ip 24 255" "vcs_branch 29 88" #"vcs_compare 60 255" #"vcs_staged 64 255"