Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b68e8c45d8
|
@ -37,7 +37,6 @@ Both include the home-manager module. Primarily I chose that route so that I cou
|
|||
};
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
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.
|
||||
#+NAME: desktop
|
||||
#+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" ];
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
(include "volume.yuck")
|
||||
|
||||
(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 calendar_day :interval "2h" "date '+%d'")
|
||||
(defpoll calendar_year :interval "2h" "date '+%Y'")
|
||||
|
@ -98,6 +99,7 @@
|
|||
(scale
|
||||
:class "volbar"
|
||||
:value volume_percent
|
||||
:draw-value: true
|
||||
:orientation "h"
|
||||
:tooltip "${volume_percent}%"
|
||||
:max 150
|
||||
|
@ -202,10 +204,10 @@
|
|||
:orientation "h"
|
||||
:spacing "0"
|
||||
(label
|
||||
:text clock_time
|
||||
:text {HOST == "kaladin" ? clock_full : clock_time}
|
||||
:class "clock_time_class" )
|
||||
(revealer :transition "slideleft"
|
||||
:reveal time_rev
|
||||
:reveal {HOST == "kaladin" ? false : time_rev}
|
||||
:duration "250ms"
|
||||
(button
|
||||
:class "clock_date_class"
|
||||
|
@ -297,7 +299,7 @@
|
|||
:geometry (geometry
|
||||
:x "15px"
|
||||
:y "10px"
|
||||
:width "99%"
|
||||
:width "80%"
|
||||
:height "30px"
|
||||
:anchor "bottom center")
|
||||
:stacking "fg"
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
(defwindow notifications
|
||||
:geometry (geometry :x "0px"
|
||||
:y "0px"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
};
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
eww = {
|
||||
url = "github:elkowar/eww";
|
||||
|
|
|
@ -85,6 +85,12 @@
|
|||
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" ];
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
|
|
|
@ -78,6 +78,12 @@
|
|||
|
||||
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" ];
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
|
|
Loading…
Reference in a new issue