Compare commits

...

4 commits

Author SHA1 Message Date
8482623b55
chore: sync new vesktop settings 2024-11-03 23:45:00 -08:00
154eb2a2bf
feat: switch to swaynotificationcenter 2024-11-03 23:44:41 -08:00
56ae9e5b22
fix: correctly add git absorb 2024-11-03 22:10:46 -08:00
2428008f7d
feat: add git-absorb
feat: enable git-maintenance

feat: enable git integration for eza

refactor: use builtin hm git options
2024-11-03 22:09:21 -08:00
6 changed files with 419 additions and 32 deletions

View file

@ -33,14 +33,19 @@ in
userName = "Youwen Wu"; userName = "Youwen Wu";
userEmail = "youwenw@gmail.com"; userEmail = "youwenw@gmail.com";
delta.enable = true; delta.enable = true;
maintenance.enable = true;
signing = {
signByDefault = true;
key = "8F5E6C1AF90976CA7102917A865658ED1FE61EC3";
};
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
commit.gpgsign = pkgs.lib.mkDefault "true";
user.signingkey = "8F5E6C1AF90976CA7102917A865658ED1FE61EC3";
safe.directory = "/etc/nixos/.git"; safe.directory = "/etc/nixos/.git";
}; };
}; };
home.packages = [ pkgs.git-absorb ];
programs.lazygit = { programs.lazygit = {
enable = true; enable = true;
settings = { settings = {
@ -173,6 +178,7 @@ in
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;
enableBashIntegration = true; enableBashIntegration = true;
git = true;
}; };
programs.yazi = { programs.yazi = {

View file

@ -6,7 +6,9 @@
"themeLinks": [ "themeLinks": [
"https://raw.githubusercontent.com/catppuccin/discord/main/themes/macchiato.theme.css" "https://raw.githubusercontent.com/catppuccin/discord/main/themes/macchiato.theme.css"
], ],
"enabledThemes": [], "enabledThemes": [
"stylix.theme.css"
],
"enableReactDevtools": false, "enableReactDevtools": false,
"frameless": false, "frameless": false,
"transparent": false, "transparent": false,
@ -45,13 +47,18 @@
"enabled": true "enabled": true
}, },
"AlwaysAnimate": { "AlwaysAnimate": {
"enabled": true "enabled": false
}, },
"AlwaysTrust": { "AlwaysTrust": {
"enabled": true "enabled": true,
"domain": true,
"file": true
}, },
"AnonymiseFileNames": { "AnonymiseFileNames": {
"enabled": true "enabled": true,
"anonymiseByDefault": true,
"method": 0,
"randomisedLength": 7
}, },
"AppleMusicRichPresence": { "AppleMusicRichPresence": {
"enabled": false "enabled": false
@ -66,7 +73,14 @@
"enabled": false "enabled": false
}, },
"BetterFolders": { "BetterFolders": {
"enabled": true "enabled": true,
"sidebar": true,
"showFolderIcon": 1,
"keepIcons": false,
"closeAllHomeButton": false,
"closeAllFolders": false,
"forceOpen": false,
"sidebarAnim": true
}, },
"BetterGifAltText": { "BetterGifAltText": {
"enabled": false "enabled": false
@ -81,13 +95,18 @@
"enabled": false "enabled": false
}, },
"BetterRoleDot": { "BetterRoleDot": {
"enabled": true "enabled": true,
"bothStyles": false,
"copyRoleColorInProfilePopout": false
}, },
"BetterSessions": { "BetterSessions": {
"enabled": true "enabled": true,
"backgroundCheck": false
}, },
"BetterSettings": { "BetterSettings": {
"enabled": true "enabled": false,
"disableFade": true,
"eagerLoad": true
}, },
"BetterUploadButton": { "BetterUploadButton": {
"enabled": false "enabled": false
@ -353,9 +372,6 @@
"PreviewMessage": { "PreviewMessage": {
"enabled": false "enabled": false
}, },
"PronounDB": {
"enabled": false
},
"QuickMention": { "QuickMention": {
"enabled": false "enabled": false
}, },
@ -389,9 +405,6 @@
"RoleColorEverywhere": { "RoleColorEverywhere": {
"enabled": false "enabled": false
}, },
"SearchReply": {
"enabled": false
},
"SecretRingToneEnabler": { "SecretRingToneEnabler": {
"enabled": false "enabled": false
}, },
@ -413,17 +426,21 @@
"ShowAllMessageButtons": { "ShowAllMessageButtons": {
"enabled": false "enabled": false
}, },
"ShowAllRoles": {
"enabled": false
},
"ShowConnections": { "ShowConnections": {
"enabled": false "enabled": false
}, },
"ShowHiddenChannels": { "ShowHiddenChannels": {
"enabled": true "enabled": true,
"showMode": 0,
"hideUnreads": true
}, },
"ShowHiddenThings": { "ShowHiddenThings": {
"enabled": true "enabled": true,
"showTimeouts": true,
"showInvitesPaused": true,
"showModView": true,
"disableDiscoveryFilters": true,
"disableDisallowedDiscoveryFilters": true
}, },
"ShowMeYourName": { "ShowMeYourName": {
"enabled": false "enabled": false
@ -441,7 +458,8 @@
"enabled": false "enabled": false
}, },
"SpotifyControls": { "SpotifyControls": {
"enabled": true "enabled": true,
"hoverControls": false
}, },
"SpotifyCrack": { "SpotifyCrack": {
"enabled": false "enabled": false
@ -547,6 +565,39 @@
}, },
"YoutubeAdblock": { "YoutubeAdblock": {
"enabled": true "enabled": true
},
"AlwaysExpandRoles": {
"enabled": false
},
"FullSearchContext": {
"enabled": false
},
"UserMessagesPronouns": {
"enabled": false
},
"DynamicImageModalAPI": {
"enabled": false
},
"AccountPanelServerProfile": {
"enabled": false
},
"CopyFileContents": {
"enabled": false
},
"FixImagesQuality": {
"enabled": false
},
"MentionAvatars": {
"enabled": false
},
"NoMaskedUrlPaste": {
"enabled": false
},
"StickerPaste": {
"enabled": false
},
"VolumeBooster": {
"enabled": false
} }
}, },
"notifications": { "notifications": {
@ -559,7 +610,7 @@
"authenticated": false, "authenticated": false,
"url": "https://api.vencord.dev/", "url": "https://api.vencord.dev/",
"settingsSync": false, "settingsSync": false,
"settingsSyncVersion": 1722547675778 "settingsSyncVersion": 1730351821316
} }
}, },
"quickCss": "" "quickCss": ""

View file

@ -52,15 +52,15 @@
services.easyeffects.package = pkgs.easyeffects; services.easyeffects.package = pkgs.easyeffects;
# Notification daemon # Notification daemon
services.dunst = { # services.dunst = {
enable = true; # enable = true;
# catppuccin.enable = true; # # catppuccin.enable = true;
iconTheme = { # iconTheme = {
name = "Papirus-Dark"; # name = "Papirus-Dark";
package = pkgs.papirus-icon-theme; # package = pkgs.papirus-icon-theme;
size = "32x32"; # size = "32x32";
}; # };
}; # };
# Currently non-functional # Currently non-functional
programs.wlogout.enable = true; programs.wlogout.enable = true;

View file

@ -38,6 +38,7 @@
"$mod, M, exec, ${pkgs.thunderbird}/bin/thunderbird" "$mod, M, exec, ${pkgs.thunderbird}/bin/thunderbird"
# "$mod, B, exec, ${pkgs.waypaper}/bin/waypaper" # "$mod, B, exec, ${pkgs.waypaper}/bin/waypaper"
"$mod, A, exec, ${pkgs.neovide}/bin/neovide" "$mod, A, exec, ${pkgs.neovide}/bin/neovide"
"$mod, N, exec, sleep 0.1 && ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw"
# Window actions # Window actions
"$mod, Q, killactive" "$mod, Q, killactive"
@ -239,6 +240,7 @@
"blur,notifications" "blur,notifications"
"ignorezero,notifications" "ignorezero,notifications"
"blur,swaync-notification-window" "blur,swaync-notification-window"
"animation,swaync-notification-window,popin"
"ignorezero,swaync-notification-window" "ignorezero,swaync-notification-window"
"blur,swaync-control-center" "blur,swaync-control-center"
"ignorezero,swaync-control-center" "ignorezero,swaync-control-center"

View file

@ -1,5 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ./swaync.nix ];
programs.waybar = { programs.waybar = {
enable = true; enable = true;
style = ./style.css; style = ./style.css;
@ -40,6 +41,7 @@
"cpu" "cpu"
"temperature" "temperature"
"clock" "clock"
"custom/notification"
]; ];
idle_inhibitor = { idle_inhibitor = {
@ -132,6 +134,22 @@
format = "{:%H:%M:%S}"; format = "{:%H:%M:%S}";
}; };
"custom/notification" = {
tooltip = false;
format = "{icon}";
format-icons = {
notification = "<span foreground='red'><small><sup></sup></small></span>";
none = " ";
dnd-notification = "<span foreground='red'><small><sup></sup></small></span>";
dnd-none = " ";
};
return-type = "json";
exec = "${pkgs.swaynotificationcenter}/bin/swaync-client -swb";
on-click = "sleep 0.1 && ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
on-click-right = "sleep 0.1 && ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
escape = true;
};
"hyprland/workspaces" = { "hyprland/workspaces" = {
show-special = true; show-special = true;
persistent-workspaces = { persistent-workspaces = {
@ -157,6 +175,7 @@
special = "󰠱"; special = "󰠱";
}; };
}; };
"hyprland/window" = { "hyprland/window" = {
icon = true; icon = true;
icon-size = 20; icon-size = 20;

View file

@ -0,0 +1,309 @@
{ config, ... }:
{
services.swaync.enable = true;
services.swaync.settings = {
positionX = "right";
positionY = "top";
control-center-margin-top = 10;
control-center-margin-bottom = 10;
control-center-margin-right = 10;
control-center-margin-left = 10;
notification-icon-size = 64;
notification-body-image-height = 100;
notification-body-image-width = 200;
timeout = 10;
timeout-low = 5;
timeout-critical = 0;
fit-to-screen = false;
control-center-width = 500;
control-center-height = 1025;
notification-window-width = 500;
keyboard-shortcuts = true;
image-visibility = "when-available";
transition-time = 200;
hide-on-clear = false;
hide-on-action = true;
script-fail-notify = true;
widgets = [
"title"
"mpris"
"volume"
"backlight"
"dnd"
"notifications"
];
widget-config = {
title = {
text = "Mission Control";
clear-all-button = "true";
button-text = " All Systems Go";
};
dnd = {
text = "Do Not Disturb";
};
label = {
max-lines = 1;
text = "Mission Control";
};
mpris = {
image-size = 96;
image-radius = 7;
};
volume = {
label = "󰕾";
};
backlight = {
label = "󰃟";
};
};
};
home.file.".config/swaync/style.css".text = ''
* {
font-family: ${config.stylix.fonts.monospace.name};
}
.control-center .notification-row:focus,
.control-center .notification-row:hover {
background: #${config.lib.stylix.colors.base00}
}
.notification-row {
outline: none;
margin: 10px;
padding: 0;
}
.notification {
background: transparent;
padding: 0;
margin: 0px;
}
.notification-content {
background: #${config.lib.stylix.colors.base00};
padding: 10px;
border-radius: 5px;
border: 2px solid #${config.lib.stylix.colors.base05};
margin: 0;
}
.notification-default-action {
margin: 0;
padding: 0;
border-radius: 5px;
}
.close-button {
background: #${config.lib.stylix.colors.base08};
color: #${config.lib.stylix.colors.base00};
text-shadow: none;
padding: 0;
border-radius: 5px;
margin-top: 5px;
margin-right: 5px;
}
.close-button:hover {
box-shadow: none;
background: #${config.lib.stylix.colors.base0D};
transition: all .15s ease-in-out;
border: none
}
.notification-action {
border: 2px solid #${config.lib.stylix.colors.base0D};
border-top: none;
border-radius: 5px;
}
.notification-default-action:hover,
.notification-action:hover {
color: #${config.lib.stylix.colors.base0B};
background: #${config.lib.stylix.colors.base0B}
}
.notification-default-action {
border-radius: 5px;
margin: 0px;
}
.notification-default-action:not(:only-child) {
border-bottom-left-radius: 7px;
border-bottom-right-radius: 7px
}
.notification-action:first-child {
border-bottom-left-radius: 10px;
background: #${config.lib.stylix.colors.base00}
}
.notification-action:last-child {
border-bottom-right-radius: 10px;
background: #${config.lib.stylix.colors.base00}
}
.inline-reply {
margin-top: 8px
}
.inline-reply-entry {
background: #${config.lib.stylix.colors.base00};
color: #${config.lib.stylix.colors.base05};
caret-color: #${config.lib.stylix.colors.base05};
border: 1px solid #${config.lib.stylix.colors.base09};
border-radius: 5px
}
.inline-reply-button {
margin-left: 4px;
background: #${config.lib.stylix.colors.base00};
border: 1px solid #${config.lib.stylix.colors.base09};
border-radius: 5px;
color: #${config.lib.stylix.colors.base05}
}
.inline-reply-button:disabled {
background: initial;
color: #${config.lib.stylix.colors.base03};
border: 1px solid transparent
}
.inline-reply-button:hover {
background: #${config.lib.stylix.colors.base00}
}
.body-image {
margin-top: 6px;
background-color: #${config.lib.stylix.colors.base05};
border-radius: 5px
}
.summary {
font-size: 16px;
font-weight: 700;
background: transparent;
color: rgba(158, 206, 106, 1);
text-shadow: none
}
.time {
font-size: 16px;
font-weight: 700;
background: transparent;
color: #${config.lib.stylix.colors.base05};
text-shadow: none;
margin-right: 18px
}
.body {
font-size: 15px;
font-weight: 400;
background: transparent;
color: #${config.lib.stylix.colors.base05};
text-shadow: none
}
.control-center {
background: #${config.lib.stylix.colors.base00};
border: 2px solid #${config.lib.stylix.colors.base0C};
border-radius: 5px;
opacity: 0.75;
}
.control-center-list {
background: transparent
}
.control-center-list-placeholder {
opacity: .5
}
.floating-notifications {
background: transparent
}
.blank-window {
background: alpha(black, 0)
}
.widget-title {
color: #${config.lib.stylix.colors.base0B};
background: #${config.lib.stylix.colors.base00};
padding: 5px 10px;
margin: 10px 10px 5px 10px;
font-size: 1.5rem;
border-radius: 5px;
}
.widget-title>button {
font-size: 1rem;
color: #${config.lib.stylix.colors.base05};
text-shadow: none;
background: #${config.lib.stylix.colors.base00};
box-shadow: none;
border-radius: 5px;
}
.widget-title>button:hover {
background: #${config.lib.stylix.colors.base08};
color: #${config.lib.stylix.colors.base00};
}
.widget-dnd {
background: #${config.lib.stylix.colors.base00};
padding: 5px 10px;
margin: 10px 10px 5px 10px;
border-radius: 5px;
font-size: large;
color: #${config.lib.stylix.colors.base0B};
}
.widget-dnd>switch {
border-radius: 5px;
/* border: 1px solid #${config.lib.stylix.colors.base0B}; */
background: #${config.lib.stylix.colors.base0B};
}
.widget-dnd>switch:checked {
background: #${config.lib.stylix.colors.base08};
border: 1px solid #${config.lib.stylix.colors.base08};
}
.widget-dnd>switch slider {
background: #${config.lib.stylix.colors.base00};
border-radius: 5px
}
.widget-dnd>switch:checked slider {
background: #${config.lib.stylix.colors.base00};
border-radius: 5px
}
.widget-label {
margin: 10px 10px 5px 10px;
}
.widget-label>label {
font-size: 1rem;
color: #${config.lib.stylix.colors.base05};
}
.widget-mpris {
color: #${config.lib.stylix.colors.base05};
padding: 5px 10px;
margin: 10px 10px 5px 10px;
border-radius: 5px;
}
.widget-mpris > box > button {
border-radius: 5px;
}
.widget-mpris-player {
padding: 5px 10px;
margin: 10px
}
.widget-mpris-title {
font-weight: 700;
font-size: 1.25rem
}
.widget-mpris-subtitle {
font-size: 1.1rem
}
.widget-menubar>box>.menu-button-bar>button {
border: none;
background: transparent
}
.topbar-buttons>button {
border: none;
background: transparent
}
.widget-volume {
background: #${config.lib.stylix.colors.base01};
padding: 5px;
margin: 10px 10px 5px 10px;
border-radius: 5px;
font-size: x-large;
color: #${config.lib.stylix.colors.base05};
}
.widget-volume>box>button {
background: #${config.lib.stylix.colors.base0B};
border: none
}
.per-app-volume {
background-color: #${config.lib.stylix.colors.base00};
padding: 4px 8px 8px;
margin: 0 8px 8px;
border-radius: 5px;
}
.widget-backlight {
background: #${config.lib.stylix.colors.base01};
padding: 5px;
margin: 10px 10px 5px 10px;
border-radius: 5px;
font-size: x-large;
color: #${config.lib.stylix.colors.base05}
}
'';
}