From 653eec66d971406f95f029431eb6da758c8ce97e Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Wed, 23 Apr 2025 10:49:55 +0200 Subject: [PATCH] Updates, Regression on Proton & Addition of pass --- flake.lock | 55 +++++++++++++++++++++------------ flake.nix | 2 ++ modules/common/default.nix | 9 +++++- users/lyes/common/default.nix | 4 +++ users/lyes/common/packages.nix | 2 ++ users/lyes/desktop/packages.nix | 39 ++++++++++++----------- 6 files changed, 73 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index aef0494..f4eaeab 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1743598667, - "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", + "lastModified": 1745369821, + "narHash": "sha256-mi6cAjuBztm9gFfpiVo6mAn81cCID6nmDXh5Kmyjwyc=", "owner": "nix-community", "repo": "disko", - "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", + "rev": "c5140c6079ff690e85eac0b86e254de16a79a4b7", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1743717835, - "narHash": "sha256-LJm6FoIcUoBw3w25ty12/sBfut4zZuNGdN0phYj/ekU=", + "lastModified": 1745380081, + "narHash": "sha256-bUy25YkdRfdWPxSyx22igWi6g3rd3HXKFg+yL4dfBPY=", "owner": "nix-community", "repo": "home-manager", - "rev": "66a6ec65f84255b3defb67ff45af86c844dd451b", + "rev": "1d0e13904bd8c444ab1595f686ede5eff377e881", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1745392233, + "narHash": "sha256-xmqG4MZArM1JNxPJ33s0MtuBzgnaCO9laARoU3AfP8E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "8bf8a2a0822365bd8f44fd1a19d7ed0a1d629d64", "type": "github" }, "original": { @@ -174,13 +174,29 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-stable": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1745279238, + "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { @@ -192,11 +208,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { @@ -230,6 +246,7 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "zen-browser": "zen-browser" } @@ -255,11 +272,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1743722669, - "narHash": "sha256-XNw/PBxt8HLFkUUXQbdt8YMP7AHRzVbGAbOi1BUFIsA=", + "lastModified": 1745382202, + "narHash": "sha256-idR8y6WmZ9eLpxUJqSXtZznAkVlan4luRSvzEIc/6LQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "05274a63b9dd6c951d66cf80db202741a5b5cbdb", + "rev": "6b11cfc1cae680049a6d5108fb90a72e2786f24f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b12abd7..876f796 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ # nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; # home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -20,6 +21,7 @@ self, nixpkgs, nixpkgs-unstable, + nixpkgs-stable, nixos-hardware, nix-flatpak, disko, diff --git a/modules/common/default.nix b/modules/common/default.nix index c6bbe55..f35cd1d 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -1,4 +1,4 @@ -{ nixpkgs-unstable, ... }: +{ nixpkgs-unstable, nixpkgs-stable, ... }: { imports = @@ -26,6 +26,13 @@ system = prev.system; }; }) + + # Stable + (final: prev: { + stable = import nixpkgs-stable { + system = prev.system; + }; + }) ]; nixpkgs.config = { diff --git a/users/lyes/common/default.nix b/users/lyes/common/default.nix index 77477d3..8aaccca 100644 --- a/users/lyes/common/default.nix +++ b/users/lyes/common/default.nix @@ -14,4 +14,8 @@ extraGroups = [ "wheel" "networkmanager" ]; shell = pkgs.fish; }; + + environment.sessionVariables = { + PASSWORD_STORE_ENABLE_EXTENSIONS = "true"; + }; } diff --git a/users/lyes/common/packages.nix b/users/lyes/common/packages.nix index dc46daf..e054dc1 100644 --- a/users/lyes/common/packages.nix +++ b/users/lyes/common/packages.nix @@ -7,5 +7,7 @@ starship wl-clipboard sl + jq + pass ]; } diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index 4643c98..ad552ce 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -1,23 +1,25 @@ { pkgs, zen-browser, lib, config, ... }: let - tex = (pkgs.texlive.combine { inherit (pkgs.texlive) - scheme-medium - lettre - wallpaper - lastpage - hyphenat - moresize - fontawesome5 - montserrat - titlesec - ly1 - footmisc - titling - frpseudocode - ebproof - comment; - }); + # tex = (pkgs.texlive.combine { inherit (pkgs.texlive) + # scheme-medium + # lettre + # wallpaper + # lastpage + # hyphenat + # moresize + # fontawesome5 + # montserrat + # titlesec + # ly1 + # footmisc + # titling + # frpseudocode + # ebproof + # comment + # ucs; + # }); + tex = pkgs.texliveFull; in { users.users.lyes.packages = with pkgs; [ # Web @@ -79,6 +81,7 @@ in { # typst tinymist zotero + folio # Programming git @@ -117,7 +120,7 @@ in { # Proton protonmail-bridge-gui protonmail-desktop - protonvpn-gui + stable.protonvpn-gui proton-pass # Multimedia