Personal-use NixOS configuration

Create flakeLib global

+44 -44
+2 -8
homes/encode42/desktop/jetbrains/intellij.nix
··· 1 1 { 2 - flakeRoot, 3 - nix-jetbrains-plugins, 2 + flakeLib, 4 3 pkgs, 5 4 ... 6 5 }: 7 6 8 - let 9 - customJetbrainsPackage = import (flakeRoot + /lib/customJetbrainsPackage.nix) { 10 - inherit nix-jetbrains-plugins pkgs; 11 - }; 12 - in 13 7 { 14 8 home.packages = [ 15 - (customJetbrainsPackage { 9 + (flakeLib.customJetbrainsPackage { 16 10 idePackage = pkgs.jetbrains.idea-ultimate; 17 11 18 12 pluginIds = [
+2 -8
homes/encode42/desktop/jetbrains/rustrover.nix
··· 1 1 { 2 - flakeRoot, 3 - nix-jetbrains-plugins, 2 + flakeLib, 4 3 pkgs, 5 4 ... 6 5 }: 7 6 8 - let 9 - customJetbrainsPackage = import (flakeRoot + /lib/customJetbrainsPackage.nix) { 10 - inherit nix-jetbrains-plugins pkgs; 11 - }; 12 - in 13 7 { 14 8 home.packages = [ 15 - (customJetbrainsPackage { 9 + (flakeLib.customJetbrainsPackage { 16 10 idePackage = pkgs.jetbrains.rust-rover; 17 11 18 12 pluginIds = [
+2 -8
homes/encode42/desktop/jetbrains/webstorm.nix
··· 1 1 { 2 - flakeRoot, 3 - nix-jetbrains-plugins, 2 + flakeLib, 4 3 pkgs, 5 4 ... 6 5 }: 7 6 8 - let 9 - customJetbrainsPackage = import (flakeRoot + /lib/customJetbrainsPackage.nix) { 10 - inherit nix-jetbrains-plugins pkgs; 11 - }; 12 - in 13 7 { 14 8 home.packages = [ 15 - (customJetbrainsPackage { 9 + (flakeLib.customJetbrainsPackage { 16 10 idePackage = pkgs.jetbrains.webstorm; 17 11 18 12 pluginIds = [
+7
lib/default.nix
··· 1 + { nix-jetbrains-plugins, pkgs }: 2 + 3 + { 4 + customJetbrainsPackage = import ./customJetbrainsPackage.nix { 5 + inherit nix-jetbrains-plugins pkgs; 6 + }; 7 + }
+27 -17
lib/mkSystem.nix
··· 1 1 { 2 2 inputs, 3 - flakeRootPath, 3 + flakeRoot, 4 4 }: 5 5 6 6 { ··· 9 9 isLaptop ? false, 10 10 }: 11 11 12 + let 13 + pkgs = import inputs.nixpkgs { 14 + inherit system; 15 + 16 + config.allowUnfree = true; 17 + }; 18 + 19 + pkgs-unstable = import inputs.nixpkgs-unstable { 20 + inherit system; 21 + 22 + config.allowUnfree = true; 23 + }; 24 + 25 + flakeLib = import ./default.nix { 26 + inherit pkgs; 27 + 28 + nix-jetbrains-plugins = inputs.nix-jetbrains-plugins; 29 + }; 30 + in 12 31 inputs.nixpkgs.lib.nixosSystem { 13 32 inherit system; 14 33 ··· 20 39 ]; 21 40 22 41 specialArgs = { 23 - inherit isLaptop; 24 - 25 - flakeRoot = flakeRootPath; 26 - 27 - pkgs = import inputs.nixpkgs { 28 - inherit system; 29 - 30 - config.allowUnfree = true; 31 - }; 32 - 33 - pkgs-unstable = import inputs.nixpkgs-unstable { 34 - inherit system; 35 - 36 - config.allowUnfree = true; 37 - }; 42 + inherit 43 + flakeRoot 44 + flakeLib 45 + pkgs 46 + pkgs-unstable 47 + isLaptop 48 + ; 38 49 39 50 lanzaboote = inputs.lanzaboote; 40 51 nixos-hardware = inputs.nixos-hardware; 41 52 home-manager = inputs.home-manager; 42 - nix-jetbrains-plugins = inputs.nix-jetbrains-plugins; 43 53 firefox-addons = inputs.firefox-addons; 44 54 nixcord = inputs.nixcord; 45 55 };
+2
modules/common/home-manager.nix
··· 1 1 { 2 2 flakeRoot, 3 + flakeLib, 3 4 home-manager, 4 5 pkgs, 5 6 pkgs-unstable, ··· 20 21 extraSpecialArgs = { 21 22 inherit 22 23 flakeRoot 24 + flakeLib 23 25 pkgs 24 26 pkgs-unstable 25 27 isLaptop
+1 -2
modules/desktop/home-manager.nix
··· 1 1 { 2 - nix-jetbrains-plugins, 3 2 nixcord, 4 3 firefox-addons, 5 4 ... ··· 16 15 ]; 17 16 18 17 extraSpecialArgs = { 19 - inherit nix-jetbrains-plugins firefox-addons; 18 + inherit firefox-addons; 20 19 }; 21 20 }; 22 21 }
+1 -1
outputs.nix
··· 4 4 mkSystem = import ./lib/mkSystem.nix { 5 5 inherit inputs; 6 6 7 - flakeRootPath = ./.; 7 + flakeRoot = ./.; 8 8 }; 9 9 in 10 10 {