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

Update

Browse source
This commit is contained in:
Lyes Saadi 2024-12-24 14:53:35 +01:00
parent cb7da26656
commit 086fa74dcc
No known key found for this signature in database
GPG key ID: 17418538BAA17767
3 changed files with 38 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

142
flake.lock generated
View file

@ -1,57 +1,5 @@
{ {
"nodes": { "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -59,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733050161, "lastModified": 1734366194,
"narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,27 +23,27 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1732285094, "lastModified": 1734128415,
"narHash": "sha256-OD9tu/QN71OnEWtgvm9pXuQs+SGQtKnLHOGVRG5f9CU=", "narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "d3a763532be5d223bb3474642f089667a8091cdf", "rev": "8bdc2540da516006d07b04019eb57ae0781a04b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gmodena", "owner": "gmodena",
"ref": "v0.5.0", "ref": "latest",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1733217105, "lastModified": 1734954597,
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "rev": "def1d472c832d77885f174089b0d34854b007198",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,11 +55,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733120037, "lastModified": 1734875076,
"narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", "rev": "1807c2b91223227ad5599d7067a61665c52d1295",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -123,27 +71,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1733015953, "lastModified": 1734649271,
"narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"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" "type": "github"
}, },
"original": { "original": {
@ -159,47 +91,7 @@
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "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"
} }
} }
}, },

3
flake.nix
View file

@ -7,8 +7,7 @@
home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/release-24.11";
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.5.0"; nix-flatpak.url = "github:gmodena/nix-flatpak/latest";
zed.url = "github:wmstack/zed/helix-support";
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nix-flatpak, ... }@attrs: { outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nix-flatpak, ... }@attrs: {

40
modules/desktop/packages.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, zed, ... }: { pkgs, lib, config, ... }:
let let
tex = (pkgs.texlive.combine { inherit (pkgs.texlive) tex = (pkgs.texlive.combine { inherit (pkgs.texlive)
@ -68,7 +68,7 @@ in {
prismlauncher prismlauncher
vvvvvv vvvvvv
ryujinx ryujinx
# dolphin-emu dolphin-emu
parsec-bin parsec-bin
# Reading # Reading
@ -98,7 +98,7 @@ in {
git git
git-lfs git-lfs
vscode vscode
zed.packages.x86_64-linux.zed-editor unstable.zed-editor
gcc gcc
rustup rustup
python3 python3
@ -231,25 +231,25 @@ in {
nixpkgs.overlays = [ nixpkgs.overlays = [
# Version pins # Version pins
(final: prev: { (final: prev: {
dolphin-emu = prev.dolphin-emu.overrideAttrs (super: { # dolphin-emu = prev.dolphin-emu.overrideAttrs (super: {
version = "2407"; # version = "2407";
commit = "b92e354389bb7c0bd114a8631b8af110d3cb3a14"; # 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 = [ # cmakeFlags = [
"-DDISTRIBUTOR=NixOS" # "-DDISTRIBUTOR=NixOS"
"-DDOLPHIN_WC_BRANCH=${final.dolphin-emu.src.rev}" # "-DDOLPHIN_WC_BRANCH=${final.dolphin-emu.src.rev}"
"-DDOLPHIN_WC_DESCRIBE=${final.dolphin-emu.version}" # "-DDOLPHIN_WC_DESCRIBE=${final.dolphin-emu.version}"
"-DDOLPHIN_WC_REVISION=${final.dolphin-emu.commit}" # "-DDOLPHIN_WC_REVISION=${final.dolphin-emu.commit}"
]; # ];
}); # });
}) })
]; ];
} }