kinda cursed mod randomly swapped

This commit is contained in:
Adrian Gunnar Lauterer 2024-09-13 00:32:00 +02:00
parent a34f88aa05
commit 8df49e4231
6 changed files with 468 additions and 73 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -16,6 +16,7 @@
}; };
programs.bash = { programs.bash = {
enable = true;
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/.";
@ -38,7 +39,7 @@
"tree" = "eza -T"; "tree" = "eza -T";
"neofetch" = "fastfetch"; "neofetch" = "fastfetch";
}; };
historyControl = ["ignoreboth" "erasedups"]; historyControl = ["ignoredups" "ignorespace" "erasedups"];
historyIgnore = [ "ls" "cd" "exit" "cd .." ".." "la"]; historyIgnore = [ "ls" "cd" "exit" "cd .." ".." "la"];
}; };

View File

@ -1,52 +1,87 @@
{ pkgs, config, nix-colors, ... }: { { pkgs, config, nix-colors, ... }:
let
nix-colors-lib = nix-colors.lib.contrib { inherit pkgs; };
background = "010C09";
foreground = "FFFFFF";
offWhite = "F0FFF8";
teal = "60C89A";
red = "E64553";
blue = "58B5E0";
green = "79E05B";
purple = "6B5BDC";
magenta = "80D1A0";
cyan = "5FE2C5";
yellow = "F5D24D";
orange = "FF8800";
pink = "FF4EC9";
grey = "888B8E";
lightGrey = "F3FCF7";
darkTeal = "154E44";
lighterTeal = "2C7A6A";
lightTeal = "B0E8DA";
in{
imports = [ imports = [
nix-colors.homeManagerModules.default nix-colors.homeManagerModules.default
]; ];
# colorScheme = nix-colors-lib.colorSchemeFromPicture {
# path = ./assets/evergarden-telescope.jpg;
# variant = "dark";
# };
colorScheme = { colorScheme = {
slug = "cyberpunk-apathy-adjusted"; slug = "cyberpunk-apathy";
name = "Cyberpunk Apathy Adjusted"; name = "Cyberpunk Apathy";
author = "Adrian G L (based on Apathy by Jannik Siebert)"; author = "Adrian G L (based on Apathy by Jannik Siebert)";
palette = { palette = {
base00 = "031A16"; # Background (kept original) # Base16 color values with context-specific usage comments
base01 = "2A6D62"; # Lighter Background (brighter) base00 = background; # Default background
base02 = "3D9F87"; # Selection Background (brighter) base01 = darkTeal; # Lighter background (used for status bars)
base03 = "68D6A0"; # Comments, Invisibles, Line Highlighting (brighter) base02 = lighterTeal; # Selection background
base04 = "99E3D6"; # Dark Foreground (brighter) base03 = teal; # Comments, secondary content, line highlighting
base05 = "D1F5E3"; # Default Foreground, Caret, Delimiters, Operators (brighter) base04 = lightTeal; # Darker foreground (used for status bars)
base06 = "E0FCF8"; # Light Foreground (brighter) base05 = foreground; # Default text and foreground
base07 = "FFFFFF"; # Light Background (brighter) base06 = lightGrey; # Lighter foreground (used for inactive text)
base08 = "D066C2"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted (brighter teal) base07 = offWhite; # Lightest background (used for highlights)
base09 = "6FBCDE"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url (brighter blue) base08 = teal; # Variables, constants, markup link text
base0A = "7E6BCC"; # Classes, Markup Bold, Search Text Background (brighter purple) base09 = blue; # Integers, booleans, constants, and XML attributes
base0B = "6ACB9A"; # Strings, Inherited Class, Markup Code, Diff Inserted (brighter magenta) base0A = magenta; # Classes, headings, keywords
base0C = "D26D6E"; # Support, Regular Expressions, Escape Characters, Markup Quotes (slightly adjusted red) base0B = cyan; # Strings, literals, escape sequences
base0D = "E0C964"; # Functions, Methods, Attribute IDs, Headings (brighter yellow) base0C = green; # Support and error colors
base0E = "8FCB5F"; # Keywords, Storage, Selector, Markup Italic, Diff Changed (brighter green) base0D = cyan; # Functions, methods, function names
base0F = "6FC8B8"; # Deprecated, Opening/Closing Embedded Language Tags (brighter cyan) base0E = red; # Keywords, storage, selectors
base0F = yellow; # Deprecated or obsolete code
}; };
}; };
programs.foot.settings.colors = { programs.foot.settings.colors = {
alpha = "0.95"; # Slightly more transparent for a cyberpunk feel alpha = "0.85";
#set based on https://github.com/tinted-theming/base16-foot/blob/main/colors/base16-apathy.ini and https://github.com/tinted-theming/base16-schemes/blob/main/apathy.yaml
foreground = "${config.colorScheme.palette.base05}"; foreground = "${config.colorScheme.palette.base05}";
background = "${config.colorScheme.palette.base00}"; background = "${config.colorScheme.palette.base00}";
regular0 = "${config.colorScheme.palette.base00}"; # Black
regular1 = "${config.colorScheme.palette.base08}"; # Red (now brighter teal) regular0 = "${config.colorScheme.palette.base00}";
regular2 = "${config.colorScheme.palette.base0B}"; # Green regular1 = "${config.colorScheme.palette.base08}";
regular3 = "${config.colorScheme.palette.base0A}"; # Yellow regular2 = "${config.colorScheme.palette.base0B}";
regular4 = "${config.colorScheme.palette.base09}"; # Blue regular3 = "${config.colorScheme.palette.base0A}";
regular5 = "${config.colorScheme.palette.base0E}"; # Magenta regular4 = "${config.colorScheme.palette.base0D}";
regular6 = "${config.colorScheme.palette.base0C}"; # Cyan (now slightly adjusted red) regular5 = "${config.colorScheme.palette.base0E}";
regular7 = "${config.colorScheme.palette.base05}"; # White regular6 = "${config.colorScheme.palette.base0C}";
bright0 = "${config.colorScheme.palette.base03}"; # Bright Black regular7 = "${config.colorScheme.palette.base05}";
bright1 = "${config.colorScheme.palette.base08}"; # Bright Red (now brighter teal)
bright2 = "${config.colorScheme.palette.base0B}"; # Bright Green bright0 = "${config.colorScheme.palette.base03}";
bright3 = "${config.colorScheme.palette.base0A}"; # Bright Yellow bright1 = "${config.colorScheme.palette.base08}";
bright4 = "${config.colorScheme.palette.base09}"; # Bright Blue bright2 = "${config.colorScheme.palette.base0B}";
bright5 = "${config.colorScheme.palette.base0E}"; # Bright Magenta bright3 = "${config.colorScheme.palette.base0A}";
bright6 = "${config.colorScheme.palette.base0C}"; # Bright Cyan (now adjusted red) bright4 = "${config.colorScheme.palette.base0D}";
bright7 = "${config.colorScheme.palette.base07}"; # Bright White bright5 = "${config.colorScheme.palette.base0E}";
selection-foreground = "${config.colorScheme.palette.base00}"; # Dark background color for selected text bright6 = "${config.colorScheme.palette.base0C}";
selection-background = "${config.colorScheme.palette.base0A}"; # Selection color bright7 = "${config.colorScheme.palette.base07}";
selection-foreground = "${config.colorScheme.palette.base00}";
selection-background = "${config.colorScheme.palette.base0A}";
}; };
} }

View File

@ -12,6 +12,11 @@
firefox firefox
gimp gimp
dconf dconf
feh
ripgrep
eza
bottom
killall
]; ];
} }

View File

@ -1,8 +1,12 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
let
palette = config.colorScheme.palette;
in
{ {
imports = [ imports = [
#./fuzzle.nix #./fuzzle.nix
#./wofi.nix #./wofi.nix
#./waybar.nix
./foot.nix ./foot.nix
./fonts.nix ./fonts.nix
./kanshi.nix ./kanshi.nix
@ -99,7 +103,7 @@
_JAVA_AWT_WM_NONREPARENTING = 1; _JAVA_AWT_WM_NONREPARENTING = 1;
# gtk applications on wayland # gtk applications on wayland
# export GDK_BACKEND=wayland #GTK_BACKEND="wayland";
}; };
@ -107,9 +111,12 @@ wayland.windowManager.sway = let
cfg = config.wayland.windowManager.sway; cfg = config.wayland.windowManager.sway;
in { in {
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
systemd.enable = true;
enable = true; enable = true;
config = rec { config = rec {
modifier = "Mod4"; modifier = "Mod4";
terminal = "footclient"; terminal = "footclient";
menu = "fuzzel"; menu = "fuzzel";
bars = [{ bars = [{
@ -134,6 +141,10 @@ in {
"${cfg.config.down}" = "resize grow height 10 px or 10 ppt"; "${cfg.config.down}" = "resize grow height 10 px or 10 ppt";
"${cfg.config.up}" = "resize shrink height 10 px or 10 ppt"; "${cfg.config.up}" = "resize shrink height 10 px or 10 ppt";
"${cfg.config.right}" = "resize grow width 10 px or 10 ppt"; "${cfg.config.right}" = "resize grow width 10 px or 10 ppt";
"Left" = "resize shrink width 10 px or 10 ppt";
"Down" = "resize grow height 10 px or 10 ppt";
"Up" = "resize shrink height 10 px or 10 ppt";
"Right" = "resize grow width 10 px or 10 ppt";
}; };
keybindings = { keybindings = {
"${cfg.config.modifier}+Return" = "exec ${cfg.config.terminal}"; "${cfg.config.modifier}+Return" = "exec ${cfg.config.terminal}";
@ -219,7 +230,7 @@ in {
"${cfg.config.modifier}+Shift+c" = "exec code"; "${cfg.config.modifier}+Shift+c" = "exec code";
"${cfg.config.modifier}+f11" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png"; "${cfg.config.modifier}+f11" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
"${cfg.config.modifier}+Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png"; "${cfg.config.modifier}+Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
"Mod1+tab" = "workspace back_and_forth"; "${cfg.config.modifier}+tab" = "workspace back_and_forth";
}; };
}; };
@ -229,11 +240,6 @@ in {
input type:keyboard xkb_numlock enabled input type:keyboard xkb_numlock enabled
xwayland enable xwayland enable
assign [class="autostart1"] workspace 1
assign [class="autostart2"] workspace 2
assign [class="autostart3"] workspace 3
assign [class="autostart4"] workspace 4
smart_borders no_gaps smart_borders no_gaps
smart_gaps on smart_gaps on
gaps inner 5 gaps inner 5
@ -241,10 +247,10 @@ in {
default_floating_border pixel 2 default_floating_border pixel 2
titlebar_border_thickness 1 titlebar_border_thickness 1
client.focused #80a0ff #303030 #c6c6c6 #80a0ff #80a0ff client.focused ${palette.base0D} ${palette.base00} ${palette.base05} ${palette.base0D} ${palette.base0D}
client.focused_inactive #80a0ff #303030 #c6c6c6 #80a0ff #80a0ff client.focused_inactive ${palette.base0D} ${palette.base00} ${palette.base05} ${palette.base0D} ${palette.base0D}
client.unfocused #80a0ff #080808 #c6c6c6 #80a0ff #303030 client.unfocused ${palette.base0D} ${palette.base03} ${palette.base05} ${palette.base0D} ${palette.base00}
client.urgent #80a0ff #80a0ff #080808 #80a0ff client.urgent ${palette.base0D} ${palette.base0D} ${palette.base03} ${palette.base0D}
for_window [title="(?:Open|Save) (?:File|Folder|As)"] floating enable for_window [title="(?:Open|Save) (?:File|Folder|As)"] floating enable
for_window [title="(?:Open|Save) (?:File|Folder|As)"] resize set 1920 1080 for_window [title="(?:Open|Save) (?:File|Folder|As)"] resize set 1920 1080
@ -260,12 +266,6 @@ in {
for_window [app_id="dolphin"] floating enable for_window [app_id="dolphin"] floating enable
for_window [app_id="file-manager"] floating enable for_window [app_id="file-manager"] floating enable
#client.focused $accent $accent #000000 #00ffcc $accent
#client.focused_inactive #000000 #000000 #ff9900 #000000 #000000
#client.unfocused #000000 #000000 #00ffcc #000000 #000000
#client.urgent #ff0000 #ff0000 #00ffcc #ff0000 #ff0000
#client.placeholder #000000 #000000 #00ffcc #000000 #000000
#client.background #000000
''; '';
}; };
} }

354
home/waybar.nix Normal file
View File

@ -0,0 +1,354 @@
{ pkgs, config, nix-colors, ... }:
let
palette = config.colorScheme.palette;
in{
imports = [
];
programs.waybar = {
enable = true;
style = ''
* {
/* `otf-font-awesome` is required to be installed for icons */
font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
font-size: 13px;
}
window#waybar {
background-color: #${palette.base00}50;
border-bottom: 3px solid #${palette.base03}50;
color: ${palette.base05};
transition-property: background-color;
transition-duration: .5s;
}
window#waybar.hidden {
opacity: 0.2;
}
/*
window#waybar.empty {
background-color: transparent;
}
window#waybar.solo {
background-color: #${palette.base07};
}
*/
window#waybar.termite {
background-color: #${palette.base03};
}
window#waybar.chromium {
background-color: #${palette.base00};
border: none;
}
button {
/* Use box-shadow instead of border so the text isn't offset */
box-shadow: inset 0 -3px transparent;
/* Avoid rounded borders under each button name */
border: none;
border-radius: 0;
}
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
button:hover {
background: inherit;
box-shadow: inset 0 -3px #${palette.base05};
}
/* you can set a style on hover for any module like this */
#pulseaudio:hover {
background-color: #${palette.base0A};
}
#workspaces button {
padding: 0 5px;
background-color: transparent;
color: #${palette.base05};
}
#workspaces button:hover {
background: #${palette.base00}20;
}
#workspaces button.focused {
background-color: #${palette.base03};
box-shadow: inset 0 -3px #${palette.base05};
}
#workspaces button.urgent {
background-color: #${palette.base08};
}
#mode {
background-color: #${palette.base03};
box-shadow: inset 0 -3px #${palette.base05};
}
#clock,
#battery,
#cpu,
#memory,
#disk,
#temperature,
#backlight,
#network,
#pulseaudio,
#wireplumber,
#custom-media,
#tray,
#mode,
#idle_inhibitor,
#scratchpad,
#power-profiles-daemon,
#mpd {
padding: 0 10px;
color: #${palette.base05};
}
#window,
#workspaces {
margin: 0 4px;
}
/* If workspaces is the leftmost module, omit left margin */
.modules-left > widget:first-child > #workspaces {
margin-left: 0;
}
/* If workspaces is the rightmost module, omit right margin */
.modules-right > widget:last-child > #workspaces {
margin-right: 0;
}
#clock {
background-color: #${palette.base03};
}
#battery {
background-color: #${palette.base05};
color: #${palette.base00};
}
#battery.charging, #battery.plugged {
color: #${palette.base05};
background-color: #${palette.base0B};
}
@keyframes blink {
to {
background-color: #${palette.base05};
color: #${palette.base00};
}
}
/* Using steps() instead of linear as a timing function to limit cpu usage */
#battery.critical:not(.charging) {
background-color: #${palette.base08};
color: #${palette.base05};
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: steps(12);
animation-iteration-count: infinite;
animation-direction: alternate;
}
#power-profiles-daemon {
padding-right: 15px;
}
#power-profiles-daemon.performance {
background-color: #${palette.base08};
color: #${palette.base05};
}
#power-profiles-daemon.balanced {
background-color: #${palette.base0D};
color: #${palette.base05};
}
#power-profiles-daemon.power-saver {
background-color: #${palette.base0B};
color: ${palette.base00};
}
label:focus {
background-color: #${palette.base00};
}
#cpu {
background-color: #${palette.base0B};
color: ${palette.base00};
}
#memory {
background-color: #${palette.base0E};
}
#disk {
background-color: #${palette.base09};
}
#backlight {
background-color: #${palette.base0C};
}
#network {
background-color: #${palette.base0D};
}
#network.disconnected {
background-color: #${palette.base08};
}
#pulseaudio {
background-color: #${palette.base0A};
color: #${palette.base00};
}
#pulseaudio.muted {
background-color: #${palette.base0C};
color: #${palette.base03};
}
#wireplumber {
background-color: #${palette.base07};
color: #${palette.base00};
}
#wireplumber.muted {
background-color: #${palette.base08};
}
#custom-media {
background-color: #${palette.base0B};
color: #${palette.base03};
min-width: 100px;
}
#custom-media.custom-spotify {
background-color: #${palette.base0B};
}
#custom-media.custom-vlc {
background-color: #${palette.base09};
}
#temperature {
background-color: #${palette.base0A};
}
#temperature.critical {
background-color: #${palette.base08};
}
#tray {
background-color: #${palette.base0D};
}
#tray > .passive {
-gtk-icon-effect: dim;
}
#tray > .needs-attention {
-gtk-icon-effect: highlight;
background-color: #${palette.base08};
}
#idle_inhibitor {
background-color: #${palette.base00};
}
#idle_inhibitor.activated {
background-color: #${palette.base07};
color: #${palette.base00};
}
#mpd {
background-color: #${palette.base0B};
color: #${palette.base03};
}
#mpd.disconnected {
background-color: #${palette.base08};
}
#mpd.stopped {
background-color: #${palette.base0C};
}
#mpd.paused {
background-color: #${palette.base0B};
}
#language {
background: #${palette.base0C};
color: #${palette.base0E};
padding: 0 5px;
margin: 0 5px;
min-width: 16px;
}
#keyboard-state {
background: #${palette.base0B};
color: #${palette.base00};
padding: 0 0px;
margin: 0 5px;
min-width: 16px;
}
#keyboard-state > label {
padding: 0 5px;
}
#keyboard-state > label.locked {
background: #${palette.base00}20;
}
#scratchpad {
background: #${palette.base00}20;
}
#scratchpad.empty {
background-color: transparent;
}
#privacy {
padding: 0;
}
#privacy-item {
padding: 0 5px;
color: #${palette.base05};
}
#privacy-item.screenshare {
background-color: #${palette.base09};
}
#privacy-item.audio-in {
background-color: #${palette.base0B};
}
#privacy-item.audio-out {
background-color: #${palette.base0D};
}
'';
};
}