diff --git a/flake.lock b/flake.lock index d459076..5a8fd63 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1717861551, - "narHash": "sha256-8wolGw60hKNa++YO57FXL8/g5U84VgINoQAZ3ppe0ME=", + "lastModified": 1717449440, + "narHash": "sha256-QtSCQFBhyQIsKJhOvcIOi+9EN1kEnNeoLo3PeQ5VbIY=", "owner": "StevenBlack", "repo": "hosts", - "rev": "846f528dfc591a647a36462ec1f8bf3453fa0c35", + "rev": "e1a7b23e9769607009d741066b5789a99aaf9923", "type": "github" }, "original": { @@ -490,11 +490,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -511,17 +511,17 @@ ] }, "locked": { - "lastModified": 1718188849, - "narHash": "sha256-bNlu9Iv/BDMbuqtDSHbS082XBA2kKW9jCMLXeprmkxI=", + "lastModified": 1714910346, + "narHash": "sha256-Up5ZFLfAu7BtASVc/Pr7Ay+5QehQ/L9vwF2Q26DRunk=", "owner": "DreamMaoMao", "repo": "hycov", - "rev": "3d144a79f8b5468656de88a005be55f3317d295b", + "rev": "115cba558d439cc25d62ce38b7c62cde83f50ef5", "type": "github" }, "original": { "owner": "DreamMaoMao", "repo": "hycov", - "rev": "3d144a79f8b5468656de88a005be55f3317d295b", + "rev": "115cba558d439cc25d62ce38b7c62cde83f50ef5", "type": "github" } }, @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1717181720, - "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -554,31 +554,53 @@ "type": "github" } }, + "hyprgrass": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1715969899, + "narHash": "sha256-NDURZAbLIihUHNt5a8PGrgmzFkcBsG5e4MgwJE/InbM=", + "owner": "horriblename", + "repo": "hyprgrass", + "rev": "6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917", + "type": "github" + }, + "original": { + "owner": "horriblename", + "repo": "hyprgrass", + "rev": "6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917", + "type": "github" + } + }, "hyprland": { "inputs": { "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], "systems": "systems", + "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1718029386, - "narHash": "sha256-iX/l3UT8iXu8psu2UirFX11Yg2zYwpgzoXB32oM3N3U=", - "rev": "ea2501d4556f84d3de86a4ae2f4b22a474555b9f", - "revCount": 4794, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" + "lastModified": 1714862770, + "narHash": "sha256-W6hJa5pWNQ19q9YNGS9s2ZaGkWmBd6yLsT9NqLtI1vg=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "0b215c5f246d3fde6c023e78b3e3579f7498c172", + "type": "github" }, "original": { - "rev": "ea2501d4556f84d3de86a4ae2f4b22a474555b9f", - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "0b215c5f246d3fde6c023e78b3e3579f7498c172", + "type": "github" } }, "hyprland-plugins": { @@ -586,11 +608,6 @@ "hyprland": [ "hyprland" ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], "systems": [ "hyprland-plugins", "hyprland", @@ -598,17 +615,16 @@ ] }, "locked": { - "lastModified": 1718111105, - "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", + "lastModified": 1717171694, + "narHash": "sha256-LN2lrcGdAMpkooleWSOV+/q1+wx1f3pSBs1TWeoMCkA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", + "rev": "e0cad229c3d799c7f72b1217ab2eb300ceecf3ac", "type": "github" }, "original": { "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", "type": "github" } }, @@ -616,12 +632,10 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" ], "systems": [ "hyprland", - "xdph", "systems" ] }, @@ -651,11 +665,11 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -676,11 +690,11 @@ ] }, "locked": { - "lastModified": 1717784906, - "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", + "lastModified": 1714755542, + "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", + "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", "type": "github" }, "original": { @@ -785,11 +799,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -800,11 +814,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1718060059, - "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", + "lastModified": 1717530100, + "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", + "rev": "a2e1d0414259a144ebdc048408a807e69e0565af", "type": "github" }, "original": { @@ -861,21 +875,6 @@ "type": "github" } }, - "nwg-dock-hyprland-pin-nixpkgs": { - "locked": { - "lastModified": 1716385560, - "narHash": "sha256-xuFXyvvrDXx5A56uo8D+YmHqsmPscsjBh279P44Z5bE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2098d845d76f8a21ae4fe12ed7c7df49098d3f15", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "2098d845d76f8a21ae4fe12ed7c7df49098d3f15", - "type": "indirect" - } - }, "ob-racket": { "flake": false, "locked": { @@ -1109,6 +1108,7 @@ "home-manager-stable": "home-manager-stable", "home-manager-unstable": "home-manager-unstable", "hycov": "hycov", + "hyprgrass": "hyprgrass", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", @@ -1117,7 +1117,6 @@ "nix-straight": "nix-straight", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", - "nwg-dock-hyprland-pin-nixpkgs": "nwg-dock-hyprland-pin-nixpkgs", "org-krita": "org-krita", "org-nursery": "org-nursery", "org-side-tree": "org-side-tree", @@ -1152,11 +1151,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1718158726, - "narHash": "sha256-nOt0XxRZ9ZwztX4OOKdS4YkPd3TVfz/PoaD8TiT7/vw=", + "lastModified": 1717726729, + "narHash": "sha256-2WDKLjVRKWXbadnJHSOUb46PTq3D5nS89vhHTphRw1M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d4d933340cd3b35d3dc256d76abc3d510e21dfdc", + "rev": "7f52ac9ae95bd60c0780d6e32baea22e542e11e1", "type": "github" }, "original": { @@ -1196,11 +1195,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1718122552, - "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", + "lastModified": 1717593209, + "narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", "owner": "danth", "repo": "stylix", - "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", + "rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", "type": "github" }, "original": { @@ -1270,6 +1269,23 @@ "type": "github" } }, + "wlroots": { + "flake": false, + "locked": { + "lastModified": 1713731601, + "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", + "type": "github" + } + }, "ws-butler": { "flake": false, "locked": { @@ -1288,7 +1304,10 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" @@ -1303,11 +1322,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1714060055, + "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3af225a..b21bb77 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ name = "Emmet"; # name/identifier email = "emmet@librephoenix.com"; # email (used for certain configurations) dotfilesDir = "~/.dotfiles"; # absolute path of the local repo - theme = "io"; # selcted theme from my themes directory (./themes/) + theme = "uwunicorn-yt"; # selcted theme from my themes directory (./themes/) wm = "hyprland"; # Selected window manager or desktop environment; must select one in both ./user/wm/ and ./system/wm/ # window manager type (hyprland or x11) translator wmType = if (wm == "hyprland") then "wayland" else "x11"; @@ -86,10 +86,6 @@ system = systemSettings.system; }; - pkgs-nwg-dock-hyprland = import inputs.nwg-dock-hyprland-pin-nixpkgs { - system = systemSettings.system; - }; - # configure lib # use nixpkgs if running a server (homelab or worklab profile) # otherwise use patched nixos-unstable nixpkgs @@ -129,7 +125,6 @@ inherit pkgs-stable; inherit pkgs-emacs; inherit pkgs-kdenlive; - inherit pkgs-nwg-dock-hyprland; inherit systemSettings; inherit userSettings; inherit inputs; @@ -180,7 +175,6 @@ nixpkgs-stable.url = "nixpkgs/nixos-23.11"; emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; - nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15"; home-manager-unstable.url = "github:nix-community/home-manager/master"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; @@ -188,20 +182,14 @@ home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; - hyprland = { - type = "git"; - url = "https://github.com/hyprwm/Hyprland"; - submodules = true; - rev = "ea2501d4556f84d3de86a4ae2f4b22a474555b9f"; - }; + hyprland.url = "github:hyprwm/Hyprland/0b215c5f246d3fde6c023e78b3e3579f7498c172?submodules=1"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; - hyprland-plugins.url = "github:hyprwm/hyprland-plugins/151102b7d7c4f61ff42f275e72008d28318dac96"; + hyprland-plugins.url = "github:hyprwm/hyprland-plugins"; hyprland-plugins.inputs.hyprland.follows = "hyprland"; - hycov.url = "github:DreamMaoMao/hycov/3d144a79f8b5468656de88a005be55f3317d295b"; + hycov.url = "github:DreamMaoMao/hycov/115cba558d439cc25d62ce38b7c62cde83f50ef5"; hycov.inputs.hyprland.follows = "hyprland"; - # FIXME hyprgrass broken on 0.41.0 - #hyprgrass.url = "github:horriblename/hyprgrass/6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917"; - #hyprgrass.inputs.hyprland.follows = "hyprland"; + hyprgrass.url = "github:horriblename/hyprgrass/6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917"; + hyprgrass.inputs.hyprland.follows = "hyprland"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; diff --git a/themes/io/README.org b/themes/uwunicorn-yt/README.org similarity index 57% rename from themes/io/README.org rename to themes/uwunicorn-yt/README.org index c6728e1..fd6ba94 100644 --- a/themes/io/README.org +++ b/themes/uwunicorn-yt/README.org @@ -1,9 +1,7 @@ -#+title: Io +#+title: Uwunicorn (Youtube ver.) #+author: Emmet -"Io" theme, which is my fork of Uwunicorn originally by Fernando Marques ([[https://github.com/RakkiUwU]]) and Gabriel Fontes ([[https://github.com/Misterio77]]). - -The main difference is that it has more vibrant colors. +"Uwunicorn" base-16 theme originally by Fernando Marques ([[https://github.com/RakkiUwU]]) and Gabriel Fontes ([[https://github.com/Misterio77]]) [[https://raw.githubusercontent.com/librephoenix/nixos-config-screenshots/main/hyprland/uwunicorn.png]] diff --git a/themes/io/backgroundsha256.txt b/themes/uwunicorn-yt/backgroundsha256.txt similarity index 100% rename from themes/io/backgroundsha256.txt rename to themes/uwunicorn-yt/backgroundsha256.txt diff --git a/themes/io/backgroundurl.txt b/themes/uwunicorn-yt/backgroundurl.txt similarity index 100% rename from themes/io/backgroundurl.txt rename to themes/uwunicorn-yt/backgroundurl.txt diff --git a/themes/io/polarity.txt b/themes/uwunicorn-yt/polarity.txt similarity index 100% rename from themes/io/polarity.txt rename to themes/uwunicorn-yt/polarity.txt diff --git a/themes/io/io.yaml b/themes/uwunicorn-yt/uwunicorn-yt.yaml similarity index 65% rename from themes/io/io.yaml rename to themes/uwunicorn-yt/uwunicorn-yt.yaml index 2c2ecb2..725c4be 100644 --- a/themes/io/io.yaml +++ b/themes/uwunicorn-yt/uwunicorn-yt.yaml @@ -1,5 +1,5 @@ scheme: "UwUnicorn" -author: "LibrePhoenix (forked from Fernando Marques (https://github.com/RakkiUwU) and Gabriel Fontes (https://github.com/Misterio77))" +author: "Fernando Marques (https://github.com/RakkiUwU) and Gabriel Fontes (https://github.com/Misterio77), modified by me (https://librephoenix.com)" base00: "241b26" base01: "2f2a3f" base02: "46354a" diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index de41ac5..c475bff 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -1359,8 +1359,6 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." (setq mu4e-index-lazy-check t) (setq mu4e-index-cleanup t) - (setq mu4e-update-interval 120) - (mu4e-alert-enable-notifications) (define-key mu4e-main-mode-map (kbd "") #'doom/leader) (define-key mu4e-headers-mode-map (kbd "") #'doom/leader) @@ -1446,8 +1444,6 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." (add-hook 'mu4e-compose-mode-hook #'no-auto-fill) (add-hook 'mu4e-compose-pre-hook #'no-org-msg-mode) - (mu4e--start) ;; start mu4e silently - ) ;;;-- Load emacs direnv;;;-- diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 072b823..68ecb1f 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -1617,8 +1617,6 @@ I don't have this active right now since it's kinda weird with pgtk... (setq mu4e-index-lazy-check t) (setq mu4e-index-cleanup t) - (setq mu4e-update-interval 120) - (mu4e-alert-enable-notifications) (define-key mu4e-main-mode-map (kbd "") #'doom/leader) (define-key mu4e-headers-mode-map (kbd "") #'doom/leader) @@ -1704,8 +1702,6 @@ I don't have this active right now since it's kinda weird with pgtk... (add-hook 'mu4e-compose-mode-hook #'no-auto-fill) (add-hook 'mu4e-compose-pre-hook #'no-org-msg-mode) - (mu4e--start) ;; start mu4e silently - ) #+END_SRC diff --git a/user/app/terminal/kitty.nix b/user/app/terminal/kitty.nix index a4ea19f..f0efaa3 100644 --- a/user/app/terminal/kitty.nix +++ b/user/app/terminal/kitty.nix @@ -7,6 +7,5 @@ programs.kitty.enable = true; programs.kitty.settings = { background_opacity = lib.mkForce "0.75"; - modify_font = "cell_width 90%"; }; } diff --git a/user/style/Trolltech.conf.mustache b/user/style/Trolltech.conf.mustache index df819c6..db33435 100644 --- a/user/style/Trolltech.conf.mustache +++ b/user/style/Trolltech.conf.mustache @@ -20,32 +20,31 @@ IntensityEffect=0 [Colors:Button] BackgroundNormal={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} -BackgroundAlternate={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} ForegroundNormal={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} +BackgroundAlternate={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} DecorationFocus={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} DecorationHover={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} -ForegroundActive={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundInactive={{base05-rgb-r}},{{base05-rgb-g}},{{base05-rgb-b}} -ForegroundLink={{base0C-rgb-r}},{{base0C-rgb-g}},{{base0C-rgb-b}} -ForegroundNegative={{base08-rgb-r}},{{base08-rgb-g}},{{base08-rgb-b}} -ForegroundNeutral={{base09-rgb-r}},{{base09-rgb-g}},{{base09-rgb-b}} -ForegroundNormal={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundPositive={{base0B-rgb-r}},{{base0B-rgb-g}},{{base0B-rgb-b}} -ForegroundVisited={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}} +ForegroundActive={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundInactive=127,140,141 +ForegroundLink={{base03-rgb-r}},{{base03-rgb-g}},{{base03-rgb-b}} +ForegroundNegative={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundNeutral={{base02-rgb-r}},{{base02-rgb-g}},{{base02-rgb-b}} +ForegroundPositive={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +ForegroundVisited=127,140,141 [Colors:Complementary] -BackgroundNormal={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} -BackgroundAlternate={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +BackgroundAlternate=59,64,69 +BackgroundNormal=49,54,59 DecorationFocus={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} DecorationHover={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} ForegroundActive={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundInactive={{base05-rgb-r}},{{base05-rgb-g}},{{base05-rgb-b}} -ForegroundLink={{base0C-rgb-r}},{{base0C-rgb-g}},{{base0C-rgb-b}} -ForegroundNegative={{base08-rgb-r}},{{base08-rgb-g}},{{base08-rgb-b}} -ForegroundNeutral={{base09-rgb-r}},{{base09-rgb-g}},{{base09-rgb-b}} +ForegroundInactive=175,176,179 +ForegroundLink={{base03-rgb-r}},{{base03-rgb-g}},{{base03-rgb-b}} +ForegroundNegative={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundNeutral={{base02-rgb-r}},{{base02-rgb-g}},{{base02-rgb-b}} ForegroundNormal={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundPositive={{base0B-rgb-r}},{{base0B-rgb-g}},{{base0B-rgb-b}} -ForegroundVisited={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}} +ForegroundPositive={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +ForegroundVisited=61,174,230 [Colors:Selection] BackgroundNormal={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} @@ -53,73 +52,65 @@ ForegroundNormal={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} BackgroundAlternate=255,0,0 DecorationFocus=0,255,0 DecorationHover=0,0,255 -ForegroundActive={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundInactive={{base05-rgb-r}},{{base05-rgb-g}},{{base05-rgb-b}} -ForegroundLink={{base0C-rgb-r}},{{base0C-rgb-g}},{{base0C-rgb-b}} -ForegroundNegative={{base08-rgb-r}},{{base08-rgb-g}},{{base08-rgb-b}} -ForegroundNeutral={{base09-rgb-r}},{{base09-rgb-g}},{{base09-rgb-b}} -ForegroundNormal={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundPositive={{base0B-rgb-r}},{{base0B-rgb-g}},{{base0B-rgb-b}} -ForegroundVisited={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}} +ForegroundActive=252,0,0 +ForegroundInactive=0,240,0 +ForegroundLink={{base03-rgb-r}},{{base03-rgb-g}},{{base03-rgb-b}} +ForegroundNegative={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundNeutral={{base02-rgb-r}},{{base02-rgb-g}},{{base02-rgb-b}} +ForegroundPositive={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +ForegroundVisited=189,195,0 [Colors:Tooltip] -BackgroundAlternate={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +BackgroundAlternate={{themix_BG-rgb-r}},{{themix_BG-rgb-g}},{{themix_BG-rgb-b}} BackgroundNormal={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} DecorationFocus={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} DecorationHover={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} -ForegroundActive={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundInactive={{base05-rgb-r}},{{base05-rgb-g}},{{base05-rgb-b}} -ForegroundLink={{base0C-rgb-r}},{{base0C-rgb-g}},{{base0C-rgb-b}} -ForegroundNegative={{base08-rgb-r}},{{base08-rgb-g}},{{base08-rgb-b}} -ForegroundNeutral={{base09-rgb-r}},{{base09-rgb-g}},{{base09-rgb-b}} -ForegroundNormal={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundPositive={{base0B-rgb-r}},{{base0B-rgb-g}},{{base0B-rgb-b}} -ForegroundVisited={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}} +ForegroundActive={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundInactive=189,195,199 +ForegroundLink={{base03-rgb-r}},{{base03-rgb-g}},{{base03-rgb-b}} +ForegroundNegative={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundNeutral={{base02-rgb-r}},{{base02-rgb-g}},{{base02-rgb-b}} +BackgroundNormal={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +ForegroundPositive={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +ForegroundVisited=127,140,141 [Colors:View] -BackgroundAlternate={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +BackgroundAlternate={{themix_BG-rgb-r}},{{themix_BG-rgb-g}},{{themix_BG-rgb-b}} BackgroundNormal={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} DecorationFocus={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} DecorationHover={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} -ForegroundActive={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundInactive={{base05-rgb-r}},{{base05-rgb-g}},{{base05-rgb-b}} -ForegroundLink={{base0C-rgb-r}},{{base0C-rgb-g}},{{base0C-rgb-b}} -ForegroundNegative={{base08-rgb-r}},{{base08-rgb-g}},{{base08-rgb-b}} -ForegroundNeutral={{base09-rgb-r}},{{base09-rgb-g}},{{base09-rgb-b}} +ForegroundActive={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundInactive=127,140,141 +ForegroundLink={{base03-rgb-r}},{{base03-rgb-g}},{{base03-rgb-b}} +ForegroundNegative={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundNeutral={{base02-rgb-r}},{{base02-rgb-g}},{{base02-rgb-b}} ForegroundNormal={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundPositive={{base0B-rgb-r}},{{base0B-rgb-g}},{{base0B-rgb-b}} -ForegroundVisited={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}} +ForegroundPositive={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +ForegroundVisited=127,140,141 [Colors:Window] -BackgroundAlternate={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} -BackgroundNormal={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +BackgroundAlternate={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +BackgroundNormal={{themix_BG-rgb-r}},{{themix_BG-rgb-g}},{{themix_BG-rgb-b}} DecorationFocus={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} DecorationHover={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} -ForegroundActive={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundInactive={{base05-rgb-r}},{{base05-rgb-g}},{{base05-rgb-b}} -ForegroundLink={{base0C-rgb-r}},{{base0C-rgb-g}},{{base0C-rgb-b}} -ForegroundNegative={{base08-rgb-r}},{{base08-rgb-g}},{{base08-rgb-b}} -ForegroundNeutral={{base09-rgb-r}},{{base09-rgb-g}},{{base09-rgb-b}} +ForegroundActive={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundInactive=127,140,141 +ForegroundLink={{base03-rgb-r}},{{base03-rgb-g}},{{base03-rgb-b}} +ForegroundNegative={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} +ForegroundNeutral={{base02-rgb-r}},{{base02-rgb-g}},{{base02-rgb-b}} ForegroundNormal={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} -ForegroundPositive={{base0B-rgb-r}},{{base0B-rgb-g}},{{base0B-rgb-b}} -ForegroundVisited={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}} +ForegroundPositive={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} +ForegroundVisited=127,140,141 [General] ColorScheme=Breeze Name={{scheme-name}} shadeSortColumn=true -desktopFont=Intel One Mono,12,-1,5,50,0,0,0,0,0 -fixed=Intel One Mono,12,-1,5,50,0,0,0,0,0 -font=Intel One Mono,12,-1,5,50,0,0,0,0,0 -menuFont=Intel One Mono,12,-1,5,50,0,0,0,0,0 -smallestReadableFont=Intel One Mono,10,-1,5,50,0,0,0,0,0 -toolBarFont=Intel One Mono,10,-1,5,50,0,0,0,0,0 [KDE] contrast=4 [WM] -activeFont=Intel One Mono,10,-1,5,50,0,0,0,0,0 activeBlend={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}} activeBackground={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}} activeForeground={{base07-rgb-r}},{{base07-rgb-g}},{{base07-rgb-b}} diff --git a/user/style/qt5ct.conf b/user/style/qt5ct.conf index 5426668..bb150be 100644 --- a/user/style/qt5ct.conf +++ b/user/style/qt5ct.conf @@ -5,9 +5,9 @@ icon_theme=oomox-current standard_dialogs=kde style=Breeze -[Fonts] -fixed="Intel One Mono,12,-1,0,50,0,0,0,0,0" -general="Intel One Mono,12,-1,0,50,0,0,0,0,0" +#[Fonts] +#fixed="Noto Sans,10,-1,0,50,0,0,0,0,0" +#general="Noto Sans,10,-1,0,50,0,0,0,0,0" [Interface] activate_item_on_single_click=1 diff --git a/user/style/stylix.nix b/user/style/stylix.nix index 6c2e492..d9ab7a3 100644 --- a/user/style/stylix.nix +++ b/user/style/stylix.nix @@ -72,7 +72,6 @@ in bright.white = "#"+config.lib.stylix.colors.base07; }; font.size = config.stylix.fonts.sizes.terminal; - font.normal.family = userSettings.font; }; stylix.targets.kde.enable = true; stylix.targets.kitty.enable = true; @@ -115,9 +114,4 @@ in style.name = "breeze-dark"; platformTheme = "kde"; }; - fonts.fontconfig.defaultFonts = { - monospace = [ userSettings.font ]; - sansSerif = [ userSettings.font ]; - serif = [ userSettings.font ]; - }; } diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index cce0113..dc14aaf 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -1,4 +1,4 @@ -{ inputs, config, lib, pkgs, userSettings, systemSettings, pkgs-nwg-dock-hyprland, ... }: let +{ inputs, config, lib, pkgs, userSettings, systemSettings, ... }: let pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { @@ -29,8 +29,7 @@ in plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails inputs.hycov.packages.${pkgs.system}.hycov - # FIXME hypgrass currently broken on 0.41.0 - #inputs.hyprgrass.packages.${pkgs.system}.default + inputs.hyprgrass.packages.${pkgs.system}.default ]; settings = { }; extraConfig = '' @@ -87,7 +86,9 @@ in general { layout = master + cursor_inactive_timeout = 30 border_size = 5 + no_cursor_warps = false col.active_border = 0xff'' + config.lib.stylix.colors.base08 + " " + ''0xff'' + config.lib.stylix.colors.base09 + " " + ''0xff'' + config.lib.stylix.colors.base0A + " " + ''0xff'' + config.lib.stylix.colors.base0B + " " + ''0xff'' + config.lib.stylix.colors.base0C + " " + ''0xff'' + config.lib.stylix.colors.base0D + " " + ''0xff'' + config.lib.stylix.colors.base0E + " " + ''0xff'' + config.lib.stylix.colors.base0F + " " + ''270deg col.inactive_border = 0xaa'' + config.lib.stylix.colors.base02 + '' @@ -97,11 +98,6 @@ in gaps_out = 7 } - cursor { - no_warps = false - inactive_timeout = 30 - } - plugin { hyprtrails { color = rgba(''+config.lib.stylix.colors.base08+''55) @@ -129,33 +125,32 @@ in show_special = 0 # show windwos in special workspace in overview. } - # FIXME hypgrass currently broken on 0.41.0 :( - #touch_gestures { - # sensitivity = 4.0 - # long_press_delay = 260 - # hyprgrass-bind = , edge:r:l, exec, hyprnome - # hyprgrass-bind = , edge:l:r, exec, hyprnome --previous - # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper + touch_gestures { + sensitivity = 4.0 + long_press_delay = 260 + hyprgrass-bind = , edge:r:l, exec, hyprnome + hyprgrass-bind = , edge:l:r, exec, hyprnome --previous + hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - # hyprgrass-bind = , swipe:3:u, hycov:toggleoverview - # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper + hyprgrass-bind = , swipe:3:u, hycov:toggleoverview + hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - # hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous - # hyprgrass-bind = , swipe:3:r, exec, hyprnome + hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous + hyprgrass-bind = , swipe:3:r, exec, hyprnome - # hyprgrass-bind = , swipe:4:u, movewindow,u - # hyprgrass-bind = , swipe:4:d, movewindow,d - # hyprgrass-bind = , swipe:4:l, movewindow,l - # hyprgrass-bind = , swipe:4:r, movewindow,r + hyprgrass-bind = , swipe:4:u, movewindow,u + hyprgrass-bind = , swipe:4:d, movewindow,d + hyprgrass-bind = , swipe:4:l, movewindow,l + hyprgrass-bind = , swipe:4:r, movewindow,r - # hyprgrass-bind = , tap:3, fullscreen,1 - # hyprgrass-bind = , tap:4, fullscreen,0 + hyprgrass-bind = , tap:3, fullscreen,1 + hyprgrass-bind = , tap:4, fullscreen,0 - # hyprgrass-bindm = , longpress:2, movewindow - # hyprgrass-bindm = , longpress:3, resizewindow + hyprgrass-bindm = , longpress:2, movewindow + hyprgrass-bindm = , longpress:3, resizewindow - #} + } } bind=SUPER,SUPER_L,exec,nwggrid-wrapper @@ -394,6 +389,9 @@ in feh killall polkit_gnome + (nwg-dock-hyprland.overrideAttrs (oldAttrs: { + patches = ./patches/noactiveclients.patch; + })) nwg-launchers papirus-icon-theme (pkgs.writeScriptBin "nwggrid-wrapper" '' @@ -540,12 +538,7 @@ in type = "Application"; })]) ++ - (with pkgs-hyprland; [ hyprlock ]) - ++ (with pkgs-nwg-dock-hyprland; [ - (nwg-dock-hyprland.overrideAttrs (oldAttrs: { - patches = ./patches/noactiveclients.patch; - })) - ]); + (with pkgs-hyprland; [ hyprlock ]); home.file.".local/share/pixmaps/hyprland-logo-stylix.svg".source = config.lib.stylix.colors { template = builtins.readFile ../../pkgs/hyprland-logo-stylix.svg.mustache; @@ -690,7 +683,6 @@ in color = rgb(''+config.lib.stylix.colors.base07-rgb-r+'',''+config.lib.stylix.colors.base07-rgb-g+'', ''+config.lib.stylix.colors.base07-rgb-b+'') font_size = 25 font_family = ''+userSettings.font+'' - rotate = 0 # degrees, counter-clockwise position = 0, 160