Move to DashVim

This commit is contained in:
DashieTM 2024-07-15 01:57:04 +02:00
parent cd0bfe5cd5
commit e8fa641a15
11 changed files with 682 additions and 339 deletions

View file

@ -32,9 +32,7 @@ in
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
services.printing.browsing = true; services.printing.browsing = true;
# fucking fun services.printing.drivers = [ pkgs.hplip ];
# TODO: https://github.com/NixOS/nixpkgs/pull/325825 ....
# services.printing.drivers = [ pkgs.hplip ];
services.printing.startWhenNeeded = true; # optional services.printing.startWhenNeeded = true; # optional
services.avahi = { services.avahi = {
enable = true; enable = true;

858
nix/flake.lock generated

File diff suppressed because it is too large Load diff

View file

@ -40,7 +40,11 @@
hyprdock.url = "github:DashieTM/hyprdock"; hyprdock.url = "github:DashieTM/hyprdock";
reset.url = "github:Xetibo/ReSet"; reset.url = "github:Xetibo/ReSet";
reset-plugins.url = "github:Xetibo/ReSet-Plugins"; reset-plugins.url = "github:Xetibo/ReSet-Plugins";
# nixvim.url = "github:nix-community/nixvim";
dashvim = {
url = "github:DashieTM/DashVim";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { ... }@inputs: outputs = { ... }@inputs:
@ -49,9 +53,6 @@
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ overlays = [
inputs.nur.overlay inputs.nur.overlay
(_: prev: {
python312 = prev.python312.override { packageOverrides = _: pysuper: { nose = pysuper.pynose; }; };
})
]; ];
config = { config = {
allowUnfree = true; allowUnfree = true;

View file

@ -22,10 +22,8 @@
hardware.graphics.extraPackages = with pkgs; [ hardware.graphics.extraPackages = with pkgs; [
libvdpau-va-gl libvdpau-va-gl
vaapiVdpau vaapiVdpau
# DUDE FOR FUCK SAKE rocmPackages.clr.icd
# TODO: rocm-opencl-runtime
# rocmPackages.clr.icd
# rocm-opencl-runtime
]; ];
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;

View file

@ -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 { colorscheme = lib.mkOption {
default = { default = {
# custom tokyo night # custom tokyo night

View file

@ -5,9 +5,15 @@
}: }:
{ {
imports = [ 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; [ home.packages = with pkgs; [
#basics #basics
gitui gitui

View file

@ -100,12 +100,12 @@ in
''; '';
# #
# dconf.settings = { # dconf.settings = {
# "org/gnome/desktop/interface" = { # "org/gnome/desktop/interface" = {
# gtk-theme = "adw-gtk3"; # gtk-theme = "adw-gtk3";
# cursor-theme = "Bibata-Modern-Classic"; # cursor-theme = "Bibata-Modern-Classic";
# cursor-size = 24; # cursor-size = 24;
# icon-theme = "MoreWaita"; # icon-theme = "MoreWaita";
# }; # };
# }; # };
programs.nix-index = programs.nix-index =

View file

@ -13,6 +13,7 @@ let
inputs.reset.homeManagerModules.default inputs.reset.homeManagerModules.default
inputs.nix-flatpak.homeManagerModules.nix-flatpak inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
inputs.dashvim.homeManagerModules.dashvim
]; ];
in in
{ {
@ -31,7 +32,6 @@ in
home-manager.users.${config.conf.username} = { home-manager.users.${config.conf.username} = {
imports = [ imports = [
./hyprland/default.nix ./hyprland/default.nix
./flatpak.nix ./flatpak.nix
./common.nix ./common.nix

View file

@ -230,8 +230,6 @@
"immediate,class:^(.*)(Pal)$" "immediate,class:^(.*)(Pal)$"
"immediate,class:^(.*)(dota2)$" "immediate,class:^(.*)(dota2)$"
"immediate,class:^(.*)(needforspeedheat.exe)$" "immediate,class:^(.*)(needforspeedheat.exe)$"
"forceinput,class:^(.*)(Pal)$"
"forceinput,class:^(.*)(Battlefield 4)$"
]; ];
exec-once = [ exec-once = [

View file

@ -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 = { programs.kitty = {
enable = true; enable = true;
settings = { settings = {
enable_audio_bell = "no"; enable_audio_bell = "no";
window_alert_on_bell = "no"; window_alert_on_bell = "no";
background_opacity = lib.mkForce "0.8";
cursor_blink_interval = "0"; cursor_blink_interval = "0";
window_padding_width = "1"; window_padding_width = "1";
shell_integration = "yes"; shell_integration = "yes";
sync_with_monitor = "no"; sync_with_monitor = "no";
background_opacity = "0.8";
font_family = "JetBrainsMono Nerd Font Mono"; font_family = "JetBrainsMono Nerd Font Mono";
bold_font = "JetBrainsMono Nerd Font Mono Extra Bold"; bold_font = "JetBrainsMono Nerd Font Mono Extra Bold";
italic_font = "JetBrainsMono Nerd Font Mono Extra Italic"; italic_font = "JetBrainsMono Nerd Font Mono Extra Italic";
bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic"; bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic";
# background = lib.mkForce "#1a1b25"; background = base;
# foreground = "#c5c8c6"; foreground = "#" + scheme.base05;
# selection_foreground = "#" + scheme.base05;
# selection_background = "#b2ceee"; selection_background = base;
# selection_foreground = "#080808"; url_color = "#" + scheme.base04;
# cursor = "#" + scheme.base05;
# url_color = "#73daca"; active_border_color = "#" + scheme.base03;
# cursor = "#c0caf5"; inactive_border_color = "#" + scheme.base01;
# cursor_text_color = "#1a1b25"; active_tab_background = base;
# active_tab_foreground = "#" + scheme.base05;
# active_tab_background = "#7aa2f7"; inactive_tab_background = "#" + scheme.base01;
# active_tab_foreground = "#16161e"; inactive_tab_foreground = "#" + scheme.base04;
# inactive_tab_background = "#292e42"; tab_bar_background = "#" + scheme.base01;
# inactive_tab_foreground = "#545c7e";
#
# active_border_color = "#7aa2f7";
# inactive_border_color = "#292e42";
# color0 = "#15161e"; color0 = base;
# color1 = "#c94448"; color1 = "#" + scheme.base08;
# color2 = "#9ece6a"; color2 = "#" + scheme.base0B;
# color3 = "#e0af68"; color3 = "#" + scheme.base0A;
# color4 = "#7aa2f7"; color4 = "#" + scheme.base0D;
# color5 = "#bb9af7"; color5 = "#" + scheme.base0E;
# color6 = "#7dcfff"; color6 = "#" + scheme.base0C;
# color7 = "#a9b1d6"; color7 = "#" + scheme.base05;
#
# color8 = "#414868"; color8 = "#" + scheme.base03;
# color9 = "#f2201f"; color9 = "#" + scheme.base08;
# color10 = "#9ece6a"; color10 = "#" + scheme.base0B;
# color11 = "#e0af68"; color11 = "#" + scheme.base0A;
# color12 = "#7aa2f7"; color12 = "#" + scheme.base0D;
# color13 = "#bb9af7"; color13 = "#" + scheme.base0E;
# color14 = "#7dcfff"; color14 = "#" + scheme.base0C;
# color15 = "#c0caf5"; color15 = "#" + scheme.base07;
#
# color16 = "#ff9e64";
# color17 = "#db4b4b";
shell = "fish"; shell = "fish";
}; };

View file

@ -4,16 +4,20 @@
enable = true; enable = true;
image = /home/${config.conf.username}/Pictures/backgrounds/shinobu_2k.jpg; image = /home/${config.conf.username}/Pictures/backgrounds/shinobu_2k.jpg;
polarity = "dark"; polarity = "dark";
targets = {
nixvim.enable = false;
fish.enable = false;
};
fonts = { fonts = {
serif = { serif = {
package = pkgs.dejavu_fonts; package = pkgs.cantarell-fonts;
name = "DejaVu Serif"; name = "Cantarell";
}; };
sansSerif = { sansSerif = {
package = pkgs.dejavu_fonts; package = pkgs.cantarell-fonts;
name = "DejaVu Sans"; name = "Cantarell";
}; };
monospace = { monospace = {