From 684dbf81abbd9440fe88d8e968ff7975306d88fe Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Wed, 5 Jun 2024 15:28:46 +0200 Subject: [PATCH] style all the things with stylix --- flake.nix | 5 +++++ home.nix | 46 +++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/flake.nix b/flake.nix index bdff37d..6717458 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,10 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -59,6 +63,7 @@ modules = [ inputs.nixvim.homeManagerModules.nixvim inputs.sops-nix.homeManagerModules.sops + inputs.stylix.homeManagerModules.stylix ./home.nix ]; }; diff --git a/home.nix b/home.nix index 819b695..1469b5f 100644 --- a/home.nix +++ b/home.nix @@ -106,18 +106,6 @@ }; bat = { enable = true; - config.theme = "Catppuccin-mocha"; - themes = { - Catppuccin-mocha = { - src = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "bat"; - rev = "main"; - sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; - }; - file = "Catppuccin-mocha.tmTheme"; - }; - }; }; btop = { enable = true; @@ -183,14 +171,15 @@ enableFishIntegration = true; keys = [ "id_ed25519" + "id_rsa" ]; }; kitty = { enable = true; shellIntegration.enableFishIntegration = true; font = { - name = "Iosevka Nerd Font"; - size = 14; + name = lib.mkForce "Iosevka Nerd Font"; + size = lib.mkForce 14; }; keybindings = { "ctrl+shift+g" = "show_last_command_output"; @@ -210,7 +199,7 @@ "ctrl+shift+z" = "next_layout"; }; settings = { - background_opacity = "0.95"; + background_opacity = lib.mkForce "0.95"; dynamic_background_opacity = true; enabled_layouts = "tall:bias=50;full_size=1"; scrollback_lines = 10000; @@ -222,7 +211,7 @@ tab_powerline_style = "round"; tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}"; }; - theme = "Catppuccin-Mocha"; + # theme = "Catppuccin-Mocha"; }; lazygit = { enable = true; @@ -241,15 +230,15 @@ vimAlias = true; viAlias = true; clipboard.providers.wl-copy.enable = true; - colorschemes = { - catppuccin = { - enable = true; - settings = { - flavour = "mocha"; - show_end_of_buffer = true; - }; - }; - }; + # colorschemes = { + # catppuccin = { + # enable = true; + # settings = { + # flavour = "mocha"; + # show_end_of_buffer = true; + # }; + # }; + # }; globals.mapleader = " "; globals.maplocalleader = " "; keymaps = [ @@ -432,6 +421,13 @@ }; }; + stylix = { + image = /home/muhh/Sync/Backgrounds/wald.jpg; + polarity = "dark"; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-moon.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + }; + wayland.windowManager = { sway = { enable = true;