lucy/nixos
Watch
1
0
Fork
You've already forked nixos
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

split up flake and use emacs as nixos module

Browse source
This commit is contained in:
lucy 2026-08-31 14:51:10 +02:00
commit ec66697d14
5 changed files with 56 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -26,7 +26,6 @@
imports = [ imports = [
wrappers.flakeModules.wrappers wrappers.flakeModules.wrappers
./modules/theme.nix ./modules/theme.nix
./modules/programs/emacs/emacs.nix
./hosts.nix ./hosts.nix
]; ];

20
hosts.nix
View file

@ -6,18 +6,26 @@ in
flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
inputs.base16.nixosModules inputs.base16.nixosModule
{ scheme = "${inputs.tt-schemes}/base16/${themeName}"; } { scheme = "${inputs.tt-schemes}/base16/${themeName}.yaml"; }
config.wrappers.emacs.install ./modules/hosts/nerv/configuration.nix
./configuration.nix ./modules/home.nix
./modules/theme.nix
./modules/programs/emacs/emacs.nix
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = { inherit inputs; };
} }
{
imports = [
(inputs.wrappers.lib.getInstallModule {
name = "emacs";
value = inputs.wrappers.lib.wrapperModules.emacs;
})
./modules/programs/emacs/emacs.nix
];
}
]; ];
}; };
} }

71
modules/hosts/nerv/configuration.nix
View file

@ -1,10 +1,14 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
imports = imports = [
[ ./hardware-configuration.nix
./hardware-configuration.nix ];
];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@ -19,43 +23,42 @@
hardware.graphics.enable = true; hardware.graphics.enable = true;
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = false; powerManagement.enable = false;
open = true; open = true;
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
services.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = true;
services.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.xkb.layout = "us"; services.xserver.xkb.layout = "us";
services.pipewire = { services.pipewire = {
enable = true; enable = true;
pulse.enable = true; pulse.enable = true;
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.lucy = { users.users.lucy = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
packages = with pkgs; [ packages = with pkgs; [
vesktop vesktop
google-chrome google-chrome
]; ];
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
fastfetch fastfetch
wget wget
git git
clang clang
]; ];
system.stateVersion = "26.05"; # Did you read the comment? system.stateVersion = "26.05"; # Did you read the comment?
} }

22
modules/hosts/nerv/theme.nix
View file

@ -1,22 +0,0 @@
{
inputs,
config,
lib,
...
}:
let
schemeName = config.theme.name;
in
{
config,
lib,
pkgs,
...
}:
let
scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
in
{
options.scheme = lib.mkOption {type = lib.types.str; };
config.scheme = scheme;
}

7
modules/programs/emacs/emacs.nix
View file

@ -5,10 +5,10 @@
... ...
}: }:
let let
schemeName = config.theme.name; schemeName = config.scheme;
in in
{ {
flake.wrappers.emacs = wrappers.emacs =
{ {
pkgs, pkgs,
wlib, wlib,
@ -17,7 +17,8 @@ in
let let
scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName; scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
in in
{ {
enable = true;
imports = [ imports = [
wlib.wrapperModules.emacs wlib.wrapperModules.emacs
]; ];