From 02c1ed3ea7f93b4da313cf3b5b98dcd534de2e07 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Fri, 4 Apr 2025 18:31:09 +0200 Subject: [PATCH] Updates --- flake.lock | 64 +++++++++++++++++++++---------- hosts/lyes-pc/default.nix | 2 +- modules/desktop/packages.nix | 11 ------ users/lyes/desktop/packages.nix | 30 ++++++++++++++- users/lyes/home/editors/emacs.nix | 1 + 5 files changed, 74 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index fa3fb90..aef0494 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1743598667, + "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1743136572, - "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", + "lastModified": 1743717835, + "narHash": "sha256-LJm6FoIcUoBw3w25ty12/sBfut4zZuNGdN0phYj/ekU=", "owner": "nix-community", "repo": "home-manager", - "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", + "rev": "66a6ec65f84255b3defb67ff45af86c844dd451b", "type": "github" }, "original": { @@ -105,6 +105,27 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1739444422, @@ -123,11 +144,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743167577, - "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", + "lastModified": 1743420942, + "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", + "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "type": "github" }, "original": { @@ -155,11 +176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -171,11 +192,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -187,11 +208,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -230,14 +251,15 @@ }, "zen-browser": { "inputs": { + "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1743216975, - "narHash": "sha256-29xgm8F3DCcTNrQZ9V3Pwj6BkjalkKvGyjd+sF9/+3k=", + "lastModified": 1743722669, + "narHash": "sha256-XNw/PBxt8HLFkUUXQbdt8YMP7AHRzVbGAbOi1BUFIsA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3", + "rev": "05274a63b9dd6c951d66cf80db202741a5b5cbdb", "type": "github" }, "original": { diff --git a/hosts/lyes-pc/default.nix b/hosts/lyes-pc/default.nix index 90f6799..a68a108 100644 --- a/hosts/lyes-pc/default.nix +++ b/hosts/lyes-pc/default.nix @@ -12,7 +12,7 @@ }; # Kernel - # boot.kernelPackages = pkgs.linuxPackages_6_13; + boot.kernelPackages = pkgs.linuxPackages_6_13; # Boot boot.loader.systemd-boot.enable = true; diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix index c4a4a5a..39878ef 100644 --- a/modules/desktop/packages.nix +++ b/modules/desktop/packages.nix @@ -28,17 +28,6 @@ # Flatpaks services.flatpak = lib.mkIf (config?services.flatpak.packages) { - packages = [ - # Utilities - "org.gnome.World.PikaBackup" - - # Customization - "com.github.tchx84.Flatseal" - - # Games - "com.usebottles.bottles" - ]; - uninstallUnmanaged = true; update.onActivation = true; update.auto.enable = true; diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index ed11f4a..4643c98 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, zen-browser, ... }: +{ pkgs, zen-browser, lib, config, ... }: let tex = (pkgs.texlive.combine { inherit (pkgs.texlive) @@ -30,9 +30,11 @@ in { discord vesktop whatsapp-for-linux + # signal-desktop # element-desktop fractal zoom-us + cinny-desktop # Image gimp @@ -49,6 +51,7 @@ in { sponsorblock pvr-iptvsimple ])) + stremio # Audio helvum @@ -127,6 +130,31 @@ in { factorio.src ]; + # Flatpaks + services.flatpak = lib.mkIf (config?services.flatpak.packages) { + packages = [ + # Messaging + "org.signal.Signal" + + # Utilities + "org.gnome.World.PikaBackup" + + # Customization + "com.github.tchx84.Flatseal" + + # Games + "com.usebottles.bottles" + ]; + + overrides = { + "org.signal.Signal".Context = { + "env" = [ + "SIGNAL_PASSWORD_STORE=gnome-libsecret" + ]; + }; + }; + }; + nixpkgs.overlays = [ # Version pins (final: prev: { diff --git a/users/lyes/home/editors/emacs.nix b/users/lyes/home/editors/emacs.nix index fa73fd5..b94d150 100644 --- a/users/lyes/home/editors/emacs.nix +++ b/users/lyes/home/editors/emacs.nix @@ -10,6 +10,7 @@ ]; extraConfig = '' (load-theme 'gruvbox-dark-hard) + (cua-mode) ''; }; }