Compare commits

..

No commits in common. "ef0f4befca294cd2d16ba31ba4a687d7995d13e4" and "65be303b10db06d65c123f43019e11a66093c52d" have entirely different histories.

7 changed files with 44 additions and 132 deletions

View file

@ -159,11 +159,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699783872, "lastModified": 1699663185,
"narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "narHash": "sha256-hI3CZPINBWstkMN+ptyzWibw5eRtFCiEvO7zR61bGBs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "280721186ab75a76537713ec310306f0eba3e407", "rev": "691cbcc03af6ad1b5384c0e0e0b5f2298f58c5ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1699994397, "lastModified": 1699646590,
"narHash": "sha256-xxNeIcMNMXH2EA9IAX6Cny+50mvY22LhIBiGZV363gc=", "narHash": "sha256-f81xS0qN6H1ULTyArpZgdjsly4FY0BnvPXdmSb7hq+o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8", "rev": "1d55765508b8316798429875712dc1ef5e62a2fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -325,11 +325,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1699781429, "lastModified": 1699099776,
"narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -341,11 +341,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1699781429, "lastModified": 1699099776,
"narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +363,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1700000610, "lastModified": 1699721903,
"narHash": "sha256-xvP14ulDdfx1MeBzIWreID3F3j0G4leAAeTC5yfE1h0=", "narHash": "sha256-ghsMr6EqRNCRJtzNokmqeyA3soMjl7bc+/TN7LX/Izc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2fcbe50f4ba80e868bd55c7f3b40e2a55c8092d0", "rev": "1286a0f41e37b2bb94f2eb87a7f4efde727f8e87",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -125,7 +125,7 @@ in
nextcloud-occ maintenance:mode --off nextcloud-occ maintenance:mode --off
echo "Unmounting the external drive" echo "Unmounting the external drive"
umount ${builtins.toString cfg.tmp_mount_point} umount ${cfg.tmp_mount_point}
echo "Job completed" echo "Job completed"
# " # "

View file

@ -7,7 +7,7 @@
// background-image: linear-gradient(45deg, #7d7d7d, #262626 30%, #262626 60%, #10384a); // background-image: linear-gradient(45deg, #7d7d7d, #262626 30%, #262626 60%, #10384a);
border-radius: 16px; border-radius: 16px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 500px 150px; background-size: 400px 150px;
} }
.dash_clock_bg { .dash_clock_bg {
@ -70,29 +70,11 @@
all: unset; all: unset;
background-color: #3A404C; background-color: #3A404C;
border-radius: 8px; border-radius: 8px;
min-height: 10px; min-height: 20px;
min-width: 210px; min-width: 200px;
margin : 10px 0px 0px 0px; margin : 10px 0px 0px 0px;
} }
.arc_container {
margin-left: 25px;
margin-right: 25px;
}
.res_cpu {
color: #FD5B85;
background-color: #7e2d42;
}
.res_mem {
color: #B1A6EE;
background-color: #585376;
}
.res_hdd {
color: #67D4F1;
background-color: #336a78;
}
.btn_logout, .btn_restart, .btn_shutdown, .btn_switch_windows { .btn_logout, .btn_restart, .btn_shutdown, .btn_switch_windows {
font-size: 40px; font-size: 40px;
font-weight: bold; font-weight: bold;

View file

@ -68,11 +68,11 @@
:spacing 10 :spacing 10
:space-evenly "false" :space-evenly "false"
:vexpand "false" :vexpand "false"
:hexpand "true" :hexpand "false"
(label :class "music_title" (label :class "music_title"
:halign "center" :halign "center"
:wrap "true" :wrap "true"
:limit-width 30 :limit-width 20
:text music_title :text music_title
) )
(label :class "music_artist" (label :class "music_artist"
@ -94,68 +94,10 @@
) )
(box :class "music_bar" :halign "center" :vexpand "false" :hexpand "false" (box :class "music_bar" :halign "center" :vexpand "false" :hexpand "false"
(scale :min 0 :active "true" :max 100 :value music_percentage) (scale :min 0 :active "true" :max 100 :value music_percentage)
))))
(defwidget dash_computer_status []
(box :class "dash_window"
:orientation "v"
:space-evenly "false"
:hexpand "false"
:vexpand "false"
(box :class "arc_container"
:hexpand "false"
:width 200
:height 200
:valign "center"
:halign "center"
(circular-progress :class "res_cpu"
:value {EWW_CPU.avg}
:thickness 5
(box :orientation "v"
:halign "center"
:valign "center"
:vexpand "false"
(label :class "small_circle_text" :text "CPU")
(label :class "small_circle_text" :text "${round(EWW_CPU.avg, 2)}%")
))
)
(box :orientation "h"
:vexpand "true"
:valign "center"
(box :class "arc_container"
:width 125
:height 125
:valign "center"
:halign "center"
(circular-progress :class "res_mem"
:value {EWW_RAM.used_mem_perc}
:thickness 5
(box :orientation "v"
:halign "center"
:valign "center"
:vexpand "false"
(label :class "small_circle_text" :text "RAM")
(label :class "small_circle_text" :text "${round(EWW_RAM.used_mem_perc, 2)}%")
) )
) )
) )
(box :class "arc_container" )
:width 125
:height 125
:valign "center"
:halign "center"
(circular-progress :class "res_hdd"
:value {EWW_DISK["/"].used_perc}
:thickness 5
(box :orientation "v"
:halign "center"
:valign "center"
:vexpand "false"
(label :class "small_circle_text" :text "Disk")
(label :class "small_circle_text" :text "${round(EWW_DISK["/"].used_perc, 2)}%")
))
))))
(defwidget logout [] (defwidget logout []
(box :class "dash_window" (box :class "dash_window"
@ -194,9 +136,9 @@
:stacking "bg" :stacking "bg"
:focusable "false" :focusable "false"
:monitor 0 :monitor 0
:geometry (geometry :x 710 :geometry (geometry :x 760
:y 300 :y 200
:width 500 :width 400
:height 150) :height 150)
(dash_clock) (dash_clock)
) )
@ -205,9 +147,9 @@
:stacking "bg" :stacking "bg"
:focusable "false" :focusable "false"
:monitor 0 :monitor 0
:geometry (geometry :x 710 :geometry (geometry :x 760
:y 300 :y 200
:width 500 :width 400
:height 150) :height 150)
(dash_clock_bg) (dash_clock_bg)
) )
@ -216,30 +158,19 @@
:stacking "bg" :stacking "bg"
:focusable "false" :focusable "false"
:monitor 0 :monitor 0
:geometry (geometry :x 710 :geometry (geometry :x 760
:y 475 :y 575
:width 500 :width 400
:height 150) :height 150)
(dash_music_state) (dash_music_state)
) )
(defwindow dash_computer_status
:stacking "bg"
:focusable "false"
:monitor 0
:geometry (geometry :x 450
:y 300
:width 250
:height 350)
(dash_computer_status)
)
(defwindow logout (defwindow logout
:stacking "bg" :stacking "bg"
:focusable "false" :focusable "false"
:monitor 0 :monitor 0
:geometry (geometry :x 1220 :geometry (geometry :x 1400
:y 300 :y 200
:width 75 :width 75
:height 75) :height 75)
(logout)) (logout))
@ -248,8 +179,8 @@
:stacking "bg" :stacking "bg"
:focusable "false" :focusable "false"
:monitor 0 :monitor 0
:geometry (geometry :x 1220 :geometry (geometry :x 1400
:y 395 :y 280
:width 75 :width 75
:height 75) :height 75)
(restart)) (restart))
@ -258,8 +189,8 @@
:stacking "bg" :stacking "bg"
:focusable "false" :focusable "false"
:monitor 0 :monitor 0
:geometry (geometry :x 1220 :geometry (geometry :x 1400
:y 485 :y 360
:width 75 :width 75
:height 75) :height 75)
(shutdown)) (shutdown))
@ -268,8 +199,8 @@
:stacking "bg" :stacking "bg"
:focusable "false" :focusable "false"
:monitor 0 :monitor 0
:geometry (geometry :x 1220 :geometry (geometry :x 1400
:y 580 :y 440
:width 75 :width 75
:height 75) :height 75)
(reboot_windows)) (reboot_windows))

View file

@ -20,7 +20,7 @@ $light_bkgrnd: rgba(60, 60, 60, 0.8);
.bar-section { .bar-section {
background-color: rgba(200, 200, 200, 0.5); background-color: rgba(200, 200, 200, 0.5);
border-radius: 15px; border-radius: 15;
} }
.sep { .sep {

View file

@ -1,5 +1,5 @@
.center-clock { .center-clock {
border-radius: 15px; border-radius: 15;
background-color: rgba(20, 20, 20, 0.9); background-color: rgba(20, 20, 20, 0.9);
color: rgba(200, 200, 200, 1.0); color: rgba(200, 200, 200, 1.0);
padding-left: 20px; padding-left: 20px;

View file

@ -44,9 +44,8 @@ in
exec-once = [ exec-once = [
"${pkgs.swww}/bin/swww init & sleep 0.5 & ${pkgs.swww}/bin/swww /home/nixolas/Downloads/RecountERD.png" "${pkgs.swww}/bin/swww init & sleep 0.5 & ${pkgs.swww}/bin/swww /home/nixolas/Downloads/RecountERD.png"
"eww open-many bar logout restart shutdown reboot_windows dash_music dash_computer_status" "eww open bar;eww open logout;eww open restart;eww open shutdown;eww open reboot_windows"
"eww open dash_clock_bg;eww open dash_clock" # the order here matters "eww open dash_clock_bg;eww open dash_clock" # the order here matters
]; ];
input = { input = {