Merge remote-tracking branch 'origin/master'

This commit is contained in:
Chris Cochrun 2022-12-28 10:01:33 -06:00
commit b68e8c45d8
6 changed files with 24 additions and 5 deletions

View file

@ -37,7 +37,6 @@ Both include the home-manager module. Primarily I chose that route so that I cou
}; };
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland"; url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
}; };
eww = { eww = {
url = "github:elkowar/eww"; url = "github:elkowar/eww";
@ -173,6 +172,12 @@ nix = {
I use plasma and awesome mostly as my desktop. Also all desktops will likely need ntfs support in order to work with windows devices. I use plasma and awesome mostly as my desktop. Also all desktops will likely need ntfs support in order to work with windows devices.
#+NAME: desktop #+NAME: desktop
#+begin_src nix #+begin_src nix
# This adds hyprland cache to cachix
nix.settings = {
substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
};
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];
services.xserver = { services.xserver = {
enable = true; enable = true;

View file

@ -6,6 +6,7 @@
(include "volume.yuck") (include "volume.yuck")
(defpoll clock_time :interval "5s" "date '+\%l:\%M \%p'") (defpoll clock_time :interval "5s" "date '+\%l:\%M \%p'")
(defpoll clock_full :interval "5s" "date '+\%b \%d, \%Y, \%l:\%M \%p'")
(defpoll clock_date :interval "1h" "date '+%b %d, %Y'") (defpoll clock_date :interval "1h" "date '+%b %d, %Y'")
(defpoll calendar_day :interval "2h" "date '+%d'") (defpoll calendar_day :interval "2h" "date '+%d'")
(defpoll calendar_year :interval "2h" "date '+%Y'") (defpoll calendar_year :interval "2h" "date '+%Y'")
@ -98,6 +99,7 @@
(scale (scale
:class "volbar" :class "volbar"
:value volume_percent :value volume_percent
:draw-value: true
:orientation "h" :orientation "h"
:tooltip "${volume_percent}%" :tooltip "${volume_percent}%"
:max 150 :max 150
@ -202,10 +204,10 @@
:orientation "h" :orientation "h"
:spacing "0" :spacing "0"
(label (label
:text clock_time :text {HOST == "kaladin" ? clock_full : clock_time}
:class "clock_time_class" ) :class "clock_time_class" )
(revealer :transition "slideleft" (revealer :transition "slideleft"
:reveal time_rev :reveal {HOST == "kaladin" ? false : time_rev}
:duration "250ms" :duration "250ms"
(button (button
:class "clock_date_class" :class "clock_date_class"
@ -297,7 +299,7 @@
:geometry (geometry :geometry (geometry
:x "15px" :x "15px"
:y "10px" :y "10px"
:width "99%" :width "80%"
:height "30px" :height "30px"
:anchor "bottom center") :anchor "bottom center")
:stacking "fg" :stacking "fg"

View file

@ -1,3 +1,4 @@
(defwindow notifications (defwindow notifications
:geometry (geometry :x "0px" :geometry (geometry :x "0px"
:y "0px" :y "0px"

View file

@ -10,7 +10,6 @@
}; };
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland"; url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
}; };
eww = { eww = {
url = "github:elkowar/eww"; url = "github:elkowar/eww";

View file

@ -85,6 +85,12 @@
Option "TripleBuffer" "on" Option "TripleBuffer" "on"
''; '';
# This adds hyprland cache to cachix
nix.settings = {
substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
};
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];
services.xserver = { services.xserver = {
enable = true; enable = true;

View file

@ -78,6 +78,12 @@
services.xserver.videoDrivers = ["intel"]; services.xserver.videoDrivers = ["intel"];
# This adds hyprland cache to cachix
nix.settings = {
substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
};
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];
services.xserver = { services.xserver = {
enable = true; enable = true;