From e099d8e62deb3e84cb022446c47495608fa2f951 Mon Sep 17 00:00:00 2001 From: arielherself Date: Sat, 3 Aug 2024 18:19:28 +0800 Subject: [PATCH] backup --- .profile | 2 ++ .tmux.conf | 2 +- awesome.rc.lua | 6 +++++- contour.yml | 6 +++--- dotback | 3 +++ home-manager/home.nix | 24 +++++++++++++++++++++++- nixos/configuration.nix | 7 ++++++- nvim/lazy-lock.json | 18 +++++++++--------- 8 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 .profile diff --git a/.profile b/.profile new file mode 100644 index 0000000..c3b9c62 --- /dev/null +++ b/.profile @@ -0,0 +1,2 @@ +export GTK_THEME=Adwaita:dark +export MOZ_USE_XINPUT2=1 diff --git a/.tmux.conf b/.tmux.conf index 5b65a64..f33c5b1 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -10,7 +10,7 @@ set-option -g default-shell "/home/user/.nix-profile/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 -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' set-option -g status-position top # List of plugins diff --git a/awesome.rc.lua b/awesome.rc.lua index 085cb13..7cfabc0 100644 --- a/awesome.rc.lua +++ b/awesome.rc.lua @@ -217,7 +217,7 @@ awful.screen.connect_for_each_screen(function(s) s.mytasklist, -- Middle widget { -- Right widgets layout = wibox.layout.fixed.horizontal, - mykeyboardlayout, + -- mykeyboardlayout, wibox.widget.systray(), mylock, mytextclock, @@ -600,3 +600,7 @@ for line in xinput:lines() do end end xinput:close() + +-- Disable screensaver +os.execute("xset s off") +os.execute("xset -dpms") diff --git a/contour.yml b/contour.yml index 4b5c915..a82bc0c 100644 --- a/contour.yml +++ b/contour.yml @@ -712,9 +712,9 @@ profiles: # Default: [] features: [] - #bold: "Hack" - #italic: "Hack" - #bold_italic: "Hack" + # bold: "BerkeleyMono Nerd Font Bold" + # italic: "BerkeleyMono Nerd Font Italic" + # bold_italic: "BerkeleyMono Nerd Font Bold Italic" # This is a special font to be used for displaying unicode symbols # that are to be rendered in emoji presentation. diff --git a/dotback b/dotback index 3c95f4c..3f77419 100755 --- a/dotback +++ b/dotback @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# Environment variables +cp $HOME/.profile . + # Neovim # cp $HOME/.vimrc . cp $HOME/.config/nvim . -r diff --git a/home-manager/home.nix b/home-manager/home.nix index 23f8784..b7c783c 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -24,6 +24,13 @@ in { terminal = false; categories = [ "AudioVideo" "Audio" ]; }; + thorium = { + name = "Thorium"; + genericName = "Web Browser"; + type = "Application"; + exec = "${pkgs.appimage-run}/bin/appimage-run ${config.home.homeDirectory}/Dropbox/arch/thorium/Thorium.AppImage"; + terminal = false; + }; }; # This value determines the Home Manager release that your configuration is @@ -45,21 +52,29 @@ in { pkgs.alacritty # Networking + pkgs.wireshark # pkgs.clash-verge-rev # Editor unstable.neovim + pkgs.fzf + pkgs.ripgrep + pkgs.clang-tools pkgs.lua-language-server pkgs.cmake-language-server pkgs.nil # Nix language server pkgs.nodePackages.prettier + unstable.markdown-oxide pkgs.helix pkgs.zed-editor # Tools + pkgs.zip + pkgs.unzip pkgs.pkg-config pkgs.appimage-run pkgs.gnumake + pkgs.go pkgs.gcc pkgs.autoconf pkgs.automake @@ -81,7 +96,7 @@ in { (pkgs.python312.withPackages (ps: with ps; [ ])) pkgs.pyright - pkgs.pipx + # pkgs.pipx # Node pkgs.nodejs_22 @@ -96,10 +111,15 @@ in { pkgs.i3lock pkgs.flameshot + # Note + pkgs.obsidian + pkgs.xournalpp + # Multimedia pkgs.kdePackages.gwenview pkgs.vlc pkgs.playerctl + pkgs.ffmpeg # Streaming pkgs.obs-studio @@ -123,6 +143,8 @@ in { unstable.adwaita-icon-theme pkgs.adwaita-qt pkgs.adwaita-qt6 + pkgs.firefox-devedition + pkgs.sioyek # My version of BerkeleyMono NF is incomplete. Should add some fallback fonts. (pkgs.nerdfonts.override { fonts = [ diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c3f6bf5..62a6c7b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -84,6 +84,7 @@ in { ]; }; }; + services.logind.extraConfig = "IdleAction=ignore"; services.displayManager = { sddm.enable = true; defaultSession = "none+awesome"; @@ -160,7 +161,7 @@ in { # Define a user account. Don't forget to set a password with ‘passwd’. users.users.user = { isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" "wireshark" ]; # Enable ‘sudo’ for the user. packages = with pkgs; [ home-manager contour @@ -179,6 +180,7 @@ in { # clash-verge-rev bind pciutils + iptables ]; # Some programs need SUID wrappers, can be configured further or are @@ -196,6 +198,9 @@ in { tunMode = true; }; + # Wireshark + programs.wireshark.enable = true; + # List services that you want to enable: # Enable the OpenSSH daemon. diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 420b5ea..ea5bfb6 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -17,13 +17,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codesnap.nvim": { "branch": "main", "commit": "06d8e345e7be43a5b2bd67a86a3993da91c59781" }, + "codesnap.nvim": { "branch": "main", "commit": "c2924bf6c9a2c2c03318fae9b7fe0706412b9d9c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, "eslint.nvim": { "branch": "main", "commit": "158f2289907d377018752fcfe0d61b746dc11767" }, "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "fzf-lua": { "branch": "main", "commit": "769b6636af07ea4587e6c06067d8fe9fb0629390" }, + "fzf-lua": { "branch": "main", "commit": "c7288e60b8dde218f3d3b5b16e1baf32ada20ef3" }, "git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" }, "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" }, "goto-preview": { "branch": "main", "commit": "1519ea3512828c944eed5b2bbb66a8f8deb92447" }, @@ -46,32 +46,32 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "melange-nvim": { "branch": "master", "commit": "800490ee87ce3e1b4afe751ff81f2864cb01937d" }, - "mini.nvim": { "branch": "main", "commit": "e24ec1fcf885990fec1a993fe8304a033fd1806d" }, + "mini.nvim": { "branch": "main", "commit": "691c5f38f575b572d0c857bd22c35be9a1512925" }, "modicator.nvim": { "branch": "main", "commit": "d1d327fd4bdfc3af4cfdf83b85c2eaefa71de7a8" }, "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, - "none-ls.nvim": { "branch": "main", "commit": "a8594ef3dabb484adabc0ebbf5800be1b807c9e7" }, + "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, - "nvim-lspconfig": { "branch": "master", "commit": "f95d371c1a274f60392edfd8ea5121b42dca736e" }, + "nvim-lspconfig": { "branch": "master", "commit": "fdc44768a09a65140aa00c92872a5381ad486485" }, "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": "2b4881286ad73c9ece7e5e4da130b2e4726c09fc" }, + "nvim-treesitter": { "branch": "master", "commit": "65310b64eee19a6e74e1b6f607a9f46f751290fe" }, "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": "a2af6aa13a2ad3ad361d562a319a91bcd68c43a4" }, - "oil.nvim": { "branch": "master", "commit": "71c972fbd218723a3c15afcb70421f67340f5a6d" }, + "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, + "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, "outline.nvim": { "branch": "main", "commit": "2175b6da5b7b5be9de14fd3f54383a17f5e4609c" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "prettier.nvim": { "branch": "main", "commit": "d98e732cb73690b07c00c839c924be1d1d9ac5c2" }, - "render-markdown": { "branch": "main", "commit": "b75f681d675e21b5a09909997e9fffa6313c946e" }, + "render-markdown": { "branch": "main", "commit": "4d046cdf65393a62c0eb209e01574b39f28bc01b" }, "search.nvim": { "branch": "main", "commit": "27191f6c10a13c8018136b2490342d35960ed0ab" }, "sg.nvim": { "branch": "master", "commit": "8bdd4d19da2268072708d5fe18fda9c23e16509d" }, "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" },