cleanup and fixes

This commit is contained in:
foglar 2025-01-03 15:18:02 +01:00
parent fab7ceefe8
commit 10a3bb165d
8 changed files with 59 additions and 35 deletions

View File

@ -25,6 +25,7 @@
ranger ranger
unzip unzip
fd fd
imagemagick # convert images from formats like jpg, png, etc.
] ]
++ ( ++ (
if pkgs.system == "x86_64-linux" if pkgs.system == "x86_64-linux"

View File

@ -47,25 +47,6 @@
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
}; };
stylix.iconTheme = {
enable = true;
package = pkgs.papirus-icon-theme;
dark = "Papirus-Dark";
};
stylix.targets = {
dunst.enable = true;
kde.enable = true;
gtk.enable = true;
waybar = {
enable = true;
enableCenterBackColors = false;
enableLeftBackColors = false;
enableRightBackColors = false;
};
};
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;

View File

@ -56,10 +56,4 @@
btop.enable = lib.mkDefault true; btop.enable = lib.mkDefault true;
fzf.enable = lib.mkDefault true; fzf.enable = lib.mkDefault true;
}; };
home.packages = with pkgs; [
alejandra
nh
nixd
];
} }

View File

@ -23,8 +23,12 @@
./tools/kitty.nix ./tools/kitty.nix
./tools/tmux.nix ./tools/tmux.nix
./tools/zoxide.nix ./tools/zoxide.nix
./style.nix
]; ];
style.enable = true;
sh.bash = { sh.bash = {
enable = enable =
if userSettings.shell == "bash" if userSettings.shell == "bash"
@ -97,16 +101,8 @@
fzf.enable = lib.mkDefault true; fzf.enable = lib.mkDefault true;
}; };
stylix.targets = {
bat.enable = lib.mkDefault true;
btop.enable = lib.mkDefault true;
fzf.enable = lib.mkDefault true;
};
home.packages = with pkgs; [ home.packages = with pkgs; [
alejandra
nh nh
nixd
]; ];
home.file = { home.file = {

View File

@ -161,6 +161,10 @@
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.extensions = with pkgs-stable.vscode-extensions; [
jnoortheen.nix-ide jnoortheen.nix-ide
]; ];
home.packages = with pkgs-stable; [
alejandra
nixd
];
}) })
(lib.mkIf config.program.vscode.ide.web.enable { (lib.mkIf config.program.vscode.ide.web.enable {
@ -189,6 +193,10 @@
github.vscode-pull-request-github github.vscode-pull-request-github
github.vscode-github-actions github.vscode-github-actions
]; ];
programs.vscode.userSettings = {
"git.autofetch" = true;
};
}) })
(lib.mkIf config.program.vscode.markdown.enable { (lib.mkIf config.program.vscode.markdown.enable {

View File

@ -14,12 +14,15 @@
enable = true; enable = true;
userName = "${userSettings.username}"; userName = "${userSettings.username}";
userEmail = "kohout.fi.2023@skola.ssps.cz"; userEmail = "kohout.fi.2023@skola.ssps.cz";
lfs.enable = true;
}; };
home.packages = with pkgs; home.packages = with pkgs;
[ [
git git
github-cli github-cli
git-lfs
git-credential-manager
] ]
++ ( ++ (
if pkgs.system == "x86_64-linux" if pkgs.system == "x86_64-linux"

View File

@ -0,0 +1,43 @@
{
lib,
config,
pkgs,
...
}: {
options = {
style.enable = lib.mkEnableOption "style";
};
config = lib.mkIf config.style.enable {
stylix.iconTheme = {
enable = true;
package = pkgs.papirus-icon-theme;
dark = "Papirus-Dark";
};
stylix.targets = {
bat.enable = lib.mkDefault true;
btop.enable = lib.mkDefault true;
fzf.enable = lib.mkDefault true;
tmux.enable =
if config.program.tmux.enable
then lib.mkDefault true
else lib.mkDefault false;
dunst.enable =
if config.desktop.hyprland.enable
then lib.mkDefault true
else lib.mkDefault false;
kde.enable = true;
gtk.enable = true;
waybar = {
enable = true;
enableCenterBackColors = false;
enableLeftBackColors = false;
enableRightBackColors = false;
};
};
};
}

View File

@ -9,8 +9,6 @@
}; };
config = lib.mkIf config.program.tmux.enable { config = lib.mkIf config.program.tmux.enable {
#stylix.targets.tmux.enable = true;
programs.tmux = { programs.tmux = {
enable = true; enable = true;
clock24 = true; clock24 = true;