lytedev/nix
1
0
Fork 1
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Daniel Flanagan 2024-07-10 08:55:09 -05:00
parent 464997aa5d 2b86faa7fe
commit 14bf7cbb24
4 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
flake.nix
View file

@ -283,6 +283,34 @@
]; ];
}; };
grablet = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = with nixosModules; [
common
outputs.diskoConfigurations.standard
hardware.nixosModules.common-cpu-intel-kaby-lake
hardware.nixosModules.common-pc-laptopp-ssd
graphical-workstation
laptop
gaming
./nixos/thablet.nix
{
home-manager.users.daniel = {
imports = with homeManagerModules; [
iex
cargo
linux-desktop-environment-config
];
};
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
}
];
};
thinker = nixpkgs.lib.nixosSystem { thinker = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [

6
modules/nixos/default.nix
View file

@ -385,9 +385,9 @@
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
# services.xrdp.enable = true; services.xrdp.enable = true;
# services.xrdp.defaultWindowManager = "plasma"; services.xrdp.defaultWindowManager = "plasma";
# services.xrdp.openFirewall = false; services.xrdp.openFirewall = false;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wl-clipboard wl-clipboard

3
nixos/beefcake.nix
View file

@ -18,9 +18,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
networking.hostName = "beefcake"; networking.hostName = "beefcake";
imports = [ imports = [
../modules/nixos/intel.nix
../modules/nixos/fonts.nix
# TODO: break these modules out someday maybe? # TODO: break these modules out someday maybe?
{ {
# hardware # hardware

8
templates/nix-flake/flake.nix
View file

@ -1,4 +1,6 @@
{ {
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
@ -10,8 +12,8 @@
}: let }: let
systems = ["aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-linux"]; systems = ["aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-linux"];
forSystems = nixpkgs.lib.genAttrs systems; forSystems = nixpkgs.lib.genAttrs systems;
pkgsFor = system: import nixpkgs {inherit system;}; pkgsFor = system: (import nixpkgs {inherit system;});
genPkgs = f: (f (forSystems pkgsFor)); genPkgs = func: (forSystems (system: func (pkgsFor system)));
in { in {
formatter = genPkgs (pkgs: pkgs.alejandra); formatter = genPkgs (pkgs: pkgs.alejandra);
@ -26,7 +28,7 @@
devShells = genPkgs (pkgs: { devShells = genPkgs (pkgs: {
nix = pkgs.mkShell { nix = pkgs.mkShell {
buildInputs = with pkgs; [nil alejandra]; packages = with pkgs; [nil alejandra];
inherit (self.outputs.checks.${pkgs.system}.pre-commit-check) shellHook; inherit (self.outputs.checks.${pkgs.system}.pre-commit-check) shellHook;
}; };