From 781e023c7433087723f33f023a608614172eeae2 Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Sun, 4 Feb 2024 16:05:26 -0700 Subject: [PATCH] Colors --- common/users/cameron/home-manager/hyprland.nix | 7 ++++--- common/users/cameron/home-manager/kitty.nix | 17 +++++++++++++++++ common/users/cameron/home-manager/zsh.nix | 4 ++-- common/users/cameron/home.nix | 4 ++++ hosts/nixos/home-manager/cameron.nix | 6 ++++-- hosts/nixserver/home-manager/cameron.nix | 6 ++++-- 6 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 common/users/cameron/home-manager/kitty.nix diff --git a/common/users/cameron/home-manager/hyprland.nix b/common/users/cameron/home-manager/hyprland.nix index 75a5864..ffd25f0 100644 --- a/common/users/cameron/home-manager/hyprland.nix +++ b/common/users/cameron/home-manager/hyprland.nix @@ -49,11 +49,11 @@ }; general = { - gaps_in = 2; - gaps_out = 2; + gaps_in = 3; + gaps_out = 6; border_size = 2; - "col.active_border" = "rgba(00aaffee) rgba(00ffffee) -45deg"; + "col.active_border" = "rgba(ff970aff) rgba(ff830aff) 45deg"; "col.inactive_border" = "rgba(595959aa)"; layout = "dwindle"; @@ -124,6 +124,7 @@ "$mod, Return, exec, $term" "$mod, B, exec, $browser" "$mod, E, killactive," + "$mod, Q, exec, hyprctl kill" "$mod, left, movefocus, l" "$mod, right, movefocus, r" diff --git a/common/users/cameron/home-manager/kitty.nix b/common/users/cameron/home-manager/kitty.nix new file mode 100644 index 0000000..56ba4f5 --- /dev/null +++ b/common/users/cameron/home-manager/kitty.nix @@ -0,0 +1,17 @@ +{ pkgs, lib, osConfig, ... }: + +{ + programs.kitty = { + enable = (builtins.length osConfig.desktop) != 0; + + settings = { + background = "#333333"; + foreground = "#cccccc"; + background_opacity = 0.95; + + editor = "nvim"; + + update_check_interval = 0; + }; + }; +} diff --git a/common/users/cameron/home-manager/zsh.nix b/common/users/cameron/home-manager/zsh.nix index e9d6683..3174a1a 100644 --- a/common/users/cameron/home-manager/zsh.nix +++ b/common/users/cameron/home-manager/zsh.nix @@ -85,7 +85,7 @@ function set_prompt() { local prefix="" for i in $(seq 1 "''${#prefixes[@]}"); do - prefix+="%F{''${colors[$i]:-255}}''${prefixes[$i]}%F{255} " + prefix+="%F{''${colors[$i]:-255}}''${prefixes[$i]}%f " done PROMPT="[''${prefix}%n@%m %1~]%(#.#.$) " @@ -118,7 +118,7 @@ fi shellAliases = { grep = "grep --color=auto"; - ls = "ls --color=auto"; + ls = "eza --icons --group-directories-first"; nv = "nvim"; nvd = "nvim ."; diff --git a/common/users/cameron/home.nix b/common/users/cameron/home.nix index 9d3c162..db708df 100644 --- a/common/users/cameron/home.nix +++ b/common/users/cameron/home.nix @@ -24,4 +24,8 @@ home.sessionVariables = { EDITOR = "nvim"; }; + + home.packages = with pkgs; [ + eza + ]; } diff --git a/hosts/nixos/home-manager/cameron.nix b/hosts/nixos/home-manager/cameron.nix index c7946ac..7291315 100644 --- a/hosts/nixos/home-manager/cameron.nix +++ b/hosts/nixos/home-manager/cameron.nix @@ -1,10 +1,12 @@ -{ lib, pkgs, inputs, config, osConfig, common_dir, ... }: +{ lib, pkgs, inputs, config, osConfig, ... }: { imports = [ - (common_dir + /users/cameron/home.nix) + (inputs.common_dir + /users/cameron/home.nix) ]; + colorScheme = inputs.nix-colors.colorSchemes.framer; + home.stateVersion = "24.05"; } diff --git a/hosts/nixserver/home-manager/cameron.nix b/hosts/nixserver/home-manager/cameron.nix index d8a88d6..fefea7e 100644 --- a/hosts/nixserver/home-manager/cameron.nix +++ b/hosts/nixserver/home-manager/cameron.nix @@ -1,10 +1,12 @@ -{ lib, pkgs, config, osConfig, common_dir, ... }: +{ lib, pkgs, inputs, config, osConfig, ... }: { imports = [ - (common_dir + /users/cameron/home.nix) + (inputs.common_dir + /users/cameron/home.nix) ]; + colorScheme = inputs.nix-colors.colorSchemes.dracula; + home.stateVersion = "23.11"; }