Nickiel/nicks-nix-config
1
0
Fork 0
mirror of https://github.com/Nickiel12/nicks-nix-config.git synced 2024-11-24 13:45:29 -08:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Nickiel:e99e9aa10c661600594cc1dc75b5901fd212505b
Branches Tags
Nickiel:main
Nickiel:awesome-dev
...
compare: Nickiel:79461fcc61901abbe8e21cecb00789c47714635a
Branches Tags
Nickiel:main
Nickiel:awesome-dev

5 commits
e99e9aa10c ... 79461fcc61

Author SHA1 Message Date
Nickiel12
79461fcc61 fixed incorrect workspace mapping 2023-11-17 12:19:43 -08:00
Nickiel12
e383b075e9 swapped workspaces to work with ewwtilities update 2023-11-17 12:15:09 -08:00
Nickiel12
2031055d7a flake.lock: Update 
Flake lock file updates:

• Updated input 'ewwtilities':
    'git+https://git.nickiel.net/Nickiel/Ewwtilities.git?ref=refs/heads/main&rev=9662ecef5a271e2c6fbbd999f210abe6a0f008ea' (2023-11-17)
  → 'git+https://git.nickiel.net/Nickiel/Ewwtilities.git?ref=refs/heads/main&rev=686ecc7a0c01e346eadb5f97e26bdf8df05773c8' (2023-11-17)
 2023-11-17 12:14:52 -08:00
Nickiel12
26af1ca9e5 flake.lock: Update 
Flake lock file updates:

• Updated input 'kmonad':
    'github:kmonad/kmonad/1b2ec006259ddbe6cda30db8eb783e8177a9f12b?dir=nix' (2023-10-25)
  → 'github:kmonad/kmonad/cec7d4ac3644c96737da23124e473e13ace5156c?dir=nix' (2023-11-17)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/d7afe436f89670fb74eb0dcff2496f0ec530be48' (2023-11-16)
  → 'github:NixOS/nixpkgs/29a55460a06e07bacc446b6ddd64eeccf0ae2ee4' (2023-11-17)
• Updated input 'nixvim':
    'github:nix-community/nixvim/a304b68a882357a55c4d76eb6db299e4d11780c5' (2023-11-16)
  → 'github:nix-community/nixvim/440c449c0a13f7864bb8406baf19f4e9f61abc55' (2023-11-17)
 2023-11-17 11:43:24 -08:00
Nickiel12
3f3079b99b split status bar on multi-monitor hosts 2023-11-17 11:40:02 -08:00
6 changed files with 171 additions and 80 deletions
Show stats Expand all files Collapse all files

26
flake.lock
View file

@ -29,11 +29,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1700189820, "lastModified": 1700252001,
"narHash": "sha256-6f6dIPqahB/8BdPuBt6V5X80XJCoCl2cQTox8y2TOPs=", "narHash": "sha256-7+WK9MYma9KIyLugb6rCBDpH8Zp3l2idp2yQV19583k=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "9662ecef5a271e2c6fbbd999f210abe6a0f008ea", "rev": "686ecc7a0c01e346eadb5f97e26bdf8df05773c8",
"revCount": 24, "revCount": 25,
"type": "git", "type": "git",
"url": "https://git.nickiel.net/Nickiel/Ewwtilities.git" "url": "https://git.nickiel.net/Nickiel/Ewwtilities.git"
}, },
@ -178,11 +178,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1698213131, "lastModified": 1700205230,
"narHash": "sha256-RPfi08g5DHvq5oEX57sJ1al2smBk0d9d8gAzL7jRnNQ=", "narHash": "sha256-jF6Qb47maZHTwexI+eY4tL0QAnHJX+MVu74DEWeazA0=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "1b2ec006259ddbe6cda30db8eb783e8177a9f12b", "rev": "cec7d4ac3644c96737da23124e473e13ace5156c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1700144580, "lastModified": 1700245229,
"narHash": "sha256-JSH+kxJ40pgyuVy7r/HF9IDFxAcuzwJBHZJH4g9+3vA=", "narHash": "sha256-q4QQyh9LreFlNCdavUiiouUArAI+41uYtPKi6EnMO2Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7afe436f89670fb74eb0dcff2496f0ec530be48", "rev": "29a55460a06e07bacc446b6ddd64eeccf0ae2ee4",
"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": 1700173604, "lastModified": 1700240304,
"narHash": "sha256-pAXDI+9w64j2SSBMnCwodN8KZs9GstvYzUUNxbzhHfI=", "narHash": "sha256-nR5Ot2nN0msfGD1Vj76/4zb6+5ksJ28gfsit/BhK/oA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "a304b68a882357a55c4d76eb6db299e4d11780c5", "rev": "440c449c0a13f7864bb8406baf19f4e9f61abc55",
"type": "github" "type": "github"
}, },
"original": { "original": {

45
modules/ewwbar/eww-config/eww.yuck
View file

@ -1,47 +1,4 @@
(defwidget bar []
(centerbox :orientation "h"
(workspaces :current-idx current-workspace)
;; (music)
(center-clock)
(info)
))
(deflisten current-workspace :initial "1" "bash ./scripts/get-active-workspace")
(defwidget workspaces [current-idx]
(box
:halign "start"
:hexpand false
:class "bar-main"
:space-evenly true
:spacing "12"
:css "* {margin-left: 20px; margin-right: 20px;}"
(box
:class {current-idx == "1" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "2" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "3" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "4" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "5" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "6" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "7" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "8" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "9" ? "active-workspace" : "regular"}
(label :text ""))))
(defwidget info [] (defwidget info []
(box (box
@ -154,7 +111,7 @@
(defpoll volume :interval "1s" (defpoll volume :interval "1s"
{"pw-volume status | jaq '.percentage // -1'" ?: 500}) {"pw-volume status | jaq '.percentage // -1'" ?: 500})
(include "windows.yuck") (include "status_bars.yuck")
(include "./modules/center-clock.yuck") (include "./modules/center-clock.yuck")
(defvar open_vol_osd false) (defvar open_vol_osd false)

139
modules/ewwbar/eww-config/status_bars.yuck Normal file
View file

@ -0,0 +1,139 @@
(defwidget bar_full []
(centerbox :orientation "h"
(full_workspaces :current-idx current-workspace)
(center-clock)
(info)
))
(deflisten current-workspace :initial "1" "bash ./scripts/get-active-workspace")
(defwidget full_workspaces [current-idx]
(box
:halign "start"
:hexpand false
:class "bar-main"
:space-evenly true
:spacing "12"
:css "* {margin-left: 20px; margin-right: 20px;}"
(box
:class {current-idx == "1" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "2" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "3" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "4" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "5" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "6" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "7" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "8" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "9" ? "active-workspace" : "regular"}
(label :text ""))))
(defwidget bar_left []
(centerbox :orientation "h"
(left_screen_workspaces :current-idx current-workspace)
(center-clock)
(info)
))
(defwidget left_screen_workspaces [current-idx]
(box
:halign "start"
:hexpand false
:class "bar-main"
:space-evenly true
:spacing "12"
:css "* {margin-left: 20px; margin-right: 20px;}"
(box
:class {current-idx == "2" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "4" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "6" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "8" ? "active-workspace" : "regular"}
(label :text ""))
))
(defwidget bar_right []
(centerbox :orientation "h"
(right_screen_workspaces :current-idx current-workspace)
(center-clock)
(info)
))
(defwidget right_screen_workspaces [current-idx]
(box
:halign "start"
:hexpand false
:class "bar-main"
:space-evenly true
:spacing "12"
:css "* {margin-left: 20px; margin-right: 20px;}"
(box
:class {current-idx == "1" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "3" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "5" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "7" ? "active-workspace" : "regular"}
(label :text ""))
(box
:class {current-idx == "9" ? "active-workspace" : "regular"}
(label :text ""))))
(defwindow full_screen_bar
:monitor 0
:exclusive true
:windowtype "dock"
:geometry (geometry :x "0%"
:y "0%"
:width "90%"
:height "10px"
:anchor "top center")
:reserve (struts :side "top" :distance "4%")
(bar_full))
(defwindow left_screen_bar
:monitor 0
:exclusive true
:windowtype "dock"
:geometry (geometry :x "0%"
:y "0%"
:width "90%"
:height "10px"
:anchor "top center")
:reserve (struts :side "top" :distance "4%")
(bar_left))
(defwindow right_screen_bar
:monitor 1
:exclusive true
:windowtype "dock"
:geometry (geometry :x "0%"
:y "0%"
:width "90%"
:height "10px"
:anchor "top center")
:reserve (struts :side "top" :distance "4%")
(bar_right))

12
modules/ewwbar/eww-config/windows.yuck
View file

@ -1,12 +0,0 @@
(defwindow bar
:monitor 1
:exclusive true
:windowtype "dock"
:geometry (geometry :x "0%"
:y "0%"
:width "90%"
:height "10px"
:anchor "top center")
:reserve (struts :side "top" :distance "4%")
(bar))

10
modules/hyprland/default.nix
View file

@ -6,6 +6,9 @@ let
monitor_config = import ./monitors.nix { hostname = hostname; }; monitor_config = import ./monitors.nix { hostname = hostname; };
two_monitor_hosts = [
"NicksNixDesktop"
];
in in
{ {
@ -44,9 +47,12 @@ 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-many logout restart shutdown reboot_windows dash_music dash_computer_status"
"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
] ++ pkgs.lib.optionals (builtins.elem hostname two_monitor_hosts ) [
"eww open-many left_screen_bar right_screen_bar"
] ++ pkgs.lib.optionals (! builtins.elem hostname two_monitor_hosts ) [
"eww open full_screen_bar"
]; ];
input = { input = {

17
modules/hyprland/displays.nix
View file

@ -15,15 +15,16 @@ in
]; ];
workspace = if (hostname == "NicksNixDesktop") then [ workspace = if (hostname == "NicksNixDesktop") then [
"2,monitor:DP-3,default:true" "1,monitor:DP-3,default:true"
"4,monitor:DP-3" "3,monitor:DP-3"
"6,monitor:DP-3" "5,monitor:DP-3"
"8,monitor:DP-3" "7,monitor:DP-3"
"9,monitor:DP-3"
"1,monitor:DP-2,default:true" "2,monitor:DP-2,default:true"
"3,monitor:DP-2" "4,monitor:DP-2"
"5,monitor:DP-2" "6,monitor:DP-2"
"7,monitor:DP-2" "8,monitor:DP-2"
] else [ ] else [
]; ];