cleanup and styles

This commit is contained in:
Ivan Kirilov Dimitrov 2024-08-02 08:39:36 +02:00
parent 5cb70e464a
commit be21318ed1
No known key found for this signature in database
GPG Key ID: 0BDAD4B211C49294
2 changed files with 18 additions and 16 deletions

View File

@ -19,16 +19,7 @@ toplevel@{ moduleWithSystem, ... }: {
publicShare = "${home.homeDirectory}/pub"; publicShare = "${home.homeDirectory}/pub";
music = "${home.homeDirectory}/mus"; music = "${home.homeDirectory}/mus";
}; };
mimeApps = { mimeApps.enable = true;
enable = true;
defaultApplications = {
"text/html" = "firefox.desktop";
"x-scheme-handler/http" = "firefox.desktop";
"x-scheme-handler/https" = "firefox.desktop";
"x-scheme-handler/about" = "firefox.desktop";
"x-scheme-handler/unknown" = "firefox.desktop";
};
};
}; };
} }
); );
@ -38,9 +29,8 @@ toplevel@{ moduleWithSystem, ... }: {
home = { home = {
username = "ivand"; username = "ivand";
homeDirectory = "/home/ivand"; homeDirectory = "/home/ivand";
sessionVariables = { EDITOR = "nvim"; PAGER = "bat"; TERM = "screen-256color"; MAKEFLAGS = "-j 4"; }; sessionVariables = { EDITOR = "nvim"; };
pointerCursor = with pkgs; { name = "catppuccin-mocha-green-cursors"; package = catppuccin-cursors.mochaGreen; size = 24; gtk.enable = true; }; packages = with pkgs; [ speedtest-cli nvim ];
packages = with pkgs; [ transmission_4 speedtest-cli nvim ];
}; };
programs = { programs = {
git = with pkgs.lib; { git = with pkgs.lib; {
@ -57,6 +47,7 @@ toplevel@{ moduleWithSystem, ... }: {
util = moduleWithSystem ( util = moduleWithSystem (
top@{ ... }: top@{ ... }:
perSystem@{ pkgs, config, ... }: { perSystem@{ pkgs, config, ... }: {
home.sessionVariables = { PAGER = "bat"; BAT_THEME = "1337"; };
programs = { programs = {
password-store = { enable = true; package = pkgs.pass.withExtensions (e: with e; [ pass-otp pass-file ]); settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; }; }; password-store = { enable = true; package = pkgs.pass.withExtensions (e: with e; [ pass-otp pass-file ]); settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; }; };
git = { git = {
@ -110,7 +101,7 @@ toplevel@{ moduleWithSystem, ... }: {
sc = "systemctl"; sc = "systemctl";
neofetch = "${pkgs.fastfetch}/bin/fastfetch -c all.jsonc"; neofetch = "${pkgs.fastfetch}/bin/fastfetch -c all.jsonc";
}; };
sessionVariables = { TERM = "screen-256color"; }; sessionVariables = { };
in in
{ {
bash = { bash = {
@ -171,6 +162,10 @@ toplevel@{ moduleWithSystem, ... }: {
swayland = moduleWithSystem ( swayland = moduleWithSystem (
top@{ ... }: top@{ ... }:
perSystem@{ pkgs, config, ... }: { perSystem@{ pkgs, config, ... }: {
home = {
packages = with pkgs; [ audacity gimp grim libnotify libreoffice-qt mupdf slurp transmission_4 wl-clipboard xdg-user-dirs xdg-utils xwayland ];
pointerCursor = with pkgs; { name = "catppuccin-mocha-green-cursors"; package = catppuccin-cursors.mochaGreen; size = 24; gtk.enable = true; };
};
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
@ -416,7 +411,7 @@ toplevel@{ moduleWithSystem, ... }: {
kitty = { kitty = {
enable = true; enable = true;
font = { package = pkgs.fira-code; name = "FiraCodeNFM-Reg"; }; font = { package = pkgs.fira-code; name = "FiraCodeNFM-Reg"; };
settings = { background_opacity = "0.90"; cursor_shape = "beam"; term = "screen-256color"; }; settings = { background_opacity = "0.90"; cursor_shape = "beam"; };
}; };
imv = { enable = true; settings = { options.fullscreen = true; }; }; imv = { enable = true; settings = { options.fullscreen = true; }; };
mpv = { enable = true; scripts = with pkgs.mpvScripts; [ uosc thumbfast ]; }; mpv = { enable = true; scripts = with pkgs.mpvScripts; [ uosc thumbfast ]; };
@ -437,7 +432,6 @@ toplevel@{ moduleWithSystem, ... }: {
}; };
}; };
}; };
home.packages = with pkgs; [ audacity gimp grim libnotify libreoffice-qt mupdf slurp wl-clipboard xdg-user-dirs xdg-utils xwayland ];
} }
); );
web = moduleWithSystem ( web = moduleWithSystem (
@ -492,6 +486,13 @@ toplevel@{ moduleWithSystem, ... }: {
allowed_extensions = [ "jid1-AQqSMBYb0a8ADg@jetpack" ]; allowed_extensions = [ "jid1-AQqSMBYb0a8ADg@jetpack" ];
}; };
}; };
xdg.mimeApps.defaultApplications = {
"text/html" = "firefox.desktop";
"x-scheme-handler/http" = "firefox.desktop";
"x-scheme-handler/https" = "firefox.desktop";
"x-scheme-handler/about" = "firefox.desktop";
"x-scheme-handler/unknown" = "firefox.desktop";
};
} }
); );
}; };

View File

@ -20,6 +20,7 @@ top@{ moduleWithSystem, ... }: {
fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) noto-fonts noto-fonts-emoji noto-fonts-lgc-plus ]; fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) noto-fonts noto-fonts-emoji noto-fonts-lgc-plus ];
environment = { environment = {
systemPackages = with pkgs; [ cmatrix uutils-coreutils-noprefix cryptsetup fd file git glibc gnumake mlocate openssh openssl procs ripgrep srm unzip vim zip just ]; systemPackages = with pkgs; [ cmatrix uutils-coreutils-noprefix cryptsetup fd file git glibc gnumake mlocate openssh openssl procs ripgrep srm unzip vim zip just ];
sessionVariables = { MAKEFLAGS = "-j 4"; };
shells = with pkgs; [ zsh nushell ]; shells = with pkgs; [ zsh nushell ];
}; };
programs = { zsh.enable = true; nix-ld.enable = true; dconf.enable = true; }; programs = { zsh.enable = true; nix-ld.enable = true; dconf.enable = true; };