Update for 25.05
This commit is contained in:
parent
8bfcca1bb8
commit
63c42b081d
12 changed files with 193 additions and 209 deletions
|
@ -21,7 +21,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
bitwarden
|
||||
darkreader
|
||||
return-youtube-dislikes
|
||||
|
@ -33,16 +33,16 @@
|
|||
|
||||
search = {
|
||||
force = true;
|
||||
default = "Ecosia";
|
||||
default = "ecosia";
|
||||
order = [
|
||||
"Ecosia"
|
||||
"NixPKGs"
|
||||
"MyNixOS"
|
||||
"YouTube"
|
||||
"Spotify"
|
||||
"ecosia"
|
||||
"nixpkgs"
|
||||
"mynixos"
|
||||
"youtube"
|
||||
"spotify"
|
||||
];
|
||||
engines = {
|
||||
"Ecosia" = {
|
||||
"ecosia" = {
|
||||
urls = [{
|
||||
template = "https://www.ecosia.org/search";
|
||||
params = [{
|
||||
|
@ -53,7 +53,7 @@
|
|||
definedAliases = [ "@e" ];
|
||||
};
|
||||
|
||||
"NixPKGs" = {
|
||||
"nixpkgs" = {
|
||||
urls = [{
|
||||
template = "https://search.nixos.org/packages";
|
||||
params = [
|
||||
|
@ -70,7 +70,7 @@
|
|||
definedAliases = [ "@p" ];
|
||||
};
|
||||
|
||||
"MyNixOS" = {
|
||||
"mynixos" = {
|
||||
urls = [{
|
||||
template = "https://mynixos.com/search";
|
||||
params = [{
|
||||
|
@ -81,7 +81,7 @@
|
|||
definedAliases = [ "@my" ];
|
||||
};
|
||||
|
||||
"YouTube" = {
|
||||
"youtube" = {
|
||||
urls = [{
|
||||
template = "https://www.youtube.com/results";
|
||||
params = [{
|
||||
|
@ -92,7 +92,7 @@
|
|||
definedAliases = [ "@y" ];
|
||||
};
|
||||
|
||||
"Spotify" = {
|
||||
"spotify" = {
|
||||
urls = [{ template = "https://open.spotify.com/search/{searchTerms}"; }];
|
||||
definedAliases = [ "@s" ];
|
||||
};
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ config, lib, pkgsStable, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
programs.ranger = {
|
||||
enable = true;
|
||||
package = pkgsStable.ranger;
|
||||
#package = pkgs.ranger;
|
||||
settings = {
|
||||
preview_images = true;
|
||||
preview_images_method = "sixel";
|
||||
#preview_images_method = "sixel";
|
||||
dirname_in_tabs = true;
|
||||
autosave_bookmarks = false;
|
||||
show_hidden = true;
|
||||
|
@ -118,9 +118,6 @@
|
|||
P:${XDG_NETWORK_DIR}/Midas/Photos
|
||||
'';
|
||||
};
|
||||
packages = with pkgsStable; [
|
||||
imagemagick
|
||||
poppler_utils
|
||||
];
|
||||
packages = with pkgs; [ poppler_utils ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
ignoreSpace = true;
|
||||
path = "$ZDOTDIR/.zsh_history";
|
||||
};
|
||||
initExtra = ''
|
||||
initContent = ''
|
||||
smallfetch
|
||||
source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
|
||||
'';
|
||||
|
|
|
@ -1,11 +1,14 @@
|
|||
{ config, lib, pkgsStable, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
home.packages = lib.mkIf config.home.desktop.enable (with pkgsStable; [
|
||||
liberation_ttf
|
||||
noto-fonts
|
||||
sarasa-gothic
|
||||
twitter-color-emoji
|
||||
ubuntu-classic
|
||||
(nerdfonts.override { fonts = [ "UbuntuMono" ]; })
|
||||
]);
|
||||
config = lib.mkIf config.home.desktop.enable {
|
||||
home.packages = (with pkgs; [
|
||||
liberation_ttf
|
||||
noto-fonts
|
||||
sarasa-gothic
|
||||
twitter-color-emoji
|
||||
]) ++ (with pkgs.nerd-fonts; [
|
||||
ubuntu
|
||||
ubuntu-mono
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ ... }:
|
||||
{
|
||||
look.fonts = {
|
||||
main = "Ubuntu";
|
||||
main = "Ubuntu Nerd Font";
|
||||
mono = "UbuntuMono Nerd Font";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,22 +2,26 @@
|
|||
{
|
||||
services.mako = {
|
||||
enable = config.home.desktop.enable;
|
||||
borderColor = "#${config.look.colors.accent}";
|
||||
backgroundColor = "#${config.look.colors.dark}D9";
|
||||
sort = "+time";
|
||||
layer = "overlay";
|
||||
padding = "8";
|
||||
margin = "0";
|
||||
borderSize = config.look.border.int;
|
||||
maxIconSize = 40;
|
||||
defaultTimeout = 4500;
|
||||
font = "${config.look.fonts.main} 12";
|
||||
anchor = "bottom-right";
|
||||
extraConfig = ''
|
||||
on-button-right=dismiss-all
|
||||
outer-margin=10
|
||||
[mode=do-not-disturb]
|
||||
invisible=1
|
||||
'';
|
||||
settings = {
|
||||
# Theme
|
||||
background-color = "#${config.look.colors.dark}D9";
|
||||
border-color = "#${config.look.colors.accent}";
|
||||
border-size = config.look.border.int;
|
||||
font = "${config.look.fonts.main} 12";
|
||||
margin = 0;
|
||||
max-icon-size = 40;
|
||||
outer-margin = 10;
|
||||
padding = 8;
|
||||
|
||||
# Rules
|
||||
anchor = "bottom-right";
|
||||
default-timeout = 4500;
|
||||
layer = "overlay";
|
||||
on-button-right = "dismiss-all";
|
||||
sort = "+time";
|
||||
|
||||
# Modes
|
||||
"mode=do-not-disturb".invisible = 1;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -22,11 +22,11 @@
|
|||
format-bluetooth = "{icon} {volume}%";
|
||||
format-muted = " muted";
|
||||
format-icons = {
|
||||
headphone = " ";
|
||||
headset = " ";
|
||||
headphone = "";
|
||||
headset = "";
|
||||
default = [
|
||||
" "
|
||||
" "
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
on-click = "${wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
|
@ -37,8 +37,8 @@
|
|||
|
||||
"mpris" = {
|
||||
player = "mpd";
|
||||
format = " {title}";
|
||||
format-paused = " {artist}";
|
||||
format = " {title}";
|
||||
format-paused = " {artist}";
|
||||
format-stopped = "";
|
||||
tooltip-format = lib.concatStrings [
|
||||
"{title} - {artist} - {album}\n"
|
||||
|
@ -60,9 +60,9 @@
|
|||
|
||||
# Print the notification status with the tooltip
|
||||
if [[ "$mode" == "do-not-disturb" ]]; then
|
||||
printf '{"text":" Off","class":"disabled","tooltip":"Notifications Disabled."}'
|
||||
printf '{"text":" Off","class":"disabled","tooltip":"Notifications Disabled."}'
|
||||
else
|
||||
printf '{"text":" On","tooltip":"Notifications Enabled."}';
|
||||
printf '{"text":" On","tooltip":"Notifications Enabled."}';
|
||||
fi
|
||||
'';
|
||||
format = "{}";
|
||||
|
@ -74,8 +74,8 @@
|
|||
"idle_inhibitor" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
activated = " On";
|
||||
deactivated = " Off";
|
||||
activated = " On";
|
||||
deactivated = " Off";
|
||||
tooltip-format-activated = "Sleep inhibited.";
|
||||
tooltip-format-deactivated = "Sleep uninhibited.";
|
||||
};
|
||||
|
@ -90,12 +90,12 @@
|
|||
};
|
||||
|
||||
"cpu" = {
|
||||
format = " {usage}%";
|
||||
format = " {usage}%";
|
||||
interval = 3;
|
||||
};
|
||||
|
||||
"memory" = {
|
||||
format = " {used}G";
|
||||
format = " {used}G";
|
||||
tooltip = false;
|
||||
interval = 3;
|
||||
};
|
||||
|
@ -137,7 +137,7 @@
|
|||
fi
|
||||
|
||||
# Output the VRAM usage
|
||||
echo "{\"text\": \" ''${vram_usage_display}\"}"
|
||||
echo "{\"text\": \" ''${vram_usage_display}\"}"
|
||||
'';
|
||||
format = "{}";
|
||||
return-type = "json";
|
||||
|
@ -145,7 +145,7 @@
|
|||
};
|
||||
|
||||
"backlight" = {
|
||||
format = "{icon} {percent}%";
|
||||
format = "{icon} {percent}%";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
|
@ -159,7 +159,7 @@
|
|||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format = "{icon} {capacity}%";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
|
@ -171,12 +171,12 @@
|
|||
|
||||
"clock" = {
|
||||
interval = 1;
|
||||
format = "{:%a %b %d %I:%M:%S%p}";
|
||||
format = " {:%a %b %d %I:%M:%S%p}";
|
||||
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
||||
};
|
||||
|
||||
"sway/scratchpad" = {
|
||||
format = " {count}";
|
||||
format = " {count}";
|
||||
show-empty = false;
|
||||
tooltip = true;
|
||||
tooltip-format = "{title}";
|
||||
|
@ -294,19 +294,17 @@
|
|||
border: 0;
|
||||
border-radius: 0;
|
||||
min-height: 0;
|
||||
font-family: ${config.look.fonts.main}, ${config.look.fonts.mono};
|
||||
font-family: ${config.look.fonts.main};
|
||||
font-size: 15.5px;
|
||||
color: #${config.look.colors.text};
|
||||
}
|
||||
|
||||
#waybar { background: #${config.look.colors.dark}; }
|
||||
#tray { padding: 0 2px 0 5px; }
|
||||
#network { padding: 0 10px 0 4px; }
|
||||
#scratchpad, #privacy { margin-left: 4px; }
|
||||
#pulseaudio { margin-right: 5px; }
|
||||
#network { padding: 0 8px 0 4px; }
|
||||
#pulseaudio, #scratchpad, #privacy, #tray, #bluetooth { margin-left: 4px; }
|
||||
#mpris, #custom-notifs, #idle_inhibitor, #custom-weather, #cpu, #memory, #custom-vram, #backlight, #battery { margin: 0 5px 0 2px; }
|
||||
|
||||
#workspaces { padding: 0 6px; }
|
||||
#workspaces { padding: 0 6px 0 0; }
|
||||
#workspaces button {
|
||||
padding: 0 3px;
|
||||
color: white;
|
||||
|
@ -325,11 +323,6 @@
|
|||
background: #${config.look.colors.light};
|
||||
}
|
||||
|
||||
#bluetooth {
|
||||
margin: 0 6px 0 4px;
|
||||
font-size: 13.4px;
|
||||
}
|
||||
|
||||
#mpris { border-bottom: 3px solid #ffb066; }
|
||||
#custom-notifs { border-bottom: 3px solid #3823C4; }
|
||||
#idle_inhibitor { border-bottom: 3px solid #941efc; }
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
{ config, lib, pkgsUnstable, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config = lib.mkIf config.virtualisation.vmware.host.enable {
|
||||
virtualisation.vmware.host = {
|
||||
package = pkgsUnstable.vmware-workstation;
|
||||
extraConfig = ''
|
||||
mks.gl.allowUnsupportedDrivers = "TRUE"
|
||||
mks.vk.allowUnsupportedDevices = "TRUE"
|
||||
'';
|
||||
};
|
||||
virtualisation.vmware.host.extraConfig = ''
|
||||
mks.gl.allowUnsupportedDrivers = "TRUE"
|
||||
mks.vk.allowUnsupportedDevices = "TRUE"
|
||||
'';
|
||||
|
||||
nixpkgs.allowUnfreePackages = [ "vmware-workstation" ];
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue