jsutter/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

converting to pure

Browse source
This commit is contained in:
Julian Sutter 2024-12-22 11:08:09 -08:00
parent 792c318df4
commit 34444081d4
3 changed files with 65 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

120
flake.lock generated
View file

@ -1,23 +1,38 @@
{
"nodes": {
"flake-parts": {
"firefox-addons": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"dir": "pkgs/firefox-addons",
"lastModified": 1734863027,
"narHash": "sha256-L2Yqu7PVbzlxp37kmTGTA3gOceu7VLRuebm1DHiKPg4=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "5a5aea6627a4c360ba030ddadeda63d1ad294125",
"type": "gitlab"
},
"original": {
"dir": "pkgs/firefox-addons",
"owner": "rycee",
"repo": "nur-expressions",
"type": "gitlab"
}
},
"flake-utils": {
"locked": {
"lastModified": 1629284811,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
@ -28,11 +43,11 @@
]
},
"locked": {
"lastModified": 1734808199,
"narHash": "sha256-MxlUcLjE8xLbrI1SJ2B2jftlg4wdutEILa3fgqwA98I=",
"lastModified": 1734893333,
"narHash": "sha256-0Ft7iTkl3UWAix72teY5nflYQD7GE0KvIiT+ox4wkB8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f342df3ad938f205a913973b832f52c12546aac6",
"rev": "1f74238a4c8e534a1b6be72cb5153043071ffd17",
"type": "github"
},
"original": {
@ -43,11 +58,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1734352517,
"narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
"lastModified": 1734862644,
"narHash": "sha256-04xesW7HITdF5WUmNM39WD4tkEERk3Ez2W1nNvdIvIw=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
"rev": "e8516a23524cc9083f5a02a8d64d14770e4c7c09",
"type": "github"
},
"original": {
@ -59,11 +74,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1734424634,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"lastModified": 1627814220,
"narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ab5b6828af26215bf2646c31961da5d3749591ef",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1734649271,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github"
},
"original": {
@ -72,28 +103,6 @@
"type": "indirect"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1734886106,
"narHash": "sha256-VZ9+3lmSGEmW8jQ9KrE+Ah+BHt0FyAIk/PVjtGWnkws=",
"owner": "nix-community",
"repo": "NUR",
"rev": "2e1c9f679ee2a3db7905afe2a6a748a356ea5497",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"plasma-manager": {
"inputs": {
"home-manager": [
@ -119,33 +128,12 @@
},
"root": {
"inputs": {
"firefox-addons": "firefox-addons",
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nur": "nur",
"nixpkgs": "nixpkgs_2",
"plasma-manager": "plasma-manager"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
}
},
"root": "root",

13
flake.nix
View file

@ -8,19 +8,17 @@
url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs";
};
nur = {
url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs";
};
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
};
};
outputs = { self, nixpkgs, nixos-hardware, home-manager, nur, plasma-manager }: {
overlay = final: prev: { nur = import nur { inherit nixpkgs; }; };
outputs = { self, nixpkgs, nixos-hardware, home-manager, plasma-manager, firefox-addons }: {
nixosConfigurations = {
framework = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -36,6 +34,9 @@
./desktop/gaming.nix
./desktop/virtualization.nix
];
specialArgs = {
firefoxAddons = firefox-addons.packages.${nixpkgs.system};
};
};
aurora = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";

4
users/jsutter.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, home-manager, nur, ... }:
{ config, pkgs, home-manager, ... }:
{
@ -166,7 +166,7 @@
user_pref("media.ffmpeg.vaapi.enabled", true);
user_pref("media.rdd-vpx.enabled", true);
'';
extensions = with nur.repos.rycee.firefox-addons; [
extensions = with firefoxAddons; [
ublock-origin
privacy-badger
bitwarden