diff --git a/common.nix b/common.nix index 266ede4..ed74697 100644 --- a/common.nix +++ b/common.nix @@ -44,6 +44,7 @@ with builtins; cool-retro-term jdk + jdk24 libsecret fzf diff --git a/flake.lock b/flake.lock index 1e79c88..e6cf851 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,16 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -70,11 +69,11 @@ }, "crane": { "locked": { - "lastModified": 1762538466, - "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", + "lastModified": 1759893430, + "narHash": "sha256-yAy4otLYm9iZ+NtQwTMEbqHwswSFUbhn7x826RR6djw=", "owner": "ipetkov", "repo": "crane", - "rev": "0cea393fffb39575c46b7a0318386467272182fe", + "rev": "1979a2524cb8c801520bd94c38bb3d5692419d93", "type": "github" }, "original": { @@ -106,11 +105,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1763361733, - "narHash": "sha256-ka7dpwH3HIXCyD2wl5F7cPLeRbqZoY2ullALsvxdPt8=", + "lastModified": 1760250892, + "narHash": "sha256-4dCaizaWtGsxA3w7oHKDKkALSoXmEkXEFjA6obKIMh0=", "owner": "nix-community", "repo": "fenix", - "rev": "6c8d48e3b0ae371b19ac1485744687b788e80193", + "rev": "b0b86e20829d1766bffb9f654d9fad47e099dc1b", "type": "github" }, "original": { @@ -280,20 +279,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", - "type": "gitlab" + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", + "ref": "48.2", "repo": "gnome-shell", - "type": "gitlab" + "type": "github" } }, "home-manager": { @@ -303,11 +300,11 @@ ] }, "locked": { - "lastModified": 1763389499, - "narHash": "sha256-GuG3PW8U41f8XqROreZQaUvrcjQt+Gh92g16X7zBUck=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "7538d965352d3bfd4c380f5b3aa618bc839a84b4", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -319,11 +316,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1763408228, - "narHash": "sha256-5zdqDsaVKHheZQyLEUgmH3J6YO7V53HAEj+BkzO0Cd4=", - "rev": "7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d", + "lastModified": 1760292753, + "narHash": "sha256-UDXkh/LOK4Qs+HUgSLOz2+JZ+YCSmtbEIqSSIKigm1I=", + "rev": "e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d.tar.gz?rev=7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb.tar.gz?rev=e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb" }, "original": { "type": "tarball", @@ -342,11 +339,11 @@ ] }, "locked": { - "lastModified": 1761960361, - "narHash": "sha256-FvuAw56NIVJpS3Kr8Wv9PpU4eehZMcdIVkxjStuYmqc=", - "rev": "c47f62187601ea2991b79a9bacdbfdf76cd29fbe", + "lastModified": 1756511062, + "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", + "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c47f62187601ea2991b79a9bacdbfdf76cd29fbe.tar.gz?rev=c47f62187601ea2991b79a9bacdbfdf76cd29fbe" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz?rev=3f09a5eb772e02d98bb8878ab687d5b721f00d16" }, "original": { "type": "tarball", @@ -363,11 +360,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763376268, - "narHash": "sha256-B1IJKNni8sIjMSdtnvgWsDvhb+FpUBIitq8cidysZGo=", + "lastModified": 1760328462, + "narHash": "sha256-LAmGgkv25DFSmYyIbcAMGGqKb8ZpFIpsoD5HqtpFPFo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9b0c42a79bd092971e183d102365e549e4280002", + "rev": "d8ed6b75d4ff881bf04c805964fd6362c2282ecb", "type": "github" }, "original": { @@ -396,11 +393,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763370666, - "narHash": "sha256-Y4IYBfaTxffpm6UIbhY1Xfpij+aVh/C+tF9Tdg6nYig=", + "lastModified": 1759395653, + "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "7f19d268b3563e3683eaca02d9665fed66ce862e", + "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", "type": "github" }, "original": { @@ -416,11 +413,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763223362, - "narHash": "sha256-iH+tM4MmtYMfWuWoo6KIc7Al+zQL13f3ScJloqSKyAs=", + "lastModified": 1760319606, + "narHash": "sha256-1OYV+2e3i8ZN65M4OZpiiXbol2B/gIHcss67+Myy670=", "owner": "kaylorben", "repo": "nixcord", - "rev": "35c173408a25cae1c5af23b9d4fd80a181a395d4", + "rev": "e3b0094a4486b1c983d46aa79328efa23f1329b4", "type": "github" }, "original": { @@ -431,11 +428,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -445,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -488,11 +485,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { @@ -519,11 +516,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1763377333, - "narHash": "sha256-GtikA/H/igDjeLBq1J34N0ZtmsEO4g67B7UbBhLHXKo=", + "lastModified": 1760205645, + "narHash": "sha256-y85FWbpmo6JCAPcqfdxdCUkchUjBo5bdS8rb5pCM/7A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0fad0156f3ee09c49be8afcf66d4ef61c46f9c6", + "rev": "66e5020bfe0af40ffa127426f8405edbdadbb40b", "type": "github" }, "original": { @@ -550,11 +547,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -565,11 +562,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -640,11 +637,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1762860488, - "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=", + "lastModified": 1760201021, + "narHash": "sha256-+Q7q1EEPVpx96qysrSE7drXcXMFt0xY3HYdO1qU9Csg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2efc80078029894eec0699f62ec8d5c1a56af763", + "rev": "6fcd20b1acd355d2d253bd6747386ed8f629b4d0", "type": "github" }, "original": { @@ -702,11 +699,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763314990, - "narHash": "sha256-gs98KFE3X2HQ64gsIpQNsj1lKFTdkNdX+1KMQTDXEus=", + "lastModified": 1760261849, + "narHash": "sha256-P0u31LhxDfzVmP/rpfPCHbUj92r4pyAEd9FW8/GdZHU=", "owner": "danth", "repo": "stylix", - "rev": "b68e8220689a6f0393204b07be1bc14bb973a0ed", + "rev": "83e0cbfa4a93b1dda28518df0e5df6dbc957c2c8", "type": "github" }, "original": { @@ -884,11 +881,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1759707084, + "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", "type": "github" }, "original": { diff --git a/modules/desktop-legacy/social.nix b/modules/desktop-legacy/social.nix index 5d40cef..117efdd 100644 --- a/modules/desktop-legacy/social.nix +++ b/modules/desktop-legacy/social.nix @@ -45,6 +45,7 @@ with lib; petpet.enable = true; pictureInPicture.enable = true; previewMessage.enable = true; + pronounDB.enable = true; relationshipNotifier.enable = true; serverInfo.enable = true; showMeYourName.enable = true; @@ -60,7 +61,6 @@ with lib; element-desktop pkgs.evolution-data-server-gtk4 iamb - deltachat-desktop ]; }; programs.evolution = { diff --git a/modules/desktop/home/niri/input.nix b/modules/desktop/home/niri/input.nix index e93fd3e..22a9eb2 100644 --- a/modules/desktop/home/niri/input.nix +++ b/modules/desktop/home/niri/input.nix @@ -7,9 +7,6 @@ variant = "altgr-intl"; }; }; - mouse = { - accel-profile = "flat"; - }; touchpad = { tap = false; natural-scroll = true; diff --git a/modules/desktop/themeing.nix b/modules/desktop/themeing.nix index 6264aa4..837e117 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -21,7 +21,7 @@ }; emoji = { - package = pkgs.noto-fonts-color-emoji; + package = pkgs.noto-fonts-emoji; name = "Noto Color Emoji"; }; }; diff --git a/modules/editors/helix/default.nix b/modules/editors/helix/default.nix index e75c477..71ade3e 100644 --- a/modules/editors/helix/default.nix +++ b/modules/editors/helix/default.nix @@ -39,8 +39,14 @@ small_image = "logo"; small_text = "Helix"; idle = { - timeout = 3600; - # action = "change_activity"; state = "Idling"; details = "In Helix"; large_image = "logo"; large_text = "Helix"; small_image = "idle"; small_text = "Idle"; + timeout = 30; + action = "change_activity"; + state = "Idling"; + details = "In Helix"; + large_image = "logo"; + large_text = "Helix"; + small_image = "idle"; + small_text = "Idle"; }; rules = { mode = "blacklist";