ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

FLAKE mode

Browse Source 
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
This commit is contained in:
Stefan Ellmauthaler 2021-11-03 22:55:34 +01:00
parent 2b97c5da20
commit ab7a288748
13 changed files with 14 additions and 5269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
configuration.flake.nix
View File

@ -1,234 +0,0 @@
# 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’).
{ pkgs, name, flakes, ... }:
{ config, pkgs, ...}:
{
imports =
[ # Include the results of the hardware scan.
#./machine/ + "${name}" + /hardware-configuration.nix)
(./machine + "/flake-${name}")
./programs/emacs
./programs/aspell.nix
./users
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
# networking.hostName = "nucturne"; # Define your hostname. - done in machine/current/default.nix
#networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true;
#networking.networkmanager.unmanaged = [ "enp0s20f0u4u1u3" ];
# Set your time zone.
time.timeZone = "Europe/Berlin";
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour.
networking.useDHCP = false;
# networking.interfaces.eno1.useDHCP = true;
# networking.interfaces.enp0s20f0u4u1u3.useDHCP = true;
# networking.interfaces.wlp0s20f3.useDHCP = true;
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties.
i18n.defaultLocale = "en_GB.UTF-8";
# console = {
# font = "Lat2-Terminus16";
# keyMap = "us";
# };
# updates and upkeep
nix.autoOptimiseStore = true;
# flake options
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
nixpkgs.overlays = [ flakes.emacs-overlay.overlay ];
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable i3
services.xserver.displayManager.lightdm.enable = true;
services.xserver.windowManager.i3 = {
enable = true;
extraPackages = with pkgs; [
rofi # launcher
polybarFull # bar
i3lock # lock screen
xss-lock
autorandr
];
extraSessionCommands = ''
${pkgs.autorandr}/bin/autorandr -c
'';
};
services.gnome.gnome-keyring.enable = true;
services.dbus = {
enable = true;
packages = with pkgs; [ gnome3.dconf ];
};
services.lorri.enable = true;
programs.dconf.enable = true;
hardware.bluetooth.enable = true;
services.blueman.enable = true;
# Configure keymap in X11
services.xserver.layout = "us";
services.xserver.xkbOptions = "eurosign:e";
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound.
sound.enable = true;
hardware.pulseaudio.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.mutableUsers = false;
users.users.ellmau = {
isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "audio"];
description = "Stefan Ellmauthaler";
shell = pkgs.zsh;
home = "/home/ellmau";
hashedPassword = "$6$JZPnaZYG$KL2c3e1it3j2avioovE1WveN/mpmq/tPsSAvHY1XRhtqKaE7TaSQkqRy69farkIR0Xs0.yTjltvKvv28kZtLO1";
};
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
# Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
#emacs
#aspell
emacs-all-the-icons-fonts
wget
firefox
alacritty
git
thunderbird-91
okular
texlive.combined.scheme-full
rustup
rust-analyzer
usbutils
#gcc
clang
keepassxc
gnome.libsecret
arandr
rnix-lsp
];
#services.emacs.enable = true;
#services.emacs.defaultEditor = true;
environment.shells = [ pkgs.zsh ];
environment.pathsToLink = [ "/share/zsh" ];
programs.zsh = {
enable = true;
enableCompletion = true;
enableGlobalCompInit = true;
autosuggestions.enable = true;
syntaxHighlighting = {
enable = true;
highlighters = [ "main" "brackets" "root" "line" ];
#styles = { cursor = "standout,underline"; };
};
setOptions = [ "auto_pushd" "correct" "extendedglob" "nocaseglob" "rcexpandparam" "numericglobsort" "nobeep" "appendhistory" ];
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
programs.mtr.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
environment.sessionVariables = rec {
XDG_CACHE_HOME = "\${HOME}/.cache";
XDG_CONFIG_HOME = "\${HOME}/.config";
XDG_BIN_HOME = "\${HOME}/.local/bin";
XDG_DATA_HOME = "\${HOME}/.local/share";
PATH = [
"\${XDG_BIN_HOME}"
];
};
fonts = {
enableDefaultFonts = true;
fonts = with pkgs; [
hasklig
# corefonts # not free
liberation_ttf
comic-relief
dejavu_fonts
gyre-fonts
open-sans
noto-fonts
noto-fonts-emoji
noto-fonts-extra
roboto
roboto-mono
(nerdfonts.override { fonts = [ "Hasklig" ]; })
material-icons
weather-icons
];
fontconfig = {
enable = true;
# defaultFonts = {
# serif = [ "TeX Gyre Heros" ];
# emoji = [ "Noto Color Emoji" ];
# sansSerif = [ "TeX Gyre Pagella" ];
# monospace = [ "Hasklug Nerd Font Mono" ];
# };
};
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "21.05"; # Did you read the comment?
}

14
configuration.nix
View File

@ -2,13 +2,13 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }:
{ pkgs, name, flakes, ... }:
{ config, pkgs, ...}:
{
imports =
[ # Include the results of the hardware scan.
./machine/current/hardware-configuration.nix
./machine/current/default.nix
((./machine + "/${name}") + /hardware-configuration.nix)
(./machine + "/${name}")
./programs/emacs
./programs/aspell.nix
./users
@ -49,6 +49,12 @@
# updates and upkeep
nix.autoOptimiseStore = true;
# flake options
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
nixpkgs.overlays = [ flakes.emacs-overlay.overlay ];
# Enable the X11 windowing system.
services.xserver.enable = true;

3
default.nix
View File

@ -7,7 +7,7 @@
extraModules = if args ? extraModules then args.extraModules else [ ];
extraOverlays = if args ? extraOverlays then args.extraOverlays else [ ];
pkgs = flakes.nixpkgs;
configuration = import ./configuration.flake.nix {inherit extraOverlays system pkgs name flakes;} ;
configuration = import ./configuration.nix {inherit extraOverlays system pkgs name flakes;} ;
in
{
inherit name;
@ -29,5 +29,6 @@ flakes.nixpkgs.lib.listToAttrs (map mkMachine [
}
{
name = "nucturne";
extraOverlays = [ flakes.home-manager.nixosModules.home-manager];
}
])

15
machine/stel-xps/default.nix
View File

@ -1,15 +0,0 @@
{ config, pkgs, ...}:
{
imports = [
"${builtins.fetchGit { url = "https://github.com/NixOS/nixos-hardware.git"; }}/dell/xps/13-7390"
./printer.nix
];
networking.hostName = "stel-xps"; # define the hostname
environment.systemPackages = with pkgs; [
brightnessctl
];
services.autorandr.enable = true;
services.xserver.desktopManager.wallpaper.mode = "fill";
}

3
machine/flake-stel-xps/default.nix → machine/stel-xps/flake-stel-xps/default.nix
View File

@ -1,8 +1,5 @@
{ config, pkgs, ...}:
{
imports = [ ./hardware-configuration.nix ];
networking.hostName = "stel-xps"; # define the hostname
environment.systemPackages = with pkgs; [

0
machine/flake-stel-xps/hardware-configuration.nix → machine/stel-xps/flake-stel-xps/hardware-configuration.nix
View File

0
machine/flake-stel-xps/ppds/Ricoh/ricoh-mp-c307.ppd → machine/stel-xps/flake-stel-xps/ppds/Ricoh/ricoh-mp-c307.ppd
View File

0
machine/flake-stel-xps/ppds/Ricoh/ricoh-sp-4510dn.ppd → machine/stel-xps/flake-stel-xps/ppds/Ricoh/ricoh-sp-4510dn.ppd
View File

0
machine/flake-stel-xps/printer.nix → machine/stel-xps/flake-stel-xps/printer.nix
View File

35
machine/stel-xps/hardware-configuration.nix
View File

@ -1,35 +0,0 @@
# 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, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/6b7f9f80-af34-4317-b017-f883a2316674";
fsType = "ext4";
};
boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/9c84f143-023d-4fcb-a49c-ca78ce69e0e0";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/4824-2CFD";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/93381a25-6704-408e-b091-cfda6cddbda0"; }
];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
}

3056
machine/stel-xps/ppds/Ricoh/ricoh-mp-c307.ppd
View File

File diff suppressed because it is too large Load Diff

1832
machine/stel-xps/ppds/Ricoh/ricoh-sp-4510dn.ppd
View File

File diff suppressed because it is too large Load Diff

87
machine/stel-xps/printer.nix
View File

@ -1,87 +0,0 @@
{ config, pkgs, ...}:
let
ppd-local = pkgs.stdenv.mkDerivation rec {
pname = "local-ppds";
version = "2021-07-04";
src = ./ppds;
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out/share/cups/model/
cp -R Ricoh $out/share/cups/model
'';
};
in
{
services.printing.drivers = with pkgs; [
foomatic-filters
gutenprint
hplip
] ++ [
ppd-local
];
hardware.printers.ensurePrinters = [
{
name = "hpm605";
location = "APB/3014";
description = "HP Laserjet Enterprise M605DN";
deviceUri = "hp:/net/HP_LaserJet_M605?hostname=hpm605.tcs.inf.tu-dresden.de";
model = "HP/hp-laserjet_m604_m605_m606-ps.ppd.gz";
ppdOptions = {
Collate = "True";
HPOption_Duplexer = "True";
HPOption_Tray4 = "HP500SheetInputTray";
HPOption_Tray3 = "HP500SheetInputTray";
MediaType = "Recycled";
Duplex = "DuplexNoTumble";
};
}
{
name = "A4";
location = "APB/3014";
description = "HP Laserjet 9040";
deviceUri = "socket://a4.tcs.inf.tu-dresden.de";
model = "HP/hp-laserjet_9040-ps.ppd.gz";
ppdOptions = {
PageSize = "A4";
HPOption_Tray1 = "True";
HPOption_Duplexer = "True";
InstalledMemory = "128-255MB";
MediaType = "Plain";
Duplex = "DuplexNoTumble";
Collate = "True";
};
}
{
name = "ricoh";
location = "APB/3014";
description = "Ricoh SP 4510DN";
deviceUri = "socket://ricoh.tcs.inf.tu-dresden.de";
model = "Ricoh/ricoh-sp-4510dn.ppd";
ppdOptions = {
OptionTray = "2Cassette";
PageSize = "A4";
InputSlot = "3Tray";
Duplex = "none";
RIPaperPolicy = "NearestSizeAdjust";
pdftops-render-default = "pdftocairo";
};
}
{
name = "ricohcolor";
location = "APB/3014";
description = "Ricoh Alficio MP C307";
deviceUri = "socket://color.tcs.inf.tu-dresden.de";
model = "Ricoh/ricoh-mp-c307.ppd";
ppdOptions = {
media = "A4";
OptionTray = "1Cassette";
RIPostScript = "Adobe";
};
}
];
}