🖌️ Goodbye Stylix
- Added theming to Btop - Added theming to Nvim and removed bufferline plugin - Added mode to theme.nix to change from light theme to dark theme - Replaced Starship theme with Catppuccin starship theme - Added QT platformtheme ENV - Moved wallpapers into wallpaper dir - Replaced image of desktop1 with more up to date one
This commit is contained in:
9
home-manager/btop.nix
Normal file
9
home-manager/btop.nix
Normal file
@ -0,0 +1,9 @@
|
||||
let
|
||||
theme = import ../theme.nix;
|
||||
in
|
||||
{
|
||||
catppuccin.btop = {
|
||||
enable = true;
|
||||
flavor = theme.flavor;
|
||||
};
|
||||
}
|
||||
@ -12,6 +12,7 @@ in
|
||||
imports = [
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
inputs.nixvim.homeManagerModules.nixvim
|
||||
./btop.nix
|
||||
./cava.nix
|
||||
./default-applications.nix
|
||||
./development
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
# Neovim configuration for Nix
|
||||
{
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
catppuccin.nvim.enable = true;
|
||||
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
|
||||
clipboard.providers.wl-copy.enable = true;
|
||||
colorschemes.catppuccin.enable = true;
|
||||
defaultEditor = true;
|
||||
vimdiffAlias = true; # Alias vimdiff to nvim -d
|
||||
|
||||
opts = {
|
||||
number = true; # Show line numbers
|
||||
@ -17,7 +17,7 @@
|
||||
};
|
||||
|
||||
plugins = {
|
||||
bufferline.enable = true;
|
||||
bufferline.enable = false;
|
||||
|
||||
# Formatters
|
||||
conform-nvim = {
|
||||
@ -53,8 +53,17 @@
|
||||
};
|
||||
|
||||
treesitter.enable = true;
|
||||
|
||||
web-devicons.enable = true;
|
||||
};
|
||||
|
||||
extraConfigLua = ''
|
||||
-- Translucent background
|
||||
vim.cmd [[
|
||||
highlight Normal guibg=none
|
||||
highlight NonText guibg=none
|
||||
highlight Normal ctermbg=none
|
||||
highlight NonText ctermbg=none
|
||||
]]
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,8 +22,8 @@
|
||||
ui_font_size = fontSize;
|
||||
buffer_font_size = fontSize;
|
||||
theme = {
|
||||
mode = "system";
|
||||
light = "Catppuccin Frappé";
|
||||
mode = theme.mode;
|
||||
light = "Catppuccin Latte";
|
||||
dark = "Catppuccin Mocha";
|
||||
};
|
||||
lsp.nil.initialization_options.formatting.command = [ "nixfmt" ];
|
||||
|
||||
@ -1,14 +1,19 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
replace =
|
||||
from: to: current:
|
||||
if current == from then to else current;
|
||||
toSingleLine =
|
||||
with lib.strings;
|
||||
s: concatMapStrings (stringAsChars (replace "\n" "")) (splitString "\n" s);
|
||||
theme = import ../theme.nix;
|
||||
in
|
||||
{
|
||||
catppuccin = {
|
||||
fish = {
|
||||
enable = true;
|
||||
flavor = theme.flavor;
|
||||
};
|
||||
starship = {
|
||||
enable = true;
|
||||
flavor = theme.flavor;
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
fish = {
|
||||
enable = true;
|
||||
@ -26,171 +31,16 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
# TODO catppuccin colours on all parts
|
||||
starship = {
|
||||
enable = true;
|
||||
settings = {
|
||||
format = toSingleLine ''
|
||||
[](#${theme.mantleAlpha})
|
||||
$os
|
||||
$username
|
||||
[](bg:#${theme.lavenderAlpha} fg:#${theme.mantleAlpha})
|
||||
$directory
|
||||
[](fg:#${theme.lavenderAlpha} bg:#${theme.blueAlpha})
|
||||
$git_branch
|
||||
$git_status
|
||||
[](fg:#${theme.blueAlpha} bg:#86BBD8)
|
||||
$c
|
||||
$elixir
|
||||
$elm
|
||||
$golang
|
||||
$gradle
|
||||
$haskell
|
||||
$java
|
||||
$julia
|
||||
$nodejs
|
||||
$nim
|
||||
$rust
|
||||
$scala
|
||||
[](fg:#86BBD8 bg:#06969A)
|
||||
$docker_context
|
||||
[](fg:#06969A bg:#33658A)
|
||||
$time
|
||||
[ ](fg:#33658A)
|
||||
'';
|
||||
|
||||
# Disable the blank line at the start of the prompt
|
||||
# add_newline = false
|
||||
|
||||
# You can also replace your username with a neat symbol like or disable this
|
||||
# and use the os module below
|
||||
username = {
|
||||
show_always = false;
|
||||
style_user = "bg:#${theme.crustAlpha}";
|
||||
style_root = "bg:#${theme.mantleAlpha}";
|
||||
format = "[$user]($style) in ";
|
||||
disabled = false;
|
||||
};
|
||||
|
||||
os = {
|
||||
style = "bg:#${theme.mantleAlpha}";
|
||||
disabled = false;
|
||||
};
|
||||
|
||||
directory = {
|
||||
style = "bg:#${theme.lavenderAlpha} fg:#${theme.baseAlpha}";
|
||||
format = "[ $path ]($style)";
|
||||
truncation_length = 3;
|
||||
truncation_symbol = "…/";
|
||||
};
|
||||
|
||||
# Here is how you can shorten some long paths by text replacement
|
||||
# similar to mapped_locations in Oh My Posh:
|
||||
directory.substitutions = {
|
||||
"Documents" = " ";
|
||||
"Downloads" = " ";
|
||||
"Music" = " ";
|
||||
"Pictures" = " ";
|
||||
};
|
||||
# Keep in mind that the order matters. For example:
|
||||
# "Important Documents" = " "
|
||||
# will not be replaced, because "Documents" was already substituted before.
|
||||
# So either put "Important Documents" before "Documents" or use the substituted version:
|
||||
# "Important " = " "
|
||||
|
||||
c = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
docker_context = {
|
||||
symbol = " ";
|
||||
style = "bg:#06969A";
|
||||
format = "[ $symbol $context ]($style)";
|
||||
};
|
||||
|
||||
elixir = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
elm = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
git_branch = {
|
||||
symbol = " ";
|
||||
style = "bg:#${theme.blueAlpha} fg:#${theme.baseAlpha}";
|
||||
format = "[ $symbol $branch ]($style)";
|
||||
};
|
||||
|
||||
git_status = {
|
||||
style = "bg:#${theme.blueAlpha} fg:#${theme.baseAlpha}";
|
||||
format = "[$all_status$ahead_behind ]($style)";
|
||||
};
|
||||
|
||||
golang = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
gradle = {
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
haskell = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
java = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
julia = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
nodejs = {
|
||||
symbol = "";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
nim = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
rust = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
scala = {
|
||||
symbol = " ";
|
||||
style = "bg:#86BBD8";
|
||||
format = "[ $symbol ($version) ]($style)";
|
||||
};
|
||||
|
||||
time = {
|
||||
disabled = false;
|
||||
time_format = "%R"; # Hour:Minute Format
|
||||
style = "bg:#33658A";
|
||||
format = "[ $time ]($style)";
|
||||
"Git" = " ";
|
||||
"nextcloud" = " ";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -8,6 +8,4 @@ in
|
||||
flavor = theme.flavor;
|
||||
icon.enable = true;
|
||||
};
|
||||
|
||||
stylix.targets.gtk.enable = false;
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ let
|
||||
common = import ../../common.nix;
|
||||
in
|
||||
{
|
||||
# TODO not working?
|
||||
home.sessionVariables = {
|
||||
HYPRSHOT_DIR = "${common.dir.pictures}/screenshots"; # Store screenshots here
|
||||
};
|
||||
|
||||
@ -18,6 +18,4 @@ in
|
||||
window_padding_width = 10;
|
||||
};
|
||||
};
|
||||
|
||||
stylix.targets.kitty.enable = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user