refactor: remove files not need anymore
This commit is contained in:
danny
parent
a611de125c
commit
f637e50a7a
5 changed files with 4 additions and 143 deletions
|
|
@ -1,81 +1,12 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
browser = "firefox";
|
||||
iconPrefix = ".local/share/icons/hicolor/scalable/apps";
|
||||
newWindow = "${browser} --new-window";
|
||||
googleCalendarIcon = pkgs.callPackage (import ../../utils/make-icon.nix {
|
||||
name = "google-calendar";
|
||||
url = "https://ssl.gstatic.com/calendar/images/dynamiclogo_2020q4/calendar_6_2x.png";
|
||||
sha256 = "sha256-IODUWX9m0iwunJWPJv1kw5gfgDPvAZtmD8vcSTEBjsQ=";
|
||||
}) { };
|
||||
in
|
||||
{
|
||||
home.packages = [
|
||||
googleCalendarIcon
|
||||
];
|
||||
|
||||
# UpdamkIconPkg te icon cache
|
||||
home.activation = {
|
||||
updateIconCache = lib.hm.dag.entryAfter [ "linkGeneration" ] ''
|
||||
$DRY_RUN_CMD ${pkgs.gtk3}/bin/gtk-update-icon-cache -t -f ~/.local/share/icons/hicolor
|
||||
'';
|
||||
};
|
||||
|
||||
home.file = {
|
||||
"${iconPrefix}/notion.svg".text = ''
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg class="wordmark_wordmark__gPyj1" viewBox="-1 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(c.com/calendar/images/dynamiclogo_2020q4/calendar_6_2x.png#a)">
|
||||
<mask id="b" width="29" height="30" x="0" y="0" maskUnits="userSpaceOnUse">
|
||||
<path fill="#fff" d="M28.714 0H0v29.995h28.714V0Z">
|
||||
</path>
|
||||
</mask>
|
||||
<g mask="url(#b)">
|
||||
<path fill="#fff" d="M1.805 1.29 18.403.069c2.038-.175 2.563-.057 3.844.873l5.298 3.724c.874.64 1.166.815 1.166 1.513v20.424c0 1.28-.467 2.037-2.097 2.153L7.34 29.919c-1.224.058-1.806-.116-2.447-.931L.99 23.925c-.7-.931-.99-1.628-.99-2.444V3.326c0-1.046.466-1.92 1.805-2.035Z">
|
||||
</path>
|
||||
<path class="wordmark_fill__RZFeq" fill="#000" fill-rule="evenodd" d="M18.403.068 1.805 1.291C.466 1.406 0 2.28 0 3.326v18.155c0 .816.29 1.513.99 2.444l3.902 5.063c.64.815 1.223.99 2.447.93l19.275-1.163c1.63-.116 2.097-.873 2.097-2.153V6.178c0-.662-.262-.853-1.034-1.416a89.567 89.567 0 0 1-.132-.097L22.247.941C20.966.011 20.44-.107 18.403.068ZM7.776 5.843c-1.574.106-1.931.13-2.825-.596L2.678 3.443c-.232-.233-.115-.524.467-.581l15.957-1.164c1.339-.117 2.038.35 2.562.756l2.737 1.979c.116.058.407.407.058.407l-16.48.99-.203.013ZM5.94 26.427V9.087c0-.756.233-1.105.932-1.164l18.926-1.105c.642-.058.933.35.933 1.105v17.223c0 .758-.117 1.398-1.166 1.456L7.455 27.65c-1.05.058-1.515-.29-1.515-1.223Zm17.88-16.41c.116.525 0 1.049-.526 1.108l-.872.174v12.8c-.758.408-1.457.64-2.039.64-.932 0-1.165-.29-1.864-1.163l-5.707-8.96v8.67l1.806.407s0 1.047-1.458 1.047l-4.017.233c-.117-.233 0-.815.408-.931l1.048-.29V12.287l-1.456-.117c-.116-.524.174-1.28.99-1.338l4.31-.29 5.94 9.077v-8.03l-1.514-.174c-.117-.641.349-1.107.931-1.164l4.02-.234Z" clip-rule="evenodd">
|
||||
</path>
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="a">
|
||||
<path fill="#fff" d="M0 0h104.229v30H0z">
|
||||
</path>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.desktopEntries = {
|
||||
notion = {
|
||||
name = "Notion";
|
||||
genericName = "Note";
|
||||
exec = "${newWindow} https://notion.so";
|
||||
comment = "Note Take Application";
|
||||
icon = "${config.home.homeDirectory}/${iconPrefix}/notion.svg";
|
||||
terminal = false;
|
||||
categories = [
|
||||
"Office"
|
||||
"Utility"
|
||||
];
|
||||
};
|
||||
|
||||
google-calendar = {
|
||||
name = "Google Calendar";
|
||||
genericName = "Calendar";
|
||||
exec = "${pkgs.xdg-utils}/bin/xdg-open https://calendar.google.com/u/2/r";
|
||||
comment = "Google Calendar";
|
||||
icon = "google-calendar";
|
||||
terminal = false;
|
||||
categories = [
|
||||
"Office"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
# Nixos
|
||||
rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#${hostname}";
|
||||
fullClean = "sudo nix store gc && sudo /run/current-system/bin/switch-to-configuration boot";
|
||||
fullClean = "sudo nix store gc && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
|
||||
|
||||
# Hyprland
|
||||
hyprlog = "grep -v \"arranged\" $XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/hyprland.log | cat";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ pkgs, config, ... }:
|
||||
|
||||
let
|
||||
getIconScript = pkgs.writeShellScriptBin "get-icon" (
|
||||
getIconScript = pkgs.writeShellScript "get-icon" (
|
||||
builtins.readFile ../../home/config/scripts/getIcons.sh
|
||||
);
|
||||
prefixKey = "C-Space";
|
||||
|
|
@ -48,8 +48,8 @@ in
|
|||
set -g status-left "#[fg=#84977f,bg=default,bold] █ session: #S"
|
||||
set -g status-right " #[fg=#828bb8,bg=default,bold]${config.networking.hostName} "
|
||||
|
||||
setw -g window-status-format "#[fg=#171616,bg=default] #[fg=#495361,bg=default]#(${getIconScript}/get-icon #I) #W"
|
||||
setw -g window-status-current-format "#[fg=#7e93a9,bg=default] #[fg=#7e93a9,bg=default,bold]#(${getIconScript}/get-icon #I) #W"
|
||||
setw -g window-status-format "#[fg=#171616,bg=default] #[fg=#495361,bg=default]#(${getIconScript} #I) #W"
|
||||
setw -g window-status-current-format "#[fg=#7e93a9,bg=default] #[fg=#7e93a9,bg=default,bold]#(${getIconScript} #I) #W"
|
||||
|
||||
set -g default-terminal "xterm-256color"
|
||||
set -ga terminal-overrides ",*256col*:Tc"
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
patchDesktop =
|
||||
pkg: appName: from: to:
|
||||
lib.hiPrio (
|
||||
pkgs.runCommand "$patched-desktop-entry-for-${appName}" { } ''
|
||||
${coreutils}/bin/mkdir -p $out/share/applications
|
||||
${gnused}/bin/sed 's#${from}#${to}#g' < ${pkg}/share/applications/${appName}.desktop > $out/share/applications/${appName}.desktop
|
||||
''
|
||||
);
|
||||
GPUOffloadApp = pkg: desktopName: patchDesktop pkg desktopName "^Exec=" "Exec=nvidia-offload ";
|
||||
in
|
||||
GPUOffloadApp
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
{
|
||||
name,
|
||||
url,
|
||||
sha256,
|
||||
}:
|
||||
{
|
||||
pkgs,
|
||||
imagemagick,
|
||||
file,
|
||||
stdenvNoCC,
|
||||
...
|
||||
}:
|
||||
let
|
||||
appName = name;
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "${appName}-icon";
|
||||
name = pname;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
inherit url sha256;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
imagemagick
|
||||
file
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/share/icons/hicolor/256x256/apps
|
||||
mkdir -p $out/share/icons/hicolor/scalable/apps
|
||||
|
||||
fileType=$(file -b --mime-type $src)
|
||||
if [ "$fileType" = "image/png" ]; then
|
||||
echo "Processing PNG image..."
|
||||
magick $src -resize 256x256 $out/share/icons/hicolor/256x256/apps/${appName}.png
|
||||
elif [ "$fileType" = "image/svg+xml" ]; then
|
||||
echo "Processing SVG image..."
|
||||
cp $src $out/share/icons/hicolor/scalable/apps/${appName}.svg
|
||||
else
|
||||
echo "Unsupported image type: $fileType"
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
||||
pathsToLink = [
|
||||
"/share/icons"
|
||||
];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue