mirror of
https://git.sr.ht/~coasteen/dotfiles
synced 2025-11-04 14:47:38 +01:00
Compare commits
2 commits
b548a36050
...
65112394b4
| Author | SHA1 | Date | |
|---|---|---|---|
|
65112394b4 | ||
|
|
43847514c1 |
17 changed files with 131 additions and 133 deletions
31
.wezterm.lua
31
.wezterm.lua
|
|
@ -1,24 +1,15 @@
|
|||
local wezterm = require 'wezterm'
|
||||
local wezterm = require("wezterm")
|
||||
local config = wezterm.config_builder()
|
||||
|
||||
config.initial_cols = 120
|
||||
config.initial_rows = 28
|
||||
|
||||
config.font_size = 12
|
||||
config.font = wezterm.font("MapleMono")
|
||||
|
||||
config.window_close_confirmation = 'NeverPrompt'
|
||||
config.enable_tab_bar = false
|
||||
|
||||
config.window_background_opacity = 0.9
|
||||
|
||||
config.font_size = 15
|
||||
config.color_scheme = "Mashup Colors (terminal.sexy)"
|
||||
config.window_padding = {
|
||||
left = 5,
|
||||
right = 5,
|
||||
top = 5,
|
||||
bottom = 5,
|
||||
left = 4,
|
||||
right = 4,
|
||||
top = 4,
|
||||
bottom = 4,
|
||||
}
|
||||
|
||||
config.color_scheme = 'Afterglow'
|
||||
|
||||
config.enable_tab_bar = false
|
||||
config.font = wezterm.font("JetBrainsMono Nerd Font")
|
||||
config.window_close_confirmation = "NeverPrompt"
|
||||
config.window_background_opacity = 0.90
|
||||
return config
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ output "HDMI-A-1" {
|
|||
}
|
||||
|
||||
output "eDP-1" {
|
||||
//off
|
||||
off
|
||||
scale 1
|
||||
transform "normal"
|
||||
position x=1280 y=0
|
||||
|
|
@ -221,7 +221,7 @@ binds {
|
|||
Mod+Shift+Minus { set-window-height "-10%"; }
|
||||
Mod+Shift+Equal { set-window-height "+10%"; }
|
||||
|
||||
Mod+V { toggle-window-floating; }
|
||||
Mod+Space { toggle-window-floating; }
|
||||
Mod+Shift+V { switch-focus-between-floating-and-tiling; }
|
||||
|
||||
Mod+Shift+F { toggle-column-tabbed-display; }
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ require("plugins/treesitter")
|
|||
--require("plugins/whichkey")
|
||||
require("config")
|
||||
require("plugins/render-markdown")
|
||||
require("nvim-toggler").setup()
|
||||
require("plugins/monokai-pro")
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
"cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
|
||||
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
|
||||
"comfy-line-numbers.nvim": { "branch": "main", "commit": "31e2f9287b4491ad72defb9e0185eb2739983799" },
|
||||
"gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
|
||||
"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" },
|
||||
"monokai-pro.nvim": { "branch": "master", "commit": "1ac671f6da720cba967d28d25c2f16b8b4e18808" },
|
||||
"none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ else
|
|||
cfg.shell = "/run/current-system/sw/bin/zsh"
|
||||
end
|
||||
|
||||
vim.cmd([[colorscheme gruvbox]])
|
||||
vim.cmd([[colorscheme monokai-pro]])
|
||||
|
||||
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
|
||||
border = "single",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
return {
|
||||
{
|
||||
"andweeb/presence.nvim",
|
||||
"ellisonleao/gruvbox.nvim",
|
||||
"loctvl842/monokai-pro.nvim",
|
||||
"neovim/nvim-lspconfig",
|
||||
"williamboman/mason.nvim",
|
||||
{
|
||||
|
|
|
|||
20
config/nvim/lua/plugins/monokai-pro/init.lua
Normal file
20
config/nvim/lua/plugins/monokai-pro/init.lua
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
require("monokai-pro").setup({
|
||||
transparent_background = true,
|
||||
devicons = true,
|
||||
terminal_colors = true,
|
||||
styles = {
|
||||
comment = { italic = true },
|
||||
keyword = { italic = true },
|
||||
type = { italic = true },
|
||||
storageclass = { italic = true },
|
||||
structure = { italic = true },
|
||||
parameter = { italic = true },
|
||||
annotation = { italic = true },
|
||||
tag_attribute = { italic = true },
|
||||
},
|
||||
filter = "spectrum",
|
||||
day_night = { enable = false },
|
||||
background_clear = { "toggleterm", "telescope", "notify", "nvim-tree" },
|
||||
})
|
||||
|
||||
vim.cmd("colorscheme monokai-pro")
|
||||
|
|
@ -1,44 +1,39 @@
|
|||
format = """
|
||||
[](#1d2021)\
|
||||
[](#1e1e1e)\
|
||||
$os\
|
||||
$username\
|
||||
[](bg:#3c3836 fg:#1d2021)\
|
||||
[](bg:#2a2a2a fg:#1e1e1e)\
|
||||
$directory\
|
||||
[](fg:#3c3836 bg:#2a2a2a)\
|
||||
[](fg:#2a2a2a bg:#3a3830)\
|
||||
$all_langs\
|
||||
[](fg:#2a2a2a bg:#1d2021)\
|
||||
$git_branch\
|
||||
[](fg:#1d2021 bg:#4a4a4a)\
|
||||
[](fg:#3a3830 bg:#1e1e1e)\
|
||||
$time\
|
||||
[ ](fg:#4a4a4a)\
|
||||
[](fg:#1e1e1e bg:#3e3a32)\
|
||||
$time\
|
||||
[ ](fg:#3e3a32)\
|
||||
"""
|
||||
|
||||
add_newline = false
|
||||
|
||||
[username]
|
||||
show_always = true
|
||||
style_user = "bg:#1d2021 fg:#bdae93"
|
||||
style_root = "bg:#1d2021 fg:#fb4934"
|
||||
style_user = "bg:#1e1e1e fg:#dcd7ba"
|
||||
style_root = "bg:#1e1e1e fg:#c05a3b"
|
||||
format = '[$user]($style)'
|
||||
disabled = false
|
||||
|
||||
[os]
|
||||
style = "bg:#1d2021 fg:#bdae93"
|
||||
style = "bg:#2a2a2a fg:#dcd7ba"
|
||||
disabled = true
|
||||
|
||||
[directory]
|
||||
style = "fg:#bdae93 bg:#3c3836"
|
||||
style = "fg:#dcd7ba bg:#2a2a2a"
|
||||
format = "[ $path ]($style)"
|
||||
truncation_length = 3
|
||||
truncation_symbol = "…/"
|
||||
|
||||
[directory.substitutions]
|
||||
"Documents" = " "
|
||||
"Downloads" = " "
|
||||
"Music" = " "
|
||||
"Pictures" = " "
|
||||
|
||||
|
||||
[git_branch]
|
||||
symbol = " "
|
||||
style = "bg:#1d2021 fg:#bdae93"
|
||||
format = "[ $symbol$branch ]($style)"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"position": "bottom",
|
||||
"layer": "bottom",
|
||||
"position": "top",
|
||||
"output": "HDMI-A-1",
|
||||
"layer": "top",
|
||||
"modules-left": [
|
||||
"niri/workspaces",
|
||||
"niri/mode",
|
||||
|
|
@ -9,7 +10,7 @@
|
|||
],
|
||||
"modules-right": [
|
||||
"clock",
|
||||
"battery",
|
||||
// "battery",
|
||||
"pulseaudio",
|
||||
"network"
|
||||
],
|
||||
|
|
@ -83,8 +84,8 @@
|
|||
"format": "<span style=\"italic\">{}</span>"
|
||||
},
|
||||
"network": {
|
||||
"interface": "wlo1",
|
||||
// "interface": "eno1",
|
||||
// "interface": "wlo1",
|
||||
"interface": "eno1",
|
||||
"format-wifi": "WLAN {essid}",
|
||||
"format-ethernet": "ETH {ipaddr}/{cidr}",
|
||||
"format-disconnected": "disconnected",
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
@define-color border #3c3836;
|
||||
@define-color background #282828;
|
||||
@define-color surface0 #3c3836;
|
||||
@define-color overlay0 #504945;
|
||||
@define-color text #ebdbb2;
|
||||
@define-color text_dim #a89984;
|
||||
@define-color blue #458588;
|
||||
@define-color green #b8bb26;
|
||||
@define-color yellow #d79921;
|
||||
@define-color peach #fe8019;
|
||||
@define-color maroon #fb4934;
|
||||
@define-color lavender #b16286;
|
||||
@define-color pink #d3869b;
|
||||
@define-color teal #689d6a;
|
||||
@define-color grey #928374;
|
||||
@define-color border #3e3a32;
|
||||
@define-color background #1e1e1e;
|
||||
@define-color surface0 #2a2a2a;
|
||||
@define-color overlay0 #3a3830;
|
||||
@define-color text #dcd7ba;
|
||||
@define-color text_dim #8c8a75;
|
||||
|
||||
@define-color blue #7fbbb3;
|
||||
@define-color green #55393D; /* changed */
|
||||
@define-color yellow #f9e2af;
|
||||
@define-color peach #e69875;
|
||||
@define-color maroon #c05a3b;
|
||||
@define-color lavender #b4beff;
|
||||
@define-color pink #f4b8e4;
|
||||
@define-color teal #7fc1ca;
|
||||
@define-color grey #5c6773;
|
||||
|
||||
* {
|
||||
border: none;
|
||||
|
|
@ -23,7 +24,7 @@
|
|||
|
||||
window#waybar {
|
||||
background: @background;
|
||||
border-top: 2px solid @surface0;
|
||||
border-bottom: 2px solid @surface0;
|
||||
}
|
||||
|
||||
#disk,
|
||||
|
|
@ -48,9 +49,7 @@ window#waybar {
|
|||
border-radius: 8px;
|
||||
}
|
||||
|
||||
#window {
|
||||
transition: none;
|
||||
}
|
||||
#window { transition: none; }
|
||||
|
||||
window#waybar.empty #window {
|
||||
background: transparent;
|
||||
|
|
@ -58,15 +57,8 @@ window#waybar.empty #window {
|
|||
border: none;
|
||||
}
|
||||
|
||||
#network {
|
||||
margin: 8px 12px 8px 12px;
|
||||
color: @text;
|
||||
}
|
||||
|
||||
#pulseaudio,
|
||||
#clock {
|
||||
color: @text;
|
||||
}
|
||||
#network { margin: 8px 12px; color: @text; }
|
||||
#pulseaudio, #clock { color: @text; }
|
||||
|
||||
#workspaces {
|
||||
margin-left: 12px;
|
||||
|
|
@ -80,19 +72,12 @@ window#waybar.empty #window {
|
|||
transition: none;
|
||||
}
|
||||
|
||||
#workspaces button.empty {
|
||||
color: @text;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
color: @peach;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
color: @maroon;
|
||||
}
|
||||
#workspaces button.empty { color: @text_dim; }
|
||||
#workspaces button.active { color: @green; } /* now #55393D */
|
||||
#workspaces button.urgent { color: @maroon; }
|
||||
|
||||
#workspaces button:hover {
|
||||
background: @overlay0;
|
||||
color: @text;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -72,10 +72,8 @@ in
|
|||
security.sudo-rs.enable = true;
|
||||
|
||||
virtualisation = {
|
||||
waydroid.enable = true;
|
||||
podman = {
|
||||
enable = true;
|
||||
};
|
||||
waydroid.enable = false;
|
||||
podman.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
@ -122,6 +120,14 @@ in
|
|||
vazir-fonts
|
||||
];
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-gnome
|
||||
];
|
||||
};
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
services.openssh.enable = true;
|
||||
system.stateVersion = "25.05";
|
||||
|
|
|
|||
11
nixos/configuration/sys/swap.nix
Normal file
11
nixos/configuration/sys/swap.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
...
|
||||
}:
|
||||
{
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/var/lib/swapfile";
|
||||
size = 12*1024;
|
||||
}
|
||||
];
|
||||
}
|
||||
10
nixos/configuration/sys/zram.nix
Normal file
10
nixos/configuration/sys/zram.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
writebackDevice = "/dev/nvme0n1p3";
|
||||
};
|
||||
}
|
||||
|
|
@ -23,6 +23,7 @@
|
|||
modules = [
|
||||
(import ./configuration/configuration.nix { inherit pkgs pkgsUnstable; })
|
||||
./configuration/sys/coreutils-configuration.nix
|
||||
./configuration/sys/swap.nix
|
||||
./hardware-configuration.nix
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/2ed14a91-f00e-4c66-8c33-29f93a8451d7";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/FB28-548D";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
@ -36,6 +36,7 @@
|
|||
suod = "sudo";
|
||||
sduo = "sudo";
|
||||
sd = "sudo";
|
||||
fastfetch = "fastfetch --pipe false | uwuify.awk";
|
||||
};
|
||||
initContent = ''
|
||||
autoload -U compinit
|
||||
|
|
@ -52,6 +53,10 @@
|
|||
EDITOR=vim
|
||||
bindkey -e
|
||||
PS1="[%n in %m %~] "
|
||||
eval "$(starship init zsh)"
|
||||
if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then
|
||||
tmux attach -t default || tmux new -s default
|
||||
fi
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@
|
|||
nvim = "nvim";
|
||||
eww = "eww";
|
||||
waybar = "waybar";
|
||||
niri = "niri";
|
||||
rofi = "rofi";
|
||||
niri = "niri";
|
||||
"starship.toml" = "starship.toml";
|
||||
};
|
||||
in {
|
||||
xdg.configFile = builtins.mapAttrs (name: subpath: {
|
||||
|
|
@ -30,9 +32,12 @@ in {
|
|||
nix-search-cli
|
||||
fastfetch
|
||||
dysk
|
||||
autotiling
|
||||
ncurses
|
||||
ollama
|
||||
tree
|
||||
pyright
|
||||
stylua
|
||||
starship
|
||||
gopls
|
||||
lua-language-server
|
||||
serve-d
|
||||
|
|
@ -45,7 +50,7 @@ in {
|
|||
mate.caja
|
||||
htop
|
||||
nixpkgs-fmt
|
||||
swaybg
|
||||
swww
|
||||
wmenu
|
||||
mako
|
||||
nwg-look
|
||||
|
|
@ -79,4 +84,11 @@ in {
|
|||
userName = "coast";
|
||||
};
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
programs.tmate = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue