housekeeping: remove unused packages, update Vesktop configs and update Blender

-150

packages/catppuccin-kde/default.nix

··· 1 - { 2 - lib, 3 - stdenvNoCC, 4 - fetchFromGitHub, 5 - writeShellApplication, 6 - lightly-plasma ? {}, 7 - gnutar, 8 - unzip, 9 - flavour ? "frappe", 10 - accent ? "blue", 11 - winDecStyle ? "modern", 12 - withLightly ? false, 13 - }: let 14 - inherit (builtins) mapAttrs listToAttrs throw concatStringsSep attrNames; 15 - inherit (lib) pipe imap1 flip nameValuePair; 16 - 17 - # The ordering of these options is important; they must match the indicies in 18 - # the installation script. 19 - # 20 - # https://github.com/catppuccin/kde/blob/main/install.sh 21 - indices = mapAttrs (_: 22 - flip pipe [ 23 - (imap1 (flip nameValuePair)) 24 - listToAttrs 25 - ]) { 26 - flavour = [ 27 - "mocha" 28 - "macchiato" 29 - "frappe" 30 - "latte" 31 - ]; 32 - accent = [ 33 - "rosewater" 34 - "flamingo" 35 - "pink" 36 - "mauve" 37 - "red" 38 - "maroon" 39 - "peach" 40 - "yellow" 41 - "green" 42 - "teal" 43 - "sky" 44 - "sapphire" 45 - "blue" 46 - "lavender" 47 - ]; 48 - winDecStyle = [ 49 - "modern" 50 - "classic" 51 - ]; 52 - }; 53 - 54 - options = 55 - mapAttrs ( 56 - option: value: 57 - (indices.${option}).${value} 58 - or ( 59 - throw "Invalid ${option} ${value}, valid ${option}s are: ${ 60 - concatStringsSep ", " (attrNames indices.${option}) 61 - }" 62 - ) 63 - ) 64 - {inherit flavour accent winDecStyle;}; 65 - in 66 - stdenvNoCC.mkDerivation rec { 67 - pname = "catppuccin-kde"; 68 - version = "0.2.4"; 69 - 70 - src = fetchFromGitHub { 71 - owner = "catppuccin"; 72 - repo = pname; 73 - rev = "v${version}"; 74 - hash = "sha256-w77lzeSisx/PPxctMJKIdRJenq0s8HwR8gLmgNh4SH8="; 75 - }; 76 - 77 - nativeBuildInputs = [ 78 - unzip 79 - 80 - # Stub out tools for interactivity. 81 - (writeShellApplication { 82 - name = "sleep"; 83 - text = ""; 84 - }) 85 - (writeShellApplication { 86 - name = "clear"; 87 - text = ""; 88 - }) 89 - (writeShellApplication { 90 - name = "lookandfeeltool"; 91 - text = ""; 92 - }) 93 - 94 - # Stub out tools that access the network. 95 - (writeShellApplication { 96 - name = "wget"; 97 - text = "echo 2>&1 'Cannot use wget in the build environment!'; exit 1"; 98 - }) 99 - 100 - # As Plasma is not available in the build environment, do not dynamically 101 - # install packages. 102 - # 103 - # kpackagetool5 is only used by the install script to install the global theme. 104 - (writeShellApplication { 105 - name = "kpackagetool5"; 106 - runtimeInputs = [gnutar]; 107 - text = '' 108 - mkdir -p "''${XDG_DATA_HOME:-$HOME/.local/share}/plasma/look-and-feel" 109 - tar xf "$2" -C "''${XDG_DATA_HOME:-$HOME/.local/share}/plasma/look-and-feel" 110 - ''; 111 - }) 112 - (writeShellApplication { 113 - name = "kpackagetool6"; 114 - text = ''kpackagetool5 "$@"''; 115 - }) 116 - ]; 117 - 118 - postPatch = '' 119 - patchShebangs . 120 - 121 - substituteInPlace install.sh \ 122 - --replace-warn '$CONFIRMATION' Y \ 123 - --replace-warn ' InstallCursor' "" 124 - ''; 125 - 126 - buildPhase = '' 127 - runHook preBuild 128 - 129 - mkdir -p .local 130 - ${lib.optionalString withLightly "cp --recursive --dereference --no-preserve=all '${lightly-plasma}'/* .local"} 131 - HOME="$PWD" ./install.sh '${toString options.flavour}' '${toString options.accent}' '${toString options.winDecStyle}' 132 - 133 - runHook postBuild 134 - ''; 135 - 136 - installPhase = '' 137 - runHook preInstall 138 - 139 - mv .local "$out" 140 - 141 - runHook postInstall 142 - ''; 143 - 144 - meta = with lib; { 145 - description = "Soothing pastel theme for KDE"; 146 - homepage = "https://github.com/catppuccin/kde"; 147 - license = licenses.mit; 148 - maintainers = with maintainers; [michaelBelsanti]; 149 - }; 150 - }

-2

packages/packages.nix

··· 2 2 catppuccin-fcitx5 = pkgs.callPackage ./catppuccin-fcitx5 {}; 3 3 catppuccin-sddm = pkgs.callPackage ./catppuccin-sddm {}; 4 4 catppuccin-konsole = pkgs.callPackage ./catppuccin-konsole {}; 5 - catppuccin-kde-new = pkgs.callPackage ./catppuccin-kde {}; 6 - rime-japanese = pkgs.callPackage ./rime-japanese {}; 7 5 rethink-sans = pkgs.callPackage ./rethink-sans {}; 8 6 }

-31

packages/rime-japanese/default.nix

··· 1 - { 2 - lib, 3 - stdenvNoCC, 4 - fetchFromGitHub, 5 - }: 6 - stdenvNoCC.mkDerivation { 7 - pname = "rime-japanese"; 8 - version = "unstable-20230802"; 9 - 10 - src = fetchFromGitHub { 11 - owner = "gkovacs"; 12 - repo = "rime-japanese"; 13 - rev = "4c1e65135459175136f380e90ba52acb40fdfb2d"; 14 - hash = "sha256-/mIIyCu8V95ArKo/vIS3qAiD8InUmk8fAF/wejxRxGw="; 15 - }; 16 - 17 - installPhase = '' 18 - runHook preInstall 19 - mkdir -p $out/share/rime-data/ 20 - cp japanese.*.yaml $out/share/rime-data/ 21 - runHook postInstall 22 - ''; 23 - 24 - meta = with lib; { 25 - description = "Layout for typing in Japanese with RIME"; 26 - homepage = "https://github.com/gkovacs/rime-japanese"; 27 - license = licenses.free; # awaiting response from gkovacs/rime-japanese#6, presumably free 28 - maintainers = with maintainers; [pluiedev]; 29 - platforms = platforms.all; 30 - }; 31 - }

+3 -2

roles/catppuccin/nixos.nix

··· 40 40 hm.home.packages = let 41 41 plasmaEnabled = config.services.desktopManager.plasma6.enable; 42 42 in 43 - lib.optional plasmaEnabled (pkgs.catppuccin-kde-new.override { 44 - inherit accent flavour; 43 + lib.optional plasmaEnabled (pkgs.catppuccin-kde.override { 44 + flavour = [flavour]; 45 + accents = [accent]; 45 46 }) 46 47 ++ [ 47 48 (pkgs.catppuccin-konsole.override {

+4 -1

users/leah/default.nix

··· 82 82 defaultShell = true; 83 83 }; 84 84 85 - environment.variables.NIXOS_OZONE_WL = "1"; 85 + environment.variables = { 86 + NIXOS_OZONE_WL = "1"; 87 + SDL_VIDEODRIVER = "wayland"; 88 + }; 86 89 87 90 networking.firewall = { 88 91 enable = true;

+12 -11

users/leah/programs/1password/default.nix

··· 56 56 }; 57 57 58 58 # Use the 1Password CLI plugins 59 - hm.home.sessionVariables = { 60 - OP_PLUGIN_ALIASES_SOURCED = "1"; 61 - OP_BIOMETRIC_UNLOCK_UNABLED = "true"; 62 - }; 59 + # TODO: no workey! 60 + #hm.home.sessionVariables = { 61 + # OP_PLUGIN_ALIASES_SOURCED = "1"; 62 + # OP_BIOMETRIC_UNLOCK_UNABLED = "true"; 63 + #}; 63 64 64 - hm.programs.fish.shellAliases = lib.pipe ["cargo" "gh"] [ 65 - (map (name: { 66 - inherit name; 67 - value = "${lib.getExe' pkgs._1password "op"} plugin run -- ${name}"; 68 - })) 69 - builtins.listToAttrs 70 - ]; 65 + #hm.programs.fish.shellAliases = lib.pipe ["cargo" "gh"] [ 66 + # (map (name: { 67 + # inherit name; 68 + # value = "${lib.getExe' pkgs._1password "op"} plugin run -- ${name}"; 69 + # })) 70 + # builtins.listToAttrs 71 + #]; 71 72 }

+3 -21

users/leah/programs/default.nix

··· 14 14 ./rust 15 15 ]; 16 16 17 - virtualisation.docker.enable = true; 18 - 19 - nixpkgs.overlays = [blender-bin.overlays.default]; 20 - 21 17 hm.home.packages = with pkgs; [ 22 18 # Apps 23 - blender_3_6 19 + (blender-bin.packages.${pkgs.system}.default) 24 20 chromium 25 21 gimp 26 22 inkscape-with-extensions 27 - kdenlive 28 - libreoffice-qt 29 - prismlauncher 30 - thunderbird 31 23 vlc 32 24 33 25 # Command-line apps 34 - any-nix-shell 35 - cachix 36 26 just 27 + fastfetch 37 28 nix-output-monitor 38 29 nurl 39 - sbctl 40 30 xclip 41 - 42 - # Java stuff 43 - jetbrains.idea-community 44 - jdk17 45 31 ]; 46 32 47 33 programs = { ··· 119 105 mode = "rgb"; 120 106 lightness = 0.60; 121 107 color_align.mode = "horizontal"; 108 + backend = "fastfetch"; 122 109 }; 123 110 }; 124 111 ··· 130 117 starship = { 131 118 enable = true; 132 119 settings = builtins.fromTOML (builtins.readFile ./starship.toml); 133 - }; 134 - 135 - thunderbird = { 136 - enable = true; 137 - profiles.${config.roles.base.username}.isDefault = true; 138 120 }; 139 121 }; 140 122 }

+9

users/leah/programs/discord/default.nix

··· 56 56 forceOpen = false; 57 57 }; 58 58 BetterGifAltText.enabled = true; 59 + BetterGifPicker.enabled = true; 59 60 BetterRoleDot = { 60 61 enabled = true; 61 62 bothStyles = false; 62 63 }; 63 64 BetterRoleContext.enabled = true; 64 65 BetterUploadButton.enabled = true; 66 + BetterSessions = { 67 + enabled = true; 68 + backgroundCheck = true; 69 + }; 65 70 BetterSettings = { 66 71 enabled = true; 67 72 disableFade = true; ··· 95 100 nitroFirst = true; 96 101 }; 97 102 FavoriteGifSearch.enabled = true; 103 + FixCodeblockGap.enabled = true; 98 104 FixInbox.enabled = true; 99 105 FixImagesQuality.enabled = true; 100 106 FixSpotifyEmbeds.enabled = true; 107 + FixYoutubeEmbeds.enabled = true; 101 108 FriendsSince.enabled = true; 102 109 GifPaste.enabled = true; 103 110 GreetStickerPicker.enabled = true; 104 111 HideAttachments.enabled = true; 105 112 iLoveSpam.enabled = true; 106 113 ImageZoom.enabled = true; 114 + ImplicitRelationships = true; 107 115 KeepCurrentChannel.enabled = true; 108 116 MemberCount.enabled = true; 109 117 MessageLinkEmbeds.enabled = true; ··· 258 266 keepSpotifyActivityOnIdle = false; 259 267 }; 260 268 StartupTimings.enabled = true; 269 + StreamerModeOnStream.enabled = true; 261 270 SuperReactionTweaks = { 262 271 enabled = true; 263 272 superReactByDefault = false;

Configure Feed

Configure Feed