From cb7da26656bec1e5090c370c5e31069b90a0d93d Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Wed, 4 Dec 2024 10:06:30 +0100 Subject: [PATCH] Update & some packages --- flake.lock | 134 +++++++++++++++++++++++++++++++---- flake.nix | 1 + modules/desktop/packages.nix | 13 ++-- modules/nvidia/default.nix | 1 + 4 files changed, 131 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 81c3c2b..43b1795 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,57 @@ { "nodes": { + "crane": { + "locked": { + "lastModified": 1727060013, + "narHash": "sha256-/fC5YlJy4IoAW9GhkJiwyzk0K/gQd9Qi4rRcoweyG9E=", + "owner": "ipetkov", + "repo": "crane", + "rev": "6b40cc876c929bfe1e3a24bf538ce3b5622646ba", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "zed", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1727073227, + "narHash": "sha256-1kmkEQmFfGVuPBasqSZrNThqyMDV1SzTalQdRZxtDRs=", + "owner": "nix-community", + "repo": "fenix", + "rev": "88cc292eb3c689073c784d6aecc0edbd47e12881", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,11 +59,11 @@ ] }, "locked": { - "lastModified": 1731880681, - "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { @@ -39,11 +91,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -55,11 +107,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", "type": "github" }, "original": { @@ -71,11 +123,27 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -91,7 +159,47 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "zed": "zed" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1726443025, + "narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "zed": { + "inputs": { + "crane": "crane", + "fenix": "fenix", + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1732278385, + "narHash": "sha256-1y83fBJJyYZvQl5IjNKgVmJWIOrX3hIGFBdBkt6FlP0=", + "owner": "wmstack", + "repo": "zed", + "rev": "485a17627e1c85dd3136ffc23c28ddd0ef819d6d", + "type": "github" + }, + "original": { + "owner": "wmstack", + "ref": "helix-support", + "repo": "zed", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 2c0b00e..afa09ba 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.5.0"; + zed.url = "github:wmstack/zed/helix-support"; }; outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nix-flatpak, ... }@attrs: { diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix index 07eb978..6a082f8 100644 --- a/modules/desktop/packages.nix +++ b/modules/desktop/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, lib, config, zed, ... }: let tex = (pkgs.texlive.combine { inherit (pkgs.texlive) @@ -60,6 +60,7 @@ in { gnome-podcasts helvum local.quadcastrgb + gnome-sound-recorder # Games heroic @@ -92,12 +93,12 @@ in { typst tinymist zotero - + # Programming git git-lfs vscode - unstable.zed-editor + zed.packages.x86_64-linux.zed-editor gcc rustup python3 @@ -108,6 +109,8 @@ in { ledit nodejs nil + nixd + nixfmt-rfc-style protege # LogIA Course # Containers & VMs @@ -132,7 +135,7 @@ in { protonmail-bridge-gui protonmail-desktop protonvpn-gui - unstable.proton-pass + proton-pass # Customization gnome-tweaks @@ -163,7 +166,7 @@ in { # Reading "com.github.johnfactotum.Foliate" - + # Science "com.github.alexhuntley.Plots" diff --git a/modules/nvidia/default.nix b/modules/nvidia/default.nix index 3529c1d..0cde0e4 100644 --- a/modules/nvidia/default.nix +++ b/modules/nvidia/default.nix @@ -18,6 +18,7 @@ # Use the open source version of the kernel module # Only available on driver 515.43.04+ open = true; + # open = false; # Enable the nvidia settings menu nvidiaSettings = true;