pierre/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from real34/framework-setup

Browse Source
This commit is contained in:
Pierre Martin
2022-09-03 07:06:57 +02:00
committed by GitHub
parent 85d73d25ff b6aa157e09
commit de77bf048c
5 changed files with 182 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
.i3status.conf → files/.i3status.conf
View File

17
files/traefik.toml Normal file
View File

@@ -0,0 +1,17 @@
logLevel = "INFO"
defaultEntryPoints = ["http", "https"]
[web]
address = ":8080"
# [entryPoints]
# [entryPoints.http]
# address = ":80"
# [entryPoints.https]
# address = ":443"
# [entryPoints.https.tls]
[docker]
domain = "test"
watch = true
network = "traefik"

40
home.nix
View File

@@ -4,26 +4,10 @@ let
latest = import <nixpkgs>{};
in
{
home.stateVersion = "18.09";
home.file.".config/traefik/traefik.toml".text = ''
logLevel = "INFO"
defaultEntryPoints = ["http", "https"]
home.stateVersion = "22.05";
[web]
address = ":8080"
# [entryPoints]
# [entryPoints.http]
# address = ":80"
# [entryPoints.https]
# address = ":443"
# [entryPoints.https.tls]
[docker]
domain = "test"
watch = true
network = "traefik"
'';
home.file.".i3status.conf".source = ./files/.i3status.conf;
home.file.".config/traefik/traefik.toml".source = ./files/traefik.toml;
home.packages = with pkgs; [
latest.wget
@@ -39,9 +23,9 @@ network = "traefik"
latest.ngrok
latest.openssl
latest.pulseaudioFull
latest.pavucontrol
latest.bluezFull
latest.niv
latest.sakura
latest.fasd
@@ -75,6 +59,7 @@ network = "traefik"
latest.yubico-pam
latest.yubikey-manager
latest.pam_u2f
latest.polkit_gnome # fun fact: https://gitlab.gnome.org/GNOME/gdm/-/issues/613
latest.arandr
latest.feh
@@ -151,11 +136,6 @@ network = "traefik"
services.gpg-agent.enable = true;
services.blueman-applet.enable = true;
programs.home-manager = {
enable = true;
path = https://github.com/nix-community/home-manager/archive/master.tar.gz;
};
programs.rofi = {
enable = true;
plugins = [ latest.rofi-calc latest.rofi-emoji ];
@@ -242,6 +222,9 @@ network = "traefik"
{ command = "copyq"; notification = false; }
{ command = "numlockx on"; notification = false; } # turn verr num on
{ command = "autorandr -c"; notification = false; }
{ command = "feh --bg-scale /home/pierre/Documents/Graphisme/fc-bg-light-black.png"; notification = false; }
# docker run -d --net traefik --ip 172.10.0.10 --restart always -v /var/run/docker.sock:/var/run/docker.sock:ro --name traefik -p 80:80 -p 8080:8080 traefik:2.4.9 --api.insecure=true --providers.docker
{ command = "docker start traefik"; notification = false; }
];
@@ -338,7 +321,6 @@ source <(kubectl completion zsh)
dcr = "docker-compose run --rm";
dcrm = "docker-compose rm -fsv";
copy = "xclip -selection c";
deploy = "docker run -it --rm -v ~/.ssh:/root/.ssh -v $SSH_AUTH_SOCK:/ssh-agent -e SSH_AUTH_SOCK=/ssh-agent -v $(pwd):/source neolao/capistrano:3.4.0 bash";
bepo = "setxkbmap -layout fr -variant bepo";
fr = "setxkbmap -layout fr -variant oss";
@@ -353,12 +335,6 @@ source <(kubectl completion zsh)
g = "git";
tg = "tig --all";
tgs = "tig status";
tgl = "tig status";
tgb = "tig blame -C";
# for some reasons `light -k -S 100` does not work for me… TODO find why, and uninstall upower
klon = "dbus-send --system --type=method_call --dest=\"org.freedesktop.UPower\" \"/org/freedesktop/UPower/KbdBacklight\" \"org.freedesktop.UPower.KbdBacklight.SetBrightness\" int32:100";
kloff = "light -k -S 0";
};
};

201
nixos/configuration.nix
View File

@@ -6,88 +6,102 @@
{
imports =
[
[ # Include the results of the hardware scan.
./hardware-configuration.nix
./framework.nix
<home-manager/nixos>
];
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
# boot.loader.grub.efiSupport = true;
# boot.loader.grub.efiInstallAsRemovable = true;
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
# Define on which hard drive you want to install Grub.
boot.loader.grub.device = "/dev/nvme0n1"; # or "nodev" for efi only
# Perso only ? (and comment grub.enable / version above)
# boot.loader.systemd-boot.enable = true;
# boot.loader.efi.canTouchEfiVariables = true;
boot.cleanTmpDir = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot/efi";
networking.hostName = "pierre"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Gnome is forcing us to use networkManager https://nixos.org/nixos/manual/index.html#sec-networkmanager
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
networking.extraHosts = "
";
hardware.bluetooth.enable = true;
# see https://nixos.wiki/wiki/Bluetooth#Enabling_A2DP_Sink
hardware.bluetooth.settings = {
General = {
Enable = "Source,Sink,Media,Socket";
MultiProfile = "multiple";
AutoEnable = true;
};
};
hardware.trackpoint.enable = true;
hardware.trackpoint.emulateWheel = true;
hardware.trackpoint.speed = 250;
hardware.trackpoint.sensitivity = 150;
# Select internationalisation properties.
console.keyMap = "fr-bepo";
# Set your time zone.
time.timeZone = "Europe/Paris";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.utf8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "fr_FR.utf8";
LC_IDENTIFICATION = "fr_FR.utf8";
LC_MEASUREMENT = "fr_FR.utf8";
LC_MONETARY = "fr_FR.utf8";
LC_NAME = "fr_FR.utf8";
LC_NUMERIC = "fr_FR.utf8";
LC_PAPER = "fr_FR.utf8";
LC_TELEPHONE = "fr_FR.utf8";
LC_TIME = "fr_FR.utf8";
};
# Configure keymap in X11
services.xserver = {
enable = true;
layout = "fr";
xkbVariant = "bepo";
displayManager = {
defaultSession = "none+i3";
};
windowManager = {
i3 = {
enable = true;
};
};
};
# Configure console keymap
console.keyMap = "fr";
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.pierre = {
isNormalUser = true;
description = "Pierre";
extraGroups = [ "networkmanager" "wheel" "audio" "docker" "video" ];
shell = pkgs.zsh;
packages = with pkgs; [];
};
home-manager.users.pierre = import /home/pierre/dotfiles/home.nix;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
thunderbolt
wpa_supplicant
#wpa_supplicant_gui
gitAndTools.gitFull
docker
firefox
unbound
# Yubikey
libu2f-host
yubikey-manager
yubikey-personalization-gui
pcsclite
# Basics
docker
gitAndTools.gitFull
vim
# Sound
blueman
bluez-tools
];
nix.settings.auto-optimise-store = true;
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 30d";
};
# Specific configuration
environment.pathsToLink = [ "/share/zsh" ];
virtualisation.docker.enable = true;
# 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; };
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
programs.zsh.enable = true; # see https://github.com/NixOS/nixpkgs/issues/20548#issuecomment-261965667
programs.light.enable = true;
@@ -99,68 +113,21 @@
services.gnome.gnome-keyring.enable = true; # see https://nixos.wiki/wiki/Visual_Studio_Code#Error_after_Sign_On
services.blueman.enable = true;
services.clamav.daemon.enable = true;
services.clamav.updater.enable = true;
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
virtualisation.docker.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# Doc: https://nixos.org/manual/nixos/stable/index.html#sec-firewall
networking.firewall.enable = true;
# Enable CUPS to print documents.
nixpkgs.config.allowUnfree = true;
services.printing.enable = true;
services.printing.drivers = [
pkgs.hplip
pkgs.gutenprint
];
# Enable sound.
sound.enable = true;
hardware.pulseaudio = {
enable = true;
# NixOS allows either a lightweight build (default) or full build of PulseAudio to be installed.
# Only the full build has Bluetooth support, so it must be selected here.
package = pkgs.pulseaudioFull;
# see https://nixos.wiki/wiki/Bluetooth#Managing_audio_devices
extraConfig = "
load-module module-switch-on-connect
";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.layout = "fr";
services.xserver.xkbVariant = "bepo";
# services.xserver.xkbOptions = "eurosign:e";
# Enable touchpad support.
services.xserver.libinput.enable = true;
services.xserver.videoDriver = "modesetting"; # to prevent "xrandr: Configure crtc 1 failed" issues
services.xserver.displayManager.gdm.wayland = false;
services.xserver.windowManager.i3.enable = true;
# See https://nixos.wiki/wiki/Yubikey
services.udev.packages = [ pkgs.yubikey-personalization pkgs.libu2f-host ];
services.pcscd.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.pierre = {
isNormalUser = true;
uid = 1000;
home = "/home/pierre";
shell = pkgs.zsh;
extraGroups = [ "audio" "wheel" "networkmanager" "docker" "video" ];
};
system.autoUpgrade.enable = true;
# This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
system.stateVersion = "18.09"; # Did you read the comment?
# 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 = "22.05"; # Did you read the comment?
}

77
nixos/framework.nix Normal file
View File

@@ -0,0 +1,77 @@
#
# NixOS Configuration for Framework Laptop
# Source: https://gist.github.com/digitalknk/ee0379c1cd4597463c31a323ea5882a5
# Alt: https://github.com/NixOS/nixos-hardware/blob/master/framework/default.nix
# Alt: https://github.com/DAlperin/dotfiles/blob/main/machines/spaceship/default.nix
# Doc: https://wiki.archlinux.org/title/Framework_Laptop
#
{ config, lib, pkgs, modulesPath, ... }:
{
boot.kernelParams = [
"mem_sleep_default=deep"
"nvme.noacpi=1" # power consumption. See https://github.com/NixOS/nixos-hardware/blob/12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1/framework/default.nix#L12
"module_blacklist=hid_sensor_hub" # brightness keys. See https://dov.dev/blog/nixos-on-the-framework-12th-gen
];
# Use latest kernel version because on 5.15 screen is not detected properly (and external monitor doesn't work either)
boot.kernelPackages = pkgs.linuxPackages_5_18; # see https://github.com/NixOS/nixpkgs/issues/183955#issuecomment-1210468614
powerManagement = {
enable = true;
powertop.enable = true;
# TODO Not sure what it does: the default detection uses "powersave"
# cpuFreqGovernor = lib.mkDefault "ondemand";
};
hardware.bluetooth.enable = true;
# Enable thermal data
services.thermald.enable = true;
# Enable fingerprint support
# see https://wiki.archlinux.org/title/fprint for usage
services.fprintd.enable = true;
# Display things like a boss
## Make it work
hardware.opengl.enable = true;
hardware.opengl.extraPackages = with pkgs; [
mesa_drivers
vaapiIntel
vaapiVdpau
libvdpau-va-gl
intel-media-driver
];
## Make it nice (https://nixos.wiki/wiki/Xorg && https://wiki.archlinux.org/title/Framework_Laptop#HiDPI_settings)
# https://github.com/kvark/dotfiles/blob/master/nix/hardware-configuration.nix#L41
hardware.video.hidpi.enable = lib.mkDefault true;
services.xserver.dpi = 130;
environment.variables = {
GDK_SCALE = "1.5";
GDK_DPI_SCALE = "0.77"; # 1/1.3
_JAVA_OPTIONS = "-Dsun.java2d.uiScale=1.5";
};
# Bring in some audio
security.rtkit.enable = true; # rtkit is optional but recommended
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true;
# Backlight (see https://wiki.archlinux.org/title/Backlight#xbacklight_returns_:_No_outputs_have_backlight_property)
hardware.acpilight.enable = true;
}