Move to DashVim
This commit is contained in:
parent
cd0bfe5cd5
commit
e8fa641a15
11 changed files with 682 additions and 339 deletions
|
|
@ -32,9 +32,7 @@ in
|
|||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
services.printing.browsing = true;
|
||||
# fucking fun
|
||||
# TODO: https://github.com/NixOS/nixpkgs/pull/325825 ....
|
||||
# services.printing.drivers = [ pkgs.hplip ];
|
||||
services.printing.drivers = [ pkgs.hplip ];
|
||||
services.printing.startWhenNeeded = true; # optional
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
|
|
|
|||
858
nix/flake.lock
generated
858
nix/flake.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -40,7 +40,11 @@
|
|||
hyprdock.url = "github:DashieTM/hyprdock";
|
||||
reset.url = "github:Xetibo/ReSet";
|
||||
reset-plugins.url = "github:Xetibo/ReSet-Plugins";
|
||||
|
||||
# nixvim.url = "github:nix-community/nixvim";
|
||||
dashvim = {
|
||||
url = "github:DashieTM/DashVim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { ... }@inputs:
|
||||
|
|
@ -49,9 +53,6 @@
|
|||
system = "x86_64-linux";
|
||||
overlays = [
|
||||
inputs.nur.overlay
|
||||
(_: prev: {
|
||||
python312 = prev.python312.override { packageOverrides = _: pysuper: { nose = pysuper.pynose; }; };
|
||||
})
|
||||
];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
|
|
|
|||
|
|
@ -22,10 +22,8 @@
|
|||
hardware.graphics.extraPackages = with pkgs; [
|
||||
libvdpau-va-gl
|
||||
vaapiVdpau
|
||||
# DUDE FOR FUCK SAKE
|
||||
# TODO:
|
||||
# rocmPackages.clr.icd
|
||||
# rocm-opencl-runtime
|
||||
rocmPackages.clr.icd
|
||||
rocm-opencl-runtime
|
||||
];
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -169,6 +169,15 @@
|
|||
};
|
||||
};
|
||||
|
||||
nvim-colorscheme = lib.mkOption {
|
||||
default = { tokyonight = { enable = true; }; };
|
||||
example = { catppuccin = { enable = true; }; };
|
||||
type = lib.types.attrs;
|
||||
description = ''
|
||||
nixvim colorscheme.
|
||||
'';
|
||||
};
|
||||
|
||||
colorscheme = lib.mkOption {
|
||||
default = {
|
||||
# custom tokyo night
|
||||
|
|
|
|||
|
|
@ -5,9 +5,15 @@
|
|||
}:
|
||||
{
|
||||
imports = [
|
||||
(import ./nvim/default.nix { inherit lib pkgs; colorscheme = config.conf.colorscheme; })
|
||||
# old neovim config
|
||||
# (import ./nvim/default.nix { inherit lib pkgs; colorscheme = config.conf.colorscheme; })
|
||||
];
|
||||
|
||||
programs.dashvim = {
|
||||
enable = true;
|
||||
colorscheme = config.conf.colorscheme;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
#basics
|
||||
gitui
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ let
|
|||
inputs.reset.homeManagerModules.default
|
||||
inputs.nix-flatpak.homeManagerModules.nix-flatpak
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.dashvim.homeManagerModules.dashvim
|
||||
];
|
||||
in
|
||||
{
|
||||
|
|
@ -31,7 +32,6 @@ in
|
|||
|
||||
home-manager.users.${config.conf.username} = {
|
||||
imports = [
|
||||
|
||||
./hyprland/default.nix
|
||||
./flatpak.nix
|
||||
./common.nix
|
||||
|
|
|
|||
|
|
@ -230,8 +230,6 @@
|
|||
"immediate,class:^(.*)(Pal)$"
|
||||
"immediate,class:^(.*)(dota2)$"
|
||||
"immediate,class:^(.*)(needforspeedheat.exe)$"
|
||||
"forceinput,class:^(.*)(Pal)$"
|
||||
"forceinput,class:^(.*)(Battlefield 4)$"
|
||||
];
|
||||
|
||||
exec-once = [
|
||||
|
|
|
|||
|
|
@ -1,59 +1,80 @@
|
|||
{ lib, ... }: {
|
||||
{ lib, config, inputs, pkgs, ... }:
|
||||
let
|
||||
base16 = pkgs.callPackage inputs.base16.lib { };
|
||||
scheme = (base16.mkSchemeAttrs config.stylix.base16Scheme);
|
||||
hexTable = {
|
||||
"0" = "1";
|
||||
"1" = "0";
|
||||
"2" = "1";
|
||||
"3" = "2";
|
||||
"4" = "3";
|
||||
"5" = "4";
|
||||
"6" = "5";
|
||||
"7" = "6";
|
||||
"8" = "7";
|
||||
"9" = "8";
|
||||
"a" = "9";
|
||||
"b" = "a";
|
||||
"c" = "b";
|
||||
"d" = "c";
|
||||
"e" = "d";
|
||||
"f" = "e";
|
||||
};
|
||||
base = "#" + lib.strings.concatStrings ((lib.lists.take 5 (lib.strings.stringToCharacters scheme.base00)) ++ [ hexTable."${(lib.lists.last (lib.strings.stringToCharacters scheme.base00))}" ]);
|
||||
in
|
||||
{
|
||||
|
||||
stylix.targets.kitty = {
|
||||
enable = false;
|
||||
};
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
enable_audio_bell = "no";
|
||||
window_alert_on_bell = "no";
|
||||
background_opacity = lib.mkForce "0.8";
|
||||
cursor_blink_interval = "0";
|
||||
window_padding_width = "1";
|
||||
shell_integration = "yes";
|
||||
sync_with_monitor = "no";
|
||||
background_opacity = "0.8";
|
||||
|
||||
font_family = "JetBrainsMono Nerd Font Mono";
|
||||
bold_font = "JetBrainsMono Nerd Font Mono Extra Bold";
|
||||
italic_font = "JetBrainsMono Nerd Font Mono Extra Italic";
|
||||
bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic";
|
||||
|
||||
# background = lib.mkForce "#1a1b25";
|
||||
# foreground = "#c5c8c6";
|
||||
#
|
||||
# selection_background = "#b2ceee";
|
||||
# selection_foreground = "#080808";
|
||||
#
|
||||
# url_color = "#73daca";
|
||||
# cursor = "#c0caf5";
|
||||
# cursor_text_color = "#1a1b25";
|
||||
#
|
||||
# active_tab_background = "#7aa2f7";
|
||||
# active_tab_foreground = "#16161e";
|
||||
# inactive_tab_background = "#292e42";
|
||||
# inactive_tab_foreground = "#545c7e";
|
||||
#
|
||||
# active_border_color = "#7aa2f7";
|
||||
# inactive_border_color = "#292e42";
|
||||
background = base;
|
||||
foreground = "#" + scheme.base05;
|
||||
selection_foreground = "#" + scheme.base05;
|
||||
selection_background = base;
|
||||
url_color = "#" + scheme.base04;
|
||||
cursor = "#" + scheme.base05;
|
||||
active_border_color = "#" + scheme.base03;
|
||||
inactive_border_color = "#" + scheme.base01;
|
||||
active_tab_background = base;
|
||||
active_tab_foreground = "#" + scheme.base05;
|
||||
inactive_tab_background = "#" + scheme.base01;
|
||||
inactive_tab_foreground = "#" + scheme.base04;
|
||||
tab_bar_background = "#" + scheme.base01;
|
||||
|
||||
# color0 = "#15161e";
|
||||
# color1 = "#c94448";
|
||||
# color2 = "#9ece6a";
|
||||
# color3 = "#e0af68";
|
||||
# color4 = "#7aa2f7";
|
||||
# color5 = "#bb9af7";
|
||||
# color6 = "#7dcfff";
|
||||
# color7 = "#a9b1d6";
|
||||
#
|
||||
# color8 = "#414868";
|
||||
# color9 = "#f2201f";
|
||||
# color10 = "#9ece6a";
|
||||
# color11 = "#e0af68";
|
||||
# color12 = "#7aa2f7";
|
||||
# color13 = "#bb9af7";
|
||||
# color14 = "#7dcfff";
|
||||
# color15 = "#c0caf5";
|
||||
#
|
||||
# color16 = "#ff9e64";
|
||||
# color17 = "#db4b4b";
|
||||
color0 = base;
|
||||
color1 = "#" + scheme.base08;
|
||||
color2 = "#" + scheme.base0B;
|
||||
color3 = "#" + scheme.base0A;
|
||||
color4 = "#" + scheme.base0D;
|
||||
color5 = "#" + scheme.base0E;
|
||||
color6 = "#" + scheme.base0C;
|
||||
color7 = "#" + scheme.base05;
|
||||
|
||||
color8 = "#" + scheme.base03;
|
||||
color9 = "#" + scheme.base08;
|
||||
color10 = "#" + scheme.base0B;
|
||||
color11 = "#" + scheme.base0A;
|
||||
color12 = "#" + scheme.base0D;
|
||||
color13 = "#" + scheme.base0E;
|
||||
color14 = "#" + scheme.base0C;
|
||||
color15 = "#" + scheme.base07;
|
||||
|
||||
shell = "fish";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,16 +4,20 @@
|
|||
enable = true;
|
||||
image = /home/${config.conf.username}/Pictures/backgrounds/shinobu_2k.jpg;
|
||||
polarity = "dark";
|
||||
targets = {
|
||||
nixvim.enable = false;
|
||||
fish.enable = false;
|
||||
};
|
||||
|
||||
fonts = {
|
||||
serif = {
|
||||
package = pkgs.dejavu_fonts;
|
||||
name = "DejaVu Serif";
|
||||
package = pkgs.cantarell-fonts;
|
||||
name = "Cantarell";
|
||||
};
|
||||
|
||||
sansSerif = {
|
||||
package = pkgs.dejavu_fonts;
|
||||
name = "DejaVu Sans";
|
||||
package = pkgs.cantarell-fonts;
|
||||
name = "Cantarell";
|
||||
};
|
||||
|
||||
monospace = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue