lyes/nixfiles
1
0
Fork 0
Code Issues Pull requests Activity Actions

Updates, Regression on Proton & Addition of pass

Browse source
This commit is contained in:
Lyes Saadi 2025-04-23 10:49:55 +02:00
parent 02c1ed3ea7
commit 653eec66d9
Signed by: lyes
GPG key ID: 55A1D803917CF39A
6 changed files with 73 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

55
flake.lock generated
View file

@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743598667, "lastModified": 1745369821,
"narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "narHash": "sha256-mi6cAjuBztm9gFfpiVo6mAn81cCID6nmDXh5Kmyjwyc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "rev": "c5140c6079ff690e85eac0b86e254de16a79a4b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +91,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743717835, "lastModified": 1745380081,
"narHash": "sha256-LJm6FoIcUoBw3w25ty12/sBfut4zZuNGdN0phYj/ekU=", "narHash": "sha256-bUy25YkdRfdWPxSyx22igWi6g3rd3HXKFg+yL4dfBPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "66a6ec65f84255b3defb67ff45af86c844dd451b", "rev": "1d0e13904bd8c444ab1595f686ede5eff377e881",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +144,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1743420942, "lastModified": 1745392233,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "narHash": "sha256-xmqG4MZArM1JNxPJ33s0MtuBzgnaCO9laARoU3AfP8E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "rev": "8bf8a2a0822365bd8f44fd1a19d7ed0a1d629d64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,13 +174,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1743583204, "lastModified": 1745279238,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "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" "type": "github"
}, },
"original": { "original": {
@ -192,11 +208,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1743583204, "lastModified": 1745234285,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,6 +246,7 @@
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
@ -255,11 +272,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1743722669, "lastModified": 1745382202,
"narHash": "sha256-XNw/PBxt8HLFkUUXQbdt8YMP7AHRzVbGAbOi1BUFIsA=", "narHash": "sha256-idR8y6WmZ9eLpxUJqSXtZznAkVlan4luRSvzEIc/6LQ=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "05274a63b9dd6c951d66cf80db202741a5b5cbdb", "rev": "6b11cfc1cae680049a6d5108fb90a72e2786f24f",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -5,6 +5,7 @@
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unstable.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/release-24.11";
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -20,6 +21,7 @@
self, self,
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
nixpkgs-stable,
nixos-hardware, nixos-hardware,
nix-flatpak, nix-flatpak,
disko, disko,

9
modules/common/default.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs-unstable, ... }: { nixpkgs-unstable, nixpkgs-stable, ... }:
{ {
imports = imports =
@ -26,6 +26,13 @@
system = prev.system; system = prev.system;
}; };
}) })
# Stable
(final: prev: {
stable = import nixpkgs-stable {
system = prev.system;
};
})
]; ];
nixpkgs.config = { nixpkgs.config = {

4
users/lyes/common/default.nix
View file

@ -14,4 +14,8 @@
extraGroups = [ "wheel" "networkmanager" ]; extraGroups = [ "wheel" "networkmanager" ];
shell = pkgs.fish; shell = pkgs.fish;
}; };
environment.sessionVariables = {
PASSWORD_STORE_ENABLE_EXTENSIONS = "true";
};
} }

2
users/lyes/common/packages.nix
View file

@ -7,5 +7,7 @@
starship starship
wl-clipboard wl-clipboard
sl sl
jq
pass
]; ];
} }

39
users/lyes/desktop/packages.nix
View file

@ -1,23 +1,25 @@
{ pkgs, zen-browser, lib, config, ... }: { pkgs, zen-browser, lib, config, ... }:
let let
tex = (pkgs.texlive.combine { inherit (pkgs.texlive) # tex = (pkgs.texlive.combine { inherit (pkgs.texlive)
scheme-medium # scheme-medium
lettre # lettre
wallpaper # wallpaper
lastpage # lastpage
hyphenat # hyphenat
moresize # moresize
fontawesome5 # fontawesome5
montserrat # montserrat
titlesec # titlesec
ly1 # ly1
footmisc # footmisc
titling # titling
frpseudocode # frpseudocode
ebproof # ebproof
comment; # comment
}); # ucs;
# });
tex = pkgs.texliveFull;
in { in {
users.users.lyes.packages = with pkgs; [ users.users.lyes.packages = with pkgs; [
# Web # Web
@ -79,6 +81,7 @@ in {
# typst # typst
tinymist tinymist
zotero zotero
folio
# Programming # Programming
git git
@ -117,7 +120,7 @@ in {
# Proton # Proton
protonmail-bridge-gui protonmail-bridge-gui
protonmail-desktop protonmail-desktop
protonvpn-gui stable.protonvpn-gui
proton-pass proton-pass
# Multimedia # Multimedia