diff --git a/home/default.nix b/home/default.nix index 4950598..ec53aca 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,13 +5,15 @@ osConfig, inputs, ... -}: { +}: rec { home = { inherit username stateVersion; homeDirectory = "/home/${username}"; - shellAliases = { - nix-reload-home = "home-manager switch --flake ${./..}"; - nix-reload-system = "nixos-rebuild switch --flake ${./..}"; + }; + xdg.userDirs = { + enable = true; + extraConfig = { + XDG_PROJECTS_DIR = "${home.homeDirectory}/Projects"; }; }; imports = [ diff --git a/home/desktops/hyprland/ags/js/themes.js b/home/desktops/hyprland/ags/js/themes.js index 382b1d3..df4148a 100644 --- a/home/desktops/hyprland/ags/js/themes.js +++ b/home/desktops/hyprland/ags/js/themes.js @@ -6,7 +6,7 @@ import { Theme, WP, lightColors, darkColors } from "./settings/theme.js"; export default [ Theme({ - name: "Latte", + name: "Frappé", icon: "󰄛", "desktop.screen_corners": false, "desktop.clock.enable": false, @@ -17,7 +17,7 @@ export default [ ...darkColors, }), Theme({ - name: "Frappe", + name: "Latte", icon: "󰄛", "desktop.screen_corners": false, "desktop.clock.enable": false, diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix index b4a1cfe..559fe23 100644 --- a/home/desktops/hyprland/default.nix +++ b/home/desktops/hyprland/default.nix @@ -221,6 +221,8 @@ name = "adw-gtk3-dark"; package = pkgs.adw-gtk3; }; + gtk3.extraCss = builtins.readFile ./gtk.css; + gtk4.extraCss = builtins.readFile ./gtk.css; iconTheme = { name = "Tela"; package = pkgs.tela-icon-theme; diff --git a/home/desktops/hyprland/gtk.css b/home/desktops/hyprland/gtk.css new file mode 100644 index 0000000..99ac926 --- /dev/null +++ b/home/desktops/hyprland/gtk.css @@ -0,0 +1,19 @@ +/* https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/named-colors.html */ +/* TODO */ + +/*@define-color window_bg_color rgba(239, 241, 245, 0.8); +@define-color window_fg_color #4c4f69; +@define-color view_bg_color @window_fg_color; +@define-color view_fg_color @window_fg_color; +@define-color accent_bg_color #1e66f5; +@define-color accent_color @accent_bg_color; +@define-color headerbar_bg_color @window_bg_color; +@define-color headerbar_fg_color @window_fg_color; +@define-color popover_bg_color #252525; +@define-color popover_fg_color @view_fg_color; +@define-color dialog_bg_color @popover_bg_color; +@define-color dialog_fg_color @popover_fg_color; +@define-color card_bg_color rgba(140, 143, 161, 0.08); +@define-color card_fg_color @window_fg_color; + +@define-color headerbar_bg_color rgba(239, 241, 245, 0.8);*/ diff --git a/home/packages/default.nix b/home/packages/default.nix index e320fde..b76ed37 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + xdg.configFile."ranger/rc.conf".source = ./ranger.conf; home.packages = with pkgs; [ # nix cachix diff --git a/home/packages/ranger.conf b/home/packages/ranger.conf new file mode 100644 index 0000000..ebcb57a --- /dev/null +++ b/home/packages/ranger.conf @@ -0,0 +1,4 @@ +set show_hidden true +set vcs_aware true +set preview_images true +set preview_images_method kitty diff --git a/home/programs/default.nix b/home/programs/default.nix index 45d3964..3ab9c09 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -5,8 +5,17 @@ git = import ./git.nix; lazygit.enable = true; nixvim = import ./nixvim.nix {inherit pkgs;}; + btop = { + enable = true; + settings = { + vim_keys = true; + }; + }; fish = { enable = true; + shellInit = '' + fish_vi_key_bindings + ''; interactiveShellInit = '' set fish_greeting '';