diff --git a/flake.lock b/flake.lock index 693a56d..ab1a1a6 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739725136, - "narHash": "sha256-UCFiCR/DiWbOYlhlGr941rg8fHh32iE188FJ5NiQFU4=", + "lastModified": 1739784040, + "narHash": "sha256-ClWxBsyfs3NrJzrEuHbTMDvOdwldSKPIM3BqN9/Kw9E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c356eb83c3461c19c2bf355d351354a0dcf76655", + "rev": "783cff85c13e857ab95b441020621ea64e7a9843", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1739735835, - "narHash": "sha256-S4VskZCNjRX6saW7GtVb4MD3kWdfvRvLurLj9QcM4Wg=", + "lastModified": 1739802995, + "narHash": "sha256-kZv0upOigS/4sUEgZuZd6/uO6s8X8oYOLk9/sGMsl+c=", "owner": "nix-community", "repo": "home-manager", - "rev": "b15e9ec6769d770879759f086dd4e51fae7f2394", + "rev": "9d0d48f4c3d2fb1a8c8607da143bb567a741d914", "type": "github" }, "original": { @@ -649,11 +649,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1739482726, - "narHash": "sha256-hd8pl109hwtfjRHA1EMzfvNfblTaELL+ZZCEE+LKMYw=", + "lastModified": 1739789146, + "narHash": "sha256-3zqH3j31nBzYWm+8jYZ43lOc8co52X/Y4KZIeB7WoLM=", "owner": "kmonad", "repo": "kmonad", - "rev": "3801a782e3a01e01097ee98908cf31533fefc52b", + "rev": "964ebcfc8ce2a3f0ae830fe72474452d5b92ce1e", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739627445, - "narHash": "sha256-fl1kOwskXXa5dJsRcly9e+UaOTdjdvy8Jqg9WhKe0Nw=", + "lastModified": 1739802387, + "narHash": "sha256-j1/mukC09zeq0mdOiL9ouE1k7ZC7f3SJCKFq5ttoqIs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b4f7ae09bc209e76944fed4648191dac8381ca76", + "rev": "59ed19d431324af3fcebbf623c081eae2e67ab97", "type": "github" }, "original": { @@ -745,11 +745,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739625307, - "narHash": "sha256-BVTlrmelSAq+rlxwlRvsyZxHrmcviRu3aHJYG37Yq8c=", + "lastModified": 1739787518, + "narHash": "sha256-F9zVBxjj8H11TjXhbMNC/nXJVAvksrrasouxTxPbju4=", "owner": "YaLTeR", "repo": "niri", - "rev": "f01c840ebe71f152906dbc6212f077fc72626f89", + "rev": "078383ea8208337d3c9ea89118aa615d7fbbab17", "type": "github" }, "original": { @@ -854,11 +854,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -912,11 +912,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739484910, - "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", + "lastModified": 1739624908, + "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", + "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", "type": "github" }, "original": { @@ -928,11 +928,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739484910, - "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", + "lastModified": 1739624908, + "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", + "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", "type": "github" }, "original": { @@ -992,11 +992,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739580444, + "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { @@ -1040,11 +1040,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -1429,11 +1429,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1739718339, - "narHash": "sha256-JlU4RBbzqqCWyxvPNaroiIYatMCgvMOfjFKBW0oGBEg=", + "lastModified": 1739776850, + "narHash": "sha256-XWzxhk0Nrw9cu6E5yjsmhAVfbt9ArVN54zz8qgzBA/I=", "owner": "sxyazi", "repo": "yazi", - "rev": "f25ef0f07b99130261caf5a1605188b61ed6f617", + "rev": "1ddbbfea711636dcb997239ea9d2b483cea16f80", "type": "github" }, "original": { diff --git a/homes/emenel/dotfiles/dot_config/shikane/config.toml b/homes/emenel/dotfiles/dot_config/shikane/config.toml index 2c12f65..c90e6e6 100644 --- a/homes/emenel/dotfiles/dot_config/shikane/config.toml +++ b/homes/emenel/dotfiles/dot_config/shikane/config.toml @@ -42,17 +42,17 @@ exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"" adaptive_sync = true scale = 1 -# [[profile]] -# name = "laptop-mirror" -# 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"] -# [[profile.output]] -# enable = true -# search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"] -# mode = "2560x1600@240Hz" -# position = "0,0" -# adaptive_sync = true +[[profile]] +name = "laptop-mirror" +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"] + [[profile.output]] + enable = true + search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"] + mode = "2560x1600@240Hz" + position = "0,0" + adaptive_sync = true -# [[profile.output]] -# enable = true -# search = "n/HDMI-[ABC]-[1-9]" # search for a matching name by regex + [[profile.output]] + enable = true + search = "n/HDMI-[ABC]-[1-9]" # search for a matching name by regex diff --git a/homes/emenel/dotfiles/dot_config/waybar/config b/homes/emenel/dotfiles/dot_config/waybar/config index 2010d1a..152d817 100644 --- a/homes/emenel/dotfiles/dot_config/waybar/config +++ b/homes/emenel/dotfiles/dot_config/waybar/config @@ -65,7 +65,7 @@ "format-disconnected": "󰱟", "tooltip-format": "{essid} {ifname}", "max-length": 50, - "on-click": "$HOME/.local/bin/wezlauncher nmtui", + "on-click": "$HOME/.local/bin/wezlauncher impala", }, "tray": { "icon-size": 20, diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 48cfdbf..da3afff 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -257,22 +257,22 @@ networkmanager = { enable = 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 = { diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index e3b6fce..2e0d006 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -26,12 +26,10 @@ pdftk zathura gpu-viewer - + foliate wl-mirror - soundconverter wmctrl - godot_4 gdtoolkit_4 sane-airscan @@ -51,7 +49,7 @@ ripdrag sway-launcher-desktop - + swayidle thunderbird-latest emojify smile @@ -176,11 +174,23 @@ }; }; - programs = { 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 = ../../homes/emenel/dotfiles/dot_config/halloy/config.toml; diff --git a/modules/home/emacs.nix b/modules/home/emacs.nix index fc1ae1c..a451e38 100644 --- a/modules/home/emacs.nix +++ b/modules/home/emacs.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages ( + emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages ( epkgs: [ epkgs.vterm epkgs.mu4e diff --git a/modules/home/hypridle.nix b/modules/home/hypridle.nix index 3353c5a..dadeba2 100644 --- a/modules/home/hypridle.nix +++ b/modules/home/hypridle.nix @@ -12,36 +12,30 @@ ignore_systemd_inhibit = false; }; - - # TODO add screen dimming and test configurations with different monitors listener = [ - # battery timers { timeout = "60"; - on-timeout = "systemd-ac-power || dim-all-monitors"; + on-timeout = "dim-all-monitors"; } + + # battery timers { timeout = "120"; on-timeout = "systemd-ac-power || lock-power-off-monitors"; } { - timeout = "300"; + timeout = "180"; on-timeout = "systemd-ac-power || lock-suspend"; } # ac power timers - { - timeout = "90"; - on-timeout = "systemd-ac-power && dim-all-monitors"; - } - { timeout = "180"; on-timeout = "systemd-ac-power && loginctl lock-session"; } { - timeout = "200"; + timeout = "240"; on-timeout = "systemd-ac-power && lock-power-off-monitors"; } diff --git a/modules/home/langs.nix b/modules/home/langs.nix index 3fddd02..1ef6966 100644 --- a/modules/home/langs.nix +++ b/modules/home/langs.nix @@ -14,6 +14,9 @@ ])) ccl racket + ruby + ruby-lsp + gdu cljfmt libxml2 diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index be1964b..85687fc 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -5,6 +5,9 @@ inputs.isd.packages.x86_64-linux.default + cmake + cmake-format + just readline rlwrap diff --git a/modules/home/swayidle.nix b/modules/home/swayidle.nix new file mode 100644 index 0000000..1f2a13f --- /dev/null +++ b/modules/home/swayidle.nix @@ -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"; + } + ]; + + }; + +} diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index dc50545..0ee9300 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -40,7 +40,7 @@ ''; }; razer = { - devices = []; + devices = [ "/dev/input/by-id/usb-Razer_Razer_Blade-event-kbd" ]; config = '' (defsrc grv 1 2 3 4 5 6 7 8 9 0 - = bspc