From 47d5321743474296dd6bd1f254e227d6a1181054 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sun, 23 Jun 2024 14:17:21 -0500 Subject: [PATCH] preparing for stylix --- flake.lock | 217 +++++++++++++++++++++++++++++++++++++- flake.nix | 7 ++ home/home.nix | 26 +++++ home/modules/hyprland.nix | 2 +- modules/desktop.nix | 27 ++++- 5 files changed, 276 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c6d0d6b..a4901fb 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,119 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, "blobs": { "flake": false, "locked": { @@ -101,6 +215,22 @@ "type": "github" } }, + "flake-compat_2": { + "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": { "inputs": { "systems": "systems" @@ -191,6 +321,39 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -212,6 +375,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "libre-presenter": { "inputs": { "flake-utils": "flake-utils_3", @@ -437,7 +621,8 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2", - "simple-nixos-mailserver": "simple-nixos-mailserver" + "simple-nixos-mailserver": "simple-nixos-mailserver", + "stylix": "stylix" } }, "rust-overlay": { @@ -505,6 +690,36 @@ "type": "gitlab" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-foot": "base16-foot", + "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_2", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719152448, + "narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=", + "owner": "danth", + "repo": "stylix", + "rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 859e1fc..8f87dec 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # hyprland = { # type = "git"; # url = "https://github.com/hyprwm/Hyprland"; @@ -64,6 +68,7 @@ libre-presenter, eww, # ags, + stylix, rust-overlay, ... }: let system = "x86_64-linux"; @@ -96,6 +101,7 @@ ./systems/syl/configuration.nix home-manager.nixosModules.home-manager # hyprland.nixosModules.default + # stylix.nixosModules.stylix nixos-hardware.nixosModules.framework-11th-gen-intel # libre-presenter.defaultPackage { @@ -113,6 +119,7 @@ ./systems/kaladin/configuration.nix home-manager.nixosModules.home-manager # hyprland.nixosModules.default + # stylix.nixosModules.stylix nixos-hardware.nixosModules.common-gpu-amd { home-manager.useGlobalPkgs = true; diff --git a/home/home.nix b/home/home.nix index 2f06b34..36353e1 100644 --- a/home/home.nix +++ b/home/home.nix @@ -219,6 +219,32 @@ in }; }; + # stylix = { + # enable = true; + # polarity = "dark"; + # base16Scheme = { + # base00 = "282a36"; + # base01 = "34353e"; + # base02 = "43454f"; + # base03 = "78787e"; + # base04 = "a5a5a9"; + # base05 = "e2e4e5"; + # base06 = "eff0eb"; + # base07 = "f1f1f0"; + # base08 = "ff5c57"; + # base09 = "ff9f43"; + # base0A = "f3f99d"; + # base0B = "5af78e"; + # base0C = "9aedfe"; + # base0D = "57c7ff"; + # base0E = "ff6ac1"; + # base0F = "b2643c"; + # }; + # image = config.lib.stylix.pixel "base0D"; + # # targets.tofi.enable = false; + # }; + + # programs.tofi.enable = true; #services.espanso = { # enable = true; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index d6fd3f4..ef7ecdf 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -337,7 +337,6 @@ in "dbus-update-activation-environment --systemd --all" "batmon.lisp" "/usr/lib/kdeconnectd" - "nm-tray" "systemctl --user stop jellyfin-mpv-shim" "systemctl --user stop emacs" "systemctl --user stop nextcloud-client" @@ -348,6 +347,7 @@ in "wl-paste --watch cliphist store" "hyprctl setcursor phinger-cursors-light 24" "hypridle" + "nm-tray" "sleep 3 && swww img /home/chris/pics/wallpapers/nixorange.jpeg -t grow --transition-bezier .14,0,.14,.99" ]; }; diff --git a/modules/desktop.nix b/modules/desktop.nix index 8d59055..eaab996 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -36,7 +36,7 @@ with lib; package = pkgs.awesome; }; desktopManager.plasma5 = { - enable = false; + enable = true; runUsingSystemd = true; }; # desktopManager.gnome.enable = true; @@ -47,6 +47,31 @@ with lib; enableKwallet = true; }; + # stylix = { + # enable = true; + # polarity = "dark"; + # base16Scheme = { + # base00 = "282a36"; + # base01 = "34353e"; + # base02 = "43454f"; + # base03 = "78787e"; + # base04 = "a5a5a9"; + # base05 = "e2e4e5"; + # base06 = "eff0eb"; + # base07 = "f1f1f0"; + # base08 = "ff5c57"; + # base09 = "ff9f43"; + # base0A = "f3f99d"; + # base0B = "5af78e"; + # base0C = "9aedfe"; + # base0D = "57c7ff"; + # base0E = "ff6ac1"; + # base0F = "b2643c"; + # }; + # image = "base0D"; + # # targets.tofi.enable = false; + # }; + fonts.packages = with pkgs; [ nerdfonts noto-fonts