home: code cleanup

This commit is contained in:
Aly Raffauf 2024-06-03 22:10:25 -04:00
parent 2b1247b696
commit 916f51d50c
14 changed files with 55 additions and 112 deletions

View file

@ -28,6 +28,7 @@ in {
plexamp
python3
ruby
tauon
trayscale
unstable.obsidian
unstable.zoom-us
@ -36,7 +37,6 @@ in {
];
alyraffauf = {
services.syncthing.enable = false;
desktop = {
defaultApps = {
enable = true;
@ -118,7 +118,6 @@ in {
fzf.enable = true;
neofetch.enable = true;
neovim.enable = true;
tauon.enable = true;
tmux.enable = true;
vsCodium.enable = true;
};

View file

@ -14,8 +14,8 @@
settings = {
colors = {
primary = {
foreground = "${config.alyraffauf.desktop.theme.colors.text}";
background = "${config.alyraffauf.desktop.theme.colors.background}";
foreground = "${config.alyraffauf.desktop.theme.colors.text}";
};
transparent_background_colors = true;
draw_bold_text_with_bright_colors = true;
@ -30,7 +30,7 @@
selection.save_to_clipboard = true;
window = {
blur = true;
# decorations = "None";
decorations = "None";
dynamic_padding = true;
opacity = 0.8;
};

View file

@ -19,7 +19,6 @@
./neofetch
./neovim
./swaylock
./tauon
./thunar
./tmux
./vsCodium

View file

@ -9,9 +9,9 @@
config = lib.mkIf config.alyraffauf.apps.eza.enable {
programs.eza = {
enable = true;
extraOptions = ["--group-directories-first" "--header"];
git = true;
icons = true;
extraOptions = ["--group-directories-first" "--header"];
};
};
}

View file

@ -14,18 +14,21 @@
font = "${config.alyraffauf.desktop.theme.terminalFont.name}:size=${toString config.alyraffauf.desktop.theme.terminalFont.size}";
icon-theme = "${config.alyraffauf.desktop.theme.iconTheme.name}";
layer = "overlay";
width = 36;
lines = 3;
terminal = config.alyraffauf.desktop.defaultApps.terminal.exe;
width = 36;
};
border = {
radius = 10;
width = 2;
};
border = {width = 2;};
colors = {
background = "${config.alyraffauf.desktop.theme.colors.background}CC";
border = "${config.alyraffauf.desktop.theme.colors.primary}EE";
selection = "${config.alyraffauf.desktop.theme.colors.background}FF";
selection-match = "#e78284FF";
selection-text = "#f4b8e4FF";
text = "${config.alyraffauf.desktop.theme.colors.text}FF";
border = "${config.alyraffauf.desktop.theme.colors.primary}EE";
};
};
};

View file

@ -12,25 +12,18 @@
programs.librewolf = {
enable = true;
settings = {
"browser.safebrowsing.blockedURIs.enabled" = true;
"browser.safebrowsing.downloads.enabled" = true;
"browser.safebrowsing.malware.enabled" = true;
"browser.safebrowsing.phishing.enabled" = true;
"browser.safebrowsing.blockedURIs.enabled" = true;
"browser.safebrowsing.provider.google4.gethashURL" = "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST";
"browser.safebrowsing.provider.google4.updateURL" = "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST";
"browser.safebrowsing.provider.google.gethashURL" = "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2";
"browser.safebrowsing.provider.google.updateURL" = "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_SAFEBROWSING_API_KEY%";
"browser.safebrowsing.downloads.enabled" = true;
"identity.fxaccounts.enabled" = true;
"privacy.clearOnShutdown.history" = false;
"middlemouse.paste" = false;
"browser.safebrowsing.provider.google4.gethashURL" = "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST";
"browser.safebrowsing.provider.google4.updateURL" = "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST";
"general.autoScroll" = true;
"identity.fxaccounts.enabled" = true;
"middlemouse.paste" = false;
"privacy.clearOnShutdown.history" = false;
};
};
};

View file

@ -12,48 +12,38 @@
programs.swaylock.enable = true;
xdg.configFile."swaylock/config".text = ''
font="${config.alyraffauf.desktop.theme.terminalFont.name}-Regular"
bs-hl-color=e78284
caps-lock-bs-hl-color=e78284
caps-lock-key-hl-color=e78284
color=303446
image=${config.alyraffauf.desktop.theme.wallpaper}
daemonize
indicator-radius=120
indicator-thickness=20
font="${config.alyraffauf.desktop.theme.terminalFont.name}-Regular"
image=${config.alyraffauf.desktop.theme.wallpaper}
indicator-caps-lock
indicator-idle-visible
key-hl-color=a6d189
separator-color=${config.alyraffauf.desktop.theme.colors.background}CC
inside-color=303446cc
inside-clear-color=303446cc
indicator-radius=120
indicator-thickness=20
inside-caps-lock-color=303446cc
inside-clear-color=303446cc
inside-color=303446cc
inside-ver-color=303446cc
inside-wrong-color=303446cc
ring-color=${config.alyraffauf.desktop.theme.colors.primary}CC
ring-clear-color=85c1dccc
ring-caps-lock-color=e78284cc
ring-ver-color=a6d189cc
ring-wrong-color=e78284cc
line-color=${config.alyraffauf.desktop.theme.colors.background}CC
line-clear-color=${config.alyraffauf.desktop.theme.colors.background}CC
key-hl-color=a6d189
line-caps-lock-color=${config.alyraffauf.desktop.theme.colors.background}CC
line-clear-color=${config.alyraffauf.desktop.theme.colors.background}CC
line-color=${config.alyraffauf.desktop.theme.colors.background}CC
line-ver-color=${config.alyraffauf.desktop.theme.colors.background}CC
line-wrong-color=${config.alyraffauf.desktop.theme.colors.background}CC
ring-caps-lock-color=e78284cc
ring-clear-color=85c1dccc
ring-color=${config.alyraffauf.desktop.theme.colors.primary}CC
ring-ver-color=a6d189cc
ring-wrong-color=e78284cc
separator-color=${config.alyraffauf.desktop.theme.colors.background}CC
text-caps-lock-color=c6d0f5
text-clear-color=c6d0f5
text-ver-color=c6d0f5
text-wrong-color=c6d0f5
bs-hl-color=e78284
caps-lock-key-hl-color=e78284
caps-lock-bs-hl-color=e78284
text-caps-lock-color=c6d0f5
'';
};
}

View file

@ -1,12 +0,0 @@
{
pkgs,
lib,
config,
...
}: {
options = {alyraffauf.apps.tauon.enable = lib.mkEnableOption "Enables Tauon.";};
config = lib.mkIf config.alyraffauf.apps.tauon.enable {
home.packages = with pkgs; [tauon];
};
}

View file

@ -18,18 +18,9 @@
];
xdg.configFile."xfce4/helpers.rc".text = ''
TerminalEmulator=alacritty
FileManager=thunar
TerminalEmulator=alacritty
WebBrowser=firefox
'';
# xfconf.settings = {
# thunar = {
# "last-menubar-visible" = false;
# "misc-confirm-close-multiple-tabs" = false;
# "misc-show-delete-action" = true;
# "misc-single-click" = true;
# };
# };
};
}

View file

@ -20,15 +20,15 @@
];
terminal = "tmux-256color";
extraConfig = ''
set-option -g status-bg plum4
set-option -g pane-active-border-style fg=plum4
run-shell ${pkgs.tmuxPlugins.battery}/share/tmux-plugins/battery/battery.tmux
run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux
run-shell ${pkgs.tmuxPlugins.resurrect}/share/tmux-plugins/resurrect/resurrect.tmux
run-shell ${pkgs.tmuxPlugins.weather}/share/tmux-plugins/weather/tmux-weather.tmux
set -g status-right '#{cpu_percentage} CPU | #{battery_percentage} BAT | %I:%M %p | #{weather}'
set-option -g @tmux-weather-format "%x+%t"
set-option -g @tmux-weather-units "u"
set -g status-right '#{cpu_percentage} CPU | #{battery_percentage} BAT | %I:%M %p | #{weather}'
run-shell ${pkgs.tmuxPlugins.battery}/share/tmux-plugins/battery/battery.tmux
run-shell ${pkgs.tmuxPlugins.resurrect}/share/tmux-plugins/resurrect/resurrect.tmux
run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux
run-shell ${pkgs.tmuxPlugins.weather}/share/tmux-plugins/weather/tmux-weather.tmux
set-option -g pane-active-border-style fg=plum4
set-option -g status-bg plum4
'';
};
};

View file

@ -7,9 +7,7 @@
imports = [./apps ./desktop ./services ./scripts];
nixpkgs = {
# Configure nixpkgs instance
config = {
# Enable unfree packages
allowUnfree = true;
};
};

View file

@ -21,19 +21,6 @@
"org/gnome/mutter".dynamic-workspaces = true;
"org/gnome/mutter".edge-tiling = true;
"org/gnome/mutter".workspaces-only-on-primary = true;
"org/gnome/shell/extensions/blur-my-shell/overview".style-components = 3;
"org/gnome/shell/extensions/blur-my-shell/panel".blur = false;
"org/gnome/shell/extensions/blur-my-shell/panel".customize = true;
"org/gnome/shell/extensions/blur-my-shell/panel".style-panel = 0;
"org/gnome/shell/extensions/blur-my-shell/panel".override-background =
false;
"org/gnome/shell/extensions/blur-my-shell/panel".override-background-dynamically =
false;
"org/gnome/shell/extensions/blur-my-shell/panel".unblur-in-overview =
true;
"org/gnome/system/location".enabled = true;
"org/gtk/gtk4/settings/file-chooser".sort-directories-first = true;
"org/gtk/settings/file-chooser".sort-directories-first = true;
"org/gnome/shell".enabled-extensions = [
"appindicatorsupport@rgcjonas.gmail.com"
"blur-my-shell@aunetx"
@ -44,6 +31,16 @@
"tiling-assistant@leleat-on-github"
"drive-menu@gnome-shell-extensions.gcampax.github.com"
];
"org/gnome/shell/extensions/blur-my-shell/overview".style-components = 3;
"org/gnome/shell/extensions/blur-my-shell/panel".blur = false;
"org/gnome/shell/extensions/blur-my-shell/panel".customize = true;
"org/gnome/shell/extensions/blur-my-shell/panel".override-background = false;
"org/gnome/shell/extensions/blur-my-shell/panel".override-background-dynamically = false;
"org/gnome/shell/extensions/blur-my-shell/panel".style-panel = 0;
"org/gnome/shell/extensions/blur-my-shell/panel".unblur-in-overview = true;
"org/gnome/system/location".enabled = true;
"org/gtk/gtk4/settings/file-chooser".sort-directories-first = true;
"org/gtk/settings/file-chooser".sort-directories-first = true;
};
};
}

View file

@ -4,5 +4,5 @@
pkgs,
...
}: {
imports = [./syncthing ./easyeffects ./mpd];
imports = [./easyeffects ./mpd];
}

View file

@ -1,15 +0,0 @@
{
pkgs,
lib,
config,
...
}: {
options = {
alyraffauf.services.syncthing.enable =
lib.mkEnableOption "Enables syncthing as user.";
};
config = lib.mkIf config.alyraffauf.services.syncthing.enable {
services.syncthing.enable = true;
};
}