geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

24.05: Fixed warnings

Browse source
This commit is contained in:
Geoffrey Frogeye 2024-06-01 21:32:11 +02:00
parent 71385d9ba9
commit 3479927d32
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
9 changed files with 52 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

46
os/desktop.nix
View file

@ -3,41 +3,43 @@
config = lib.mkIf config.frogeye.desktop.xorg {
services = {
blueman.enable = true;
displayManager.defaultSession = "none+i3";
xserver = {
enable = true;
windowManager.i3.enable = true;
displayManager.defaultSession = "none+i3";
# Keyboard layout
extraLayouts.qwerty-fr = {
description = "QWERTY-fr";
languages = [ "fr" ];
symbolsFile = "${pkgs.stdenv.mkDerivation {
name = "qwerty-fr-keypad";
src = builtins.fetchGit {
url = "https://github.com/qwerty-fr/qwerty-fr.git";
rev = "3a4d13089e8ef016aa20baf6b2bf3ea53de674b8";
xkb = {
extraLayouts.qwerty-fr = {
description = "QWERTY-fr";
languages = [ "fr" ];
symbolsFile = "${pkgs.stdenv.mkDerivation {
name = "qwerty-fr-keypad";
src = builtins.fetchGit {
url = "https://github.com/qwerty-fr/qwerty-fr.git";
rev = "3a4d13089e8ef016aa20baf6b2bf3ea53de674b8";
};
patches = [ ./qwerty-fr-keypad.diff ];
# TODO This doesn't seem to be applied... it's the whole point of the derivation :(
installPhase = ''
runHook preInstall
mkdir -p $out/linux
cp $src/linux/us_qwerty-fr $out/linux
runHook postInstall
'';
}}/linux/us_qwerty-fr";
};
patches = [ ./qwerty-fr-keypad.diff ];
# TODO This doesn't seem to be applied... it's the whole point of the derivation :(
installPhase = ''
runHook preInstall
mkdir -p $out/linux
cp $src/linux/us_qwerty-fr $out/linux
runHook postInstall
'';
}}/linux/us_qwerty-fr";
layout = "qwerty-fr";
};
layout = "qwerty-fr";
};
};
# Enable sound & bluetooth
sound.enable = true;
hardware = {
bluetooth.enable = true;
pulseaudio.enable = true;
# TODO Try pipewire
bluetooth.enable = true;
pulseaudio.enable = true;
# TODO Try pipewire
};
# So we can use gnome3 pinentry flavour

2
os/geoffrey.nix
View file

@ -41,7 +41,7 @@
programs.dconf.enable = true;
# Because everything is encrypted and I'm the only user, this is fine.
services.xserver.displayManager.autoLogin.user = "geoffrey";
services.displayManager.autoLogin.user = "geoffrey";
};
imports = [
home-manager.nixosModules.home-manager

2
os/printing/default.nix
View file

@ -3,7 +3,7 @@
config = lib.mkIf config.services.printing.enable {
services.avahi = {
enable = true;
nssmdns = true;
nssmdns4 = true;
openFirewall = true;
};
};