From aae14e214e7379d228fd58cd00028dee1c2524ec Mon Sep 17 00:00:00 2001 From: atagen Date: Sat, 20 May 2023 22:28:48 +1000 Subject: [PATCH] who knows --- flake.lock | 230 ++++++++++++++++++++++++++++--- flake.nix | 14 +- home/dots/eww/colors.scss | 38 ++--- home/dots/hyprland/hyprland.conf | 14 +- home/dots/swaync/style.css | 18 +-- home/dots/wlogout/layout | 74 +++++----- home/dots/wlogout/style.css | 8 +- home/home.nix | 226 +++++++++++++++++++++--------- home/programs/eww/eww.scss | 2 +- style.css | 44 ------ system/configuration.nix | 62 +++++++-- 11 files changed, 512 insertions(+), 218 deletions(-) delete mode 100644 style.css diff --git a/flake.lock b/flake.lock index d134e9f..88cde32 100644 --- a/flake.lock +++ b/flake.lock @@ -194,6 +194,38 @@ "type": "github" } }, + "flake-compat_3": { + "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-compat_4": { + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -250,6 +282,46 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nix-rice", + "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" + } + }, "helix": { "inputs": { "nci": "nci", @@ -262,11 +334,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1684393286, - "narHash": "sha256-Ws9uWtZLvTwL5HNonFr4YwyPoTU8QlCvhs6IJ92aLDw=", + "lastModified": 1684456775, + "narHash": "sha256-fjrP6+fZqBmAx8+ASDNkVf0ES5hIFQitEwPo+qQz4JI=", "owner": "helix-editor", "repo": "helix", - "rev": "7f5940be80eaa3aec7903903072b7108f41dd97b", + "rev": "53f47bc47771c94dab51626ca025be28e62eba0c", "type": "github" }, "original": { @@ -282,11 +354,11 @@ ] }, "locked": { - "lastModified": 1684321175, - "narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=", + "lastModified": 1684442239, + "narHash": "sha256-8wD+fQpNULCF9a88E1Knw3MtXWqvyhn8u/859QSSoE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86", + "rev": "c10403a5739d6275334710903fe709bc8d587980", "type": "github" }, "original": { @@ -337,6 +409,22 @@ "type": "github" } }, + "kitty-themes-src": { + "flake": false, + "locked": { + "lastModified": 1678282211, + "narHash": "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=", + "owner": "kovidgoyal", + "repo": "kitty-themes", + "rev": "c01fcbd694353507c3cc7f657179bad1f32140a7", + "type": "github" + }, + "original": { + "owner": "kovidgoyal", + "repo": "kitty-themes", + "type": "github" + } + }, "mk-naked-shell": { "flake": false, "locked": { @@ -381,6 +469,28 @@ "type": "github" } }, + "nix-rice": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "kitty-themes-src": "kitty-themes-src", + "nixpkgs-lib": "nixpkgs-lib", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1682952592, + "narHash": "sha256-1qXvqCxnWpk0ELdpmS2OMDu047gvl166CGBm+sfi8oo=", + "owner": "bertof", + "repo": "nix-rice", + "rev": "dddd03ed3c5e05c728b0df985f7af905b002f588", + "type": "github" + }, + "original": { + "owner": "bertof", + "repo": "nix-rice", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1683014792, @@ -397,6 +507,37 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1678872516, + "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgsV1": { "locked": { "lastModified": 1678500271, @@ -414,11 +555,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1684305980, - "narHash": "sha256-vd4SKXX1KZfSX6n3eoguJw/vQ+sBL8XGdgfxjEgLpKc=", + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6e389917a8c778be636e67a67ec958f511cc55d", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1684385584, + "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "type": "github" }, "original": { @@ -430,11 +587,11 @@ }, "nur": { "locked": { - "lastModified": 1684403108, - "narHash": "sha256-vExZx+sBTqM7rHP6Tt9JA2bhjGcrxwIDiGpJamk2yi8=", + "lastModified": 1684469276, + "narHash": "sha256-AgJ0m3gAv1QvjpY1Euu9gb/btz8+8Jg71GFpjpWdclc=", "owner": "nix-community", "repo": "NUR", - "rev": "95ef79d0d41f42fd33695ce0bc8e284cd80b0967", + "rev": "868fce50c669080c90cbf5d467a3a405df55552a", "type": "github" }, "original": { @@ -465,6 +622,31 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": [ + "nix-rice", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1682596858, + "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "fb58866e20af98779017134319b5663b8215d912", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "declarative-cachix": "declarative-cachix", @@ -474,7 +656,8 @@ "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", + "nix-rice": "nix-rice", + "nixpkgs": "nixpkgs_3", "nur": "nur", "rust-overlay": "rust-overlay_2" } @@ -511,11 +694,11 @@ ] }, "locked": { - "lastModified": 1684376381, - "narHash": "sha256-XVFTXADfvBXKwo4boqfg80awUbT+JgQvlQ8uZ+Xgo1s=", + "lastModified": 1684462813, + "narHash": "sha256-YFphDnxzXtLLExXjiR9bUVF4isI/MKiC4HMboh2ZSOc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7c9a265c2eaa5783bc18593b1aec39a85653c076", + "rev": "e2ceeaa7f9334c5d732323b6fec363229da4f382", "type": "github" }, "original": { @@ -554,6 +737,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ca3f7b0..824a99f 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,8 @@ hyprland.url = "github:hyprwm/Hyprland"; declarative-cachix.url = "github:jonascarpay/declarative-cachix"; + + nix-rice.url = "github:bertof/nix-rice"; }; outputs = { @@ -49,6 +51,7 @@ eww, helix, hyprland, + nix-rice, ... } @ inputs: let inherit (self) outputs; @@ -70,7 +73,10 @@ # ); # any overlays or modules we use - overlays = import ./overlay.nix {inherit inputs;}; + overlays = [ + nix-rice.overlays.default + (import ./overlay.nix {inherit inputs;}) + ]; # nixosModules = import ./modules/nixos; # homeModules = import ./modules/home; @@ -81,6 +87,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ ./system/quiver.nix + nur.nixosModules.nur ]; }; @@ -90,6 +97,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ ./system/adrift.nix + nur.nixosModules.nur ]; }; }; @@ -99,8 +107,8 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = {inherit inputs outputs;}; modules = [ - nur.nixosModules.nur ./home/bolt.nix + nur.hmModules.nur ]; }; @@ -108,8 +116,8 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = {inherit inputs outputs;}; modules = [ - nur.nixosModules.nur ./home/plank.nix + nur.hmModules.nur ]; }; }; diff --git a/home/dots/eww/colors.scss b/home/dots/eww/colors.scss index d4076e3..0f44701 100644 --- a/home/dots/eww/colors.scss +++ b/home/dots/eww/colors.scss @@ -1,31 +1,31 @@ -$black: #2f343f; -$black_a: #1e2233; +$black: #BLACK; +$black_a: #BLCKA; -$red: #ed244e; -$red_a: #da4453; +$red: #RED; +$red_a: #RDA; -$green: #27ae60; -$green_a: #71f79f; +$green: #GREEN; +$green_a: #GRNA; -$yellow: #f67400; -$yellow_a: #fdbc4b; +$yellow: #YELLOW; +$yellow_a: #YLWA; -$blue: #2980b9; -$blue_a: #1d99f3; +$blue: #BLUE; +$blue_a: #BLUA; -$magenta: #c50ed2; -$magenta_a: #9b59b6; +$magenta: #MAGENTA; +$magenta_a: #MGNA; -$cyan: #3daee9; -$cyan_a: #5294e2; +$cyan: #CYAN; +$cyan_a: #CYNA; -$white: #a1a9b1; -$white_a: #656a73; +$white: #WHITE; +$white_a: #WHTA; -$fg: #d3dae3; -$bg: #060604; +$fg: #FG; +$bg: #BG; -$border: $red; +$border: $black; $shadow: $black; $base: $bg; $bg1: $black; diff --git a/home/dots/hyprland/hyprland.conf b/home/dots/hyprland/hyprland.conf index 7bd280e..7af379d 100644 --- a/home/dots/hyprland/hyprland.conf +++ b/home/dots/hyprland/hyprland.conf @@ -2,15 +2,15 @@ exec-once = eww open bar exec-once = swayidle -w timeout 300 'waylock' exec-once = swayidle -w timeout 600 'systemctl suspend' after-resume 'eww open bar' exec-once = ckb-next -c -b -exec-once = swaybg -i $HOME/Downloads/fantastyland-dark.png -m fill +exec-once = swaybg -i #BGIMAGE -m fill exec-once = xrdb -l ~/.Xresources exec-once = swayosd --max-volume 100 exec-once = keepassxc exec-once = swaync exec = eww reload -exec = gsettings set org.gnome.desktop.interface gtk-theme 'Sweet-Dark' -exec = gsettings set org.gnome.desktop.interface font-name 'Montreux Classic' -exec = gsettings set org.gnome.desktop.interface icon-theme 'Papirus-Dark' +exec = gsettings set org.gnome.desktop.interface gtk-theme '#GTKTHEME' +exec = gsettings set org.gnome.desktop.interface font-name '#FONT' +exec = gsettings set org.gnome.desktop.interface icon-theme '#ICONTHEME' input { kb_layout=us @@ -26,10 +26,8 @@ general { gaps_out=25 resize_on_border=true hover_icon_on_border=true - col.active_border=0xffa1a9b1 - col.inactive_border=0xff2f343f - col.group_border=0xffda4453 - col.group_border_active=0xffed244e + col.active_border=0xff#ACTIVEBORDER + col.inactive_border=0xff#BORDER } dwindle { diff --git a/home/dots/swaync/style.css b/home/dots/swaync/style.css index 74574f7..6af8469 100644 --- a/home/dots/swaync/style.css +++ b/home/dots/swaync/style.css @@ -2,19 +2,19 @@ * vim: ft=less */ -@define-color cc-bg #060604; +@define-color cc-bg #PANELBG; -@define-color noti-border-color #2f343f; -@define-color noti-bg #060604; -@define-color noti-bg-hover #1e2233; -@define-color noti-bg-focus #2f343f; -@define-color noti-close-bg #060604; -@define-color noti-close-bg-hover #1e2233; +@define-color noti-border-color #BORDER; +@define-color noti-bg #NOTIBGNORM; +@define-color noti-bg-hover #NOTIBGHOVER; +@define-color noti-bg-focus #NOTIBGFOCUS; +@define-color noti-close-bg #NOTIBGCLOSE; +@define-color noti-close-bg-hover #NOTIBGHOVERCLOSE; -@define-color bg-selected #2f343f; +@define-color bg-selected #BGSELECTED; * { - font-family: "Montreux Classic", sans-serif; + font-family: "FONT", sans-serif; } .notification-row { diff --git a/home/dots/wlogout/layout b/home/dots/wlogout/layout index 9d7a31e..de02de1 100644 --- a/home/dots/wlogout/layout +++ b/home/dots/wlogout/layout @@ -1,36 +1,38 @@ -{ -"label" : "lock", -"action" : "waylock", -"text" : "Lock", -"keybind" : "l" -} -{ -"label" : "logout", -"action" : "loginctl terminate-user $USER", -"text" : "Logout", -"keybind" : "e" -} -{ - "label" : "suspend", - "action" : "systemctl suspend", - "text" : "Suspend", - "keybind" : "s" -} -{ - "label" : "shutdown", - "action" : "systemctl poweroff", - "text" : "Shutdown", - "keybind" : "d" -} -{ - "label" : "reboot", - "action" : "systemctl reboot", - "text" : "Reboot", - "keybind" : "r" -} -{ - "label" : "hibernate", - "action" : "systemctl hibernate", - "text" : "Hibernate", - "keybind" : "h" -} +[ + { + "label" : "lock", + "action" : "waylock", + "text" : "Lock", + "keybind" : "l" + }, + { + "label" : "logout", + "action" : "loginctl terminate-user $USER", + "text" : "Logout", + "keybind" : "e" + }, + { + "label" : "suspend", + "action" : "systemctl suspend", + "text" : "Suspend", + "keybind" : "s" + }, + { + "label" : "shutdown", + "action" : "systemctl poweroff", + "text" : "Shutdown", + "keybind" : "d" + }, + { + "label" : "reboot", + "action" : "systemctl reboot", + "text" : "Reboot", + "keybind" : "r" + }, + { + "label" : "hibernate", + "action" : "systemctl hibernate", + "text" : "Hibernate", + "keybind" : "h" + } +] \ No newline at end of file diff --git a/home/dots/wlogout/style.css b/home/dots/wlogout/style.css index b3f3048..4cc1ce5 100644 --- a/home/dots/wlogout/style.css +++ b/home/dots/wlogout/style.css @@ -2,11 +2,11 @@ background-image: none; } window { - background-color: #181b28; + background-color: #WINBG; } button { - color: #FFFFFF; - background-color: #181b28; + color: #BTNCOL; + background-color: #BTNBG; border-style: solid; border-width: 2px; background-repeat: no-repeat; @@ -15,7 +15,7 @@ button { } button:focus, button:active, button:hover { - background-color: #27ae60; + background-color: #BTNFOCUSBG; outline-style: none; } diff --git a/home/home.nix b/home/home.nix index 22a855d..d848452 100644 --- a/home/home.nix +++ b/home/home.nix @@ -4,31 +4,15 @@ lib, config, pkgs, + nur, ... -}: let - wlogout_style_base = dots/wlogout/style.css; - wlogout_style = pkgs.runCommandLocal "wlogout_style_base" {wlogpath = lib.strings.escape ["/"] "${pkgs.wlogout}";} '' - cp ${wlogout_style_base} $out - sed -i "s/\/usr\/share\/wlogout/$wlogpath\/share\/wlogout/g" $out - sed -i "s/\/etc\/wlogout/$wlogpath\/etc\/wlogout/g" $out - ''; +}: in { imports = [ inputs.hyprland.homeManagerModules.default ./programs/eww/default.nix ]; - nixpkgs = { - overlays = [ - outputs.overlays.additions - outputs.overlays.unstable-pkgs - ]; - config = { - allowUnfree = true; - allowUnfreePredicate = _: true; - }; - }; - home.stateVersion = "22.11"; home.packages = with pkgs; [ @@ -63,7 +47,7 @@ in { fuzzel kdeconnect - syncthing + # syncthing keepassxc git-credential-keepassxc @@ -76,6 +60,8 @@ in { libsForQt5.qtstyleplugin-kvantum gtk-engine-murrine + material-icons + material-design-icons ]; services.syncthing = { @@ -91,12 +77,63 @@ in { hidpi = false; }; recommendedEnvironment = true; - extraConfig = builtins.readFile dots/hyprland/hyprland.conf; + extraConfig = with pkgs.rice; builtins.replaceStrings + ["#BGIMAGE" + "#GTKTHEME" + "#FONT" + "#ICONTHEME" + "#ACTIVEBORDER" + "#BORDER"] + ["${bg.image}" + gtk.name + fonts.sansSerif.name + icons.name + palette.util.fg + palette.util.bg] + (builtins.readFile dots/hyprland/hyprland.conf); }; + programs.eww-hyprland = { enable = true; - colors = builtins.readFile dots/eww/colors.scss; + colors = with pkgs.rice.palette; + (builtins.replaceStrings + ["BLACK" + "BLCKA" + "RED" + "RDA" + "GREEN" + "GRNA" + "YELLOW" + "YLWA" + "BLUE" + "BLUA" + "MAGENTA" + "MGNA" + "CYAN" + "CYNA" + "WHITE" + "WHTA" + "FG" + "BG" ] + [normal.black + bright.black + normal.red + bright.red + normal.green + bright.green + normal.yellow + bright.yellow + normal.blue + bright.blue + normal.magenta + bright.magenta + normal.cyan + bright.cyan + normal.white + bright.white + util.fg + util.bg] (builtins.readFile dots/eww/colors.scss)); }; systemd.user.startServices = "sd-switch"; @@ -113,8 +150,6 @@ in { }; }; - xresources.extraConfig = builtins.readFile ./dots/Xresources; - xdg.enable = true; xdg.configFile = builtins.mapAttrs (name: value: { @@ -122,12 +157,26 @@ in { text = builtins.readFile value; }) { - "wlogout/layout" = dots/wlogout/layout; - "wlogout/style.css" = wlogout_style; "swaync/config.json" = dots/swaync/config.json; "swaync/configSchema.json" = dots/swaync/configSchema.json; - "swaync/style.css" = dots/swaync/style.css; - "fuzzel/fuzzel.ini" = dots/fuzzel/fuzzel.ini; + "swaync/style.css" = with rice.palette; builtins.replaceStrings + ["PANELBG" + "BORDER" + "NOTIBGNORM" + "NOTIBGHOVER" + "NOTIBGFOCUS" + "NOTIBGCLOSE" + "NOTIBGHOVERCLOSE" + "BGSELECTED"] + [util.bg + normal.black + util.bg + bright.black + bright.black + normal.black + bright.black + bright.black] + (builtins.readFile dots/swaync/style.css); }; xdg.systemDirs.data = [ @@ -136,19 +185,59 @@ in { ]; home.sessionVariables = { - GTK_THEME = "Sweet-Dark"; + GTK_THEME = rice.gtk.name; + }; + programs.wlogout = { + enable = true; + layout = builtins.fromJSON (builtins.readFile dots/wlogout/layout); + style = with rice.palette; builtins.replaceStrings + ["/usr/share/wlogout" + "/etc/wlogout" + "WINBG" + "BTNCOL" + "BTNBG" + "BTNFOCUSBG"] + ["${pkgs.wlogout}/share/wlogout" + "${pkgs.wlogout}/etc/wlogout" + util.bg + util.fg + util.bg_sel + normal.yellow] + (builtins.readFile dots/wlogout/style.css); + }; + + programs.fuzzel = with pkgs.rice; { + enable = true; + settings = { + main = { + dpi-aware = "no"; + font = with fonts.sansSerif; lib.strings.concatStrings [name ":size=" size]; + icon-theme = icons.name; + terminal = "kitty"; + }; + dmenu = { + exit-immediately-if-empty = "yes"; + }; + border = with borders; { + width = thickness; + radius = rounding; + }; + colors = { + background = lib.strings.concatStrings [pkgs.rice.palette.util.bg "FF"]; + text = lib.strings.concatStrings [pkgs.rice.palette.util.fg "FF"]; + selection = lib.strings.concatStrings [pkgs.rice.palette.util.bg_sel "FF"]; + selection-text = lib.strings.concatStrings [pkgs.rice.palette.util.fg_sel "FF"]; + selection-match = lib.strings.concatStrings [pkgs.rice.palette.util.cursor_text "FF"]; + match = lib.strings.concatStrings [pkgs.rice.palette.util "FF"]; + border = lib.strings.concatStrings [pkgs.rice.palette.util.bg_sel "FF"]; + }; + }; }; gtk = { enable = true; - theme = { - package = pkgs.sweet; - name = "Sweet-Dark"; - }; - iconTheme = { - package = pkgs.papirus-icon-theme; - name = "Papirus-Dark"; - }; + theme = rice.gtk; + iconTheme = rice.icons; }; programs.direnv = { @@ -166,7 +255,7 @@ in { settings = { "browser.startup.homepage" = "about:blank"; }; - extensions = with config.nur.repos.rycee.firefox-addons; [ + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ vimium-c darkreader localcdn @@ -181,39 +270,40 @@ in { enable = true; # package = inputs.helix.packages.${pkgs.hostPlatform.system}.default; settings = { - theme = "gruvbox_dark_hard"; + theme = "gruvbox_dark"; editor.lsp.display-messages = true; }; }; - programs.kitty = { + programs.kitty = with rice; { enable = true; - font = { - name = "Ellograph CF"; - size = 10; + font = with fonts; { + name = monospace.name; + size = monospace.size; }; - settings = { - foreground = "#d3dae3"; - background = "#060604"; - cursor = "#d3dae3"; - selection_foreground = "#fdbc4b"; - selection_background = "#1e2233"; - color0 = "#2f343f"; - color1 = "#ed244e"; - color2 = "#27ae60"; - color3 = "#f67400"; - color4 = "#2980b9"; - color5 = "#c50ed2"; - color6 = "#3daee9"; - color7 = "#a1a9b1"; - color8 = "#1e2233"; - color9 = "#da4453"; - color10 = "#71f79f"; - color11 = "#fdbc4b"; - color12 = "#1d99f3"; - color13 = "#9b59b6"; - color14 = "#5294e2"; - color15 = "#656a73"; + settings = with palette; { + foreground = util.fg; + background = util.bg; + cursor = util.cursor; + cursor_text = util.cursor_text; + selection_foreground = util.fg_sel; + selection_background = util.bg_sel; + color0 = normal.black; + color1 = normal.red; + color2 = normal.green; + color3 = normal.yellow; + color4 = normal.blue; + color5 = normal.magenta; + color6 = normal.cyan; + color7 = normal.white; + color8 = bright.black; + color9 = bright.red; + color10 = bright.green; + color11 = bright.yellow; + color12 = bright.blue; + color13 = bright.magenta; + color14 = bright.cyan; + color15 = bright.white; }; }; @@ -229,6 +319,14 @@ in { programs.fzf = { enable = true; enableZshIntegration = true; + colors = with rice.palette; { + fg = util.fg; + bg = util.bg; + hl = util.cursor_text; + "fg+" = util.fg_sel; + "bg+" = util.bg_sel; + "hl+" = bright.green; + }; }; programs.zsh = { diff --git a/home/programs/eww/eww.scss b/home/programs/eww/eww.scss index e809818..d647c2f 100644 --- a/home/programs/eww/eww.scss +++ b/home/programs/eww/eww.scss @@ -13,7 +13,7 @@ * { all: unset; - font-family: "Montreux Classic", "Jost *", Roboto, sans-serif; + font-family: "Inria Sans", Roboto, sans-serif; transition: 200ms ease; } diff --git a/style.css b/style.css deleted file mode 100644 index 4f5607a..0000000 --- a/style.css +++ /dev/null @@ -1,44 +0,0 @@ -* { - background-image: none; -} -window { - background-color: #181b28; -} -button { - color: #FFFFFF; - background-color: #181b28; - border-style: solid; - border-width: 2px; - background-repeat: no-repeat; - background-position: center; - background-size: 25%; -} - -button:focus, button:active, button:hover { - background-color: #27ae60; - outline-style: none; -} - -#lock { - background-image: image(url("pkgs.wlogout/share/wlogout/icons/lock.png"), url("/usr/local/share/wlogout/icons/lock.png")); -} - -#logout { - background-image: image(url("pkgs.wlogout/share/wlogout/icons/logout.png"), url("/usr/local/share/wlogout/icons/logout.png")); -} - -#suspend { - background-image: image(url("pkgs.wlogout/share/wlogout/icons/suspend.png"), url("/usr/local/share/wlogout/icons/suspend.png")); -} - -#hibernate { - background-image: image(url("pkgs.wlogout/share/wlogout/icons/hibernate.png"), url("/usr/local/share/wlogout/icons/hibernate.png")); -} - -#shutdown { - background-image: image(url("pkgs.wlogout/share/wlogout/icons/shutdown.png"), url("/usr/local/share/wlogout/icons/shutdown.png")); -} - -#reboot { - background-image: image(url("pkgs.wlogout/share/wlogout/icons/reboot.png"), url("/usr/local/share/wlogout/icons/reboot.png")); -} diff --git a/system/configuration.nix b/system/configuration.nix index 35bde22..f872348 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -4,18 +4,20 @@ lib, config, pkgs, + nix-rice, ... -}: -# let -# lemurs = callPackage ./system/syspkgs/lemurs.nix {}; -# ly = callPackage ./system/syspkgs/ly.nix {}; -# in -{ +}: { nixpkgs = { overlays = [ outputs.overlays.additions outputs.overlays.unstable-pkgs + inputs.nur.overlay + nix-rice.overlays.default ]; + config = { + allowUnfree = true; + allowUnfreePredicate = _: true; + }; }; nix = { @@ -25,14 +27,47 @@ }; }; - # imports = [ - # inputs.declarative-cachix - # inputs.helix - # ]; + imports = [ + inputs.declarative-cachix.nixosModules.declarative-cachix + # inputs.helix + ]; - # cachix = [ - # "nix-community" - # ]; + # stylix = { + # polarity = "dark"; + # image = pkgs.fetchurl { + # sha256 = "sha256-6BCoxgqK5pCxv5P7Rf5MoyLbHAShRd3YuacAcZ916C8="; + # url = "https://gruvbox-wallpapers.pages.dev/wallpapers/irl/flowers-2.jpg"; + # }; + # base16Scheme = "${inputs.base16-schemes}/gruvbox-dark-hard.yaml"; + # fonts = { + # sizes = { + # desktop = 12; + # popups = 12; + # terminal = 10; + # applications = 12; + # }; + # monospace = { + # name = "Fira Code"; + # package = pkgs.fira-code; + # }; + # sansSerif = { + # name = "Inria Sans"; + # package = pkgs.inriafonts; + # }; + # serif = { + # name = "Inria Serif"; + # package = pkgs.inriafonts; + # }; + # emoji = { + # name = "Twitter Color Emoji"; + # package = pkgs.twemoji-color-font; + # }; + # }; + # }; + + cachix = [ + "nix-community" + ]; nix.extraOptions = '' keep-outputs = true @@ -64,7 +99,6 @@ useXkbConfig = true; # use xkbOptions in tty. }; - nixpkgs.config.allowUnfree = true; hardware.opengl.enable = true; hardware.opengl.driSupport32Bit = true;