emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactoring

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-03-21 22:51:04 -04:00
parent 69400c1aa3
commit 88fe4f636b
3 changed files with 31 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -70,11 +70,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1742576675, "lastModified": 1742609412,
"narHash": "sha256-2JbkmTzqfb5c/zk2xM6JKHZzgN1YsxblgqucbI0P4bU=", "narHash": "sha256-IxX39CKe2jknL7ipiufh92z0V3WXfdpe+oHIzAqtcTs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "610d71db8074a369a0498572ff75b444d284409d", "rev": "724499d6305658949e21e01f5624ac429d9ab48a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,11 +357,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742569620, "lastModified": 1742588233,
"narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1272,11 +1272,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742406979, "lastModified": 1742595978,
"narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d",
"type": "github" "type": "github"
}, },
"original": { "original": {

57
flake.nix
View file

@ -111,6 +111,8 @@
inherit (nixpkgs.lib) genAttrs replaceStrings; inherit (nixpkgs.lib) genAttrs replaceStrings;
inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive; inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive;
sys = "x86_64-linux";
forAllSystems = forAllSystems =
function: function:
genAttrs [ genAttrs [
@ -122,9 +124,20 @@
configArgs = { configArgs = {
inherit inputs; inherit inputs;
nix-config = self; nix-config = self;
pkgs-stable = inputs.nixpkgs-stable { pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${sys};
config.allowUnfree = true; };
};
baseHomeModules = [
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops
];
baseHomeManager = {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "bak";
sharedModules = baseHomeModules;
extraSpecialArgs = configArgs;
}; };
in in
@ -154,7 +167,7 @@
nixosConfigurations = { nixosConfigurations = {
eddie = nixpkgs.lib.nixosSystem { eddie = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = sys;
specialArgs = configArgs; specialArgs = configArgs;
modules = [ modules = [
inputs.musnix.nixosModules.musnix inputs.musnix.nixosModules.musnix
@ -165,22 +178,7 @@
./hosts/eddie/configuration.nix ./hosts/eddie/configuration.nix
{ {
home-manager = { home-manager = baseHomeManager // {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "bak";
sharedModules = [
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops
];
extraSpecialArgs = {
inherit inputs;
nix-config = self;
pkgs-stable = inputs.nixpkgs-stable {
config.allowUnfree = true;
};
};
users.emenel = import ./homes/emenel/default.nix; users.emenel = import ./homes/emenel/default.nix;
}; };
} }
@ -188,7 +186,7 @@
}; };
media-server = nixpkgs.lib.nixosSystem { media-server = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = sys;
specialArgs = configArgs; specialArgs = configArgs;
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -198,22 +196,7 @@
./hosts/media-server/configuration.nix ./hosts/media-server/configuration.nix
{ {
home-manager = { home-manager = baseHomeManager // {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "bak";
sharedModules = [
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops
];
extraSpecialArgs = {
inherit inputs;
nix-config = self;
pkgs-stable = inputs.nixpkgs-stable {
config.allowUnfree = true;
};
};
users.media = import ./homes/media/default.nix; users.media = import ./homes/media/default.nix;
}; };
} }

4
modules/home/langs.nix
View file

@ -1,4 +1,4 @@
{ nix-config, pkgs, ... }: { pkgs-stable, pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -47,7 +47,7 @@
ccls ccls
vscode-langservers-extracted vscode-langservers-extracted
java-language-server java-language-server
nix-config.pkgs-stable.javascript-typescript-langserver pkgs-stable.javascript-typescript-langserver
haskell-language-server haskell-language-server
cmake-language-server cmake-language-server
stylelint-lsp stylelint-lsp