changing wifi to iwd, adding desktop entries for tui apps, etc

This commit is contained in:
Matt Nish-Lapidus 2025-02-17 10:13:08 -05:00
parent 1975a1c6c7
commit f920b83d27
11 changed files with 143 additions and 80 deletions

66
flake.lock generated
View file

@ -69,11 +69,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1739725136, "lastModified": 1739784040,
"narHash": "sha256-UCFiCR/DiWbOYlhlGr941rg8fHh32iE188FJ5NiQFU4=", "narHash": "sha256-ClWxBsyfs3NrJzrEuHbTMDvOdwldSKPIM3BqN9/Kw9E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c356eb83c3461c19c2bf355d351354a0dcf76655", "rev": "783cff85c13e857ab95b441020621ea64e7a9843",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739735835, "lastModified": 1739802995,
"narHash": "sha256-S4VskZCNjRX6saW7GtVb4MD3kWdfvRvLurLj9QcM4Wg=", "narHash": "sha256-kZv0upOigS/4sUEgZuZd6/uO6s8X8oYOLk9/sGMsl+c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b15e9ec6769d770879759f086dd4e51fae7f2394", "rev": "9d0d48f4c3d2fb1a8c8607da143bb567a741d914",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +649,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1739482726, "lastModified": 1739789146,
"narHash": "sha256-hd8pl109hwtfjRHA1EMzfvNfblTaELL+ZZCEE+LKMYw=", "narHash": "sha256-3zqH3j31nBzYWm+8jYZ43lOc8co52X/Y4KZIeB7WoLM=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "3801a782e3a01e01097ee98908cf31533fefc52b", "rev": "964ebcfc8ce2a3f0ae830fe72474452d5b92ce1e",
"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": 1739627445, "lastModified": 1739802387,
"narHash": "sha256-fl1kOwskXXa5dJsRcly9e+UaOTdjdvy8Jqg9WhKe0Nw=", "narHash": "sha256-j1/mukC09zeq0mdOiL9ouE1k7ZC7f3SJCKFq5ttoqIs=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "b4f7ae09bc209e76944fed4648191dac8381ca76", "rev": "59ed19d431324af3fcebbf623c081eae2e67ab97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739625307, "lastModified": 1739787518,
"narHash": "sha256-BVTlrmelSAq+rlxwlRvsyZxHrmcviRu3aHJYG37Yq8c=", "narHash": "sha256-F9zVBxjj8H11TjXhbMNC/nXJVAvksrrasouxTxPbju4=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "f01c840ebe71f152906dbc6212f077fc72626f89", "rev": "078383ea8208337d3c9ea89118aa615d7fbbab17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -854,11 +854,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1738816619, "lastModified": 1739798439,
"narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -912,11 +912,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1739484910, "lastModified": 1739624908,
"narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -928,11 +928,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1739484910, "lastModified": 1739624908,
"narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -992,11 +992,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1739446958, "lastModified": 1739580444,
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "rev": "8bb37161a0488b89830168b81c48aed11569cb93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1040,11 +1040,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1739580444, "lastModified": 1739736696,
"narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8bb37161a0488b89830168b81c48aed11569cb93", "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1429,11 +1429,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1739718339, "lastModified": 1739776850,
"narHash": "sha256-JlU4RBbzqqCWyxvPNaroiIYatMCgvMOfjFKBW0oGBEg=", "narHash": "sha256-XWzxhk0Nrw9cu6E5yjsmhAVfbt9ArVN54zz8qgzBA/I=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "f25ef0f07b99130261caf5a1605188b61ed6f617", "rev": "1ddbbfea711636dcb997239ea9d2b483cea16f80",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -42,17 +42,17 @@ exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""
adaptive_sync = true adaptive_sync = true
scale = 1 scale = 1
# [[profile]] [[profile]]
# name = "laptop-mirror" name = "laptop-mirror"
# exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"", exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"",
# "wl-present mirror eDP-1 & sleep .5; wl-present fullscreen-output HDMI-A-1; wl-present fullscreen"] "wl-present mirror eDP-1 & sleep .5; wl-present fullscreen-output HDMI-A-1; wl-present fullscreen"]
# [[profile.output]] [[profile.output]]
# enable = true enable = true
# search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"] search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"]
# mode = "2560x1600@240Hz" mode = "2560x1600@240Hz"
# position = "0,0" position = "0,0"
# adaptive_sync = true adaptive_sync = true
# [[profile.output]] [[profile.output]]
# enable = true enable = true
# search = "n/HDMI-[ABC]-[1-9]" # search for a matching name by regex search = "n/HDMI-[ABC]-[1-9]" # search for a matching name by regex

View file

@ -65,7 +65,7 @@
"format-disconnected": "󰱟", "format-disconnected": "󰱟",
"tooltip-format": "{essid} {ifname}", "tooltip-format": "{essid} {ifname}",
"max-length": 50, "max-length": 50,
"on-click": "$HOME/.local/bin/wezlauncher nmtui", "on-click": "$HOME/.local/bin/wezlauncher impala",
}, },
"tray": { "tray": {
"icon-size": 20, "icon-size": 20,

View file

@ -257,22 +257,22 @@
networkmanager = { networkmanager = {
enable = true; enable = true;
wifi.powersave = true; wifi.powersave = true;
# wifi.backend = "iwd"; wifi.backend = "iwd";
};
wireless = {
iwd = {
enable = true;
package = pkgs.iwd;
settings = {
IPv6 = {
enabled = true;
};
Settings = {
AutoConnect = true;
};
};
};
}; };
# wireless = {
# iwd = {
# enable = true;
# package = pkgs.iwd;
# settings = {
# IPv6 = {
# enabled = true;
# };
# Settings = {
# AutoConnect = true;
# };
# };
# };
# };
}; };
services.resolved = { services.resolved = {

View file

@ -26,12 +26,10 @@
pdftk pdftk
zathura zathura
gpu-viewer gpu-viewer
foliate
wl-mirror wl-mirror
soundconverter soundconverter
wmctrl wmctrl
godot_4 godot_4
gdtoolkit_4 gdtoolkit_4
sane-airscan sane-airscan
@ -51,7 +49,7 @@
ripdrag ripdrag
sway-launcher-desktop sway-launcher-desktop
swayidle
thunderbird-latest thunderbird-latest
emojify emojify
smile smile
@ -176,11 +174,23 @@
}; };
}; };
programs = { programs = {
firefox.enable = true; firefox.enable = true;
}; };
xdg.desktopEntries = {
isd = {
name = "isd (interactive systemd)";
exec = "/home/emenel/.local/bin/wezapp isd";
categories = [ "System" ];
};
impala = {
name = "impala (iwd wifi)";
exec = "/home/emenel/.local/bin/wezapp impala";
categories = [ "System" ];
};
};
xdg.configFile."halloy/config.toml".source = xdg.configFile."halloy/config.toml".source =
../../homes/emenel/dotfiles/dot_config/halloy/config.toml; ../../homes/emenel/dotfiles/dot_config/halloy/config.toml;

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages ( emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (
epkgs: [ epkgs: [
epkgs.vterm epkgs.vterm
epkgs.mu4e epkgs.mu4e

View file

@ -12,36 +12,30 @@
ignore_systemd_inhibit = false; ignore_systemd_inhibit = false;
}; };
# TODO add screen dimming and test configurations with different monitors
listener = [ listener = [
# battery timers
{ {
timeout = "60"; timeout = "60";
on-timeout = "systemd-ac-power || dim-all-monitors"; on-timeout = "dim-all-monitors";
} }
# battery timers
{ {
timeout = "120"; timeout = "120";
on-timeout = "systemd-ac-power || lock-power-off-monitors"; on-timeout = "systemd-ac-power || lock-power-off-monitors";
} }
{ {
timeout = "300"; timeout = "180";
on-timeout = "systemd-ac-power || lock-suspend"; on-timeout = "systemd-ac-power || lock-suspend";
} }
# ac power timers # ac power timers
{
timeout = "90";
on-timeout = "systemd-ac-power && dim-all-monitors";
}
{ {
timeout = "180"; timeout = "180";
on-timeout = "systemd-ac-power && loginctl lock-session"; on-timeout = "systemd-ac-power && loginctl lock-session";
} }
{ {
timeout = "200"; timeout = "240";
on-timeout = "systemd-ac-power && lock-power-off-monitors"; on-timeout = "systemd-ac-power && lock-power-off-monitors";
} }

View file

@ -14,6 +14,9 @@
])) ]))
ccl ccl
racket racket
ruby
ruby-lsp
gdu gdu
cljfmt cljfmt
libxml2 libxml2

View file

@ -5,6 +5,9 @@
inputs.isd.packages.x86_64-linux.default inputs.isd.packages.x86_64-linux.default
cmake
cmake-format
just just
readline readline
rlwrap rlwrap

53
modules/home/swayidle.nix Normal file
View file

@ -0,0 +1,53 @@
{ inputs, ... }:
{
services.swayidle = {
enable = true;
events = [
{
event = "lock";
command = "pidof hyprlock || hyprlock";
}
{
event = "after-resume";
command = "shikanectl reload && brillo -e -u 150000 -I";
}
];
timeouts = [
{
timeout = 60;
command = "dim-all-monitors";
}
# battery timers
{
timeout = 120;
command = "systemd-ac-power || lock-power-off-monitors";
}
{
timeout = 180;
command = "systemd-ac-power || lock-suspend";
}
# ac power timers
{
timeout = 180;
command = "systemd-ac-power && loginctl lock-session";
}
{
timeout = 240;
command = "systemd-ac-power && lock-power-off-monitors";
}
{
timeout = 600;
command = "systemd-ac-power && lock-suspend";
}
];
};
}

View file

@ -40,7 +40,7 @@
''; '';
}; };
razer = { razer = {
devices = []; devices = [ "/dev/input/by-id/usb-Razer_Razer_Blade-event-kbd" ];
config = '' config = ''
(defsrc (defsrc
grv 1 2 3 4 5 6 7 8 9 0 - = bspc grv 1 2 3 4 5 6 7 8 9 0 - = bspc