working on screens and power stuff

This commit is contained in:
Matt Nish-Lapidus 2025-02-14 14:52:10 -05:00
parent ca06918f79
commit 743efa1782
9 changed files with 88 additions and 66 deletions

66
flake.lock generated
View file

@ -69,11 +69,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1739463649, "lastModified": 1739552424,
"narHash": "sha256-TrR9U9RHSWF8Fw3mOjR70PhxLCNiE6W71bpjXdgk7Uk=", "narHash": "sha256-64bBQo821rZGJ3AT2+7d+aM+JGTJlmeKISVVV7j5258=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9196c8d59c9110238c98c38cbb452ed49ef35ce3", "rev": "9262057cc86e7512d742a1c1ae9d7d118bb82d48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739458725, "lastModified": 1739470101,
"narHash": "sha256-k9AeUzs3phaTgfljRslR4iNTX9svBNhxoIw4QLd/V70=", "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "22b418c13fb0be43f4bc5c185f323a3237028594", "rev": "5031c6d2978109336637977c165f82aa49fa16a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,11 +377,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1739048878, "lastModified": 1739465717,
"narHash": "sha256-zTyoyIWe/yPtyMl6ZXuEk3gUAwrzT6yTY5pLpW3GYAU=", "narHash": "sha256-8Ulwr1Z6n5YjM518DYMSHZUbPsZOG53d6QO/bwhb4SA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "cf5b4dab9ddaa10d688012c0a45a20061dd647d4", "rev": "3e30a63b5db64a208e9394328a81048044571368",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +649,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1739455993, "lastModified": 1739482726,
"narHash": "sha256-eLoauPdmvcvTtBQQESw6aKDkItZ9HVJNkpzr7GAgxj0=", "narHash": "sha256-hd8pl109hwtfjRHA1EMzfvNfblTaELL+ZZCEE+LKMYw=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "8e71ac9e1275673c610a8d15a43e6cf19b6fc666", "rev": "3801a782e3a01e01097ee98908cf31533fefc52b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -712,11 +712,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1739436814, "lastModified": 1739516087,
"narHash": "sha256-axkBabPrOWdGXWNM3ZyFrFlmn2WWaea10ca4nBqABXM=", "narHash": "sha256-X3WTcaL/9O3C03TZ+8PmXcn3sqCgig1RIYY/J27ZsLQ=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "2597ff0d56048e6e33e5bea90cbbdad697a1338f", "rev": "9669e839805737ce7c66c9c05a3f97017f84cf24",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739432365, "lastModified": 1739513000,
"narHash": "sha256-uQm3OhhgUQHA5eV+0v/qAFmFHly8yHg2P+BVVy/3DcY=", "narHash": "sha256-LDSApEzhz3I9441ocnkkEVJu18OnGSj4a4MaxvuJYMk=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "4c98b874862c2e6df7f71bdf36df0ba527690fbb", "rev": "7816f20e6a3ddc4057aa1ab35742dc7f67453bc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -928,11 +928,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1739206421, "lastModified": 1739357830,
"narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44534bc021b85c8d78e465021e21f33b856e2540", "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -992,11 +992,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1739214665, "lastModified": 1739446958,
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1040,11 +1040,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1739214665, "lastModified": 1739446958,
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1373,11 +1373,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1739455114, "lastModified": 1739478829,
"narHash": "sha256-NpU7+G5vh+dj58SaIhkXTD37V/uQn6bqItF0Jt/xg1c=", "narHash": "sha256-zUAt4Ak3NHD3KNJ10ibJoP9zqQF5hdPIeP5mlFyU81o=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "1e527797424b3aea0d326792033ef9c4f283a6e8", "rev": "ee0c04e735fb94cb5119681f704fb7fa6731e713",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1429,11 +1429,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1739444537, "lastModified": 1739546226,
"narHash": "sha256-mdp5DsogMoWINRvsw5A0bqik0gWhFg15FfJMWpxtR1Q=", "narHash": "sha256-d7zNnAovgxugkZabfRffp0eOf6GPUmSlNyd/XOPZOlQ=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "077faacc9a84bb5a06c5a8185a71405b0cb3dc8a", "rev": "38e45c647b9e93a9d837b6f4e3f345d85608cc1a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -0,0 +1,3 @@
#!/usr/bin/env fish
cat /sys/class/power_supply/AC0/online

View file

@ -51,13 +51,13 @@
"memory": { "memory": {
"interval": 30, "interval": 30,
"format": "{used:0.1f}G/{total:0.1f}G ", "format": "{used:0.1f}G/{total:0.1f}G ",
"on-click": "$HOME/.local/bin/wezapp htop" "on-click": "$HOME/.local/bin/wezapp btop"
}, },
"cpu": { "cpu": {
"interval": 10, "interval": 10,
"format": "{}% ", "format": "{}% ",
"max-length": 10, "max-length": 10,
"on-click": "$HOME/.local/bin/wezapp htop" "on-click": "$HOME/.local/bin/wezapp btop"
}, },
"network": { "network": {
"format-wifi": "", "format-wifi": "",

View file

@ -238,6 +238,7 @@ password=${config.sops.placeholder.filez}
}; };
nvidiaSettings = true; nvidiaSettings = true;
}; };
brillo.enable = true;
}; };
musnix = { musnix = {
@ -493,8 +494,6 @@ password=${config.sops.placeholder.filez}
}; };
}; };
programs.light.enable = true;
programs.steam = { programs.steam = {
enable = true; enable = true;
protontricks.enable = true; protontricks.enable = true;

View file

@ -51,7 +51,6 @@
ripdrag ripdrag
sway-launcher-desktop sway-launcher-desktop
swayosd
thunderbird-latest thunderbird-latest
emojify emojify
@ -110,6 +109,13 @@
protonplus protonplus
fstl fstl
nwg-look
kooha
obs-studio
obs-studio-plugins.wlrobs
obs-studio-plugins.obs-gstreamer
wineWowPackages.stagingFull wineWowPackages.stagingFull
winetricks winetricks
]; ];
@ -129,11 +135,11 @@
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
}; };
theme = { theme = {
name = "Colloid-Dark"; name = "Colloid";
package = pkgs.colloid-gtk-theme.override { package = pkgs.colloid-gtk-theme.override {
colorVariants = [ "dark" ];
tweaks = [ "normal" "nord" ]; tweaks = [ "normal" "nord" ];
themeVariants = [ "grey" ]; themeVariants = [ "grey" ];
}; };
}; };
iconTheme = { iconTheme = {
@ -157,19 +163,26 @@
}; };
}; };
services.flatpak = { services = {
flatpak = {
enable = true; enable = true;
packages = [ packages = [
"com.github.tchx84.Flatseal" "com.github.tchx84.Flatseal"
"dev.qwery.AddWater" "dev.qwery.AddWater"
]; ];
}; };
swayosd = {
enable = true;
};
kanshi = {
enable = true;
};
};
programs = { programs = {
# eww = {
# enable = true;
# configDir = ../../homes/emenel/dotfiles/dot_config/eww;
# };
firefox.enable = true; firefox.enable = true;
}; };

View file

@ -9,40 +9,49 @@
before_sleep_cmd = "loginctl lock-session"; before_sleep_cmd = "loginctl lock-session";
}; };
# battery timers
listener = [ listener = [
# battery timers
{ {
timeout = "30"; timeout = "30";
on-timeout = "systemd-ac-power || light -O && light -S 0 && light -s razer/0003:1532:02B6.0003/backlight -S 0"; on-timeout = "systemd-ac-power || light -O && light -S 0 && light -s razer/0003:1532:02B6.0003/backlight -S 0";
on-resume = "systemd-ac-power || light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40"; on-resume = "light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40";
} }
{ {
timeout = "120"; timeout = "120";
on-timeout = "systemd-ac-power || loginctl lock-session && niri msg action power-off-monitors"; on-timeout = "systemd-ac-power || light -O && loginctl lock-session && niri msg action power-off-monitors";
on-resume = "light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40";
} }
{ {
timeout = "300"; timeout = "300";
on-timeout = "systemd-ac-power || loginctl lock-session && systemctl suspend"; on-timeout = "systemd-ac-power || light -O && loginctl lock-session && systemctl suspend";
on-resume = "light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40";
} }
# ac power timers # ac power timers
{ {
timeout = "60"; timeout = "60";
on-timeout = "systemd-ac-power && light -O && light -S 0 && light -s razer/0003:1532:02B6.0003/backlight -S 0"; on-timeout = "systemd-ac-power && light -O && light -S 0 && light -s razer/0003:1532:02B6.0003/backlight -S 0";
on-resume = "systemd-ac-power && light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40"; on-resume = "light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40";
} }
{ timeout = "180"; {
on-timeout = "systemd-ac-power && loginctl lock-session"; } timeout = "180";
on-timeout = "systemd-ac-power && loginctl lock-session";
on-resume = "light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40";
}
{ timeout = "300"; {
on-timeout = "systemd-ac-power && loginctl lock-session && niri msg action power-off-monitors"; } timeout = "300";
on-timeout = "systemd-ac-power && light -O && loginctl lock-session && niri msg action power-off-monitors";
on-resume = "light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40";
}
{ {
timeout = "900"; timeout = "900";
on-timeout = "systemd-ac-power && loginctl lock-session && systemctl suspend"; on-timeout = "systemd-ac-power && light -O && loginctl lock-session && systemctl suspend";
on-resume = "light -I && light -s razer/0003:1532:02B6.0003/backlight -S 40";
} }
]; ];

View file

@ -13,10 +13,8 @@ in {
spawn-at-startup = [ spawn-at-startup = [
{ command = ["maestral_qt"]; } { command = ["maestral_qt"]; }
{ command = ["clipse" "-listen"]; } { command = ["clipse" "-listen"]; }
{ command = ["swayosd-server"]; } # { command = ["waybar"]; }
{ command = ["waybar"]; } { command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" ]; }
# { command = ["eww" "daemon"]; }
{ command = [ "systemctl" "--user" "restart" "hypridle.service" "xwayland-satellite.service" ]; }
]; ];
workspaces = { workspaces = {

View file

@ -24,7 +24,7 @@
tldr tldr
glow glow
delta delta
htop btop
gnupg gnupg
imagemagick imagemagick
gnutls gnutls

View file

@ -6,7 +6,7 @@ in {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = pkgs.waybar; package = pkgs.waybar;
systemd.enable = false; systemd.enable = true;
style = '' style = ''
* { * {
border: none; border: none;