colors test

This commit is contained in:
Adrian Gunnar Lauterer 2024-09-11 14:57:36 +02:00
parent 8a2ddf5534
commit 7ae6520740
6 changed files with 63 additions and 99 deletions

View File

@ -8,9 +8,7 @@
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
stylix.url = "github:bluskript/stylix/6bc871ab352c9f18d1179daab9e392a4d46393af"; nix-colors.url = "github:misterio77/nix-colors";
stylix.inputs.nixpkgs.follows = "nixpkgs";
stylix.inputs.home-manager.follows = "home-manager";
ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git"; ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git";
ozai.inputs.nixpkgs.follows = "unstable"; ozai.inputs.nixpkgs.follows = "unstable";
@ -32,7 +30,7 @@
outputs = { outputs = {
self self
, home-manager , home-manager
, stylix , nix-colors
, matrix-synapse-next , matrix-synapse-next
, ozai , ozai
, ozai-webui , ozai-webui
@ -49,26 +47,6 @@
in in
{ {
nixosConfigurations = { nixosConfigurations = {
boromir = nixpkgs.lib.nixosSystem {
system = "x84_64-linux";
specialArgs = {
inherit inputs;
};
modules = [
# Overlays-module makes "pkgs.unstable" available in configuration.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./machines/boromir/configuration.nix
sops-nix.nixosModules.sops
nixos-hardware.nixosModules.lenovo-thinkpad-p1
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users."gunalx" = import ./home/full.nix;
}
];
};
eowyn = nixpkgs.lib.nixosSystem { eowyn = nixpkgs.lib.nixosSystem {
system = "x84_64-linux"; system = "x84_64-linux";
@ -85,10 +63,8 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users."gunalx" = import ./home/full.nix; home-manager.users."gunalx" = import ./home/full.nix;
home-manager.extraSpecialArgs = {inherit nix-colors inputs;};
} }
#need to choose one. The nixos one has bootloader and display manager in addition to the home manager one.
inputs.stylix.nixosModules.stylix
#inputs.stylix.homeManagerModules.stylix
]; ];
}; };

View File

@ -19,17 +19,23 @@
shellAliases = { shellAliases = {
"rebuild" = "sudo nixos-rebuild switch --update-input nixpkgs --update-input unstable --no-write-lock-file --refresh --flake git+https://github.com/adrlau/nix-dotfiles.git --upgrade"; "rebuild" = "sudo nixos-rebuild switch --update-input nixpkgs --update-input unstable --no-write-lock-file --refresh --flake git+https://github.com/adrlau/nix-dotfiles.git --upgrade";
"nixedit" = "vim /etc/nixos/nix-dotfiles/."; "nixedit" = "vim /etc/nixos/nix-dotfiles/.";
"nixdir" = "cd /etc/nixos/nix-dotfiles";
"," = "comma "; "," = "comma ";
"gst" = "git status"; "gst" = "git status";
"gsw" = "git switch"; "gsw" = "git switch";
"gcm" = "git commit -m "; "gcm" = "git commit -m ";
"gca" = "git commit --amend"; "gca" = "git commit --amend";
"gaa" = "git add -A"; "gaa" = "git add -A";
"gb" = "git branch"; "gb" = "git branch";
"sl" = "eza"; "sl" = "eza";
"ls" = "eza"; "ls" = "eza";
"lls" = "ls"; "lls" = "ls";
"la" = "eza -la"; "la" = "eza -la";
"tree" = "eza -T";
"neofetch" = "fastfetch"; "neofetch" = "fastfetch";
}; };
historyControl = ["ignoreboth" "erasedups"]; historyControl = ["ignoreboth" "erasedups"];
@ -70,12 +76,6 @@
]; ];
}; };
home.stateVersion = "23.05"; home.stateVersion = "23.05";
} }

51
home/colors.nix Normal file
View File

@ -0,0 +1,51 @@
{ pkgs, config, nix-colors, ... }: {
imports = [
nix-colors.homeManagerModules.default
];
colorScheme = {
slug = "neon-pulse";
name = "Neon Pulse";
author = "Adrian G L";
palette = {
base00 = "#1A1B2E"; # dark grey background
base01 = "#2A2B3E"; # lighter background
base02 = "#3A3B4E"; # selection background
base03 = "#4A4B5E"; # comments, invisibles
base04 = "#5A5B6E"; # dark foreground
base05 = "#E4E3FE"; # default foreground (contrast)
base06 = "#7A7B8E"; # light foreground
base07 = "#8A8B9E"; # light background
base08 = "#FF2A6D"; # variables, red
base09 = "#9A9BAE"; # integers, constants
base0A = "#05D9E8"; # classes, turquoise
base0B = "#7DF9FF"; # strings, mint green
base0C = "#13c299"; # support, cyan
base0D = "#24acd4"; # functions, methods, blue
base0E = "#A742EA"; # keywords, purple
base0F = "#6B1FB1"; # deprecations, dark purple
};
};
programs.foot.settings.colors = {
alpha = "0.9";
foreground = "${config.colorScheme.palette.base05}"; # Light foreground for high contrast
background = "${config.colorScheme.palette.base00}"; # Dark background
regular0 = "${config.colorScheme.palette.base00}"; # Black
regular1 = "${config.colorScheme.palette.base08}"; # Red
regular2 = "${config.colorScheme.palette.base0A}"; # Yellow (Turquoise)
regular3 = "${config.colorScheme.palette.base0B}"; # Green
regular4 = "${config.colorScheme.palette.base0D}"; # Blue (from foot default)
regular5 = "${config.colorScheme.palette.base0E}"; # Magenta (Purple)
regular6 = "${config.colorScheme.palette.base0C}"; # Cyan (from foot default)
regular7 = "${config.colorScheme.palette.base05}"; # White
bright0 = "${config.colorScheme.palette.base03}"; # Bright Black
bright1 = "${config.colorScheme.palette.base08}"; # Bright Red
bright2 = "${config.colorScheme.palette.base0B}"; # Bright Green
bright3 = "e9e836"; # Bright Yellow (from foot default)
bright4 = "5dc5f8"; # Bright Blue (from foot default)
bright5 = "feabf2"; # Bright Magenta (from foot default)
bright6 = "${config.colorScheme.palette.base0C}"; # Bright Cyan
bright7 = "${config.colorScheme.palette.base06}"; # Bright White
};
}

View File

@ -6,28 +6,7 @@
programs.foot.enable = true; programs.foot.enable = true;
programs.foot.settings = { programs.foot.settings = {
##lets stylix handle this instead.
#colors = {
# alpha="0.9";
# foreground="ffffff";
# background="000000";
# regular0="2e3436";
# regular1="cc0000";
# regular2="c4e9a0";
# regular3="cc4a00";
# regular4="c3465a";
# regular5="c75507";
# regular6="c06989";
# regular7="cd3d7c";
# bright0="555753";
# bright1="5ef292";
# bright2="58ae23";
# bright3="5fce94";
# bright4="5729fc";
# bright5="5ad7fa";
# bright6="534e2e";
# bright7="5eeeee";
#};
main = { main = {
term = "xterm-256color"; term = "xterm-256color";
font = "0xproto:size=12"; font = "0xproto:size=12";

View File

@ -4,8 +4,9 @@
./base.nix ./base.nix
./code.nix ./code.nix
./sway.nix ./sway.nix
./stylix.nix ./colors.nix
#inputs.nix-colors.homeManagerModules.default
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
firefox firefox

View File

@ -1,43 +0,0 @@
{ pkgs, lib, ... }:
{
stylix.enable = true;
stylix.image = "/etc/nixos/nix-dotfiles/home/assets/wallpaper.jpg";
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/apathy.yaml";
# stylix.fonts = {
# monospace = {
# package = pkgs.nerdfonts.override {fonts = [“JetBrainsMono”];};
# name = “JetBrainsMono Nerd Font Mono”;
# };
# sansSerif = {
# package = pkgs.dejavu_fonts;
# name = “DejaVu Sans”;
# };
# serif = {
# package = pkgs.dejavu_fonts;
# name = “DejaVu Serif”;
# };
# };
# stylix.fonts.sizes = {
# applications = 16;
# terminal = 12;
# desktop = 12;
# popups = 12;
# };
stylix.opacity = {
applications = 1.0;
terminal = 0.8;
desktop = 1.0;
popups = 0.9;
};
stylix.polarity = "dark"; # “light” or “either”
}