From 5f4546c508b72f8bd03f1f0c04bc9ba419ce88ad Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Thu, 24 Apr 2025 12:36:39 -0400 Subject: [PATCH] misc cleanup and chat apps --- flake.lock | 78 ++++++++++++++-------------- homes/emenel/dotfiles/dot_ssh/config | 2 +- hosts/eddie/configuration.nix | 22 ++++---- modules/home/desktop.nix | 16 ++++-- modules/home/mpd.nix | 6 +-- modules/home/niri.nix | 10 ++-- modules/system/forgejo.nix | 4 +- 7 files changed, 74 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index e1dbc79..a583e09 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1745224732, - "narHash": "sha256-0OWgbEKhpMLpk3WQi3ugOwxWW4Y6JVpKiQ+o0nuNzus=", + "lastModified": 1745502102, + "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", "owner": "nix-community", "repo": "disko", - "rev": "1770bf1ae5da05564f86b969ef21c7228cc1a70b", + "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1745342319, - "narHash": "sha256-Tl4ZEeGxlGqBdkKyWGadx4jC66eIVjjKSEqy5PZWW1E=", + "lastModified": 1745483009, + "narHash": "sha256-nMSo37sprHHbK7uYAw5IwVbQ/qqB9piMh8IGH77EqSk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "029d994c584161072f221206b52411dd6c3df227", + "rev": "acf94b5dd33ce8e3fb995421cd1a719bb0d9c804", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1745350245, - "narHash": "sha256-KK0LZX8O73DVIcI5qnxuDeSh3b4RrkDfC6lvIjzEyzc=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "6899001a762b0e089ad7b8ec7637d0a678640b8e", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -416,11 +416,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1743294595, - "narHash": "sha256-kEr12UVk8Bul09wi9g8UwXADpTdDxinfAO2V5/1RhJA=", + "lastModified": 1745357037, + "narHash": "sha256-eakUr+0ON1muX3nusJy3eC66unUQtjgnUUzQ5XMIB+k=", "owner": "hyprwm", "repo": "hypridle", - "rev": "66d1815b5ef5f7de083ec285aaab68064924b897", + "rev": "b18d83027676d0efbc6d56ed4a6935ac65d75067", "type": "github" }, "original": { @@ -724,11 +724,11 @@ ] }, "locked": { - "lastModified": 1745350616, - "narHash": "sha256-pph3fWc7ikLiB6LoYnoEGxwd37v93/0AW3ee+ZA/HwM=", + "lastModified": 1745477852, + "narHash": "sha256-QvJJ3BHhPOhotJuuIYEzZwwtXUBwXBl2aVJy7FBe29k=", "owner": "viperML", "repo": "nh", - "rev": "3262f3ccc8ea26bc04b13ebc3b13409224d436dc", + "rev": "418c6620f80f064b38011d0f44c1240c67169cc5", "type": "github" }, "original": { @@ -749,11 +749,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745355323, - "narHash": "sha256-cgUL9JndEImhR5Oj/dzKI4/CrvpTH4i8IzzMJZWKAYo=", + "lastModified": 1745483403, + "narHash": "sha256-fNemxNtPugDzCK7ofPApufFhD4EW5PiA0v3+aS1O6rY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "706ab2a083c38902ff31680d96a82486ee8e2a78", + "rev": "17ebd40a372527ad20cc799b1835beaf7abf7200", "type": "github" }, "original": { @@ -894,11 +894,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -952,11 +952,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745279238, + "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", "type": "github" }, "original": { @@ -968,11 +968,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745279238, + "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745279238, + "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", "type": "github" }, "original": { @@ -1048,11 +1048,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -1479,11 +1479,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1744860839, - "narHash": "sha256-m/p0wFYey7zqlf5yEJ3g/h+4ZNPkjPsGiMZVJ09aWWw=", + "lastModified": 1745372360, + "narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2b5288b4b9ad2481a033e9c3cc1205108323e7d9", + "rev": "c31679aa41966ee9272bb240703755cb1e7c72e3", "type": "github" }, "original": { @@ -1512,11 +1512,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1744860839, - "narHash": "sha256-m/p0wFYey7zqlf5yEJ3g/h+4ZNPkjPsGiMZVJ09aWWw=", + "lastModified": 1745372360, + "narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2b5288b4b9ad2481a033e9c3cc1205108323e7d9", + "rev": "c31679aa41966ee9272bb240703755cb1e7c72e3", "type": "github" }, "original": { diff --git a/homes/emenel/dotfiles/dot_ssh/config b/homes/emenel/dotfiles/dot_ssh/config index 2b5784e..bd05e3a 100644 --- a/homes/emenel/dotfiles/dot_ssh/config +++ b/homes/emenel/dotfiles/dot_ssh/config @@ -12,4 +12,4 @@ Host ford Host services User emenel - Hostname 157.180.47.84 + Hostname gt.emenel.ca diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index c4b0842..5651ace 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -210,15 +210,15 @@ }; hardware = { - # sane = { - # enable = true; - # extraBackends = [ - # pkgs.hplipWithPlugin - # pkgs.sane-airscan - # pkgs.epkowa - # pkgs.utsushi - # ]; - # }; + sane = { + enable = true; + extraBackends = [ + pkgs.hplipWithPlugin + pkgs.sane-airscan + pkgs.epkowa + pkgs.utsushi + ]; + }; i2c.enable = true; uinput.enable = true; openrazer = { @@ -308,8 +308,8 @@ pkgs.vial pkgs.ddcutil pkgs.game-devices-udev-rules - # pkgs.sane-airscan - # pkgs.utsushi + pkgs.sane-airscan + pkgs.utsushi (pkgs.writeTextFile { name = "on-battery"; diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 951c8a0..dfae141 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -48,9 +48,9 @@ # godot_4 # gdtoolkit_4 - # epsonscan2 - # sane-airscan - # xsane + epsonscan2 + sane-airscan + xsane bitwarden-cli bitwarden-desktop @@ -97,10 +97,15 @@ krita-plugin-gmic rawtherapee inkscape - # kicad + + # (kicad.override { + # addons = with pkgs.kicadAddons; [ kikit kikit-library ]; + # }) + turbocase openscad-unstable openscad-lsp + picard plugdata pavucontrol @@ -144,6 +149,9 @@ dualsensectl.out wpaperd + + zulip + revolt-desktop ]) ]; diff --git a/modules/home/mpd.nix b/modules/home/mpd.nix index db565bb..0dd9f73 100644 --- a/modules/home/mpd.nix +++ b/modules/home/mpd.nix @@ -2,13 +2,13 @@ { home.packages = with pkgs; [ - rmpc mpc - vimpc ncmpcpp - inori + # music-player ]; + programs.fish.shellAliases = { "ncm" = "ncmpcpp"; }; + services = { mpd = { enable = true; diff --git a/modules/home/niri.nix b/modules/home/niri.nix index 881fbad..f6c1320 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -250,10 +250,10 @@ in } ]; - switch-events = with config.lib.niri.actions; { - lid-close.action = spawn "niri msg output eDP-1 off"; - lid-open.action = spawn "niri msg output eDP-1 on"; - }; + # switch-events = with config.lib.niri.actions; { + # lid-close.action = spawn "niri msg output eDP-1 off"; + # lid-open.action = spawn "niri msg output eDP-1 on"; + # }; binds = with config.lib.niri.actions; @@ -497,7 +497,7 @@ in "Mod+Shift+P".action = power-off-monitors; "Mod+Shift+Alt+P" = { hotkey-overlay.title = "Turn Displays On"; - action = power-on-monitors; + action = spawn "niri" "msg" "output" "eDP-1" "on"; }; }; }; diff --git a/modules/system/forgejo.nix b/modules/system/forgejo.nix index 0c827e8..85a0a0b 100644 --- a/modules/system/forgejo.nix +++ b/modules/system/forgejo.nix @@ -36,7 +36,9 @@ in USER = "git@gt.emenel.ca"; }; }; - mailerPasswordFile = config.sops.secrets.forgejo-smtp.path; + secrets = { + mailer.PASSWD = config.sops.secrets.forgejo-smtp.path; + }; }; caddy.virtualHosts."gt.emenel.ca" = {