mirror of
https://github.com/deltathetawastaken/dotfiles.git
synced 2025-12-06 07:16:37 +03:00
smol impruv
This commit is contained in:
Your Name
parent
95f6fa652b
commit
cbe06e1d34
144
apps/apps.nix
144
apps/apps.nix
|
|
@ -90,7 +90,7 @@ in {
|
|||
overrides.diosevka
|
||||
# overrides.iosevka-comfy
|
||||
overrides.vesktop
|
||||
overrides.input-font
|
||||
# overrides.input-font
|
||||
# overrides.input-fonts
|
||||
stable.peazip
|
||||
element-desktop
|
||||
|
|
@ -235,9 +235,149 @@ in {
|
|||
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
plugins.lightline.enable = true;
|
||||
enableMan = false;
|
||||
colorschemes.tokyonight = {
|
||||
enable = true;
|
||||
settings = {
|
||||
transparent = true
|
||||
;
|
||||
};
|
||||
};
|
||||
globals.mapleader = ",";
|
||||
keymaps = [
|
||||
{
|
||||
key = ";";
|
||||
action = ":";
|
||||
}
|
||||
{
|
||||
key = "<leader>gg";
|
||||
action = "<cmd>Man<CR>";
|
||||
options = {
|
||||
silent = true;
|
||||
remap = false;
|
||||
};
|
||||
}
|
||||
];
|
||||
plugins = {
|
||||
lightline = {
|
||||
enable = true;
|
||||
active = {
|
||||
left = [
|
||||
[
|
||||
"mode"
|
||||
"paste"
|
||||
]
|
||||
[
|
||||
"readonly"
|
||||
"filename"
|
||||
"modified"
|
||||
]
|
||||
];
|
||||
};
|
||||
};
|
||||
which-key.enable = true;
|
||||
lsp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
bashls.enable = true;
|
||||
nixd.enable = true;
|
||||
};
|
||||
keymaps.lspBuf = {
|
||||
"gd" = "definition";
|
||||
"gD" = "references";
|
||||
"gt" = "type_definition";
|
||||
"gi" = "implementation";
|
||||
"K" = "hover";
|
||||
};
|
||||
};
|
||||
none-ls = {
|
||||
enable = true;
|
||||
sources = {
|
||||
diagnostics = {
|
||||
statix.enable = true;
|
||||
};
|
||||
formatting = {
|
||||
nixfmt.enable = true;
|
||||
markdownlint.enable = true;
|
||||
shellharden.enable = true;
|
||||
shfmt.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
nvim-tree = {
|
||||
enable = true;
|
||||
openOnSetupFile = true;
|
||||
autoReloadOnWrite = true;
|
||||
};
|
||||
lsp-lines = {
|
||||
enable = true;
|
||||
currentLine = true;
|
||||
};
|
||||
telescope = {
|
||||
enable = true;
|
||||
keymaps = {
|
||||
"<leader>ff" = "find_files";
|
||||
"<leader>fg" = "live_grep";
|
||||
"<leader>fb" = "buffers";
|
||||
"<leader>fh" = "help_tags";
|
||||
|
||||
"<C-p>" = {
|
||||
action = "git_files";
|
||||
options = {
|
||||
desc = "Telescope Git Files";
|
||||
};
|
||||
};
|
||||
};
|
||||
extensions.fzf-native = { enable = true; };
|
||||
};
|
||||
toggleterm = {
|
||||
enable = true;
|
||||
settings = {
|
||||
open_mapping = "[[<C-t>]]";
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
treesitter = {
|
||||
enable = true;
|
||||
nixGrammars = true;
|
||||
indent = true;
|
||||
};
|
||||
treesitter-context.enable = true;
|
||||
rainbow-delimiters.enable = true;
|
||||
|
||||
trouble.enable = true;
|
||||
wilder = {
|
||||
enable = true;
|
||||
modes = [ ":" "/" "?" ];
|
||||
renderer = "pumblend";
|
||||
};
|
||||
nvim-autopairs.enable = true;
|
||||
};
|
||||
|
||||
options= {
|
||||
updatetime = 100; # Faster completion
|
||||
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
|
||||
autoindent = true;
|
||||
# clipboard = "unnamedplus";
|
||||
clipboard = "unnamed,unnamedplus";
|
||||
expandtab = true;
|
||||
shiftwidth = 2;
|
||||
smartindent = true;
|
||||
tabstop = 2;
|
||||
|
||||
ignorecase = true;
|
||||
incsearch = true;
|
||||
smartcase = true;
|
||||
wildmode = "list:longest";
|
||||
|
||||
# swapfile = false;
|
||||
undofile = true; # Build-in persistent undo
|
||||
|
||||
mouse = "a";
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -46,5 +46,10 @@
|
|||
systemd.enable = true;
|
||||
extraConfig = builtins.readFile ./hyprland.conf;
|
||||
};
|
||||
# home.activation = {
|
||||
# unlink_hyprland = lib.hm.dag.entryAfter ["onFilesChange"] ''
|
||||
# unlink /home/delta/.config/hypr/hyprland.conf
|
||||
# '';
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR
|
|||
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
||||
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
||||
exec-once = swww init
|
||||
exec-once = sh -c "sleep 1 && swww clear"
|
||||
exec-once = sh -c "sleep 2 && swww clear"
|
||||
#exec-once = swww img Downloads/PC\ Wallpapers/gifpixel/rooftop.gif
|
||||
#exec-once = mpvpaper '*' -o "video-scale-y=1.1 --gpu-context=wayland --vo=gpu --hwdec=vaapi-copy" videowork/bgloop.webm
|
||||
# exec-once = gtk-launch autostart
|
||||
|
|
@ -267,6 +267,15 @@ windowrulev2 = size 45% 45%,title:^(clipboard_manager)$
|
|||
windowrulev2 = pin,title:^(clipboard_manager)$
|
||||
# windowrulev2 = opacity 0.7,title:^(clipboard_manager)$
|
||||
|
||||
windowrulev2 = float,title:^(clipboard_manager_kt)$
|
||||
windowrulev2 = noanim,title:^(clipboard_manager_kt)$
|
||||
windowrulev2 = stayfocused,title:^(clipboard_manager_kt)$
|
||||
windowrulev2 = center,title:^(clipboard_manager_kt)$
|
||||
windowrulev2 = size 80% 60%,title:^(clipboard_manager_kt)$
|
||||
windowrulev2 = pin,title:^(clipboard_manager_kt)$
|
||||
# windowrulev2 = opacity 0.7 override,title:^(clipboard_manager_kt)$
|
||||
windowrulev2 = opacity 1 override,title:^(clipboard_manager_kt)$
|
||||
|
||||
|
||||
#foot applauncher app_launcher
|
||||
windowrulev2 = float,title:^(app_launcher)$
|
||||
|
|
@ -392,7 +401,8 @@ bind = ,Print , exec, wl-paste | swappy -f - # take a screenshot
|
|||
#bind = $mainMod, S, exec, hyprshot -m output -s -c --clipboard-only # take a screenshot
|
||||
#bind = ALT, V, exec, cliphist list | wofi -dmenu | cliphist decode | wl-copy # open clipboard manager
|
||||
#bind = ALT, V, exec, cliphist list | /home/delta/scripts/fzfmenu | cliphist decode | wl-copy # open clipboard manager
|
||||
bind = ALT, V, exec, cliphist list | /home/delta/scripts/fzfmenuft | cliphist decode | wl-copy && wtype -M ctrl v -m ctrl # open clipboard manager
|
||||
bind = ALT, V, exec, cliphist list | /home/delta/scripts/fzfmenuft | cliphist decode | wl-copy # && wtype -M ctrl v -m ctrl # open clipboard manager
|
||||
bind = ALT SHIFT, V, exec, /home/delta/scripts/clipfzfkt # && wtype -M ctrl v -m ctrl # open clipboard manager
|
||||
bind = $mainMod, R, exec, footclient --title=emoji_manager sh -c "~/scripts/shmoji/shmoji fzf | wl-copy" & hyprctl switchxkblayout at-translated-set-2-keyboard 0
|
||||
#bind = $mainMod, T, exec, ~/.config/HyprV/hyprv_util vswitch # switch HyprV version
|
||||
bind = $mainMod, X, togglesplit, # dwindle
|
||||
|
|
|
|||
|
|
@ -142,8 +142,12 @@ in {
|
|||
Type = "simple";
|
||||
};
|
||||
|
||||
postStart = ''
|
||||
gost -L=tcp://0.0.0.0:4780/192.168.150.2:4780 &>/dev/null &
|
||||
'';
|
||||
|
||||
preStart = "${stop_novpn}/bin/stop_novpn && ip netns add novpn";
|
||||
path = with pkgs; [ gawk iproute2 iptables sysctl coreutils ];
|
||||
path = with pkgs; [ gost gawk iproute2 iptables sysctl coreutils ];
|
||||
};
|
||||
|
||||
warp-svc = {
|
||||
|
|
|
|||
90
flake.lock
90
flake.lock
|
|
@ -3,18 +3,20 @@
|
|||
"anyrun": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713259062,
|
||||
"narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=",
|
||||
"owner": "Kirottu",
|
||||
"owner": "anyrun-org",
|
||||
"repo": "anyrun",
|
||||
"rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Kirottu",
|
||||
"owner": "anyrun-org",
|
||||
"repo": "anyrun",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -297,16 +299,16 @@
|
|||
"hyprcursor": "hyprcursor",
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"systems": "systems",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715526061,
|
||||
"narHash": "sha256-cVhbpdH8ln4ybFAG3yJFDTbKYTATok8cEkOM94IM0cU=",
|
||||
"lastModified": 1715803431,
|
||||
"narHash": "sha256-YFx9BSgJPKUSLOLkol9tU+5JJNOs2pQ3YN0eY1RldOE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "fd35b35000fa11ce540d944966ff17c71c31fd27",
|
||||
"revCount": 4678,
|
||||
"rev": "a8522db683ae260f16f8e7778561d8a54906beb1",
|
||||
"revCount": 4699,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
|
|
@ -324,11 +326,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713780596,
|
||||
"narHash": "sha256-DDAYNGSnrBwvVfpKx+XjkuecpoE9HiEf6JW+DBQgvm0=",
|
||||
"lastModified": 1715621965,
|
||||
"narHash": "sha256-S5Wzi3hhFOiCaeZqmx3zBdrv8KzaEafD5hCfY8ixz0A=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "contrib",
|
||||
"rev": "110e6dc761d5c3d352574def3479a9c39dfc4358",
|
||||
"rev": "46d2206858657d439792926958f52b037534de49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -401,11 +403,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715287423,
|
||||
"narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
|
||||
"lastModified": 1715608589,
|
||||
"narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
|
||||
"rev": "65c2636484e5cb00583b8a7446c3fb657f568883",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -437,11 +439,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1696193975,
|
||||
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
|
||||
"lastModified": 1715534503,
|
||||
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
|
||||
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -453,11 +455,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1715395895,
|
||||
"narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=",
|
||||
"lastModified": 1715668745,
|
||||
"narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "71bae31b7dbc335528ca7e96f479ec93462323ff",
|
||||
"rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -485,11 +487,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1715447595,
|
||||
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
|
||||
"lastModified": 1715534503,
|
||||
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
|
||||
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -517,11 +519,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1715087517,
|
||||
"narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
|
||||
"lastModified": 1715534503,
|
||||
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
|
||||
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -548,22 +550,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1715447595,
|
||||
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1712791164,
|
||||
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
|
||||
|
|
@ -579,7 +565,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1712883908,
|
||||
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
|
||||
|
|
@ -595,7 +581,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1714906307,
|
||||
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
|
||||
|
|
@ -619,16 +605,16 @@
|
|||
"flake-root": "flake-root",
|
||||
"home-manager": "home-manager_2",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715545653,
|
||||
"narHash": "sha256-VKuHTHhi4fQ87Hd4yZWU38yYj4f8dsfR5PfCUSZqcd8=",
|
||||
"lastModified": 1715758881,
|
||||
"narHash": "sha256-0W9F2F9YnqMZPBrz68VrTALlhTyBBeuuh/xD8C0PEVg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "a2a558d15ee85ea07291d172310e54ebadd6b221",
|
||||
"rev": "e035d22b64a9bd5f469664cbe42ea798d7c16b2e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -671,7 +657,7 @@
|
|||
"home-manager": "home-manager",
|
||||
"hyprland": "hyprland",
|
||||
"hyprland-contrib": "hyprland-contrib",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nixpkgs2105": "nixpkgs2105",
|
||||
|
|
@ -682,7 +668,7 @@
|
|||
},
|
||||
"secrets": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"sops-nix": "sops-nix"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -726,7 +712,7 @@
|
|||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -821,7 +807,7 @@
|
|||
"tdesktop": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715005420,
|
||||
|
|
|
|||
|
|
@ -255,6 +255,8 @@
|
|||
esc = [ "collapse_selection" "keep_primary_selection" ];
|
||||
};
|
||||
};
|
||||
|
||||
extraPackages = [ pkgs.marksman pkgs.nil pkgs.nodePackages.bash-language-server];
|
||||
};
|
||||
|
||||
#programs.dircolors.enable = true;
|
||||
|
|
|
|||
|
|
@ -40,11 +40,17 @@
|
|||
interval = "weekly";
|
||||
};
|
||||
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 7d";
|
||||
# randomizedDelaySec = "30m";
|
||||
# nix.gc = {
|
||||
# automatic = true;
|
||||
# dates = "weekly";
|
||||
# options = "--delete-older-than 7d";
|
||||
# # randomizedDelaySec = "30m";
|
||||
# };
|
||||
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
clean.enable = true;
|
||||
clean.extraArgs = "--keep-since 7d --keep 4";
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
openvpn
|
||||
any-nix-shell
|
||||
comma
|
||||
|
||||
#work scripts
|
||||
openconnect
|
||||
|
|
|
|||
Loading…
Reference in a new issue