stupidcomputer
/
dot_testing
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

has my pain ended?

This commit is contained in:
randomuser 2024-01-07 23:08:20 -06:00
parent 5b01a13f3e
commit 40fe8061c2
5 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boxes/mlg/default.nix
View File

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
./hardware-configuration.nix # ./hardware-configuration.nix
./nvidia.nix ./nvidia.nix
../../modules/bootstrap.nix ../../modules/bootstrap.nix
../../modules/common.nix ../../modules/common.nix

1
boxes/x230t/default.nix
View File

@ -6,7 +6,6 @@
../../modules/bootstrap.nix ../../modules/bootstrap.nix
../../modules/common.nix ../../modules/common.nix
../../modules/x11.nix ../../modules/x11.nix
../../modules/discord.nix
]; ];
boot.loader.grub.enable = true; boot.loader.grub.enable = true;

4
flake.lock
View File

@ -92,11 +92,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-xCQE9SSKWjmoYOaIkzdlGULeGbEF9Gau5TPgYJxalmw=", "narHash": "sha256-xCQE9SSKWjmoYOaIkzdlGULeGbEF9Gau5TPgYJxalmw=",
"path": "/nix/store/rg6mp8f9i9grfp47chg801vxzz4w564f-source/builds", "path": "/nix/store/p4zd0ifx5r5qfr03q5bbg0wilya43x5s-source/builds",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/rg6mp8f9i9grfp47chg801vxzz4w564f-source/builds", "path": "/nix/store/p4zd0ifx5r5qfr03q5bbg0wilya43x5s-source/builds",
"type": "path" "type": "path"
} }
} }

44
flake.nix
View File

@ -24,13 +24,6 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/virtbox ./boxes/virtbox
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.usr = import ./boxes/virtbox/home.nix;
}
]; ];
}; };
x230t = nixpkgs.lib.nixosSystem { x230t = nixpkgs.lib.nixosSystem {
@ -38,13 +31,6 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/x230t ./boxes/x230t
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.usr = import ./boxes/x230t/home.nix;
}
]; ];
}; };
mainsail = nixpkgs.lib.nixosSystem { mainsail = nixpkgs.lib.nixosSystem {
@ -52,13 +38,29 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/mainsail ./boxes/mainsail
home-manager.nixosModules.home-manager ];
{ };
home-manager.useGlobalPkgs = true; };
home-manager.useUserPackages = true; homeConfigurations = {
home-manager.extraSpecialArgs = { inherit inputs; }; "usr@x230t" = home-manager.lib.homeManagerConfiguration {
home-manager.users.usr = import ./boxes/mainsail/home.nix; pkgs = nixpkgs.legacyPackages.x86_64-linux;
} extraSpecialArgs = { inherit inputs; };
modules = [
./boxes/x230t/home.nix
];
};
"usr@mainsail" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs; };
modules = [
./boxes/x230t/home.nix
];
};
"usr@virtbox" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs; };
modules = [
./boxes/x230t/home.nix
]; ];
}; };
}; };

4
modules/bootstrap.nix
View File

@ -1,10 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [
./hardware-configuration.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
neovim neovim