phfroidmont/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reformat Nix files

Browse source
This commit is contained in:
Paul-Henri Froidmont 2021-07-16 19:13:51 +02:00
parent f39ddc8078
commit fdc4148540
Signed by: phfroidmont
GPG key ID: BE948AFD7E7873BE
9 changed files with 87 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

18
configs/games.nix
View file

@ -1,16 +1,18 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
home-manager.users.froidmpa = {pkgs, config, ...}: { home-manager.users.froidmpa = { pkgs, config, ... }: {
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
packageOverrides = super: let self = super.pkgs; in { packageOverrides = super:
lutris-unwrapped = super.lutris-unwrapped.overridePythonAttrs (oldAttrs: rec { let self = super.pkgs; in
patches = [ {
./lutris_sort_new_with_model_fix.patch lutris-unwrapped = super.lutris-unwrapped.overridePythonAttrs (oldAttrs: rec {
]; patches = [
}); ./lutris_sort_new_with_model_fix.patch
}; ];
});
};
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
steam steam

6
configs/home/cli.nix
View file

@ -54,7 +54,7 @@
hideUserlandThreads = true; hideUserlandThreads = true;
highlightBaseName = true; highlightBaseName = true;
fields = [ "PID" "USER" "M_RESIDENT" "M_SHARE" "STATE" "PERCENT_CPU" "PERCENT_MEM" "IO_RATE" "TIME" "COMM" ]; fields = [ "PID" "USER" "M_RESIDENT" "M_SHARE" "STATE" "PERCENT_CPU" "PERCENT_MEM" "IO_RATE" "TIME" "COMM" ];
meters.left = [ "LeftCPUs" "Memory" "Swap" ] ; meters.left = [ "LeftCPUs" "Memory" "Swap" ];
meters.right = [ "RightCPUs" "Tasks" "LoadAverage" "Uptime" ]; meters.right = [ "RightCPUs" "Tasks" "LoadAverage" "Uptime" ];
}; };
broot = { broot = {
@ -112,8 +112,8 @@
home.file.".config/ranger/plugins" = { home.file.".config/ranger/plugins" = {
source = builtins.fetchGit { source = builtins.fetchGit {
url = "git://github.com/phfroidmont/ranger_devicons.git"; url = "git://github.com/phfroidmont/ranger_devicons.git";
rev = "e02b6a3203411b76616a0e4328245bf8b47c5dcc"; rev = "e02b6a3203411b76616a0e4328245bf8b47c5dcc";
}; };
recursive = true; recursive = true;
}; };

96
configs/home/xmonad.nix
View file

@ -13,7 +13,7 @@
numlock.enable = true; numlock.enable = true;
}; };
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
ncmpcpp = pkgs.ncmpcpp.override {visualizerSupport = true;}; ncmpcpp = pkgs.ncmpcpp.override { visualizerSupport = true; };
firefox = pkgs.firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }; firefox = pkgs.firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; };
}; };
@ -42,7 +42,7 @@
]; ];
keyboard = { keyboard = {
layout = "fr"; layout = "fr";
options = ["caps:escape"]; options = [ "caps:escape" ];
}; };
file = { file = {
".wallpaper.png".source = ./files/wallpaper.png; ".wallpaper.png".source = ./files/wallpaper.png;
@ -77,20 +77,20 @@
musicDirectory = "${config.home.homeDirectory}/Nextcloud/Media/Music"; musicDirectory = "${config.home.homeDirectory}/Nextcloud/Media/Music";
playlistDirectory = "${config.home.homeDirectory}/Nextcloud/Playlists"; playlistDirectory = "${config.home.homeDirectory}/Nextcloud/Playlists";
extraConfig = '' extraConfig = ''
max_output_buffer_size "16384" max_output_buffer_size "16384"
auto_update "yes" auto_update "yes"
audio_output { audio_output {
type "pulse" type "pulse"
name "pulse audio" name "pulse audio"
device "pulse" device "pulse"
mixer_type "hardware" mixer_type "hardware"
} }
audio_output { audio_output {
type "fifo" type "fifo"
name "toggle_visualizer" name "toggle_visualizer"
path "/tmp/mpd.fifo" path "/tmp/mpd.fifo"
format "44100:16:2" format "44100:16:2"
} }
''; '';
}; };
stalonetray = { stalonetray = {
@ -98,11 +98,11 @@
config = { config = {
geometry = "1x1-5+0"; geometry = "1x1-5+0";
background = "#000000"; background = "#000000";
transparent = true; transparent = true;
grow_gravity = "E"; grow_gravity = "E";
icon_gravity = "E"; icon_gravity = "E";
icon_size = "24"; icon_size = "24";
kludges = "force_icons_size"; kludges = "force_icons_size";
}; };
}; };
unclutter.enable = true; unclutter.enable = true;
@ -111,7 +111,7 @@
enable = true; enable = true;
settings = { settings = {
global = { global = {
monitor = 0; monitor = 0;
geometry = "350x5-30+50"; geometry = "350x5-30+50";
transparency = 10; transparency = 10;
font = "monospace 14"; font = "monospace 14";
@ -124,7 +124,7 @@
sort = "yes"; sort = "yes";
}; };
frame = { frame = {
width = 3; width = 3;
color = "#ebdbb2"; color = "#ebdbb2";
}; };
shortcuts = { shortcuts = {
@ -165,7 +165,7 @@
urxvt = { urxvt = {
enable = true; enable = true;
package = pkgs.rxvt_unicode-with-plugins; package = pkgs.rxvt_unicode-with-plugins;
fonts = ["xft:monospace:size=12:antialias=true"]; fonts = [ "xft:monospace:size=12:antialias=true" ];
scroll = { scroll = {
bar.enable = false; bar.enable = false;
lines = 65535; lines = 65535;
@ -175,31 +175,31 @@
"Shift-Control-V" = "eval:paste_clipboard"; "Shift-Control-V" = "eval:paste_clipboard";
}; };
extraConfig = { extraConfig = {
"perl-ext-common" = "default,clipboard,matcher,resize-font"; "perl-ext-common" = "default,clipboard,matcher,resize-font";
"background" = "rgba:28ff/28ff/28ff/cf00"; "background" = "rgba:28ff/28ff/28ff/cf00";
"foreground" = "#ebdbb2"; "foreground" = "#ebdbb2";
"color0" = "#282828"; "color0" = "#282828";
"color8" = "#928374"; "color8" = "#928374";
"color1" = "#cc241d"; "color1" = "#cc241d";
"color9" = "#fb4934"; "color9" = "#fb4934";
"color2" = "#98971a"; "color2" = "#98971a";
"color10" = "#b8bb26"; "color10" = "#b8bb26";
"color3" = "#d79921"; "color3" = "#d79921";
"color11" = "#fabd2f"; "color11" = "#fabd2f";
"color4" = "#458588"; "color4" = "#458588";
"color12" = "#83a598"; "color12" = "#83a598";
"color5" = "#b16286"; "color5" = "#b16286";
"color13" = "#d3869b"; "color13" = "#d3869b";
"color6" = "#689d6a"; "color6" = "#689d6a";
"color14" = "#8ec07c"; "color14" = "#8ec07c";
"color7" = "#a89984"; "color7" = "#a89984";
"color15" = "#ebdbb2"; "color15" = "#ebdbb2";
"termName" = "rxvt-256color"; "termName" = "rxvt-256color";
"letterSpace" = "-1"; "letterSpace" = "-1";
"internalBorder" = "10"; "internalBorder" = "10";
"depth" = "32"; "depth" = "32";
"resize-font.smaller" = "C-Down"; "resize-font.smaller" = "C-Down";
"resize-font.bigger" = "C-Up"; "resize-font.bigger" = "C-Up";
}; };
}; };
}; };

2
configs/system.nix
View file

@ -10,7 +10,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(pkgs.writeShellScriptBin "nixFlakes" '' (pkgs.writeShellScriptBin "nixFlakes" ''
exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@" exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
'') '')
wget wget

2
configs/virtualisation.nix
View file

@ -8,7 +8,7 @@
}; };
users.users.froidmpa.extraGroups = [ "docker" "vboxusers" ]; users.users.froidmpa.extraGroups = [ "docker" "vboxusers" ];
home-manager.users.froidmpa = {pkgs, config, ...}: { home-manager.users.froidmpa = { pkgs, config, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
docker-compose docker-compose
]; ];

6
hosts/froidmpa-laptop/configuration.nix
View file

@ -53,20 +53,20 @@
}; };
services.blueman.enable = true; services.blueman.enable = true;
home-manager.users.froidmpa = {pkgs, config, ...}: { home-manager.users.froidmpa = { pkgs, config, ... }: {
imports = [ imports = [
../../configs/home/full.nix ../../configs/home/full.nix
]; ];
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Paul-Henri Froidmont"; userName = "Paul-Henri Froidmont";
userEmail = "git.contact-57n2p@froidmont.org"; userEmail = "git.contact-57n2p@froidmont.org";
}; };
services.network-manager-applet.enable = true; services.network-manager-applet.enable = true;
services.blueman-applet.enable = true; services.blueman-applet.enable = true;
services.grobi = { services.grobi = {
enable = true; enable = true;
executeAfter = ["${pkgs.systemd}/bin/systemctl --user restart stalonetray" "${pkgs.feh}/bin/feh --bg-fill ~/.wallpaper.png"]; executeAfter = [ "${pkgs.systemd}/bin/systemctl --user restart stalonetray" "${pkgs.feh}/bin/feh --bg-fill ~/.wallpaper.png" ];
rules = [ rules = [
{ {
name = "Work HDMI"; name = "Work HDMI";

12
hosts/froidmpa-laptop/hardware-configuration.nix
View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
@ -14,19 +15,20 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e"; {
device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/1e900b2e-daea-4558-b18f-3d3a5843de61"; boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/1e900b2e-daea-4558-b18f-3d3a5843de61";
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/077C-758A"; {
device = "/dev/disk/by-uuid/077C-758A";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/bb8fa9ef-9b8f-413d-913a-6c891649a954"; } [{ device = "/dev/disk/by-uuid/bb8fa9ef-9b8f-413d-913a-6c891649a954"; }];
];
} }

18
hosts/nixos-desktop/configuration.nix
View file

@ -8,7 +8,7 @@
../../configs/games.nix ../../configs/games.nix
]; ];
home-manager.users.froidmpa = {pkgs, config, ...}: { home-manager.users.froidmpa = { pkgs, config, ... }: {
imports = [ imports = [
../../configs/home/full.nix ../../configs/home/full.nix
]; ];
@ -17,7 +17,7 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Paul-Henri Froidmont"; userName = "Paul-Henri Froidmont";
userEmail = "git.contact-57n2p@froidmont.org"; userEmail = "git.contact-57n2p@froidmont.org";
signing = { signing = {
key = "3AC6F170F01133CE393BCD94BE948AFD7E7873BE"; key = "3AC6F170F01133CE393BCD94BE948AFD7E7873BE";
@ -27,12 +27,12 @@
}; };
hardware.opengl = { hardware.opengl = {
driSupport = true; driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
rocm-opencl-icd rocm-opencl-icd
rocm-opencl-runtime rocm-opencl-runtime
]; ];
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -64,7 +64,7 @@
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
services.xserver.videoDrivers = ["amdgpu"]; services.xserver.videoDrivers = [ "amdgpu" ];
services.sshd.enable = true; services.sshd.enable = true;
services.pcscd.enable = true; services.pcscd.enable = true;

9
hosts/nixos-desktop/hardware-configuration.nix
View file

@ -7,18 +7,19 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/f1e21558-88e6-413e-b56a-04e0b25e9ddd"; {
device = "/dev/disk/by-uuid/f1e21558-88e6-413e-b56a-04e0b25e9ddd";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CCD1-0415"; {
device = "/dev/disk/by-uuid/CCD1-0415";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/f714775c-b5af-4c0c-8330-999b43db4794"; } [{ device = "/dev/disk/by-uuid/f714775c-b5af-4c0c-8330-999b43db4794"; }];
];
nix.maxJobs = lib.mkDefault 16; nix.maxJobs = lib.mkDefault 16;
# High-DPI console # High-DPI console