mirror of
https://github.com/Nickiel12/nicks-nix-config.git
synced 2024-11-24 13:45:29 -08:00
Compare commits
No commits in common. "364e69481d3f3026eedbcac8e42adc057e5542ba" and "d6c9a492cc9039416d30c2c5d9db9387d7c12d79" have entirely different histories.
364e69481d
...
d6c9a492cc
7 changed files with 107 additions and 234 deletions
18
flake.lock
18
flake.lock
|
|
@ -122,11 +122,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698162493,
|
"lastModified": 1697931116,
|
||||||
"narHash": "sha256-Zehw3cWiTXGGlDDjzTgIX1BhWG+049D/RcSMAiypAcM=",
|
"narHash": "sha256-KdjQQBavncOSLgv/AM/hwWH8GAYeP3O2XXLfXSuJzQ0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "14b54157201fd574b0fa1b3ce7394c9d3a87fbc1",
|
"rev": "81ab14626273ca38cba947d9a989c9d72b5e7593",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -192,11 +192,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698181360,
|
"lastModified": 1697929210,
|
||||||
"narHash": "sha256-oEfGhb3MzTglzMqDItLvBnn2Ja3YmyjGZ2iRFb5+Vz0=",
|
"narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "98e7aaa5cfad782b8effe134bff3717280ec41ca",
|
"rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -294,11 +294,11 @@
|
||||||
"pre-commit-hooks": "pre-commit-hooks"
|
"pre-commit-hooks": "pre-commit-hooks"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698063089,
|
"lastModified": 1697928654,
|
||||||
"narHash": "sha256-fJRcsO+KHf0K04fRHIS6HETJRWMakTNbUaWx8WeYHX4=",
|
"narHash": "sha256-dyMe4/EhJhqZICJ06HkhA6DIBK5z8vRtwreGgfhLMFU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "0c5dcb56d105addedd001f043e6a32ab9f1abe92",
|
"rev": "56f46166f998d4adddb1c43dbf54d4c0604eef29",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
# max cores used per derivation
|
|
||||||
nix.settings.cores = 8;
|
|
||||||
# max derivations that can be built at once
|
|
||||||
# nix.settings.max-jobs = 2;
|
|
||||||
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
security.pam.services.kwallet = {
|
security.pam.services.kwallet = {
|
||||||
|
|
|
||||||
|
|
@ -2,17 +2,12 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
hostname = osConfig.networking.hostName;
|
|
||||||
|
|
||||||
monitor_config = import ./monitors.nix { hostname = hostname; };
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./ewwbar.nix
|
./ewwbar.nix
|
||||||
./keybinds.nix
|
./keybinds.nix
|
||||||
./displays.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
@ -31,15 +26,21 @@ in
|
||||||
# Whether to enable patching wlroots for better Nvidia support
|
# Whether to enable patching wlroots for better Nvidia support
|
||||||
enableNvidiaPatches = true;
|
enableNvidiaPatches = true;
|
||||||
|
|
||||||
extraConfig = lib.strings.concatStrings [
|
extraConfig = if (osConfig.networking.hostName == "NicksNixDesktop") then
|
||||||
monitor_config
|
|
||||||
''
|
''
|
||||||
|
monitor=DP-2, 2560x1440@144, 1920x0, 1
|
||||||
|
monitor=DP-3, 1920x1080@60, 0x360,1
|
||||||
|
|
||||||
|
env = LIBVA_DRIVER_NAME,nvidia
|
||||||
|
env = XDG_SESSION_TYPE,wayland
|
||||||
|
env = GBM_BACKEND,nvidia-drm
|
||||||
|
env = WLR_NO_HARDWARE_CURSORS,1
|
||||||
''
|
''
|
||||||
];
|
else ''
|
||||||
|
|
||||||
|
'';
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
|
|
||||||
"$mod" = "SUPER";
|
"$mod" = "SUPER";
|
||||||
|
|
||||||
exec-once = [
|
exec-once = [
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
{ osConfig, ...}:
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
hostname = osConfig.networking.hostName;
|
|
||||||
|
|
||||||
in
|
|
||||||
{
|
|
||||||
wayland.windowManager.hyprland.settings = {
|
|
||||||
workspace = if (hostname == "NicksNixDesktop") then [
|
|
||||||
"1,monitor:DP-2"
|
|
||||||
"3,monitor:DP-2"
|
|
||||||
"5,monitor:DP-2"
|
|
||||||
"7,monitor:DP-2"
|
|
||||||
"9,monitor:DP-2"
|
|
||||||
|
|
||||||
"2,monitor:DP-3"
|
|
||||||
"4,monitor:DP-3"
|
|
||||||
"6,monitor:DP-3"
|
|
||||||
"8,monitor:DP-3"
|
|
||||||
"10,monitor:DP-3"
|
|
||||||
] else [
|
|
||||||
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -3,41 +3,52 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
//Global Styles
|
//Global Styles
|
||||||
.bar-main {
|
.bar {
|
||||||
|
background-color: #3a3a3a;
|
||||||
color: #b0b4bc;
|
color: #b0b4bc;
|
||||||
margin: 15px;
|
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
margin-bottom: 0px;
|
|
||||||
padding-bottom: 0px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.bar-section {
|
// Styles on classes (see eww.yuck for more information)
|
||||||
background-color: rgba(200, 200, 200, 0.5);
|
|
||||||
border-radius: 15;
|
.sidestuff slider {
|
||||||
|
all: unset;
|
||||||
|
color: #ffd5cd;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sep {
|
.metric scale trough highlight {
|
||||||
color: rgba(200, 200, 200, 0.5);
|
all: unset;
|
||||||
|
background-color: #D35D6E;
|
||||||
|
color: #000000;
|
||||||
|
border-radius: 10px;
|
||||||
}
|
}
|
||||||
|
.metric scale trough {
|
||||||
.time {
|
all: unset;
|
||||||
font-weight: bold;
|
background-color: #4e4e4e;
|
||||||
padding-right: 20px;
|
border-radius: 50px;
|
||||||
|
min-height: 3px;
|
||||||
|
min-width: 50px;
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
|
.metric scale trough highlight {
|
||||||
.alert {
|
all: unset;
|
||||||
color: #aa5555;
|
background-color: #D35D6E;
|
||||||
padding: 5px;
|
color: #000000;
|
||||||
|
border-radius: 10px;
|
||||||
}
|
}
|
||||||
|
.metric scale trough {
|
||||||
.regular {
|
all: unset;
|
||||||
color: #b0b4bc;
|
background-color: #4e4e4e;
|
||||||
padding: 5px;
|
border-radius: 50px;
|
||||||
|
min-height: 3px;
|
||||||
|
min-width: 50px;
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
|
.label-ram {
|
||||||
.active-workspace {
|
font-size: large;
|
||||||
background-color: rgba(150, 150, 150, 0.4);
|
}
|
||||||
border-radius: 10;
|
.workspaces button:hover {
|
||||||
padding-left: 10px;
|
color: #D35D6E;
|
||||||
padding-right: 10px;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,140 +1,38 @@
|
||||||
(defwidget bar []
|
(defwidget bar []
|
||||||
(centerbox :orientation "h"
|
(centerbox :orientation "h"
|
||||||
(workspaces :names active-workspaces :current-idx current-workspace)
|
(workspaces)
|
||||||
(music)
|
(music)
|
||||||
(info)))
|
(sidestuff)))
|
||||||
|
|
||||||
(deflisten active-workspaces :initial "[]" "bash ./scripts/get-workspaces")
|
(defwidget sidestuff []
|
||||||
(deflisten current-workspace :initial "1" "bash ./scripts/get-active-workspace")
|
(box :class "sidestuff" :orientation "h" :space-evenly false :halign "end"
|
||||||
(defwidget workspaces [names current-idx]
|
(metric :label "🔊"
|
||||||
(box
|
:value volume
|
||||||
:halign "start"
|
:onchange "amixer -D pulse sset Master {}%")
|
||||||
:hexpand false
|
(metric :label ""
|
||||||
:space-evenly true
|
:value {EWW_RAM.used_mem_perc}
|
||||||
:spacing "12"
|
:onchange "")
|
||||||
:css "* {margin-left: 20px; margin-right: 20px;}"
|
(metric :label "💾"
|
||||||
(box
|
:value {round((1 - (EWW_DISK["/"].free / EWW_DISK["/"].total)) * 100, 0)}
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "1" ? "active-workspace" : "regular"}
|
:onchange "")
|
||||||
(label :text {names =~ `"1"` ? "" : ""}))
|
time))
|
||||||
(box
|
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "2" ? "active-workspace" : "regular"}
|
|
||||||
(label :text {names =~ `"2"` ? "" : ""}))
|
|
||||||
(box
|
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "3" ? "active-workspace" : "regular"}
|
|
||||||
(label :text {names =~ `"3"` ? "" : ""}))
|
|
||||||
(box
|
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "4" ? "active-workspace" : "regular"}
|
|
||||||
(label :text {names =~ `"4"` ? "" : ""}))
|
|
||||||
(box
|
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "5" ? "active-workspace" : "regular"}
|
|
||||||
(label :text {names =~ `"5"` ? "" : ""}))
|
|
||||||
(box
|
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "6" ? "active-workspace" : "regular"}
|
|
||||||
(label :text {names =~ `"6"` ? "" : ""}))
|
|
||||||
(box
|
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "7" ? "active-workspace" : "regular"}
|
|
||||||
(label :text {names =~ `"7"` ? "" : ""}))
|
|
||||||
(box
|
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "8" ? "active-workspace" : "regular"}
|
|
||||||
(label :text {names =~ `"8"` ? "" : ""}))
|
|
||||||
(box
|
|
||||||
:class {replace(captures(names, "\"[0-9]\"")[captures(current-idx, "[0-9]")[0][0]][0], "\"", "") == "9" ? "active-workspace" : "regular"}
|
|
||||||
(label :text {names =~ `"9"` ? "" : ""}))))
|
|
||||||
|
|
||||||
(defwidget info []
|
(deflisten workspaces :initial "[]" "bash ./scripts/get-workspaces")
|
||||||
(box
|
(deflisten current_workspace :initial "1" "bash ./scripts/get-active-workspace")
|
||||||
:class "side-stuff"
|
(defwidget workspaces []
|
||||||
:halign "end"
|
(eventbox :onscroll "bash ./scripts/change-active-workspace {} ${current_workspace}" :class "workspaces-widget"
|
||||||
:space-evenly false
|
(box :space-evenly true
|
||||||
:spacing "25"
|
(label :text "${workspaces}${current_workspace}" :visible false)
|
||||||
(box
|
(for workspace in workspaces
|
||||||
:space-evenly false
|
(eventbox :onclick "hyprctl dispatch workspace ${workspace.id}"
|
||||||
:spacing "10"
|
(box :class "workspace-entry ${workspace.id == current_workspace ? "current" : ""} ${workspace.windows > 0 ? "occupied" : "empty"}"
|
||||||
(_volume :volume volume)
|
(label :text "${workspace.id}")
|
||||||
(_battery :status {EWW_BATTERY.BAT0.status} :battery {EWW_BATTERY.BAT0.capacity}))
|
)
|
||||||
(_network :strength net-strength :name net-name)
|
)
|
||||||
(sep)
|
)
|
||||||
(buttons)))
|
)
|
||||||
|
)
|
||||||
(defvar eww "eww -c $HOME/.config/eww")
|
)
|
||||||
|
|
||||||
(defwidget revealer-on-hover [toggle togglename ?transition ?duration]
|
|
||||||
(eventbox
|
|
||||||
:onhover "${eww} update ${togglename}=true"
|
|
||||||
:onhoverlost "${eww} update ${togglename}=false"
|
|
||||||
(box
|
|
||||||
:space-evenly false
|
|
||||||
(children :nth 0)
|
|
||||||
(revealer
|
|
||||||
:reveal toggle
|
|
||||||
:transition {transition ?: "slideright"}
|
|
||||||
:duration {duration ?: "300ms"}
|
|
||||||
(children :nth 1)))))
|
|
||||||
|
|
||||||
(defvar volume-visible false)
|
|
||||||
(defwidget _volume [volume]
|
|
||||||
(box
|
|
||||||
:hexpand false
|
|
||||||
:class {volume > 100 ? "alert" : "regular"}
|
|
||||||
(revealer-on-hover
|
|
||||||
:toggle volume-visible
|
|
||||||
:togglename "volume-visible"
|
|
||||||
(label :text {volume <= 0 ? " " :
|
|
||||||
volume < 33 ? " " :
|
|
||||||
volume < 66 ? " " :
|
|
||||||
volume < 99 ? " " : " "})
|
|
||||||
(label :text "${volume}%"))))
|
|
||||||
|
|
||||||
|
|
||||||
(defvar battery-visible false)
|
|
||||||
(defwidget _battery [status battery]
|
|
||||||
(box
|
|
||||||
:hexpand false
|
|
||||||
:class {battery < 20 ? "alert" : "regular"}
|
|
||||||
(revealer-on-hover
|
|
||||||
:toggle battery-visible
|
|
||||||
:togglename "battery-visible"
|
|
||||||
(label :text {status == 'Charging' ? "" :
|
|
||||||
battery < 20 ? "" :
|
|
||||||
battery < 40 ? "" :
|
|
||||||
battery < 60 ? "" :
|
|
||||||
battery < 80 ? "" : ""})
|
|
||||||
(label :text "${battery}%"))))
|
|
||||||
|
|
||||||
(defvar network-visible false)
|
|
||||||
(defwidget _network [strength name]
|
|
||||||
(box
|
|
||||||
:hexpand false
|
|
||||||
:vexpand true
|
|
||||||
:class "regular"
|
|
||||||
(revealer-on-hover
|
|
||||||
:toggle network-visible
|
|
||||||
:togglename "network-visible"
|
|
||||||
:ransition "slidedown"
|
|
||||||
(label :text {strength == "" ? " " :
|
|
||||||
strength < 26 ? " " :
|
|
||||||
strength < 51 ? " " :
|
|
||||||
strength < 76 ? " " : " "})
|
|
||||||
(label :text "${name} (${strength})"))))
|
|
||||||
|
|
||||||
(defwidget buttons []
|
|
||||||
(box
|
|
||||||
:halign "end"
|
|
||||||
:hexpand false
|
|
||||||
:space-evenly true
|
|
||||||
:spacing "15"
|
|
||||||
(box (button :onclick `hyprctl dispatch exit` " "))
|
|
||||||
(box (button :onclick `reboot` " "))
|
|
||||||
(box (button :onclick `shutdown now` " "))))
|
|
||||||
|
|
||||||
(defwidget sep [] (box :hexpand false (label :class "sep" :text "|")))
|
|
||||||
|
|
||||||
(defpoll net-strength :interval "5s" :initial `N/A`
|
|
||||||
`nmcli -t -f SIGNAL,ACTIVE device wifi | awk -F':' '{if($2=="yes")print$1}'`)
|
|
||||||
(defpoll net-name :interval "60s" :initial "N/A" "nmcli -t -f NAME c show --active | head -n 1")
|
|
||||||
|
|
||||||
(deflisten music :initial ""
|
|
||||||
"playerctl --follow metadata --format '{{ artist }} - {{ title }}' || true")
|
|
||||||
|
|
||||||
(defwidget music []
|
(defwidget music []
|
||||||
(box :class "music"
|
(box :class "music"
|
||||||
|
|
@ -143,6 +41,23 @@
|
||||||
:halign "center"
|
:halign "center"
|
||||||
{music != "" ? "🎵${music}" : ""}))
|
{music != "" ? "🎵${music}" : ""}))
|
||||||
|
|
||||||
|
|
||||||
|
(defwidget metric [label value onchange]
|
||||||
|
(box :orientation "h"
|
||||||
|
:class "metric"
|
||||||
|
:space-evenly false
|
||||||
|
(box :class "label" label)
|
||||||
|
(scale :min 0
|
||||||
|
:max 101
|
||||||
|
:active {onchange != ""}
|
||||||
|
:value value
|
||||||
|
:onchange onchange)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
(deflisten music :initial ""
|
||||||
|
"playerctl --follow metadata --format '{{ artist }} - {{ title }}' || true")
|
||||||
|
|
||||||
(defpoll volume :interval "1s"
|
(defpoll volume :interval "1s"
|
||||||
"scripts/getvol")
|
"scripts/getvol")
|
||||||
|
|
||||||
|
|
@ -151,7 +66,6 @@
|
||||||
|
|
||||||
(defwindow bar
|
(defwindow bar
|
||||||
:monitor 0
|
:monitor 0
|
||||||
:exclusive true
|
|
||||||
:windowtype "dock"
|
:windowtype "dock"
|
||||||
:geometry (geometry :x "0%"
|
:geometry (geometry :x "0%"
|
||||||
:y "0%"
|
:y "0%"
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
{ hostname ? "undefined" }:
|
|
||||||
|
|
||||||
# Yes, this is less efficient, but I wanted to save this solution to the issue for future reference
|
|
||||||
let
|
|
||||||
monitor_config = if (hostname == "NicksNixDesktop") then
|
|
||||||
''
|
|
||||||
monitor=DP-2, 2560x1440@144, 1920x0, 1
|
|
||||||
monitor=DP-3, 1920x1080@60, 0x360,1
|
|
||||||
|
|
||||||
env = LIBVA_DRIVER_NAME,nvidia
|
|
||||||
env = XDG_SESSION_TYPE,wayland
|
|
||||||
env = GBM_BACKEND,nvidia-drm
|
|
||||||
env = WLR_NO_HARDWARE_CURSORS,1
|
|
||||||
''
|
|
||||||
else if (hostname == "NicksNixLaptop") then ''
|
|
||||||
|
|
||||||
'' else ''
|
|
||||||
|
|
||||||
'';
|
|
||||||
|
|
||||||
in monitor_config
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue