From 6034a5ea9341ab5f53adaf3ce09bfd0ac9f7f71f Mon Sep 17 00:00:00 2001 From: specCon18 Date: Thu, 31 Aug 2023 00:14:52 -0400 Subject: [PATCH] updated terminal fonts --- extract.sh | 2 +- flake.lock | 222 +------- flake.nix | 6 +- hosts/katana/default.nix | 3 + modules/home-manager/alacritty.nix | 9 +- modules/home-manager/helix.nix | 2 +- modules/home-manager/hyprland.nix | 31 +- modules/home-manager/waybar.nix | 485 +++++++++++------- .../system/desktop-environments/hyprland.nix | 19 + users/speccon18/home.nix | 10 + 10 files changed, 379 insertions(+), 410 deletions(-) mode change 100644 => 100755 extract.sh diff --git a/extract.sh b/extract.sh old mode 100644 new mode 100755 index 0393cd4..6d78f2f --- a/extract.sh +++ b/extract.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh function extract { if [ -z "$1" ]; then diff --git a/flake.lock b/flake.lock index 2ff8f64..90a430d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "devenv": { - "inputs": { - "flake-compat": "flake-compat", - "nix": "nix", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1678113758, - "narHash": "sha256-mD3SkN43b1s5CJ8Rx3l2oK3Dqgs+6Ze0FfWrdMcrrYk=", - "owner": "cachix", - "repo": "devenv", - "rev": "6455f319fc90e0be2071327093c5458f9afc61bf", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "devenv", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -42,59 +20,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "devenv", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -102,11 +27,11 @@ ] }, "locked": { - "lastModified": 1687871164, - "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", + "lastModified": 1692099905, + "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", "owner": "nix-community", "repo": "home-manager", - "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", + "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", "type": "github" }, "original": { @@ -119,7 +44,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" @@ -163,46 +88,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1676545802, - "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=", - "owner": "domenkozar", - "repo": "nix", - "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "relaxed-flakes", - "repo": "nix", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1679765008, @@ -221,53 +106,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677534593, - "narHash": "sha256-PuZSAHeq4/9pP/uYH1FcagQ3nLm/DrDrvKi/xC9glvw=", + "lastModified": 1691654369, + "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ad64d9e2d5bf80c877286102355b1625891ae9a", + "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { - "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1679748960, "narHash": "sha256-BP8XcYHyj1NxQi04RpyNW8e7KiXSoI+Fy1tXIK2GfdA=", @@ -285,27 +138,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1692339729, + "narHash": "sha256-TUK76/Pqm9qIDjEGd27Lz9EiBIvn5F70JWDmEQ4Y5DQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1690726002, - "narHash": "sha256-cACz6jCJZtsZHGCJAN4vMobxzH5s6FCOTZHMrh/Hu0M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "391e8db1f06c3f74c2d313a73135515023af3993", + "rev": "ae521bd4e460b076a455dca8b13f4151489a725c", "type": "github" }, "original": { @@ -315,7 +152,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1679734080, "narHash": "sha256-z846xfGLlon6t9lqUzlNtBOmsgQLQIZvR6Lt2dImk1M=", @@ -331,49 +168,20 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "flake-utils": "flake-utils", - "gitignore": "gitignore", - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1677160285, - "narHash": "sha256-tBzpCjMP+P3Y3nKLYvdBkXBg3KvTMo3gvi8tLQaqXVY=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "2bd861ab81469428d9c823ef72c4bb08372dd2c4", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { - "devenv": "devenv", "disko": "disko", "home-manager": "home-manager", "hyprland": "hyprland", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1679799335, diff --git a/flake.nix b/flake.nix index 3deac61..7a403d0 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; sops-nix.url = github:Mic92/sops-nix; - devenv.url = "github:cachix/devenv/latest"; hyprland.url = "github:hyprwm/Hyprland"; - # xdph.url = "github:hyprwm/xdg-desktop-portal-hyprland"; home-manager = { url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,7 +16,7 @@ }; }; - outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, hyprland, ... }@inputs: + outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, hyprland, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -76,7 +74,7 @@ ] #extra modules to be loaded [ - hyprland.homeManagerModules.default + hyprland.homeManagerModules.default ./modules/home-manager/hyprland.nix ./modules/home-manager/helix.nix ./modules/home-manager/alacritty.nix diff --git a/hosts/katana/default.nix b/hosts/katana/default.nix index b6c59a0..d919d57 100644 --- a/hosts/katana/default.nix +++ b/hosts/katana/default.nix @@ -67,4 +67,7 @@ displayManager.tuigreet.enable = true; }; }; + fonts.fonts = with pkgs; [ + (nerdfonts.override { fonts = [ "SourceCodePro" "DroidSansMono" ]; }) + ]; } \ No newline at end of file diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix index ea0f7c0..752b5f8 100644 --- a/modules/home-manager/alacritty.nix +++ b/modules/home-manager/alacritty.nix @@ -22,12 +22,17 @@ font = { normal = { family = "SauceCodePro Nerd Font"; + style = "Regular"; }; bold = { family = "SauceCodePro Nerd Font"; - style = "bold"; + style = "Bold"; }; - size = 12; + italic = { + family = "SauceCodePro Nerd Font"; + style = "Italic"; + }; + size = 14; }; colors = { primary = { diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix index d3d0b2f..e4facda 100644 --- a/modules/home-manager/helix.nix +++ b/modules/home-manager/helix.nix @@ -9,7 +9,7 @@ nodePackages_latest.typescript-language-server nodePackages_latest.svelte-language-server nodePackages_latest.vls - python39Packages.python-lsp-server + python311Packages.python-lsp-server rnix-lsp rust-analyzer taplo diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index b3f8329..d7ffec8 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -4,12 +4,37 @@ # systemdIntegration = true; enable = true; extraConfig = '' - bind = SUPER, Return, exec, alacritty - bind = CONTROL_SHIFT, W, exec, firefox - bind = SUPER, R, exec, rofi -show drun + $mainMod = SUPER + bind = $mainMod, Return, exec, alacritty + bind = $mainMod, W, exec, firefox + bind = $mainMod, R, exec, rofi -show drun + # Switch workspaces with mainMod + [0-9] + bind = $mainMod, 1, workspace, 1 + bind = $mainMod, 2, workspace, 2 + bind = $mainMod, 3, workspace, 3 + bind = $mainMod, 4, workspace, 4 + bind = $mainMod, 5, workspace, 5 + bind = $mainMod, 6, workspace, 6 + bind = $mainMod, 7, workspace, 7 + bind = $mainMod, 8, workspace, 8 + bind = $mainMod, 9, workspace, 9 + bind = $mainMod, 0, workspace, 10 + + # Move active window to a workspace with mainMod + SHIFT + [0-9] + bind = $mainMod SHIFT, 1, movetoworkspace, 1 + bind = $mainMod SHIFT, 2, movetoworkspace, 2 + bind = $mainMod SHIFT, 3, movetoworkspace, 3 + bind = $mainMod SHIFT, 4, movetoworkspace, 4 + bind = $mainMod SHIFT, 5, movetoworkspace, 5 + bind = $mainMod SHIFT, 6, movetoworkspace, 6 + bind = $mainMod SHIFT, 7, movetoworkspace, 7 + bind = $mainMod SHIFT, 8, movetoworkspace, 8 + bind = $mainMod SHIFT, 9, movetoworkspace, 9 + bind = $mainMod SHIFT, 0, movetoworkspace, 10 exec-once=waybar exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=mako + exec-once = swww init monitor=,highres,auto,1 ''; }; diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 8982b36..daec355 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -3,219 +3,320 @@ programs.waybar = { enable = true; package = pkgs.waybar; + systemd = { + enable = true; + target = "hyprland-session.target" + }; settings = { main_bar = { - layer = "top"; + gtk-layer-shell = true; + position = "top"; + height = 0; modules-left = [ - "cpu" - "memory" - "tray" + "river/mode" + "river/tags" ]; modules-center = [ "clock" + "custom/joljol" ]; modules-right = [ - "backlight" - "custom/pw-volume" + "tray" + "network" + "pulseaudio" "battery" ]; - - "custom/pipewire" = { - "exec" = "pw-volume status"; - "return-type" = "json"; - "interval" = "once"; - "signal" = 8; - "format" = "{icon} {percentage}"; - "format-icons" = { - "mute" = ""; - "default" = [ - "" - "" - "" + river/tags = { + num-tags = 9; + }; + river/mode = { + format = "Mode: {}"; + }; + clock = { + format = "{:%H:%M}"; + format-alt = "{:%Y-%m-%d}"; + }; + battery = { + interval = 60; + states = { + hundred = 100; + ninty = 90; + eighty = 80; + seventy = 70; + sixty = 60; + fifty = 50; + fourty = 40; + thirty = 30; + twenty = 20; + ten = 10; + five = 5; + three = 3; + }; + format = " {capacity} "; + format-charging = " {capacity} "; + format-discharging = " {capacity} "; + format-plugged = " {capacity} "; + format-full = " {capacity} "; + }; + network = { + format-wifi = ""; + format-ethernet = "ﯱ"; + format-linked = " (No IP)"; + format-disconnected = "睊"; + format-alt = "{bandwidthUpBytes} {bandwidthDownBits}"; + interval = 2; + }; + pulseaudio = { + states = { + hundred = 100; + ninty = 90; + eighty = 80; + seventy = 70; + sixty = 60; + fifty = 50; + fourty = 40; + thirty = 30; + twenty = 20; + ten = 10; + zero = 0; + }; + format = "{icon}"; + format-muted = ""; + on-click = "pactl set-sink-mute alsa_output.pci-0000_00_1f.3.analog-stereo toggle"; + scroll-steps = 10; + format-icons = { + headphone = ""; + "hands-free" = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ + "" + "" + "" ]; }; }; - "network" = { - "tooltip" = false; - "format-wifi" = " {essid}"; - "format-ethernet" = ""; + tray = { + show-passive-items = true; + icon-size = 20; + spacing = 10; }; - "backlight" = { - "tooltip" = false; - "format" = " {}%"; - "interval" = 1; - "on-scroll-up" = "light -A 5"; - "on-scroll-down" = "light -U 5"; - }; - "battery" = { - "states" = { - "good" = 95; - "warning" = 30; - "critical" = 20; - }; - "format" = "{icon} {capacity}%"; - "format-charging" = " {capacity}%"; - "format-plugged" = " {capacity}%"; - "format-alt" = "{time} {icon}"; - "format-icons" = [ - "" - "" - "" - "" - "" - ]; - }; - "tray" = { - "icon-size" = 18; - "spacing" = 10; - }; - "clock" = { - "format" = "{: %I:%M %p  %d/%m/%Y}"; - }; - "cpu" = { - "interval" = 15; - "format" = " {}%"; - "max-length" = 10; - }; - "memory" = { - "interval" = 30; - "format" = " {}%"; - "max-length" = 10; - }; - }; + custom/joljol = { + exec = "joljol"; + format = "{}"; + update-interval = 100; + }; }; + style = '' * { - border: none; - border-radius: 10; - font-family: "JetbrainsMono Nerd Font" ; - font-size: 15px; - min-height: 10px; - } - - window#waybar { - background: transparent; - } - - window#waybar.hidden { - opacity: 0.2; - } - - #window { - margin-top: 6px; - padding-left: 10px; - padding-right: 10px; - border-radius: 10px; - transition: none; - color: transparent; - background: transparent; - } - - #network { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #161320; - background: #bd93f9; - } - - #battery { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #161320; - background: #B5E8E0; - } - - #battery.charging, #battery.plugged { - color: #161320; - background-color: #B5E8E0; - } - - #battery.critical:not(.charging) { - background-color: #B5E8E0; - color: #161320; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; - } - - @keyframes blink { - to { - background-color: #BF616A; - color: #B5E8E0; - } - } - - #backlight { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #161320; - background: #F8BD96; - } - - #clock { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #161320; - background: #ABE9B3; - /*background: #1A1826;*/ - } - - #memory { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - margin-bottom: 0px; - padding-right: 10px; - border-radius: 10px; - transition: none; - color: #161320; - background: #DDB6F2; + border: none; + /* font-family: "Recursive Sans Casual Static", "JetBrainsMono Nerd Font"; */ + font-family: "Gintronic","Recursive Sans Casual Static", "JetBrainsMono Nerd Font"; + font-size: 12px; + min-height: 20px; + border-radius: 0px; } - #cpu { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - margin-bottom: 0px; - padding-right: 10px; - border-radius: 10px; - transition: none; - color: #161320; - background: #96CDFB; + window#waybar { + background: transparent; + border-radius: 0px; } - + tooltip { + background: #ebbcba; + } + + tooltip label { + color: #191724; + } + #tags { + background-color: transparent; + border-radius: 0px; + padding: 5px 5px 0px 5px; + } + + #tags button { + padding: 0px 5px; + margin-right: 5px; + margin-left: 5px; + color: transparent; + /* border: 0px solid transparent; */ + /* border-top: 3px solid #f6c177; */ + /* border-left: 3px solid #f6c177; */ + /* border-bottom: 2px solid #f6c177; */ + background: #1f1d2e; + } + + #tags button.occupied { + border-radius: 0px; + font-weight: 900; + color: #191724; + background: #31748f; + } + + #tags button.focused { + font-weight: 900; + color: #191724; + background: #ebbcba; + } + + #tags button.urgent { + color: #e0def4; + background-color: #eb6f92; + border-radius: 0px; + } + + #custom-date, + #clock, + #battery, + #pulseaudio, + #network, + #custom-joljol { + color: #e0def4; + background: #1f1d2e; + padding: 2.5px 15px; + margin: 10px 10px 0px 0px; + font-weight: 900; + } + + #clock { + color: #ebbcba; + } + + #custom-joljol { + color: #ebbcba; + margin: 10px 10px 0px 10px; + } + + #battery { + background: #31748f; + color: #191724; + } + + /* #battery.charging { */ + /* color: #9ccfd8; */ + /* } */ + + #battery.ninty.charging { + background: linear-gradient(to right, #31748f 90%, #9ccfd8 90%); + } + #battery.ninty:not(.charging) { + background: linear-gradient(to right, #31748f 90%, #ebbcba 90%); + } + #battery.eighty.charging { + background: linear-gradient(to right, #31748f 80%, #9ccfd8 80%); + } + #battery.eighty:not(.charging) { + background: linear-gradient(to right, #31748f 80%, #ebbcba 80%); + } + #battery.seventy.charging { + background: linear-gradient(to right, #31748f 70%, #9ccfd8 70%); + } + #battery.seventy:not(.charging) { + background: linear-gradient(to right, #31748f 70%, #ebbcba 70%); + } + #battery.sixty.charging { + background: linear-gradient(to right, #31748f 60%, #9ccfd8 60%); + } + #battery.sixty:not(.charging) { + background: linear-gradient(to right, #31748f 60%, #ebbcba 60%); + } + #battery.fifty.charging { + background: linear-gradient(to right, #31748f 50%, #9ccfd8 50%); + } + #battery.fifty:not(.charging) { + background: linear-gradient(to right, #31748f 50%, #ebbcba 50%); + } + #battery.fourty.charging { + background: linear-gradient(to right, #31748f 40%, #9ccfd8 40%); + } + #battery.fourty:not(.charging) { + background: linear-gradient(to right, #31748f 40%, #ebbcba 40%); + } + #battery.thirty.charging { + background: linear-gradient(to right, #31748f 30%, #9ccfd8 30%); + } + #battery.thirty:not(.charging) { + background: linear-gradient(to right, #31748f 30%, #ebbcba 30%); + } + #battery.twenty.charging { + background: linear-gradient(to right, #31748f 20%, #9ccfd8 20%); + } + #battery.twenty:not(.charging) { + background: linear-gradient(to right, #31748f 20%, #eb6f92 20%); + } + #battery.ten.charging { + background: linear-gradient(to right, #31748f 10%, #9ccfd8 10%); + } + #battery.ten:not(.charging) { + background: linear-gradient(to right, #31748f 10%, #eb6f92 10%); + } + #battery.five.charging { + background: linear-gradient(to right, #31748f 5%, #9ccfd8 5%); + } + #battery.five:not(.charging) { + background: linear-gradient(to right, #31748f 5%, #eb6f92 5%); + } + #battery.three.charging { + background: linear-gradient(to right, #31748f 3%, #9ccfd8 3%); + } + #battery.three:not(.charging) { + background: linear-gradient(to right, #31748f 3%, #eb6f92 3%); + } + #network { + color: #31748f; + } + + #pulseaudio { + background: #c4a7e7; + color: #191724; + } + #pulseaudio.ninty { + background: linear-gradient(to top, #c4a7e7 90%, #908caa 90%); + } + #pulseaudio.eighty { + background: linear-gradient(to top, #c4a7e7 80%, #908caa 80%); + } + #pulseaudio.seventy { + background: linear-gradient(to top, #c4a7e7 70%, #908caa 70%); + } + #pulseaudio.sixty { + background: linear-gradient(to top, #c4a7e7 60%, #908caa 60%); + } + #pulseaudio.fifty { + background: linear-gradient(to top, #c4a7e7 50%, #908caa 50%); + } + #pulseaudio.fourty { + background: linear-gradient(to top, #c4a7e7 40%, #908caa 40%); + } + #pulseaudio.thirty { + background: linear-gradient(to top, #c4a7e7 30%, #908caa 30%); + } + #pulseaudio.twenty { + background: linear-gradient(to top, #c4a7e7 20%, #908caa 20%); + } + #pulseaudio.ten { + background: linear-gradient(to top, #c4a7e7 10%, #908caa 10%); + } + #pulseaudio.zero { + background: linear-gradient(to top, #c4a7e7 0%, #908caa 00%); + } + #pulseaudio.muted { + font-weight: 900; + background: #eb6f92; + } + #tray { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - margin-bottom: 0px; - padding-right: 10px; - border-radius: 10px; - transition: none; - color: #B5E8E0; - background: #161320; + /* background: #505050; */ + /* padding: 5px 10px; */ + margin: 10px 10px 0px 10px; + color: #e0def4; + } + + #tray menu { + color: #e0def4; } ''; }; diff --git a/modules/system/desktop-environments/hyprland.nix b/modules/system/desktop-environments/hyprland.nix index e0431c5..76162ee 100644 --- a/modules/system/desktop-environments/hyprland.nix +++ b/modules/system/desktop-environments/hyprland.nix @@ -25,10 +25,29 @@ in { libnotify mako hyprland + font-awesome ]; sessionVariables = { + #Enable Wayland WLR_NO_HARDWARE_CURSORS = "1"; NIXOS_OZONE_WL = "1"; + MOZ_ENABLE_WAYLAND = "1"; + GTK_USE_PORTAL = "1"; + NIXOS_XDG_OPEN_USE_PORTAL = "1"; + SDL_VIDEODRIVER = "wayland"; + + # XDG_Config + XDG_CURRENT_DESKTOP = "Hyprland"; + XDG_SESSION_DESKTOP = "Hyprland"; + XDG_SESSION_TYPE = "wayland"; + XDG_CACHE_HOME = "\${HOME}/.cache"; + XDG_CONFIG_HOME = "\${HOME}/.config"; + XDG_BIN_HOME = "\${HOME}/.local/bin"; + XDG_DATA_HOME = "\${HOME}/.local/share"; + + #Default Applications + BROWSER = "firefox"; + TERMINAL = "alacritty"; }; }; xdg.portal = { diff --git a/users/speccon18/home.nix b/users/speccon18/home.nix index f7e993e..2d241a5 100644 --- a/users/speccon18/home.nix +++ b/users/speccon18/home.nix @@ -3,7 +3,17 @@ home = { username = "speccon18"; homeDirectory = "/home/speccon18"; + + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. stateVersion = "22.11"; + packages = with pkgs; [ inkscape freecad