diff --git a/flake.lock b/flake.lock index c74b874..49611da 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "base16": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658847131, + "narHash": "sha256-X6Mml7cT0YR3WCD5fkUhpRVV5ZPcwdcDsND8r8xMqTE=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "6b404cda2e04ca3cf5ca7b877af9c469e1386acb", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, "doom-emacs": { "flake": false, "locked": { @@ -162,6 +183,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" @@ -218,6 +255,28 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1680000368, + "narHash": "sha256-TlgC4IJ7aotynUdkGRtaAVxquaiddO38Ws89nB7VGY8=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "765e4007b6f9f111469a25d1df6540e8e0ca73a6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nix-doom-emacs": { "inputs": { "doom-emacs": "doom-emacs", @@ -306,6 +365,22 @@ "type": "indirect" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1679793451, + "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0cd51a933d91078775b300cf0f29aa3495231aa2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nose": { "flake": false, "locked": { @@ -422,7 +497,8 @@ "inputs": { "home-manager": "home-manager", "nix-doom-emacs": "nix-doom-emacs", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "stylix": "stylix" } }, "rotate-text": { @@ -457,6 +533,27 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "flake-compat": "flake-compat_2", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1683100629, + "narHash": "sha256-c+cHSnwkWYJNydJJYo0vS1uy/NoLW4OAkQZsxRl4WCY=", + "owner": "danth", + "repo": "stylix", + "rev": "a9367cea1bdc0ad35b3b0b2afc4aa9cf94cdecdb", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -488,6 +585,21 @@ "type": "github" } }, + "utils": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ws-butler": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3542b24..b95da72 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,10 @@ home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; + stylix.url = "github:danth/stylix"; }; - outputs = { self, nixpkgs, home-manager, nix-doom-emacs, ... }: + outputs = { self, nixpkgs, home-manager, nix-doom-emacs, stylix, ... }: let system = "x86_64-linux"; @@ -26,6 +27,7 @@ modules = [ ./user/home.nix nix-doom-emacs.hmModule + stylix.homeManagerModules.stylix ]; }; }; diff --git a/user/home.nix b/user/home.nix index eca56af..3d6bf25 100644 --- a/user/home.nix +++ b/user/home.nix @@ -51,6 +51,22 @@ in imports = [ ./wm/xmonad/xmonad.nix ]; + stylix.autoEnable = false; + stylix.image = pkgs.fetchurl { + url = "https://w.wallhaven.cc/full/6d/wallhaven-6d5k6x.jpg"; + sha256 = "+xl4H3UiVmMRNvMhIlaLdVTYYqnSyCTSX2UOTGsDQ8c="; + }; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + stylix.targets.alacritty.enable = true; + #programs.alacritty.enable = true; + stylix.targets.kitty.enable = true; + #programs.kitty.enable = true; + stylix.targets.gtk.enable = true; + stylix.targets.rofi.enable = true; + programs.rofi.enable = true; + stylix.targets.feh.enable = true; + programs.feh.enable = true; + # stylix.targets.lightdm.enable = true; programs.git.enable = true; programs.git.userName = myName; @@ -71,10 +87,10 @@ in # The home.packages option allows you to install Nix packages into your # environment. - gtk.enable = true; - gtk.theme.package = pkgs.graphite-gtk-theme.override { themeVariants = ["all"]; colorVariants = ["dark"]; tweaks = ["black"]; }; - gtk.theme.name = "Graphite-green-Dark"; - qt.enable = true; + # gtk.enable = true; + # gtk.theme.package = pkgs.graphite-gtk-theme.override { themeVariants = ["all"]; colorVariants = ["dark"]; tweaks = ["black"]; }; + # gtk.theme.name = "Graphite-green-Dark"; + # qt.enable = true; # qt.platformTheme = "gtk"; home.packages = with pkgs; [ @@ -90,7 +106,7 @@ in brave dmenu rofi - nitrogen + feh git xmobar qt5ct @@ -269,7 +285,6 @@ in nodePackages.ungit # Compositor and Desktop Utils - nitrogen picom alttab xwinwrap diff --git a/user/wm/xmonad/startup.sh b/user/wm/xmonad/startup.sh index 1590abc..56dd312 100755 --- a/user/wm/xmonad/startup.sh +++ b/user/wm/xmonad/startup.sh @@ -41,7 +41,6 @@ killall twmnd killall trayer killall nm-applet killall nextcloud -killall nitrogen killall xautolock killall caffeine killall syncthing-gtk @@ -99,7 +98,6 @@ sed -i "s/colorSecondary/"$colorSecondary"/g" ~/.config/xmobar/xmobarrc & # xmob # xautolock -time 10 -locker "dm-tool switch-to-greeter & systemctl suspend" & twmnd & alttab -w 1 -t 240x160 -i 64x64 -sc 1 -bg $colorBgNormal -fg $colorFgNormal -frame $colorSecondary -inact $colorFgNormal & -nitrogen --restore & autokey-gtk & ##/usr/bin/trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --transparent true --alpha 0 --height 28 --tint $trayertint --monitor "primary" & nm-applet & diff --git a/user/wm/xmonad/xmonad.org b/user/wm/xmonad/xmonad.org index 1afd0fa..edf98f2 100644 --- a/user/wm/xmonad/xmonad.org +++ b/user/wm/xmonad/xmonad.org @@ -751,7 +751,6 @@ killall twmnd killall trayer killall nm-applet killall nextcloud -killall nitrogen killall xautolock killall caffeine killall syncthing-gtk @@ -821,7 +820,6 @@ Lastly, desktop applications are started in the background. # xautolock -time 10 -locker "dm-tool switch-to-greeter & systemctl suspend" & twmnd & alttab -w 1 -t 240x160 -i 64x64 -sc 1 -bg $colorBgNormal -fg $colorFgNormal -frame $colorSecondary -inact $colorFgNormal & -nitrogen --restore & autokey-gtk & ##/usr/bin/trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --transparent true --alpha 0 --height 28 --tint $trayertint --monitor "primary" & nm-applet &