douzeb/mrflos-nixos-config-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

save a l\arrache

Browse source
This commit is contained in:
Florian Schmitt 2023-06-19 15:52:25 +03:00
parent 3774c53e72
commit aa631246b2
7 changed files with 150 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
machines/MacBookPro12.1-configuration.nix
View file

@ -6,8 +6,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
hardware.bluetooth.enable = true; hardware.bluetooth.enable = false;
# Additional configuration from github/jeremiehuchet/nixos-macbookpro # Additional configuration from github/jeremiehuchet/nixos-macbookpro
boot.kernelParams = [ boot.kernelParams = [
"hid_apple.fnmode=1" "hid_apple.fnmode=1"
@ -80,7 +80,7 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.11"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?
} }

8
machines/MacBookPro12.1-hardware-configuration.nix
View file

@ -12,7 +12,10 @@
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.blacklistedKernelModules = [ ];
boot.extraModulePackages = with config.boot.kernelPackages; [
#rtl8192eu
];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/d56411cf-7072-48a8-aab7-70fb73695e64"; { device = "/dev/disk/by-uuid/d56411cf-7072-48a8-aab7-70fb73695e64";
@ -33,9 +36,10 @@
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
#nixpkgs.config.allowBroken = true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display # high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true; #hardware.video.hidpi.enable = lib.mkDefault true;
hardware.opengl.enable = true; hardware.opengl.enable = true;
} }

6
modules/console.nix
View file

@ -23,6 +23,7 @@
nixupdate = "sudo nixos-rebuild switch"; nixupdate = "sudo nixos-rebuild switch";
nixclean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc"; nixclean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc";
}; };
shellInit = "cd ~/Developpements;";
ohMyZsh = { ohMyZsh = {
enable = true; enable = true;
plugins = [ "git" ]; plugins = [ "git" ];
@ -53,12 +54,15 @@
mosh mosh
neofetch neofetch
pandoc pandoc
pciutils
starship starship
tmux tmux
tree tree
unzip unzip
whois usbutils
wget wget
whois
wirelesstools
zola zola
zsh-autosuggestions zsh-autosuggestions
]; ];

73
modules/desktop.nix
View file

@ -12,6 +12,9 @@ in
services = { services = {
#blueman.enable = true; #blueman.enable = true;
openvpn.servers = {
arn = { config = '' config /home/mrflos/Nextcloud/vpn\ ARN/2023/vpn510.conf ''; };
};
pipewire = { pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
@ -31,14 +34,7 @@ in
layout = "us"; layout = "us";
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
desktopManager.plasma5.excludePackages = with pkgs.libsForQt5; [ # desktopManager.gnome.enable = true;
elisa
gwenview
oxygen
khelpcenter
plasma-browser-integration
];
desktopManager.gnome.enable = true;
# libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager). # libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
}; };
@ -47,7 +43,9 @@ in
programs = { programs = {
# conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867 # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867
ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass"; ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
ssh.startAgent = true;
dconf.enable = true; dconf.enable = true;
steam.enable = true;
firefox.enable = true; firefox.enable = true;
chromium = { chromium = {
enable = true; enable = true;
@ -81,6 +79,13 @@ in
}; };
}; };
environment.plasma5.excludePackages = with pkgs.libsForQt5; [
elisa
gwenview
oxygen
khelpcenter
plasma-browser-integration
];
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -93,6 +98,8 @@ in
dracula-theme.theme-dracula dracula-theme.theme-dracula
ms-vscode-remote.remote-ssh ms-vscode-remote.remote-ssh
gruntfuggly.todo-tree gruntfuggly.todo-tree
eamodio.gitlens
mhutchie.git-graph
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{ {
name = "remote-ssh-edit"; name = "remote-ssh-edit";
@ -106,44 +113,50 @@ in
enableWideVine = true; # DRM support enableWideVine = true; # DRM support
}) })
bitwarden bitwarden
digikam
dracula-theme
palenight-theme
numix-cursor-theme
papirus-icon-theme
element-desktop element-desktop
filezilla filezilla
gimp-with-plugins gimp-with-plugins
gnome.gnome-tweaks hyprland
inkscape-with-extensions inkscape-with-extensions
inter joplin-desktop
kitty kitty
kitty-themes kitty-themes
libsForQt5.ark libsForQt5.ark
libsForQt5.bismuth libsForQt5.bismuth
mattermost-desktop mattermost-desktop
nextcloud-client nextcloud-client
obsidian
onlyoffice-bin
signal-desktop signal-desktop
tdesktop tdesktop
thunderbird thunderbird
transmission-qt
vlc vlc
unstable.hyprland
unstable.obsidian
]; ];
environment.gnome.excludePackages = (with pkgs; [ # environment.gnome.excludePackages = (with pkgs; [
gnome-photos # gnome-photos
gnome-tour # gnome-tour
]) ++ (with pkgs.gnome; [ # ]) ++ (with pkgs.gnome; [
cheese # webcam tool # cheese # webcam tool
gnome-music # gnome-music
gedit # text editor # gedit # text editor
epiphany # web browser # epiphany # web browser
geary # email reader # geary # email reader
gnome-characters # gnome-characters
tali # poker game # tali # poker game
iagno # go game # iagno # go game
hitori # sudoku game # hitori # sudoku game
atomix # puzzle game # atomix # puzzle game
yelp # Help view # yelp # Help view
gnome-contacts # gnome-contacts
gnome-initial-setup # gnome-initial-setup
]); # ]);
# Do not restart the display manager automatically # Do not restart the display manager automatically
systemd.services.display-manager.restartIfChanged = lib.mkForce false; systemd.services.display-manager.restartIfChanged = lib.mkForce false;

116
modules/home-config.nix
View file

@ -3,7 +3,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
# TODO can we automate the installation of home-manager ? # TODO can we automate the installation of home-manager ?
# sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-22.11.tar.gz home-manager # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
{ {
imports = [ imports = [
<home-manager/nixos> <home-manager/nixos>
@ -13,7 +13,7 @@
#programs.home-manager.enable = true; #programs.home-manager.enable = true;
home-manager.users.mrflos = { pkgs, ... }: { home-manager.users.mrflos = { pkgs, ... }: {
home.stateVersion = "22.11"; home.stateVersion = "23.05";
accounts.email.accounts = { accounts.email.accounts = {
"mrflos@chmok.net" = { "mrflos@chmok.net" = {
@ -31,6 +31,27 @@
tls.useStartTls = true; tls.useStartTls = true;
}; };
smtp = {
host = "mail.gandi.net";
port = 587;
tls.useStartTls = true;
};
};
"contact@yeswiki.pro" = {
realName = "YesWiki.pro";
userName = "contact@yeswiki.pro";
address = "contact@yeswiki.pro";
primary = false;
thunderbird = {
enable = true;
};
imap = {
host = "mail.gandi.net";
port = 143;
tls.useStartTls = true;
};
smtp = { smtp = {
host = "mail.gandi.net"; host = "mail.gandi.net";
port = 587; port = 587;
@ -57,38 +78,77 @@
}; };
gtk = { # gtk = {
enable = true; # enable = true;
iconTheme = { # iconTheme = {
name = "Papirus-Dark"; # name = "Papirus-Dark";
package = pkgs.papirus-icon-theme; # package = pkgs.papirus-icon-theme;
}; # };
theme = { # theme = {
name = "palenight"; # name = "dracula";
package = pkgs.palenight-theme; # package = pkgs.dracula-theme;
}; # };
cursorTheme = { # cursorTheme = {
name = "Numix-Cursor"; # name = "Numix-Cursor";
package = pkgs.numix-cursor-theme; # package = pkgs.numix-cursor-theme;
}; # };
gtk3.extraConfig = { # gtk3.extraConfig = {
Settings = '' # Settings = ''
gtk-application-prefer-dark-theme=1 # gtk-application-prefer-dark-theme=1
''; # '';
}; # };
gtk4.extraConfig = { # gtk4.extraConfig = {
Settings = '' # Settings = ''
gtk-application-prefer-dark-theme=1 # gtk-application-prefer-dark-theme=1
''; # '';
}; # };
}; # };
home.sessionVariables.GTK_THEME = "palenight"; # dconf.settings = {
# "org/gnome/shell" = {
# disable-user-extensions = false;
# favorite-apps = [
# "firefox.desktop"
# "thunderbird.desktop"
# "org.gnome.Nautilus.desktop"
# "kitty.desktop"
# "element.desktop"
# "mattermost.desktop"
# "codium.desktop"
# "virt-manager.desktop"
# ];
# };
# "org/gnome/desktop/interface" = {
# color-scheme = "prefer-dark";
# enable-hot-corners = false;
# };
# "org/gnome/desktop/wm/preferences" = {
# workspace-names = [ "Principal" ];
# };
# "org/gnome/desktop/background" = {
# picture-uri = "file:///run/current-system/sw/share/backgrounds/gnome/vnc-l.png";
# picture-uri-dark = "file:///run/current-system/sw/share/backgrounds/gnome/vnc-d.png";
# };
# "org/gnome/desktop/screensaver" = {
# picture-uri = "file:///run/current-system/sw/share/backgrounds/gnome/vnc-d.png";
# primary-color = "#3465a4";
# secondary-color = "#000000";
# };
# };
# home.packages = with pkgs; [
# gnomeExtensions.user-themes
# gnomeExtensions.tray-icons-reloaded
# gnomeExtensions.vitals
# gnomeExtensions.dash-to-panel
# gnomeExtensions.sound-output-device-chooser
# gnomeExtensions.space-bar
# ];
# home.sessionVariables.GTK_THEME = "dracula";
}; };

2
modules/local-dev.nix
View file

@ -117,6 +117,8 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(import (fetchTarball https://github.com/cachix/devenv/archive/v0.6.2.tar.gz)).default (import (fetchTarball https://github.com/cachix/devenv/archive/v0.6.2.tar.gz)).default
direnv direnv
php
symfony-cli
docker-compose docker-compose
nodejs nodejs
virt-manager virt-manager

6
modules/nixos.nix
View file

@ -12,7 +12,7 @@
}; };
# TODO : find what is installing this # TODO : find what is installing this
nixpkgs.config.permittedInsecurePackages = [ # nixpkgs.config.permittedInsecurePackages = [
"electron-21.4.0" # "electron-21.4.0"
]; # ];
} }