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

Going back to 24.05

Browse source
This commit is contained in:
Lyes Saadi 2024-10-29 15:32:06 +01:00
parent 7d06c6ce45
commit 6db56b42fb
No known key found for this signature in database
GPG key ID: 17418538BAA17767
7 changed files with 80 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

38
flake.lock generated
View file

@ -7,15 +7,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728903686, "lastModified": 1726989464,
"narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -38,11 +39,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1728729581, "lastModified": 1730161780,
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +55,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728888510, "lastModified": 1729973466,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "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" "type": "github"
}, },
"original": { "original": {
@ -73,7 +90,8 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

10
flake.nix
View file

@ -2,17 +2,15 @@
description = "NixOS Configuration"; description = "NixOS Configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
# nixpkgs.url = "github:NixOS/nixpkgs/?ref=e7f16004a749b67628898c1eda4beee6ef84f4c0"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:NixOS/nixpkgs/gnome"; home-manager.url = "github:nix-community/home-manager/release-24.05";
# nixpkgs.url = "github:LyesSaadi/nixpkgs/unstablegnome47";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; 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 = { nixosConfigurations = {
lyes-pc = nixpkgs.lib.nixosSystem { lyes-pc = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";

2
general/packages.nix
View file

@ -31,7 +31,7 @@
enableDefaultPackages = true; enableDefaultPackages = true;
packages = with pkgs; [ packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk-sans
noto-fonts-lgc-plus noto-fonts-lgc-plus
noto-fonts-emoji noto-fonts-emoji
cantarell-fonts cantarell-fonts

12
general/system.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
# OS Configuration # OS Configuration
@ -28,15 +28,15 @@
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth optional pam_permit.so auth optional pam_permit.so
auth required pam_env.so auth required pam_env.so
auth [success=ok default=1] ${pkgs.gdm}/lib/security/pam_gdm.so auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so
account include login account include login
password required pam_deny.so password required pam_deny.so
session include login 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 # Time
@ -124,8 +124,8 @@
# Virtualisation # Virtualisation
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
virtualisation.virtualbox.host.enable = true; # virtualisation.virtualbox.host.enable = true;
virtualisation.virtualbox.host.enableExtensionPack = true; # virtualisation.virtualbox.host.enableExtensionPack = true;
users.extraGroups.vboxusers.members = [ "lyes" ]; users.extraGroups.vboxusers.members = [ "lyes" ];
# Containers # Containers

67
general/user/packages.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { pkgs, nixpkgs-unstable, lib, config, ... }:
let let
tex = (pkgs.texlive.combine { inherit (pkgs.texlive) tex = (pkgs.texlive.combine { inherit (pkgs.texlive)
@ -63,20 +63,20 @@ in {
local.quadcastrgb local.quadcastrgb
# Reading # Reading
calibre # calibre
papers papers
# Utilities # Utilities
impression impression
resources resources
file-roller gnome.file-roller
baobab baobab
# Proton # Proton
protonmail-bridge-gui protonmail-bridge-gui
protonmail-desktop protonmail-desktop
protonvpn-gui protonvpn-gui
proton-pass unstable.proton-pass
# Games # Games
heroic heroic
@ -84,7 +84,7 @@ in {
prismlauncher prismlauncher
vvvvvv vvvvvv
ryujinx ryujinx
dolphin-emu # dolphin-emu
parsec-bin parsec-bin
# Nix # Nix
@ -95,12 +95,13 @@ in {
# Commandline # Commandline
starship starship
wl-clipboard wl-clipboard
sl
# System # System
gnome-firmware gnome-firmware
# Customization # Customization
gnome-tweaks gnome.gnome-tweaks
gnome-extension-manager gnome-extension-manager
adw-gtk3 adw-gtk3
paper-icon-theme paper-icon-theme
@ -110,7 +111,7 @@ in {
git git
git-lfs git-lfs
vscode vscode
zed-editor unstable.zed-editor
gcc gcc
rustup rustup
python3 python3
@ -125,7 +126,7 @@ in {
# Containers & VMs # Containers & VMs
toolbox toolbox
distrobox distrobox
gnome-boxes gnome.gnome-boxes
# Office # Office
libreoffice libreoffice
@ -143,7 +144,6 @@ in {
tex tex
pandoc pandoc
typst typst
typst-live
tinymist tinymist
zotero zotero
@ -205,26 +205,35 @@ in {
update.auto.enable = true; update.auto.enable = true;
}; };
# Version pins nixpkgs.overlays = [
nixpkgs.overlays = [ (final: prev: { # Version pins
dolphin-emu = prev.dolphin-emu.overrideAttrs (super: { (final: prev: {
version = "2407"; dolphin-emu = prev.dolphin-emu.overrideAttrs (super: {
commit = "b92e354389bb7c0bd114a8631b8af110d3cb3a14"; version = "2407";
commit = "b92e354389bb7c0bd114a8631b8af110d3cb3a14";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "dolphin-emu"; owner = "dolphin-emu";
repo = "dolphin"; repo = "dolphin";
rev = "heads/refs/tags/${final.dolphin-emu.version}"; rev = "heads/refs/tags/${final.dolphin-emu.version}";
hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c="; hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c=";
fetchSubmodules = true; 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}"
];
});
}) ];
} }

4
pkgs/quadcastrgb/default.nix
View file

@ -1,7 +1,7 @@
{ {
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
libusb libusb1
}: }:
stdenv.mkDerivation (final: { stdenv.mkDerivation (final: {
@ -29,5 +29,5 @@ stdenv.mkDerivation (final: {
make install BINDIR_INS=$out/bin MANDIR_INS=$out/man make install BINDIR_INS=$out/bin MANDIR_INS=$out/man
''; '';
buildInputs = [ libusb ]; buildInputs = [ libusb1 ];
}) })

2
specific/lyes-pc/configuration.nix
View file

@ -5,7 +5,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest; # boot.kernelPackages = pkgs.linuxPackages_latest;
# Boot # Boot
boot.loader.systemd-boot.extraEntries = { boot.loader.systemd-boot.extraEntries = {