diff --git a/config/eww/eww.scss b/config/eww/eww.scss index bca062e..3975a93 100644 --- a/config/eww/eww.scss +++ b/config/eww/eww.scss @@ -5,13 +5,13 @@ border-radius: 10px; } -$bg: #191724; -$bg1: #1f1d2e; +$bg: #111111; +$bg1: #111111; $bg2: #26233a; -$fg: #e0def4; +$fg: #ebbcba; $fgdim: #6e6a86; $accent: #9ccfd8; -$border: #26233a; +$border: #ebbcba; .container { background-color: $bg1; @@ -19,7 +19,7 @@ $border: #26233a; color: $fg; border-radius: 10px; padding: 6px; - opacity: 0.7; + opacity: 0.9; } .button-label, .label { diff --git a/config/eww/eww.yuck b/config/eww/eww.yuck index 902e809..1ab7c4e 100644 --- a/config/eww/eww.yuck +++ b/config/eww/eww.yuck @@ -40,7 +40,7 @@ :y "30px" :width "70px" :height "70px" - :anchor "bottom left") + :anchor "bottom right") (gif1)) (defwindow gif2 @@ -53,6 +53,6 @@ :y "250px" :width "70px" :height "70px" - :anchor "bottom left") + :anchor "bottom right") (gif2)) diff --git a/config/foot/foot.ini b/config/foot/foot.ini index 93a2217..875ed93 120000 --- a/config/foot/foot.ini +++ b/config/foot/foot.ini @@ -1 +1 @@ -/nix/store/lwg9ayd158y7g0z9q4p51nkykn4kcz9w-home-manager-files/.config/foot/foot.ini \ No newline at end of file +/nix/store/ya9248ng717qf0ncbn6sbs9bai66g5xn-home-manager-files/.config/foot/foot.ini \ No newline at end of file diff --git a/config/mako/config b/config/mako/config index 4ab1d0a..dc922a1 100644 --- a/config/mako/config +++ b/config/mako/config @@ -1,12 +1,13 @@ default-timeout=5000 ignore-timeout=1 -background-color=#282828 -text-color=#ebdbb2 -border-color=#3c3836 -progress-color=over #3c3836 +background-color=#0f0f0f +text-color=#ffffff +border-color=#ebbcba +progress-color=over #2a2a2a border-radius=8 [urgency=low] -border-color=#458588 +border-color=#ebbcba [urgency=high] -border-color=#fb4934 +border-color=#ebbcba + diff --git a/config/niri/config.kdl b/config/niri/config.kdl index 0e86fdd..56782dd 100644 --- a/config/niri/config.kdl +++ b/config/niri/config.kdl @@ -42,7 +42,7 @@ output "eDP-1" { } layout { - gaps 13 + gaps 5 center-focused-column "never" preset-column-widths { @@ -56,12 +56,13 @@ layout { } focus-ring { - width 4 - active-color "#2a273f" + width 2.5 + active-color "#211e1e" inactive-color "#191724" } border { + off width 4 active-color "#191724" inactive-color "#191724" diff --git a/config/nushell/config.nu b/config/nushell/config.nu index 7bf78b8..1658d14 100644 --- a/config/nushell/config.nu +++ b/config/nushell/config.nu @@ -41,20 +41,19 @@ alias hotp = htop alias c = clear alias dir = tree -idA -let bg0 = "#191724" -let bg1 = "#1e1e2e" -let bg2 = "#26233a" -let bg3 = "#2a2736" +let bg0 = "#0f0f0f" +let bg1 = "#1a1a1a" +let bg2 = "#2a2a2a" +let bg3 = "#3a3a3a" let fg0 = "#e0def4" -let fg1 = "#dcd7ba" -let fg2 = "#c4a7e7" +let fg1 = "#ebbcba" let red = "#eb6f92" -let green = "#9ccfd8" -let yellow = "#f6c177" -let blue = "#31748f" -let purple = "#c4a7e7" -let aqua = "#9ccfd8" -let orange = "#f6c177" +let green = "#eb6f92" +let yellow = "#ea9a97" +let blue = "#d7827e" +let purple = "#ea9a97" +let aqua = "#ebbcba" +let orange = "#ea9a97" let gray = "#6e6a86" let dark = { @@ -97,3 +96,4 @@ $env.config.color_config = $dark $env.config.use_ansi_coloring = true source ~/.config/nushell/starship.nu + diff --git a/config/nushell/history.txt b/config/nushell/history.txt index 70411d8..0ca2cdb 100644 --- a/config/nushell/history.txt +++ b/config/nushell/history.txt @@ -2613,3 +2613,474 @@ vim lua/config.lua cd lua/plugins/rosepine/ vim init.lua cd ~/.local/src +git add -A +git commit +qr +cd +ls +./qrgen +vim qrgen +./qrgen +rm qrgen +pip uninstall qrcode[PIL] +pip uninstall qrcode[PIL] --break-system-packages +cd .local/src/ +git commit +rm -rf nixos +cp -r /etc/nixos . +git commit +git push coasteen master +jaba +java +nix-search openjdk +sudo vim /etc/nixos/home-configuration/configuration.nix +lldb +gdb +plugin use +help plugin +plugin list +plugin search +cd .config/mako +ls +cat config +cat config | wl-copy +vim config +pkill mako +mako & disown +sh -c "mako &disown" +notify-send hi +cd .config/eww +vim eww.yuck +ld +ls +vim eww.scss +sudo vim /etc/resolv.conf +man unistd +man uni_ +man unistdERR +unistd +ssh user@185.83.29.87 +sd nixos-rebuild switch +ssh -p 2222 user@185.83.29.87 +ssh user@185.83.29.87 +ssh user@192.168.1.128 +sd nixos-rebuild switch +nix-search openjre +sudo vim /etc/nixos/home-configuration/configuration.nix +sudo nixos-rebuild switch +nix-search jre +sudo vim /etc/nixos/home-configuration/configuration.nix +nix-search jre +sudo nixos-rebuild switch +cd .config/niri +nix-search oraclejre +nix search oraclejre +nix search nixpkgs#oraclejre +nix search nixpkgs# +nix search nixpkgs. +nix search nixpkgs.oraclejre +nix search +vim config.kdl +sudo vim /etc/nixos/home-configuration/configuration.nix +sudo nixos-rebuild switch +nix-search openjre +sudo nixos-rebuild switch +ls +cd Downloads/ +ls +java -jar Unciv.jar +sudo vim /etc/nixos/home-configuration/configuration.nix +~/.local/share/PrismLauncher/java/java-runtime-delta/bin/java -jar Unciv.jar +nvidia-smi +cd Downloads/ +nix-shell -p mesa.dev libGL +nix-shell -p mesa mesa_libGL glfw jre17 +nix-shell -p mesalibGL glfw +nix-shell -p mesa libGL glfw +nix-search unciv +sudo vim /etc/nixos/home-configuration/configuration.nix +cd Downloads/ +sd nixos-rebuild switch +cd Downloads/ +java -jar Unciv.jar +java +clear +man java +java +java version +java --version +javac +ls /nix/store | grep unciv +cd /nix/store/694g7f39gxbacv9198l5a7bjy09smrvj-unciv-4.16.5 +ls +cd bin +ls +./unciv +which unciv +cd /etc/profiles/per-user/coast/bin/ +readlink unciv +cd /nix/store/z5c7drwpbznrl366dqmfc3zd8clclj59-home-manager-path/bin/unciv +cd /nix/store/z5c7drwpbznrl366dqmfc3zd8clclj59-home-manager-path/bin/ +ls +readlink unciv +cd /nix/store/694g7f39gxbacv9198l5a7bjy09smrvj-unciv-4.16.5/bin/ +ls +./unciv +unciv +pkill veskt +tray +try +cd .config/ +cd waybar +vim config.jsonc +clear +ping google.com +int main() +#include +int main(){<\n>printf("Hi\n");<\n>return 0;<\n>}<\n>} +cd .config/rofi +vim gruvbox.rasi +sd vim /etc/nixos/home-configuration/configuration.nix +sudo nixos-rebuild switch +ping +rm Downloads/gruvbox-dark.qbtheme +cd .config/waybar +vim style.css +ls +clear +ls +cd .config/eww +swww img Wallpapers/rosepine1.png +vim eww.scss +ls +clear +cd ../waybar +ls +vim style.css +cd ../niri +vim config.kdl +cd .. +ls +clear +ls +clear +cd waybar +waybar +vim style.css +cd ../nvim +ls +cd lua +ls +cd plugins/rosepine/ +ls +vim init.lua +cd .config/waybar +vim style.css +ls +vim config.jsonc +ls +vim init.lua +vim ../lazy/plugins.lua +clear +ls +clear +exit +vim init.lua +clear +cd .config/nvim +vim init.lua +cd lua/plugins/ +mv rosepine/ pinkfly +ls +cd pinkfly/ +ls +sudo vim /etc/nixos/home-configuration/apps/foot.nix +sudo nixos-rebuild switch +pkill foot +cd .config/ +ls +cat starship.toml |wl-copy +vim starship.toml +clear +ls +clear +ls +clear +cd .config/nushell +cat config.nu | wl-copy +cd .config/nushell +ls +clear +vim config.nu +cd .config/nushell +vim config.nu +ls +clear +cd .config/waybar +vim config.jsonc +vim style.css +cmatrix -Cowouegbiwg +cmatrix -C magenta +cd .config/mako +cat config | wl-copy +pkillmako +pkill mako +mako & disown +sh -c "mako &disown" +notify-send hi +pkill mako +sh -c "mako &disown" +notify-send hi +pkill mako +notify-send hi +vim config +cd .config/waybar +vim config.jsonc +vim style.css +cd +cd .local +mkdir git +cd git +git clone https://github.com/diinki/diinki-retrofuture.git --depth1 +git clone https://github.com/diinki/diinki-retrofuture.git --depth=1 +ls +cd diinki-retrofuture/ +ls +cd gtk_theme/ +ls +cp diinki-retro-dark/ ~/.themes +cp diinki-retro-dark/ ~/.themes -r +llsblk +lsblk +sudo fdisk /dev/sda +lsblk +sudo mkfs.vfat /dev/sda1 +lsblk +sudo mount /dev/sda1 /mnt --mkdir +cd 'Downloads/Young.Sheldon.S07.1080p.x265-ELiTE[EZTVx.to]/' +ls +sudo cp *mkv /mnt +sudo mount /mnt +sudo mount /mnt/ +lsblk +sudo parted /dev/sda --mklabel msdos +cd Downloads/ +rm Unciv.jar +ls +cd .themes/diinki-retro-dark/ +ls +cp -r gtk-4.0/ +cp -r gtk-4.0/ ~/.config/ +rm -rf ~/.config/gtk-4.0/ +cp -r gtk-4.0/ ~/.config/ +cd .themes/diinki-retro-dark/ +ls +cp gtk-3* -r ~/.config/ +cp gtk-2* -r ~/.config/ +cd .config/rofi +cat gruvbox.rasi | wl-copy +vim gruvbox.rasi +cd .config/rofi +vim gruvbox.rasi +lsblk +s +ls +clear +ls SaveFiles/ +rm -rf SaveFiles/ +ls +cd 'Downloads/Young.Sheldon.S07.1080p.x265-ELiTE[EZTVx.to]/' +ls +mpv "Young.Sheldon.S07E01.1080p.x265-ELiTE[EZTVx.to].mkv" +mpv --playlist. +sudo vim /etc/nixos/home-configuration/apps/foot.nix +sudo vim /etc/nixos/home-configuration/configuration.nix +sudo nixos-rebuild switch +cd .config/waybar +vim style.css +clear +cd +cmatrix -C magenta +cd 'Music/Albums/Mezmerize [E]/' +ls +cd 'Music/Albums/Mezmerize [E]/' +sh -c "mpv cover.jpg &disown" +mpv --playlist=. +cd 'Downloads/Young.Sheldon.S07.1080p.x265-ELiTE[EZTVx.to]/' +cd .config/mako +notify-send hi +pkill mako +notify-send hi +vim config +htop +cd .config/eww +vim eww.scss +vim eww.yuck +cd .config/niri +vim config.kdl +cd .config/mako +vim config +pkill mako +notify-send hi +date +date h +date humanize +date | date humanize +date +date now +date +date to-timezone +date to-timezone GMT+3 +date to-timezone GMT+3:30 +date now | date to-timezone GMT+3:30 +date now | date to-timezone GMT+3 +date now | date to-timezone +0330 +date +date --help +command date +uname +cd .config/waybar +vim config.jsonc +/dev/stdout +cat /dev/stdout +vim main.c +./main +ls +clang main.c -o main +./main +vim main.c +./main +vim main.py +ls +rm main +rm main.c +cmatrix -C magenta +clear +lsblk +sudo mount /dev/sda /mnt +cd /mnt +ls +ls -la +mpv "?? ??? ???? 11.mp4" +cd +sudo umount /dev/sda +lsblk +cd Downloads/ +ls +mkdir Movies +mv 'Young.Sheldon.S07.1080p.x265-ELiTE[EZTVx.to]/' Movies/ +ls Movies +ls 'Movies/Young.Sheldon.S07.1080p.x265-ELiTE[EZTVx.to]/' +celar +clear +ls +mv Georgie.and.Mandys.First.Marriage.S01.1080p.x265-ELiTE/ Movies +cd Movies/ +ls +alsmaixer +rsync Georgie.and.Mandys.First.Marriage.S01.1080p.x265-ELiTE/ -avz user@192.168.1.128:/home/user/media/Movies/ +lsblk +sudo mount /dev/sda1 /mnt +cd /mnt +ls +sudo rm * +ls +sudo cp ~/Downloads/Movies/Georgie.and.Mandys.First.Marriage.S01.1080p.x265-ELiTE/ -r . +ls +cd +sudo umount /dev/sda1 +lsblkk +lsblk +ssh user@192.168.1.128 +mpv --playlist=. +cd +echo $env.PWD +bash +pwd +clear +ls +cd Downloads/Movies/Georgie.and.Mandys.First.Marriage.S01.1080p.x265-ELiTE/ +ls +vim main.c +niri msg --json outputs +jq +sudo vim /etc/nixos/home-configuration/configuration.nix +sd nixos-rebuild switch +cd .local/bin +vim toggle-screens.sh +./toggle-screens.sh +ls +cat toggle-screens.sh +niri msg --json outputs | jq +mpv --playlist=. +vim main.c +clang main.c -o main +./main +vim main.c +clang main.c -o main +./main +rm main +rm main.c +ssh user@192.168.1.128 +rsync -avz .config/nvim user@192.168.1.128:/home/user/.config +cd .local/src/config/ +rsync -avz nvim user@192.168.1.128:/home/user/ +mpv --playlist=. +sudo vim /etc/nixos/home-configuration/configuration.nix +sudo nixos-rebuild switch +cd .config/ +mkdir tmux +cd tmux +clear +ls +tmux +tmux source-file .config/tmux/tmux.conf +tmux +tmux source-file .config/tmux/tmux.conf +vim tmux.conf +cd +cd .config/nvim/lua/plugins/lualine +ls +vim init.lua +clear +cd .config/tmux +vim tmux.conf +clear +cd +nvim +vim +vim main.c +clang main.c -o main +./main +rm main +rm main.c +tmux +nu +config nu +sudo vim /etc/nixos/home-configuration/apps/foot.nix +sudo nixos-rebuild switch +foot -s +pkill foot +sudo vim /etc/nixos/home-configuration/apps/foot.nix +cd .config/tmux +vim tmux.conf +cp -r ../tmux/ ~/.local/src/config/ +cd .. +rm -rf tmux +sudo vim /etc/nixos/home-configuration/configuration.nix +sudo nixos-rebuild switch +cd .config/nushell +ls +cd ../tmux +ls +vim tmux.conf +ls -l tmux +ls -l +env ls -l tmux +ls -l /nix/store/ya9248ng717qf0ncbn6sbs9bai66g5xn-home-manager-files/.config/tmux +env ls -l /nix/store/ya9248ng717qf0ncbn6sbs9bai66g5xn-home-manager-files/.config/tmux +env ls -l /nix/store/k96gmsxxhp5mn2sfcza1kpbvh2d2sl7h-hm_tmux +cd +cd .local/src/config/tmux +ls +cd .. diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 8c39949..3fd75f6 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -7,5 +7,5 @@ require("config") require("plugins/render-markdown") --require("status_line").setup() require("plugins/lualine") -require("plugins/rosepine") +require("plugins/pinkfly") require("colorizer").setup() -- #ffffff #edb511 diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index fe22ac5..34de4af 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,5 +1,4 @@ { - "barbar.nvim": { "branch": "master", "commit": "fb4369940a07dda35fa4d7f54cf4a36aa00440e6" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, @@ -9,12 +8,12 @@ "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "comfy-line-numbers.nvim": { "branch": "main", "commit": "31e2f9287b4491ad72defb9e0185eb2739983799" }, "fterm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" }, - "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" }, "lsp_signature.nvim": { "branch": "master", "commit": "d50e40b3bf9324128e71b0b7e589765ce89466d2" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, "mini.nvim": { "branch": "main", "commit": "429e5f9dc9cd59bf76cd98b687300f0a384a7f52" }, + "moonfly": { "branch": "master", "commit": "ef85b89739bee184e204c89bc06280d62bd84039" }, "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" }, "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, diff --git a/config/nvim/lua/plugins/lazy/plugins.lua b/config/nvim/lua/plugins/lazy/plugins.lua index 1e39315..9769ea9 100644 --- a/config/nvim/lua/plugins/lazy/plugins.lua +++ b/config/nvim/lua/plugins/lazy/plugins.lua @@ -106,17 +106,6 @@ return { }, }, }, - { - "romgrk/barbar.nvim", - dependencies = { - "lewis6991/gitsigns.nvim", - "nvim-tree/nvim-web-devicons", - }, - init = function() - vim.g.barbar_auto_setup = false - end, - opts = {}, - }, "nguyenvukhang/nvim-toggler", "alvan/vim-closetag", "norcalli/nvim-colorizer.lua", @@ -128,5 +117,11 @@ return { width = 0.9, }, }, + { + "bluz71/vim-moonfly-colors", + name = "moonfly", + lazy = false, + priority = 1000, + }, }, } diff --git a/config/nvim/lua/plugins/pinkfly/init.lua b/config/nvim/lua/plugins/pinkfly/init.lua new file mode 100644 index 0000000..87cd9b5 --- /dev/null +++ b/config/nvim/lua/plugins/pinkfly/init.lua @@ -0,0 +1,124 @@ +vim.cmd("colorscheme moonfly") + +local palette = { + black = "#0f0f0f", + surface = "#1a1a1a", + overlay = "#2a2a2a", + text = "#e0def4", + dim = "#6e6a86", + pink = "#ebbcba", + magenta = "#f2a7b0", + peach = "#f6c177", + white = "#ffffff", + comment = "#55505c", +} + +vim.cmd("hi clear") +if vim.fn.exists("syntax_on") then + vim.cmd("syntax reset") +end +vim.o.background = "dark" +vim.g.colors_name = "pinkfly" + +local ui = { + Normal = { fg = palette.text, bg = palette.black }, + NormalNC = { fg = palette.text, bg = palette.black }, + NormalFloat = { fg = palette.text, bg = palette.surface }, + FloatBorder = { fg = palette.pink, bg = palette.surface }, + VertSplit = { fg = palette.overlay, bg = palette.black }, + StatusLine = { fg = palette.pink, bg = palette.black }, + StatusLineNC = { fg = palette.dim, bg = palette.black }, + TabLine = { fg = palette.text, bg = palette.overlay }, + TabLineSel = { fg = palette.black, bg = palette.pink, bold = true }, + Pmenu = { fg = palette.text, bg = palette.surface }, + PmenuSel = { fg = palette.black, bg = palette.pink }, + CursorLine = { bg = palette.surface }, + CursorLineNr = { fg = palette.pink, bold = true }, + LineNr = { fg = palette.comment }, + Visual = { bg = "#2a1f2a" }, + Search = { bg = palette.pink, fg = palette.black }, + IncSearch = { bg = palette.magenta, fg = palette.black }, + MatchParen = { fg = palette.pink, bold = true }, +} + +local syntax = { + Comment = { fg = palette.comment, italic = true }, + Constant = { fg = palette.pink }, + String = { fg = palette.peach }, + Character = { fg = palette.peach }, + Number = { fg = palette.magenta }, + Boolean = { fg = palette.magenta, bold = true }, + Identifier = { fg = palette.pink }, + Function = { fg = palette.pink, bold = true }, + Statement = { fg = palette.magenta }, + Conditional = { fg = palette.pink, bold = true }, + Repeat = { fg = palette.pink }, + Label = { fg = palette.magenta }, + Operator = { fg = palette.pink }, + Keyword = { fg = palette.magenta, bold = true }, + Exception = { fg = palette.pink }, + PreProc = { fg = palette.pink }, + Type = { fg = palette.pink }, + StorageClass = { fg = palette.magenta }, + Structure = { fg = palette.pink }, + Typedef = { fg = palette.pink }, + Delimiter = { fg = palette.text }, + Special = { fg = palette.magenta }, +} + +local diagnostics = { + DiagnosticError = { fg = "#ff7b7b" }, + DiagnosticWarn = { fg = palette.peach }, + DiagnosticInfo = { fg = palette.pink }, + DiagnosticHint = { fg = palette.magenta }, +} + +for group, opts in pairs(ui) do + vim.api.nvim_set_hl(0, group, opts) +end +for group, opts in pairs(syntax) do + vim.api.nvim_set_hl(0, group, opts) +end +for group, opts in pairs(diagnostics) do + vim.api.nvim_set_hl(0, group, opts) +end + +local ok, lualine = pcall(require, "lualine") +if ok then + local lualine_pink = { + normal = { + a = { bg = palette.pink, fg = palette.black, gui = "bold" }, + b = { bg = palette.surface, fg = palette.pink }, + c = { bg = palette.black, fg = palette.text }, + }, + insert = { + a = { bg = palette.magenta, fg = palette.black, gui = "bold" }, + }, + visual = { + a = { bg = palette.peach, fg = palette.black, gui = "bold" }, + }, + replace = { + a = { bg = palette.pink, fg = palette.black, gui = "bold" }, + }, + inactive = { + a = { bg = palette.surface, fg = palette.dim }, + b = { bg = palette.surface, fg = palette.dim }, + c = { bg = palette.black, fg = palette.dim }, + }, + } + + lualine.setup({ + options = { + theme = lualine_pink, + section_separators = { left = "", right = "" }, + component_separators = { left = "", right = "" }, + }, + }) +end + +vim.g.barbar_highlight = { + background = { fg = palette.dim, bg = palette.black }, + buffer_visible = { fg = palette.text, bg = palette.black }, + buffer_selected = { fg = palette.pink, bg = palette.black, bold = true }, + modified_selected = { fg = palette.peach, bg = palette.black, bold = true }, +} diff --git a/config/nvim/lua/plugins/rosepine/init.lua b/config/nvim/lua/plugins/rosepine/init.lua deleted file mode 100644 index d860f27..0000000 --- a/config/nvim/lua/plugins/rosepine/init.lua +++ /dev/null @@ -1,22 +0,0 @@ -vim.cmd("colorscheme rosepine") -local transparent_groups = { - "Normal", - "NormalNC", - "NormalFloat", - "VertSplit", - "StatusLine", - "StatusLineNC", - "TabLine", - "TabLineFill", - "TabLineSel", - "Pmenu", - "PmenuSel", - "PmenuSbar", - "PmenuThumb", -} - -for _, group in ipairs(transparent_groups) do - vim.api.nvim_set_hl(0, group, { bg = "none" }) -end - -vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) diff --git a/config/nvim/undo/%home%coast%.local%src%config%waybar%config.jsonc b/config/nvim/undo/%home%coast%.local%src%config%waybar%config.jsonc index 4be715b..cbd3adb 100644 Binary files a/config/nvim/undo/%home%coast%.local%src%config%waybar%config.jsonc and b/config/nvim/undo/%home%coast%.local%src%config%waybar%config.jsonc differ diff --git a/config/nvim/undo/%home%coast%.local%src%config%waybar%style.css b/config/nvim/undo/%home%coast%.local%src%config%waybar%style.css index c65d86e..3b6fd1e 100644 Binary files a/config/nvim/undo/%home%coast%.local%src%config%waybar%style.css and b/config/nvim/undo/%home%coast%.local%src%config%waybar%style.css differ diff --git a/config/rofi/gruvbox.rasi b/config/rofi/gruvbox.rasi index 360fd9f..4941db9 100644 --- a/config/rofi/gruvbox.rasi +++ b/config/rofi/gruvbox.rasi @@ -2,17 +2,17 @@ highlight: bold italic; scrollbar: true; - base-bg: #191724; - base-bg-soft: #1f1d2e; - base-bg-alt: #26233a; + base-bg: #0f0f0f; + base-bg-soft: #1a1a1a; + base-bg-alt: #2a2a2a; base-fg: #e0def4; base-fg-dim: #6e6a86; - accent: #eb6f92; - accent-light: #f6c177; - accent-dark: #31748f; + accent: #ebbcba; + accent-light: #ea9a97; + accent-dark: #d7827e; - border-gray: #3b3a5a; + border-gray: #454545; background: @base-bg; background-color: @background; @@ -48,7 +48,7 @@ configuration { font: "JetBrainsMono Nerd Font 14"; show-icons: true; - terminal: "alacritty"; + terminal: "footclient"; } element-icon { @@ -58,3 +58,4 @@ element-icon { window { border-radius: 10px; } + diff --git a/config/starship.toml b/config/starship.toml index 2634665..119021d 100644 --- a/config/starship.toml +++ b/config/starship.toml @@ -1,33 +1,30 @@ format = """ -[](#191724)\ -$os\ +[](#0f0f0f)\ $username\ -[](bg:#1e1e2e fg:#191724)\ +[](bg:#1a1a1a fg:#0f0f0f)\ $directory\ -[](bg:#26233a fg:#1e1e2e)\ +[](bg:#2a2a2a fg:#1a1a1a)\ $all_langs\ -[](bg:#2a2736 fg:#26233a)\ +[](bg:#1a1a1a fg:#2a2a2a)\ $time\ -[](bg:#3a3840 fg:#2a2736)\ -$time\ -[ ](fg:#3a3840)\ - """ +[](fg:#1a1a1a) +""" add_newline = false [username] show_always = true -style_user = "bg:#191724 fg:#e0def4" -style_root = "bg:#191724 fg:#eb6f92" +style_user = "bg:#0f0f0f fg:#ebbcba" +style_root = "bg:#0f0f0f fg:#eb6f92" format = '[$user]($style)' disabled = false [os] -style = "bg:#1e1e2e fg:#e0def4" +style = "bg:#1a1a1a fg:#ebbcba" disabled = true [directory] -style = "fg:#e0def4 bg:#1e1e2e" +style = "fg:#ebbcba bg:#1a1a1a" format = "[ $path ]($style)" truncation_length = 3 truncation_symbol = "…/" diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf new file mode 100644 index 0000000..7bd46dc --- /dev/null +++ b/config/tmux/tmux.conf @@ -0,0 +1,67 @@ +set -g default-terminal "tmux-256color" +set -ga terminal-overrides ",*:RGB" +set -g mouse on +set -g set-clipboard on + +unbind C-b +set -g prefix C-a +bind-key C-a send-prefix + +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R + +unbind % +bind | split-window -h -c "#{pane_current_path}" + +unbind '"' +bind - split-window -v -c "#{pane_current_path}" + +unbind r +bind r source-file $HOME/.config/tmux/tmux.conf + +set -g base-index 1 +set -g pane-base-index 1 +set -g renumber-windows on + +set -g mode-keys vi +bind-key -T copy-mode-vi v send-keys -X begin-selection +bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle +bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel +unbind -T copy-mode-vi MouseDragEnd1Pane + +bind -n M-h select-pane -L +bind -n M-j select-pane -D +bind -n M-k select-pane -U +bind -n M-l select-pane -R + +bind -n M-1 select-window -t 1 +bind -n M-2 select-window -t 2 +bind -n M-3 select-window -t 3 +bind -n M-4 select-window -t 4 +bind -n M-5 select-window -t 5 +bind -n M-6 select-window -t 6 +bind -n M-7 select-window -t 7 +bind -n M-8 select-window -t 8 +bind -n M-9 select-window -t 9 + +set -g status on +set -g status-justify centre +set -g status-bg "#1a1a1a" +set -g status-fg "#ebbcba" +set -g status-style "bg=#1a1a1a,fg=#ebbcba" + +set -g status-left "#[bg=#ebbcba,fg=#1a1a1a,bold] #S " +set -g status-right " #[bg=#ebbcba,fg=#1a1a1a,bold] %H:%M " +set -g window-status-current-format "#[fg=#ebbcba]#[bg=#ebbcba,fg=#1a1a1a,bold] #I: #W #[fg=#ebbcba,bg=#1a1a1a]" +set -g window-status-format "#[fg=#ebbcba]#[bg=#ebbcba,fg=#111111] #I #[fg=#ebbcba,bg=#1a1a1a]" + +set -g pane-border-style "fg=#ebbcba" +set -g pane-active-border-style "fg=#ebbcba" + +set -g mode-style "bg=#ebbcba,fg=#ebbcba" + +set -g message-style "fg=#ebbcba,bg=#1a1a1a,bold" +set -g message-command-style "fg=#ebbcba,bg=#1a1a1a,bold" + diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index f497e98..6907e47 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -10,9 +10,7 @@ "modules-center": [ ], "modules-right": [ - - // "tray", - // "network", + "network", "pulseaudio", "clock" ], diff --git a/config/waybar/style.css b/config/waybar/style.css index 58a9128..601dd6d 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,14 +1,14 @@ -@define-color border #26233a; -@define-color background #191724; -@define-color surface0 #1f1d2e; -@define-color overlay0 #26233a; +@define-color border #211e1e; +@define-color background #111111; +@define-color surface0 #151111; +@define-color overlay0 #161515; @define-color text #e0def4; @define-color text_dim #6e6a86; @define-color blue #31748f; @define-color green #9ccfd8; @define-color yellow #f6c177; @define-color peach #ebbcba; -@define-color maroon #eb6f92; +@define-color maroon #e79591; @define-color lavender #c4a7e7; @define-color pink #eb6f92; @define-color teal #9ccfd8; @@ -22,7 +22,7 @@ } window#waybar { - background: @background; + background: transparent; } #disk, @@ -42,7 +42,7 @@ window#waybar { padding: 5px 10px; margin: 3px 0 13px 10px; background: @surface0; - color: @text; + color: @peach; transition: 0.3s; border: 1.5px solid @border; border-radius: 8px; @@ -56,27 +56,27 @@ window#waybar.empty #window { border: none; } -#network { color: @text; } -#clock { margin-right: 12px; color: @text; } -#pulseaudio { color: @text; } +#network { color: @peach; } +#clock { margin-right: 12px; color: @peach; } +#pulseaudio { color: @peach; } #workspaces { margin-left: 12px; - color: @text; + color: @peach; } #workspaces button { margin: 0; padding: 1px 3px; - color: @text; + color: @peach; transition: none; } -#workspaces button.empty { color: @text_dim; } +#workspaces button.empty { color: @peach; } #workspaces button.active { color: @maroon; } -#workspaces button.urgent { color: @maroon; } +#workspaces button.urgent { color: @peach; } #workspaces button:hover { background: @overlay0; - color: @text; + color: @peach; } diff --git a/local/bin/toggle-screens.sh b/local/bin/toggle-screens.sh new file mode 100755 index 0000000..dcda9f3 --- /dev/null +++ b/local/bin/toggle-screens.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +outputs_json="$(niri msg --json outputs)" + +echo "$outputs_json" | jq -c '.[]' | while read -r out; do + name=$(echo "$out" | jq -r '.name') + dpms=$(echo "$out" | jq -r '.dpms') + + if [ "$dpms" = "On" ]; then + echo "Turning off $name" + niri msg output "$name" dpms off + fi +done diff --git a/nixos/configuration/configuration.nix b/nixos/configuration/configuration.nix index a0a9a6a..428f073 100644 --- a/nixos/configuration/configuration.nix +++ b/nixos/configuration/configuration.nix @@ -72,7 +72,6 @@ in security.sudo-rs.enable = true; virtualisation = { - waydroid.enable = false; podman.enable = true; }; @@ -90,7 +89,6 @@ in unstable.qbittorrent unstable.zathura unstable.rofi - unstable.alacritty ]; nixpkgs.config.allowUnfree = true; @@ -98,12 +96,10 @@ in users.users.coast = { isNormalUser = true; extraGroups = [ "wheel" "podman" ]; - shell = pkgs.zsh; + shell = pkgs.nushell; }; programs = { - zsh.enable = true; - zsh.syntaxHighlighting.enable = true; foot.enable = false; nano.enable = false; nekoray.enable = true; @@ -123,6 +119,7 @@ in xdg.portal = { enable = true; + xdgOpenUsePortal = true; extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-gnome diff --git a/nixos/flake.nix b/nixos/flake.nix index 62cca20..b9c9114 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -43,7 +43,9 @@ ./home-configuration/configuration.nix ./home-configuration/apps/sway.nix ./home-configuration/apps/zsh.nix + ./home-configuration/apps/nushell.nix ./home-configuration/apps/alacritty.nix + ./home-configuration/apps/foot.nix ]; }; }; diff --git a/nixos/home-configuration/apps/alacritty.nix b/nixos/home-configuration/apps/alacritty.nix index d18710d..8ce3197 100644 --- a/nixos/home-configuration/apps/alacritty.nix +++ b/nixos/home-configuration/apps/alacritty.nix @@ -5,7 +5,8 @@ }: { programs.alacritty = { - enable = true; + enable = false; + theme = "gruvbox_dark"; settings = { window = { opacity = 0.9; @@ -13,6 +14,7 @@ x = 2; y = 2; }; + blur = true; }; font = { normal = { diff --git a/nixos/home-configuration/apps/foot.nix b/nixos/home-configuration/apps/foot.nix new file mode 100644 index 0000000..6bbffda --- /dev/null +++ b/nixos/home-configuration/apps/foot.nix @@ -0,0 +1,31 @@ +{ + programs.foot = { + enable = true; + settings = { + main.font = "JetBrainsMono Nerd Font:size=14"; + main.pad = "4x4"; + scrollback.lines = 100000; + + colors.alpha = "0.9"; + colors.background = "191724"; + colors.foreground = "e0def4"; + colors.regular0 = "191724"; + colors.regular1 = "eb6f92"; + colors.regular2 = "9ccfd8"; + colors.regular3 = "f6c177"; + colors.regular4 = "31748f"; + colors.regular5 = "c4a7e7"; + colors.regular6 = "ebbcba"; + colors.regular7 = "e0def4"; + colors.bright0 = "6e6a86"; + colors.bright1 = "eb6f92"; + colors.bright2 = "9ccfd8"; + colors.bright3 = "f6c177"; + colors.bright4 = "31748f"; + colors.bright5 = "c4a7e7"; + colors.bright6 = "ebbcba"; + colors.bright7 = "e0def4"; + }; + }; +} + diff --git a/nixos/home-configuration/apps/nushell.nix b/nixos/home-configuration/apps/nushell.nix new file mode 100644 index 0000000..2d5d83a --- /dev/null +++ b/nixos/home-configuration/apps/nushell.nix @@ -0,0 +1,13 @@ +{ + pkgs, + config, + ... +}: +{ + programs = { + carapace = { + enable = true; + enableNushellIntegration = true; + }; + }; +} diff --git a/nixos/home-configuration/apps/zsh.nix b/nixos/home-configuration/apps/zsh.nix index da7fd97..6eb6446 100644 --- a/nixos/home-configuration/apps/zsh.nix +++ b/nixos/home-configuration/apps/zsh.nix @@ -5,7 +5,7 @@ }: { programs.zsh = { - enable = true; + enable = false; history = { path = "/home/coast/.cache/zsh/history"; size = 100000000; diff --git a/nixos/home-configuration/configuration.nix b/nixos/home-configuration/configuration.nix index 6255740..9df9ad0 100644 --- a/nixos/home-configuration/configuration.nix +++ b/nixos/home-configuration/configuration.nix @@ -7,13 +7,13 @@ mkSl = path: config.lib.file.mkOutOfStoreSymlink path; configs = { kitty = "kitty"; - foot = "foot"; qtile = "qtile"; mako = "mako"; nvim = "nvim"; eww = "eww"; waybar = "waybar"; rofi = "rofi"; + nushell = "nushell"; niri = "niri"; "starship.toml" = "starship.toml"; }; @@ -29,9 +29,13 @@ in { stateVersion = "25.05"; packages = with pkgs; [ alsa-utils + xwayland-satellite nix-search-cli fastfetch + lollypop + cmatrix dysk + brightnessctl ncurses tree xfce.ristretto @@ -51,19 +55,20 @@ in { grim slurp yazi - mate.caja - htop + nautilus + btop nixpkgs-fmt swww wmenu mako nwg-look xorg.xkill + xorg.xeyes mpv vesktop wlr-randr nodejs - gcc_multi + clang_multi gnumake clang-tools ruby_3_4 @@ -76,10 +81,9 @@ in { unzip zip go - tauon gimp waybar - glibc_multi + glibc man-pages man-pages-posix eww