Compare commits
No commits in common. "00223ea6756e826fa043229474dc9d56926f5a5b" and "1524994babb3e495bd68dcafe7a8740603baf761" have entirely different histories.
00223ea675
...
1524994bab
4 changed files with 32 additions and 53 deletions
36
flake.lock
36
flake.lock
|
|
@ -150,11 +150,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734343412,
|
||||
"narHash": "sha256-b7G8oFp0Nj01BYUJ6ENC9Qf/HsYAIZvN9k/p0Kg/PFU=",
|
||||
"lastModified": 1734088167,
|
||||
"narHash": "sha256-OIitVU+IstPbX/NWn2jLF+/sT9dVKcO2FKeRAzlyX6c=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "a08bfe06b39e94eec98dd089a2c1b18af01fef19",
|
||||
"rev": "d32f2d1750d61a476a236526b725ec5a32e16342",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -430,11 +430,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734344598,
|
||||
"narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
|
||||
"lastModified": 1734093295,
|
||||
"narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "83ecd50915a09dca928971139d3a102377a8d242",
|
||||
"rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -551,11 +551,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1734352517,
|
||||
"narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
|
||||
"lastModified": 1733861262,
|
||||
"narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
|
||||
"rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -566,11 +566,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1734119587,
|
||||
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
|
||||
"lastModified": 1733940404,
|
||||
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
|
||||
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -694,11 +694,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734425854,
|
||||
"narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=",
|
||||
"lastModified": 1734261738,
|
||||
"narHash": "sha256-3Lzk+7QyX8v60+km26D3dln7NMSA13vW+KYTkMkds6Q=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d",
|
||||
"rev": "4c8e75efbbdcc6f9203f64b1f21f8a55d2285264",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -742,11 +742,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734489114,
|
||||
"narHash": "sha256-dKBBZr2pw7KDI/7GeiN5qPccqqtvnK2jqAMcMo4rVvU=",
|
||||
"lastModified": 1734230139,
|
||||
"narHash": "sha256-zsp0Mz8VgyIAnU8UhP/YT1g+zlsl+NIJTBMAbY+RifQ=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "b2e385f8e5c1d7c0d9ce738d650955c2e94555ae",
|
||||
"rev": "150fbc8aa2bc501041810bbc1dbfe73694a861be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -49,8 +49,7 @@ in
|
|||
"sway/workspaces"
|
||||
"sway/mode"
|
||||
]
|
||||
++ lib.optional (cfg.profile == "home") "custom/now_playing"
|
||||
++ lib.optional (cfg.profile == "work") "mpris";
|
||||
++ lib.optional (cfg.profile == "home") "custom/now_playing";
|
||||
|
||||
modules-center = (lib.optional cfg.sway "sway/window") ++ (lib.optional cfg.river "river/window");
|
||||
|
||||
|
|
@ -79,7 +78,7 @@ in
|
|||
tooltip-format = "{:%e %B %Y}";
|
||||
};
|
||||
|
||||
cpu = {
|
||||
"cpu" = {
|
||||
interval = 5;
|
||||
format = " {usage}% ({load})"; # Icon: cpu_64_bit
|
||||
states = {
|
||||
|
|
@ -88,7 +87,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
memory = {
|
||||
"memory" = {
|
||||
interval = 5;
|
||||
format = " {}%"; # Icon: memory
|
||||
states = {
|
||||
|
|
@ -97,7 +96,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
network = {
|
||||
"network" = {
|
||||
interval = 5;
|
||||
format-wifi = " {essid} ({signalStrength}%)"; # Icon: wifi
|
||||
format-ethernet = " {ifname}: {ipaddr}/{cidr}"; # Icon: ethernet
|
||||
|
|
@ -117,16 +116,6 @@ in
|
|||
on-scroll-up = "${pkgs.ha-now-playing}/bin/ha-now-playing --host home.datarift.nl --entity media_player.sonos_woonkamer --token-file /run/secrets/ha_now_playing_token volume-down";
|
||||
};
|
||||
|
||||
mpris = {
|
||||
format = "[{player}] {status_icon} {dynamic}";
|
||||
status-icons = {
|
||||
paused = " "; # Icon: pause
|
||||
playing = " "; # Icon: play
|
||||
stopped = " "; # Icon: stop
|
||||
};
|
||||
on-click-middle = "stop";
|
||||
};
|
||||
|
||||
"sway/mode" = {
|
||||
format = ''<span style="italic"> {}</span>''; # Icon: arrow_expand_all
|
||||
tooltip = false;
|
||||
|
|
@ -143,9 +132,9 @@ in
|
|||
format = "{icon} {name}";
|
||||
sort-by-number = true;
|
||||
format-icons = {
|
||||
urgent = "";
|
||||
focused = "";
|
||||
default = "";
|
||||
"urgent" = "";
|
||||
"focused" = "";
|
||||
"default" = "";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -172,7 +161,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
wireplumber = {
|
||||
"wireplumber" = {
|
||||
format = "{icon} {volume}%";
|
||||
format-muted = ""; # Icon: volume_off
|
||||
format-icons = {
|
||||
|
|
@ -193,7 +182,7 @@ in
|
|||
on-click-right = "${pkgs.easyeffects}/bin/easyeffects";
|
||||
};
|
||||
|
||||
temperature = {
|
||||
"temperature" = {
|
||||
hwmon-path = cfg.cpuTempPath;
|
||||
critical-threshold = 80;
|
||||
interval = 5;
|
||||
|
|
@ -208,12 +197,11 @@ in
|
|||
tooltip = true;
|
||||
};
|
||||
|
||||
tray = {
|
||||
"tray" = {
|
||||
icon-size = 21;
|
||||
spacing = 10;
|
||||
};
|
||||
|
||||
idle_inhibitor = {
|
||||
"idle_inhibitor" = {
|
||||
format = ''<span size="large">{icon}</span>'';
|
||||
format-icons = {
|
||||
activated = "";
|
||||
|
|
|
|||
|
|
@ -345,13 +345,9 @@
|
|||
Name = "enp5s0f1";
|
||||
};
|
||||
|
||||
networkConfig = {
|
||||
DHCP = "yes";
|
||||
};
|
||||
|
||||
# addresses = [
|
||||
# { Address = "192.168.42.10/24"; }
|
||||
# ];
|
||||
addresses = [
|
||||
{ Address = "192.168.42.10/24"; }
|
||||
];
|
||||
};
|
||||
"41-horus1" = {
|
||||
matchConfig = {
|
||||
|
|
@ -509,10 +505,6 @@
|
|||
"mistral"
|
||||
];
|
||||
};
|
||||
plantuml-server = {
|
||||
enable = true;
|
||||
listenPort = 5080;
|
||||
};
|
||||
};
|
||||
|
||||
environment = {
|
||||
|
|
|
|||
|
|
@ -283,7 +283,6 @@ in
|
|||
"secrets"
|
||||
];
|
||||
};
|
||||
playerctld.enable = true;
|
||||
udiskie = {
|
||||
enable = true;
|
||||
tray = "auto";
|
||||
|
|
|
|||
Loading…
Reference in a new issue