This commit is contained in:
zoe 2023-08-28 21:39:39 +02:00
parent df91312422
commit dda3886212
2 changed files with 32 additions and 34 deletions

View File

@ -1,8 +1,6 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
let let nvimCustom = import ./nvim/settings.nix;
nvimCustom = import ./nvim/settings.nix; in {
in
{
imports = [ imports = [
./fish/settings.nix ./fish/settings.nix
./variables.nix ./variables.nix
@ -37,9 +35,7 @@ in
}; };
programs.yt-dlp = { programs.yt-dlp = {
enable = true; enable = true;
settings = { settings = { format = "bestaudio*[height<=720][fps<=24]"; };
format = "bestaudio*[height<=720][fps<=24]";
};
}; };
services.picom = { services.picom = {
@ -63,6 +59,12 @@ in
forwardX11Trusted = true; forwardX11Trusted = true;
forwardX11 = true; forwardX11 = true;
}; };
"odroid" = {
hostname = "192.168.178.46";
user = "root";
forwardX11Trusted = true;
forwardX11 = true;
};
}; };
home.pointerCursor = { home.pointerCursor = {
x11.enable = true; x11.enable = true;
@ -87,37 +89,32 @@ in
package = pkgs.catppuccin-gtk; package = pkgs.catppuccin-gtk;
}; };
}; };
programs.starship = programs.starship = let
let flavour = "frappe"; # One of `latte`, `frappe`, `macchiato`, or `mocha`
flavour = "frappe"; # One of `latte`, `frappe`, `macchiato`, or `mocha` in {
in enable = true;
{ enableFishIntegration = true;
enable = true; settings = {
enableFishIntegration = true; # Other config here
settings = { format = "$all"; # Remove this line to disable the default prompt format
# Other config here palette = "catppuccin_${flavour}";
format = "$all"; # Remove this line to disable the default prompt format } // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub {
palette = "catppuccin_${flavour}"; owner = "catppuccin";
} // builtins.fromTOML (builtins.readFile repo = "starship";
(pkgs.fetchFromGitHub rev = "3e3e54410c3189053f4da7a7043261361a1ed1bc";
{ sha256 = "soEBVlq3ULeiZFAdQYMRFuswIIhI9bclIU8WXjxd7oY=";
owner = "catppuccin"; } + /palettes/${flavour}.toml));
repo = "starship"; };
rev = "3e3e54410c3189053f4da7a7043261361a1ed1bc";
sha256 = "soEBVlq3ULeiZFAdQYMRFuswIIhI9bclIU8WXjxd7oY=";
} + /palettes/${flavour}.toml));
};
programs.bat = { programs.bat = {
enable = true; enable = true;
config.theme = "catppuccinFrappe"; config.theme = "catppuccinFrappe";
themes = { themes = {
catppuccinFrappe = builtins.readFile (pkgs.fetchFromGitHub catppuccinFrappe = builtins.readFile (pkgs.fetchFromGitHub {
{ owner = "catppuccin";
owner = "catppuccin"; repo = "bat";
repo = "bat"; rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; } + "/Catppuccin-frappe.tmTheme");
} + "/Catppuccin-frappe.tmTheme");
}; };
}; };
}; };

View File

@ -150,6 +150,7 @@ in {
nodePackages_latest.svelte-language-server nodePackages_latest.svelte-language-server
nodePackages_latest.svelte-check nodePackages_latest.svelte-check
## rust ## rust
sqlx-cli
rustup rustup
cargo-watch cargo-watch
llvmPackages_rocm.clang llvmPackages_rocm.clang