From ea0c73a9bad27262518d08139f312fc750c7167a Mon Sep 17 00:00:00 2001 From: pryazha Date: Sun, 12 Oct 2025 15:22:37 +0500 Subject: using xterm with Xresources now, also trying to immplement mklinks --- .config/.Xresources | 8 ++++++ .config/.bashrc | 18 ------------- .config/.emacs | 25 +++++++++++++----- .config/.profile | 11 ++++++++ .config/.runit/init.sh | 9 +++++++ .config/.tmux.conf | 4 +-- .config/alacritty/alacritty.toml | 56 +++++++++++++++++++++++++++++----------- .config/nvim/init.lua | 3 ++- .config/nvim/lua/keymaps.lua | 4 +-- .config/nvim/lua/options.lua | 27 +++++++++---------- .config/nvim/lua/plugins.lua | 2 -- .config/xorg.conf | 6 ++--- 12 files changed, 110 insertions(+), 63 deletions(-) create mode 100644 .config/.profile create mode 100755 .config/.runit/init.sh (limited to '.config') diff --git a/.config/.Xresources b/.config/.Xresources index e69de29..d60def1 100644 --- a/.config/.Xresources +++ b/.config/.Xresources @@ -0,0 +1,8 @@ +Xft.dpi: 96 +Xcursor.theme: miku-cursor-linux + +xterm*background: black +xterm*foreground: white +xterm*faceName: Iosevka +xterm*faceSize: 18 +# xterm*font: -*-fixed-*-*-*-*-18-*-*-*-*-*-*-* diff --git a/.config/.bashrc b/.config/.bashrc index 1105efe..d2672dc 100644 --- a/.config/.bashrc +++ b/.config/.bashrc @@ -1,20 +1,2 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return - -PS1="\w > " -PS2=">> " - -PATH="${HOME}/clone/dotfiles/scripts:${PATH}" -PATH="${HOME}/.local/bin:${PATH}" - -EDITOR='vim' -LOGDIR='~/log' - -alias log="${EDITOR} ${LOGDIR}/`date +%d_%m_%Y`" -alias ls="ls --color" - -if command -v startx >/dev/null 2>&1 ; then - if [[ -z $DISPLAY ]] && [[ $(tty) = "/dev/tty1" ]]; then - exec startx &> /dev/null - fi -fi diff --git a/.config/.emacs b/.config/.emacs index 9e9164c..407eb53 100644 --- a/.config/.emacs +++ b/.config/.emacs @@ -5,8 +5,13 @@ ;; functional (set-default 'ring-bell-function 'ignore) -(setq c-basic-offset 8) -(setq indent-line-function 'insert-tab) +;; (setq c-basic-offset 8) +;; (setq indent-line-function 'insert-tab) + +(defun hook-c () + (setq c-set-style "k&r") + (setq indent-tabs-mode nil)) +(add-hook 'c-mode-common-hook 'hook-c) ;; keybinds (keymap-global-set "C-c c" 'compile) @@ -14,11 +19,17 @@ ;; visual (setq inhibit-startup-screen t) (set-default 'truncate-lines t) -(add-to-list 'default-frame-alist '(font . "FantasqueSansM Nerd Font-16")) -(add-to-list 'custom-theme-load-path "~/.emacs.d/themes") -(load-theme 'kanagawa t) - +(add-to-list 'default-frame-alist '(font . "Iosevka-16")) +(load-theme 'wombat t) (custom-set-variables - '(package-selected-packages '(autothemer))) + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(package-selected-packages '(rfc-mode))) (custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. ) diff --git a/.config/.profile b/.config/.profile new file mode 100644 index 0000000..fc7d58f --- /dev/null +++ b/.config/.profile @@ -0,0 +1,11 @@ +PS1="$ " +PS2="$$ " + +PATH="$HOME/clone/dotfiles/scripts:$PATH" +PATH="$HOME/.local/bin:$PATH" + +EDITOR='vi' +LOGDIR='~/log' + +PLAN9=/home/pryazha/clone/plan9port export PLAN9 +PATH=$PATH:$PLAN9/bin export PATH diff --git a/.config/.runit/init.sh b/.config/.runit/init.sh new file mode 100755 index 0000000..5b7f97a --- /dev/null +++ b/.config/.runit/init.sh @@ -0,0 +1,9 @@ +#!/bin/sh +dir=$(dirname $0) +mkdir -p ~/.runit +cp -r $dir/sv ~/.runit +mkdir -p ~/.runit/runsvdir +ln -s ~/.runit/sv/pipewire ~/.runit/runsvdir +ln -s ~/.runit/sv/wireplumber ~/.runit/runsvdir +ln -s ~/.runit/sv/pipewire-pulse ~/.runit/runsvdir +ln -s ~/.runit/sv/mpd ~/.runit/runsvdir diff --git a/.config/.tmux.conf b/.config/.tmux.conf index 12fb1b5..3c53d59 100644 --- a/.config/.tmux.conf +++ b/.config/.tmux.conf @@ -1,3 +1,3 @@ -set-option -g prefix M-a +set-option -g prefix C-t unbind-key C-b -bind-key M-a send-prefix +bind-key C-t send-prefix diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 821274d..57db335 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -2,29 +2,55 @@ padding = { x = 4, y = 4 } [font] -normal = { family = "Iosevka", style = "Regular" } +normal = { family = "FantasqueSansM Nerd Font", style = "Regular" } size = 15 +# [colors.primary] +# background = '#242829' +# foreground = '#dcd7d7' + +# [colors.normal] +# black = '#242829' +# red = '#e6507a' +# green = '#439085' +# yellow = '#2e89a5' +# blue = '#84b8a9' +# magenta = '#e18d8e' +# cyan = '#5cadc6' +# white = '#dcd7d7' + +# [colors.bright] +# black = '#242829' +# red = '#e6507a' +# green = '#439085' +# yellow = '#2e89a5' +# blue = '#84b8a9' +# magenta = '#e18d8e' +# cyan = '#5cadc6' +# white = '#dcd7d7' +# Colors (Kanagawa Wave) +# Source https//github.com/rebelot/kanagawa.nvim + [colors.primary] background = '#242829' foreground = '#dcd7d7' [colors.normal] black = '#242829' -red = '#e6507a' -green = '#439085' -yellow = '#2e89a5' -blue = '#84b8a9' -magenta = '#e18d8e' -cyan = '#5cadc6' -white = '#dcd7d7' +red = '#df2683' +green = '#13868c' +yellow = '#fcfcdf' +blue = '#1a86b9' +magenta = '#bc7fd2' +cyan = '#7cc7d6' +white = '#4a4b4b' [colors.bright] -black = '#242829' -red = '#e6507a' -green = '#439085' -yellow = '#2e89a5' -blue = '#84b8a9' -magenta = '#e18d8e' -cyan = '#5cadc6' +black = '#7b8b99' +red = '#df2683' +green = '#13868c' +yellow = '#fcfcdf' +blue = '#1a86b9' +magenta = '#bc7fd2' +cyan = '#7cc7d6' white = '#dcd7d7' diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 2fdc380..7f7daa9 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,2 +1,3 @@ -require("plugins") +require("options") +-- require("plugins") require("keymaps") diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua index e488e46..dbcef69 100644 --- a/.config/nvim/lua/keymaps.lua +++ b/.config/nvim/lua/keymaps.lua @@ -1,3 +1,3 @@ --- bindings -vim.keymap.set("n", "", ":make!:copen") +vim.keymap.set("n", "", ":make") -- :copen") +vim.keymap.set("n", "", ":cnext") vim.keymap.set("n", "", ":grep!-rn.''") diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index d27f9c9..867fc87 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -1,15 +1,13 @@ -- visual vim.opt.termguicolors = true vim.cmd("syntax on") --- vim.cmd("colorscheme desert") local palette = { - black = "#242829", - white = "#dcd7d7", - magenta = "#e18d8e", - cyan = "#5cadc6", - blue = "#84b8a9", - red = "#e6507a", - yellow = "#2e89a5", + black = "#242829", white = "#dcd7d7", + magenta = "#e18d8e", + cyan = "#5cadc6", + blue = "#84b8a9", + red = "#e6507a", + yellow = "#2e89a5", } vim.cmd("colorscheme quiet") vim.cmd("hi normal guifg=" .. palette.white .. " guibg=" .. palette.black) @@ -31,14 +29,17 @@ vim.cmd("hi error guifg=" .. palette.black .. "guibg=" .. palette.red) vim.g.netrw_banner = false -- formatting --- vim.opt.shiftwidth = 4 --- vim.opt.expandtab = true +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.expandtab = true vim.opt.textwidth = 80 -vim.opt.wrap = false vim.opt.cindent = true +vim.opt.filetype = "c" +vim.opt.wrap = false vim.opt.cinoptions = ":0,l1,t0,g0,(0" +vim.opt.hlsearch = false -- functional vim.opt.clipboard:append { "unnamedplus" } -vim.opt.hlsearch = false -vim.opt.makeprg = "./build.sh" +vim.opt.makeprg = "./b" diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 79b5dec..5db9c4c 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -15,8 +15,6 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -require("options") - -- setup lazy.nvim require("lazy").setup({ { "ibhagwan/fzf-lua" } diff --git a/.config/xorg.conf b/.config/xorg.conf index 00290e2..b481da8 100644 --- a/.config/xorg.conf +++ b/.config/xorg.conf @@ -9,13 +9,13 @@ EndSection Section "InputClass" Identifier "libinput pointer catchall" MatchIsPointer "true" - Driver "libinput" - Option "AccelProfile" "flat" + Driver "libinput" + Option "AccelProfile" "flat" EndSection Section "Monitor" Identifier "eDP" - Option "Primary" "true" + Option "Primary" "true" EndSection Section "Monitor" -- cgit v1.2.3-70-g09d2