WIP
Signed-off-by: Tristan Druyen <tristan@vault81.de>
This commit is contained in:
parent
ff3698ade7
commit
e3369f2372
5 changed files with 58 additions and 41 deletions
|
@ -1,6 +1,3 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
|
@ -48,18 +45,24 @@
|
|||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "de_DE.UTF-8";
|
||||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||
LC_MEASUREMENT = "de_DE.UTF-8";
|
||||
LC_MONETARY = "de_DE.UTF-8";
|
||||
LC_NAME = "de_DE.UTF-8";
|
||||
LC_NUMERIC = "de_DE.UTF-8";
|
||||
LC_PAPER = "de_DE.UTF-8";
|
||||
LC_TELEPHONE = "de_DE.UTF-8";
|
||||
LC_TIME = "de_DE.UTF-8";
|
||||
extraLocaleSettings = {
|
||||
LANG = "en_US.UTF-8";
|
||||
LC_ADDRESS = "de_DE.UTF-8";
|
||||
LC_COLLATE = "de_DE.UTF-8";
|
||||
LC_CTYPE = "de_DE.UTF-8";
|
||||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||
LC_MEASUREMENT = "de_DE.UTF-8";
|
||||
LC_MESSAGES = "en_US.UTF-8";
|
||||
LC_MONETARY = "de_DE.UTF-8";
|
||||
LC_NAME = "de_DE.UTF-8";
|
||||
LC_NUMERIC = "de_DE.UTF-8";
|
||||
LC_PAPER = "de_DE.UTF-8";
|
||||
LC_TELEPHONE = "de_DE.UTF-8";
|
||||
LC_TIME = "de_DE.UTF-8";
|
||||
};
|
||||
};
|
||||
|
||||
services.xserver = {
|
||||
|
@ -93,9 +96,6 @@
|
|||
services.xserver.displayManager.autoLogin.enable = true;
|
||||
services.xserver.displayManager.autoLogin.user = "tristand";
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
environment.sessionVariables = {
|
||||
MOZ_USE_XINPUT2 = "1";
|
||||
};
|
||||
|
|
13
flake.lock
generated
13
flake.lock
generated
|
@ -42,11 +42,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1694687465,
|
||||
"narHash": "sha256-rbAxvy9cIAsVb8Uc/oZdoR4W9C3dPPv10JRE06jU73E=",
|
||||
"lastModified": 1694716032,
|
||||
"narHash": "sha256-PQbomjq3tZ7WYAbbM1NO6RMoPbnEbSCVnBhvD4+rgog=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "4d65e731b6c3891445cdd80ad0c3c94f7955b039",
|
||||
"rev": "918199aeaa2c9b9d0f73e304a187a05b99fd9050",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -260,15 +260,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1694643239,
|
||||
"narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
|
||||
"lastModified": 1694465129,
|
||||
"narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
|
||||
"rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
27
flake.nix
27
flake.nix
|
@ -10,7 +10,7 @@
|
|||
url = "github:blitz/tuxedo-nixos";
|
||||
};
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
url = "github:nix-community/home-manager/release-23.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-doom-emacs = {
|
||||
|
@ -30,23 +30,30 @@
|
|||
nix-doom-emacs,
|
||||
emacs-overlay,
|
||||
}: {
|
||||
nixosConfigurations = {
|
||||
formatter = {
|
||||
x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
|
||||
};
|
||||
nixosConfigurations = let
|
||||
customPkgs = import nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
overlays = [emacs-overlay.overlay];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
in {
|
||||
nixos-pulse = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./configuration.nix
|
||||
{
|
||||
_module.args.nix-doom-emacs-module = nix-doom-emacs.hmModule;
|
||||
nixpkgs.pkgs = nixpkgs.legacyPackages.x86_64-linux.extend emacs-overlay.overlay;
|
||||
}
|
||||
./home.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.useGlobalPkgs = true;
|
||||
}
|
||||
tuxedo-nixos.nixosModules.default
|
||||
{
|
||||
_module.args.nix-doom-emacs-module = nix-doom-emacs.hmModule;
|
||||
nixpkgs.pkgs = customPkgs;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.useGlobalPkgs = true;
|
||||
hardware.tuxedo-control-center.enable = true;
|
||||
hardware.tuxedo-control-center.package = tuxedo-nixos.packages.x86_64-linux.default;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
|
|
22
home.nix
22
home.nix
|
@ -8,6 +8,7 @@
|
|||
description = "Tristan Druyen";
|
||||
extraGroups = ["networkmanager" "wheel" "libvirtd"];
|
||||
shell = pkgs.fish;
|
||||
home = "/home/tristand";
|
||||
};
|
||||
|
||||
home-manager.users.tristand = {pkgs, ...}: {
|
||||
|
@ -40,7 +41,11 @@
|
|||
programs.doom-emacs = {
|
||||
enable = true;
|
||||
doomPrivateDir = ./doom.d;
|
||||
emacsPackage = pkgs.emacs-unstable-pgtk;
|
||||
emacsPackage = pkgs.emacs;
|
||||
};
|
||||
services.emacs = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
};
|
||||
|
||||
programs.fish.enable = true;
|
||||
|
@ -56,14 +61,15 @@
|
|||
};
|
||||
};
|
||||
|
||||
services.emacs = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
alejandra
|
||||
atool
|
||||
alacritty
|
||||
aspell
|
||||
aspellDicts.en
|
||||
aspellDicts.en-computers
|
||||
aspellDicts.en-science
|
||||
aspellDicts.de
|
||||
bitwarden
|
||||
binutils
|
||||
brave
|
||||
|
@ -80,8 +86,14 @@
|
|||
tailscale
|
||||
tokei
|
||||
thunderbird
|
||||
zellij
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
BROWSER = "firefox";
|
||||
TERMINAL = "alacritty";
|
||||
};
|
||||
|
||||
home.stateVersion = "23.05";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue