diff --git a/flake.lock b/flake.lock index 68ff334..a20463e 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1675728165, - "narHash": "sha256-ebSx6DaXoGKcCoK6UcDnWvdAW6J2X6pJRPD1Pw7UNOw=", + "lastModified": 1678691587, + "narHash": "sha256-EGfPa1uGYwQLhM27nyWosJo5Pe4yIhC3JOW0vqajK7w=", "owner": "arkenfox", "repo": "user.js", - "rev": "73884850632ffe284f76881786f7d5903b917f58", + "rev": "e2e8c4ea8f9c8034a2ff72fe3c2d4a4a89404c10", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1678271387, - "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=", + "lastModified": 1678886248, + "narHash": "sha256-ff81NJtc+AgQhUlTCkx8t8hda0o72vSxDeHVGrfxH70=", "owner": "nix-community", "repo": "home-manager", - "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2", + "rev": "2bd74d92bc7345f323ebcbfeb631d5cf4067ed8e", "type": "github" }, "original": { @@ -475,11 +475,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1678371846, - "narHash": "sha256-fOFX0PASpIpU4NK9Wen9yJKwg5RYe5jFIu1H0OUzglE=", + "lastModified": 1678899680, + "narHash": "sha256-o+bo+n1HYvYJVnOG/Y/nnxdx4Lu1oFgVyrHemBbT2sE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c9167d96467f0c1546f337828e874d7dd849f900", + "rev": "f5669a7d6bdb54d21426f6aa31a66fe813fc4e7d", "type": "github" }, "original": { @@ -514,11 +514,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1677282271, - "narHash": "sha256-wNooEHZpKMJN2jj2qPa1jRhi6f5q1yTYCxQcXEJ32eM=", + "lastModified": 1678893556, + "narHash": "sha256-FHhBetkV/S7M9BMpbCzUWX/P5E7tGE4mZIpj/2m0K2M=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "83867464c523c3ac2f7ce53d2c4b8d4f9b7551cd", + "rev": "61961973cfd10853b32c7f904cdb88f9ab6d84dd", "type": "github" }, "original": { @@ -545,11 +545,11 @@ }, "master": { "locked": { - "lastModified": 1678375527, - "narHash": "sha256-0W7Xu8XJLr8wUAf0fYKI2Ese3HB1fC5b/+lS9BPVgOQ=", + "lastModified": 1678898370, + "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "87af394014d51f563dade30f3f7ef55a00a3d1d6", + "rev": "ac718d02867a84b42522a0ece52d841188208f2c", "type": "github" }, "original": { @@ -565,11 +565,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1678371176, - "narHash": "sha256-tsPKurteDIU0bz9GutdRr4vwQ1kIsbJEbaY0nsz+H94=", + "lastModified": 1678886704, + "narHash": "sha256-eSeJva5Wg9Dlccc9eLR/iPunQPpzHAYh6eGjPCJnnPE=", "owner": "neovim", "repo": "neovim", - "rev": "9ef7297ef142354ace8b1f3f277d0eee3cfdc6d4", + "rev": "5a38e951ec1532ba1ee8b35b42181003866d479c", "type": "github" }, "original": { @@ -590,11 +590,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1678313833, - "narHash": "sha256-HUkOzLVYDTYzxH4zMeR2JIrh1zY/n3LIs8rtNnKeOTA=", + "lastModified": 1678728829, + "narHash": "sha256-KbA8uakGfjfvRH+Td/VegiLdHrnqIZHkMTQ5XBjL2dE=", "owner": "oxalica", "repo": "nil", - "rev": "d1017418841c612552f73d1f670d87f57dc5e090", + "rev": "e7045f1779fd202a3316f84b864c304f339cccea", "type": "github" }, "original": { @@ -733,11 +733,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1678298120, - "narHash": "sha256-iaV5xqgn29xy765Js3EoZePQyZIlLZA3pTYtTnKkejg=", + "lastModified": 1678843226, + "narHash": "sha256-TkA5tsC8N38HNgaI/odBbSOJWkUrD1uIB2A7Yms72Is=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e383aada51b416c6c27d4884d2e258df201bc11", + "rev": "abb2ade261c33516716aa21068d8c10c48d03367", "type": "github" }, "original": { @@ -841,11 +841,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1677832802, - "narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=", + "lastModified": 1678376203, + "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "382bee738397ca005206eefa36922cc10df8a21c", + "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a", "type": "github" }, "original": { @@ -921,11 +921,11 @@ ] }, "locked": { - "lastModified": 1677638104, - "narHash": "sha256-vbdOoDYnQ1QYSchMb3fYGCLYeta3XwmGvMrlXchST5s=", + "lastModified": 1678415622, + "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f388187efb41ce4195b2f4de0b6bb463d3cd0a76", + "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7", "type": "github" }, "original": { @@ -952,11 +952,11 @@ }, "stable": { "locked": { - "lastModified": 1678230755, - "narHash": "sha256-SFAXgNjNTXzcAideXcP0takfUGVft/VR5CACmYHg+Fc=", + "lastModified": 1678761643, + "narHash": "sha256-tapXZvg6Kg5Fm7Fm6i+7cRC5Exp2lX7cgMrqsfrGhuc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a7cc81913bb3cd1ef05ed0ece048b773e1839e51", + "rev": "c4aec3c021620d98861639946123214207e98344", "type": "github" }, "original": { diff --git a/modules/config/theming/catppuccin.nix b/modules/config/theming/catppuccin.nix index 99ecea9..bca09bc 100644 --- a/modules/config/theming/catppuccin.nix +++ b/modules/config/theming/catppuccin.nix @@ -36,6 +36,20 @@ in { home-manager.users.moritz = { programs = { + fzf.colors = { + "bg+" = "#${surface0}"; + "fg+" = "#${text}"; + "hl+" = "#${red}"; + bg = "#${base}"; + fg = "#${text}"; + header = "#${red}"; + hl = "#${red}"; + info = "#${mauve}"; + marker = "#${rosewater}"; + pointer = "#${rosewater}"; + prompt = "#${mauve}"; + spinner = "#${rosewater}"; + }; kitty.extraConfig = '' # vim:ft=kitty diff --git a/modules/config/theming/dracula.nix b/modules/config/theming/dracula.nix index 22ef8e6..76fa25a 100644 --- a/modules/config/theming/dracula.nix +++ b/modules/config/theming/dracula.nix @@ -4,22 +4,36 @@ with lib; let cfg = config.my.theming; - background = "#282a36"; - currentLine = "#44475a"; - foreground = "#f8f8f2"; - comment = "#6272a4"; - cyan = "#8be9fd"; - green = "#50fa7b"; - orange = "#ffb86c"; - pink = "#ff79c6"; - purple = "#bd93f9"; - red = "#ff5555"; - yellow = "#f1fa8c"; + background = "282a36"; + currentLine = "44475a"; + foreground = "f8f8f2"; + comment = "6272a4"; + cyan = "8be9fd"; + green = "50fa7b"; + orange = "ffb86c"; + pink = "ff79c6"; + purple = "bd93f9"; + red = "ff5555"; + yellow = "f1fa8c"; in { config = mkIf (cfg.enable && cfg.scheme == "dracula") { home-manager.users.moritz = { programs = { + fzf.colors = { + "bg+" = "#${currentLine}"; + "fg+" = "#${foreground}"; + "hl+" = "#${purple}"; + bg = "#${background}"; + fg = "#${foreground}"; + header = "#${comment}"; + hl = "#${purple}"; + info = "#${orange}"; + marker = "#${pink}"; + pointer = "#${pink}"; + prompt = "#${green}"; + spinner = "#${orange}"; + }; kitty.extraConfig = '' # https://draculatheme.com/kitty @@ -142,9 +156,9 @@ in }; xsession.windowManager.bspwm = { settings = { - focused_border_color = purple; - normal_border_color = background; - active_border_color = background; + focused_border_color = "#${purple}"; + normal_border_color = "#${background}"; + active_border_color = "#${background}"; }; }; services = { @@ -181,42 +195,43 @@ in polybar = { config = { "bar/bottom" = { - inherit background foreground; - border-color = background; + background = "#${background}"; + foreground = "#${foreground}"; + border-color = "#${background}"; }; "module/bspwm" = { - label-focused-foreground = pink; - label-occupied-foreground = comment; - label-urgent-foreground = red; - label-empty-foreground = currentLine; - label-separator-foreground = background; + label-focused-foreground = "#${pink}"; + label-occupied-foreground = "#${comment}"; + label-urgent-foreground = "#${red}"; + label-empty-foreground = "#${currentLine}"; + label-separator-foreground = "#${background}"; }; "module/cpu" = { - format-foreground = background; - format-background = green; + format-foreground = "#${background}"; + format-background = "#${green}"; }; "module/time" = { - format-foreground = background; - format-background = cyan; + format-foreground = "#${background}"; + format-background = "#${cyan}"; }; "module/date" = { - format-foreground = background; - format-background = yellow; + format-foreground = "#${background}"; + format-background = "#${yellow}"; }; "module/memory" = { - format-foreground = background; - format-background = cyan; + format-foreground = "#${background}"; + format-background = "#${cyan}"; }; "module/pulseaudio" = { - format-volume-foreground = background; - format-volume-background = purple; - label-muted = "%{F${red}}婢 %{F${background}}muted"; - format-muted-foreground = background; - format-muted-background = red; + format-volume-foreground = "#${background}"; + format-volume-background = "#${purple}"; + label-muted = "%{F#${red}}婢 %{F#${background}}muted"; + format-muted-foreground = "#${background}"; + format-muted-background = "#${red}"; }; "module/network" = { - format-connected-foreground = background; - format-connected-background = purple; + format-connected-foreground = "#${background}"; + format-connected-background = "#${purple}"; }; }; }; diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index f24182c..7d1c6e7 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -45,7 +45,6 @@ in aliases = { ls = "exa -lh --icons --git"; cat = "bat"; - grep = "rg"; rm = "rm -i"; mv = "mv -i"; cd = "z"; @@ -137,8 +136,14 @@ in programs = { # Let Home Manager install and manage itself. home-manager.enable = true; - fzf.enable = true; + fzf = { + enable = true; + defaultOptions = [ + "--height 50%" + ]; + }; zoxide.enable = true; + navi.enable = true; }; home = { username = "moritz"; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index cc73d24..71732d3 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -118,7 +118,7 @@ with lib; { keepassxc libreoffice pavucontrol - signal-desktop + stable.signal-desktop tlaplusToolbox vlc thunderbird diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index c143217..5ac37d0 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -32,8 +32,6 @@ in shellAliases = shellConfig.aliases; shellInit = '' - fzf_configure_bindings --git_log=\cg - # Vi Mode fish_vi_key_bindings @@ -74,8 +72,6 @@ in cheat = "cht.sh $argv | bat -p"; }; }; - fzf.enableFishIntegration = true; - starship.enableFishIntegration = true; }; }; };