framework: merged updates
This commit is contained in:
commit
3ba1aecdb4
15 changed files with 72 additions and 96 deletions
|
|
@ -42,8 +42,6 @@
|
|||
pkgs = import inputs.nixpkgs {inherit system;};
|
||||
user = "tristan";
|
||||
userFullname = "Tristan Beedell";
|
||||
# auto-login = import ./nixos/programs/auto-login.nix;
|
||||
|
||||
mkConf = import ./lib/mkconf.nix {inherit inputs system user userFullname;};
|
||||
in {
|
||||
formatter.${system} = pkgs.alejandra;
|
||||
|
|
@ -51,7 +49,6 @@
|
|||
zenix = mkConf {
|
||||
nixos-modules = [
|
||||
./hardware/zenix.nix
|
||||
./nixos/programs/cosmic.nix
|
||||
./nixos/programs/niri.nix
|
||||
./nixos/programs/gamer.nix
|
||||
./nixos/programs/personal.nix
|
||||
|
|
@ -62,7 +59,6 @@
|
|||
./home/programs/graphical.nix
|
||||
./home/programs/gamer.nix
|
||||
./home/programs/personal/.
|
||||
./home/desktop/cosmic/.
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -71,13 +67,11 @@
|
|||
./hardware/framework-13.nix
|
||||
./nixos/workstation.nix
|
||||
./nixos/modules/work.nix
|
||||
./nixos/programs/cosmic.nix
|
||||
./nixos/programs/niri.nix
|
||||
];
|
||||
home-modules = [
|
||||
./home/programs/work.nix
|
||||
./home/programs/graphical.nix
|
||||
./home/desktop/cosmic/.
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue