diff --git a/flake.lock b/flake.lock index da33b6d..3258eac 100644 --- a/flake.lock +++ b/flake.lock @@ -7,15 +7,16 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -38,11 +39,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "type": "github" }, "original": { @@ -54,11 +55,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -73,7 +90,8 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 44da8d4..0958cbd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,17 +2,15 @@ description = "NixOS Configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # nixpkgs.url = "github:NixOS/nixpkgs/?ref=e7f16004a749b67628898c1eda4beee6ef84f4c0"; - # nixpkgs.url = "github:NixOS/nixpkgs/gnome"; - # nixpkgs.url = "github:LyesSaadi/nixpkgs/unstablegnome47"; - home-manager.url = "github:nix-community/home-manager"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; }; - outputs = { self, nixpkgs, nixos-hardware, nix-flatpak, ... }@attrs: { + outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nix-flatpak, ... }@attrs: { nixosConfigurations = { lyes-pc = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/general/packages.nix b/general/packages.nix index 1ff6e62..5f9b1b1 100644 --- a/general/packages.nix +++ b/general/packages.nix @@ -31,7 +31,7 @@ enableDefaultPackages = true; packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-lgc-plus noto-fonts-emoji cantarell-fonts diff --git a/general/system.nix b/general/system.nix index 325236f..c2e7f19 100644 --- a/general/system.nix +++ b/general/system.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { # OS Configuration @@ -28,15 +28,15 @@ auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so auth optional pam_permit.so auth required pam_env.so - auth [success=ok default=1] ${pkgs.gdm}/lib/security/pam_gdm.so - auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so + auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so account include login password required pam_deny.so session include login - session optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start + session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start ''; # Time @@ -124,8 +124,8 @@ # Virtualisation virtualisation.libvirtd.enable = true; - virtualisation.virtualbox.host.enable = true; - virtualisation.virtualbox.host.enableExtensionPack = true; + # virtualisation.virtualbox.host.enable = true; + # virtualisation.virtualbox.host.enableExtensionPack = true; users.extraGroups.vboxusers.members = [ "lyes" ]; # Containers diff --git a/general/user/packages.nix b/general/user/packages.nix index 356024c..753aeca 100644 --- a/general/user/packages.nix +++ b/general/user/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, nixpkgs-unstable, lib, config, ... }: let tex = (pkgs.texlive.combine { inherit (pkgs.texlive) @@ -63,20 +63,20 @@ in { local.quadcastrgb # Reading - calibre + # calibre papers # Utilities impression resources - file-roller + gnome.file-roller baobab # Proton protonmail-bridge-gui protonmail-desktop protonvpn-gui - proton-pass + unstable.proton-pass # Games heroic @@ -84,7 +84,7 @@ in { prismlauncher vvvvvv ryujinx - dolphin-emu + # dolphin-emu parsec-bin # Nix @@ -95,12 +95,13 @@ in { # Commandline starship wl-clipboard + sl # System gnome-firmware # Customization - gnome-tweaks + gnome.gnome-tweaks gnome-extension-manager adw-gtk3 paper-icon-theme @@ -110,7 +111,7 @@ in { git git-lfs vscode - zed-editor + unstable.zed-editor gcc rustup python3 @@ -125,7 +126,7 @@ in { # Containers & VMs toolbox distrobox - gnome-boxes + gnome.gnome-boxes # Office libreoffice @@ -143,7 +144,6 @@ in { tex pandoc typst - typst-live tinymist zotero @@ -205,26 +205,35 @@ in { update.auto.enable = true; }; - # Version pins - nixpkgs.overlays = [ (final: prev: { - dolphin-emu = prev.dolphin-emu.overrideAttrs (super: { - version = "2407"; - commit = "b92e354389bb7c0bd114a8631b8af110d3cb3a14"; + nixpkgs.overlays = [ + # Version pins + (final: prev: { + dolphin-emu = prev.dolphin-emu.overrideAttrs (super: { + version = "2407"; + commit = "b92e354389bb7c0bd114a8631b8af110d3cb3a14"; - src = pkgs.fetchFromGitHub { - owner = "dolphin-emu"; - repo = "dolphin"; - rev = "heads/refs/tags/${final.dolphin-emu.version}"; - hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c="; - fetchSubmodules = true; + src = pkgs.fetchFromGitHub { + owner = "dolphin-emu"; + repo = "dolphin"; + rev = "heads/refs/tags/${final.dolphin-emu.version}"; + hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c="; + fetchSubmodules = true; + }; + + cmakeFlags = [ + "-DDISTRIBUTOR=NixOS" + "-DDOLPHIN_WC_BRANCH=${final.dolphin-emu.src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${final.dolphin-emu.version}" + "-DDOLPHIN_WC_REVISION=${final.dolphin-emu.commit}" + ]; + }); + }) + + # Unstable + (final: prev: { + unstable = import nixpkgs-unstable { + system = prev.system; }; - - cmakeFlags = [ - "-DDISTRIBUTOR=NixOS" - "-DDOLPHIN_WC_BRANCH=${final.dolphin-emu.src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${final.dolphin-emu.version}" - "-DDOLPHIN_WC_REVISION=${final.dolphin-emu.commit}" - ]; - }); - }) ]; + }) + ]; } diff --git a/pkgs/quadcastrgb/default.nix b/pkgs/quadcastrgb/default.nix index 7ded313..7b39925 100644 --- a/pkgs/quadcastrgb/default.nix +++ b/pkgs/quadcastrgb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, - libusb + libusb1 }: stdenv.mkDerivation (final: { @@ -29,5 +29,5 @@ stdenv.mkDerivation (final: { make install BINDIR_INS=$out/bin MANDIR_INS=$out/man ''; - buildInputs = [ libusb ]; + buildInputs = [ libusb1 ]; }) diff --git a/specific/lyes-pc/configuration.nix b/specific/lyes-pc/configuration.nix index b53d291..9291933 100644 --- a/specific/lyes-pc/configuration.nix +++ b/specific/lyes-pc/configuration.nix @@ -5,7 +5,7 @@ ./hardware-configuration.nix ]; - boot.kernelPackages = pkgs.linuxPackages_latest; + # boot.kernelPackages = pkgs.linuxPackages_latest; # Boot boot.loader.systemd-boot.extraEntries = {