ran nixfmt to fix formatting mistakes

This commit is contained in:
Aly Raffauf 2024-03-25 23:57:27 -04:00
parent e33ffbeda7
commit c711790262
7 changed files with 170 additions and 167 deletions

View file

@ -1,27 +1,30 @@
{ config, pkgs, ... }:
{
programs.alacritty = {
enable = true;
settings = {
colors = {
primary = {
foreground = "#fafafa";
background = "#232634";
};
draw_bold_text_with_bright_colors = true;
};
font = {
normal = { family = "NotoSansM Nerd Font"; style = "Regular"; };
size = 10;
};
selection.save_to_clipboard = true;
window = {
blur = true;
# decorations = "None";
dynamic_padding = true;
opacity = 0.8;
};
programs.alacritty = {
enable = true;
settings = {
colors = {
primary = {
foreground = "#fafafa";
background = "#232634";
};
draw_bold_text_with_bright_colors = true;
};
font = {
normal = {
family = "NotoSansM Nerd Font";
style = "Regular";
};
size = 10;
};
selection.save_to_clipboard = true;
window = {
blur = true;
# decorations = "None";
dynamic_padding = true;
opacity = 0.8;
};
};
};
}

View file

@ -1,6 +1,5 @@
{ config, pkgs, ... }:
{
imports =
[ ./common.nix ./common-gui.nix ./hypr ./waybar ./mako ./fuzzel ];
imports = [ ./common.nix ./common-gui.nix ./hypr ./waybar ./mako ./fuzzel ];
}

View file

@ -1,40 +1,43 @@
{ config, pkgs, ... }:
{
dconf.enable = true;
dconf.settings = {
"org/gnome/desktop/datetime".automatic-timezone = true;
"org/gnome/desktop/interface".clock-format = "12h";
"org/gnome/desktop/interface".enable-hot-corners = true;
"org/gnome/desktop/peripherals/touchpad".tap-to-click = true;
"org/gnome/desktop/search-providers".enabled = "['org.gnome.Calendar.desktop', 'org.gnome.Weather.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calculator.desktop', 'org.gnome.Characters.desktop', 'org.gnome.clocks.desktop']";
"org/gnome/desktop/wm/preferences".auto-raise = true;
"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"
"gsconnect@andyholmes.github.io"
"nightthemeswitcher@romainvigier.fr"
"noannoyance-fork@vrba.dev"
"tailscale-status@maxgallup.github.com"
"tiling-assistant@leleat-on-github"
"drive-menu@gnome-shell-extensions.gcampax.github.com"
];
"org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"];
uris = ["qemu:///system"];
};
dconf.enable = true;
dconf.settings = {
"org/gnome/desktop/datetime".automatic-timezone = true;
"org/gnome/desktop/interface".clock-format = "12h";
"org/gnome/desktop/interface".enable-hot-corners = true;
"org/gnome/desktop/peripherals/touchpad".tap-to-click = true;
"org/gnome/desktop/search-providers".enabled =
"['org.gnome.Calendar.desktop', 'org.gnome.Weather.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Calculator.desktop', 'org.gnome.Characters.desktop', 'org.gnome.clocks.desktop']";
"org/gnome/desktop/wm/preferences".auto-raise = true;
"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"
"gsconnect@andyholmes.github.io"
"nightthemeswitcher@romainvigier.fr"
"noannoyance-fork@vrba.dev"
"tailscale-status@maxgallup.github.com"
"tiling-assistant@leleat-on-github"
"drive-menu@gnome-shell-extensions.gcampax.github.com"
];
"org/virt-manager/virt-manager/connections" = {
autoconnect = [ "qemu:///system" ];
uris = [ "qemu:///system" ];
};
}
};
}

View file

@ -21,16 +21,17 @@
};
xdg.configFile."hypr/hypridle.conf".source = ./hypridle.conf;
xdg.configFile."hypr/hyprlock.conf".source = ./hyprlock.conf;
xdg.configFile."hypr/hyprpaper.conf".source = ./hyprpaper.conf;
xdg.configFile."hypr/tokyoGreen.jpg".source = ./tokyoGreen.jpg;
xdg.configFile."hypr/greenCity.jpg".source = ./greenCity.jpg;
xdg.configFile."hypr/shaders/blue-light-filter.glsl".source = ./blue-light-filter.glsl;
xdg.configFile."hypr/shaders/blue-light-filter.glsl".source =
./blue-light-filter.glsl;
xdg.configFile."hypr/hyprshade.toml".source = ./hyprshade.toml;
home.pointerCursor = {
gtk.enable = true;
# x11.enable = true;

View file

@ -1,16 +1,16 @@
{ config, pkgs, ... }:
{
services.mako = {
enable = true;
anchor = "top-center";
backgroundColor = "#232634CC";
borderColor = "#ca9ee6";
borderRadius = 10;
defaultTimeout = 10000;
font = "NotoSans Nerd Font Regular 10";
layer = "overlay";
padding = "15";
textColor = "#FAFAFA";
};
services.mako = {
enable = true;
anchor = "top-center";
backgroundColor = "#232634CC";
borderColor = "#ca9ee6";
borderRadius = 10;
defaultTimeout = 10000;
font = "NotoSans Nerd Font Regular 10";
layer = "overlay";
padding = "15";
textColor = "#FAFAFA";
};
}

View file

@ -2,97 +2,94 @@
{
home.packages = with pkgs; [
# backblaze-b2
curl
gh
git
nixfmt
python3
ruby
wget
home.packages = with pkgs; [
# backblaze-b2
curl
gh
git
nixfmt
python3
ruby
wget
];
programs.bash = {
enable = true;
enableCompletion = true;
initExtra = ''
export PS1="[\[$(tput setaf 27)\]\u\[$(tput setaf 135)\]@\[$(tput setaf 45)\]\h:\[$(tput setaf 33)\]\w] \[$(tput sgr0)\]$ "
'';
};
programs.emacs = {
enable = true;
extraPackages = (epkgs:
(with epkgs; [
better-defaults
catppuccin-theme
markdown-mode
nix-mode
org
org-bullets
org-journal
org-roam
ox-pandoc
projectile
python
treemacs
treemacs-projectile
treemacs-tab-bar
use-package
yaml
yaml-mode
]));
package = pkgs.emacs-nox;
extraConfig = builtins.readFile ./emacs.el;
};
programs.eza = {
enable = true;
git = true;
icons = true;
extraOptions = [ "--group-directories-first" "--header" ];
};
programs.fzf = {
enable = true;
tmux.enableShellIntegration = true;
};
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
defaultEditor = true;
};
programs.nnn.enable = true;
programs.tmux = {
enable = true;
mouse = true;
newSession = true;
plugins = with pkgs; [
tmuxPlugins.weather
tmuxPlugins.better-mouse-mode
tmuxPlugins.cpu
tmuxPlugins.battery
tmuxPlugins.resurrect
];
programs.bash = {
enable = true;
enableCompletion = true;
initExtra = ''
export PS1="[\[$(tput setaf 27)\]\u\[$(tput setaf 135)\]@\[$(tput setaf 45)\]\h:\[$(tput setaf 33)\]\w] \[$(tput sgr0)\]$ "
'';
};
programs.emacs = {
enable = true;
extraPackages = ( epkgs: (with epkgs; [
better-defaults
catppuccin-theme
markdown-mode
nix-mode
org
org-bullets
org-journal
org-roam
ox-pandoc
projectile
python
treemacs
treemacs-projectile
treemacs-tab-bar
use-package
yaml
yaml-mode
])
);
package = pkgs.emacs-nox;
extraConfig = builtins.readFile ./emacs.el;
};
programs.eza = {
enable = true;
git = true;
icons = true;
extraOptions = [
"--group-directories-first"
"--header"
];
};
programs.fzf = {
enable = true;
tmux.enableShellIntegration = true;
};
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
defaultEditor = true;
};
programs.nnn.enable = true;
programs.tmux = {
enable = true;
mouse = true;
newSession = true;
plugins = with pkgs; [
tmuxPlugins.weather
tmuxPlugins.better-mouse-mode
tmuxPlugins.cpu
tmuxPlugins.battery
tmuxPlugins.resurrect
];
terminal = "tmux-256color";
extraConfig = ''
set-option -g status-bg plum4
set-option -g pane-active-border-style fg=plum4
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.weather}/share/tmux-plugins/weather/tmux-weather.tmux
run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux
run-shell ${pkgs.tmuxPlugins.battery}/share/tmux-plugins/battery/battery.tmux
run-shell ${pkgs.tmuxPlugins.battery}/share/tmux-plugins/resurrect/resurrect.tmux
'';
};
terminal = "tmux-256color";
extraConfig = ''
set-option -g status-bg plum4
set-option -g pane-active-border-style fg=plum4
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.weather}/share/tmux-plugins/weather/tmux-weather.tmux
run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux
run-shell ${pkgs.tmuxPlugins.battery}/share/tmux-plugins/battery/battery.tmux
run-shell ${pkgs.tmuxPlugins.battery}/share/tmux-plugins/resurrect/resurrect.tmux
'';
};
}

View file

@ -26,7 +26,7 @@
cursorTheme.package = pkgs.catppuccin-cursors.latteDark;
cursorTheme.name = "Catppuccin-Frappe-Dark-Cursors";
cursorTheme.size = 32;
extraConfig = ''
background=#ca9ee6
enable-hidpi=on