save a l\arrache
This commit is contained in:
Florian Schmitt
parent
3774c53e72
commit
aa631246b2
7 changed files with 150 additions and 67 deletions
|
|
@ -6,7 +6,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.enable = false;
|
||||
|
||||
# Additional configuration from github/jeremiehuchet/nixos-macbookpro
|
||||
boot.kernelParams = [
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
# 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.11"; # Did you read the comment?
|
||||
system.stateVersion = "23.05"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,10 @@
|
|||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.blacklistedKernelModules = [ ];
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [
|
||||
#rtl8192eu
|
||||
];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/d56411cf-7072-48a8-aab7-70fb73695e64";
|
||||
|
|
@ -33,9 +36,10 @@
|
|||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
#nixpkgs.config.allowBroken = true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# high-resolution display
|
||||
hardware.video.hidpi.enable = lib.mkDefault true;
|
||||
#hardware.video.hidpi.enable = lib.mkDefault true;
|
||||
hardware.opengl.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
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";
|
||||
};
|
||||
shellInit = "cd ~/Developpements;";
|
||||
ohMyZsh = {
|
||||
enable = true;
|
||||
plugins = [ "git" ];
|
||||
|
|
@ -53,12 +54,15 @@
|
|||
mosh
|
||||
neofetch
|
||||
pandoc
|
||||
pciutils
|
||||
starship
|
||||
tmux
|
||||
tree
|
||||
unzip
|
||||
whois
|
||||
usbutils
|
||||
wget
|
||||
whois
|
||||
wirelesstools
|
||||
zola
|
||||
zsh-autosuggestions
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ in
|
|||
|
||||
services = {
|
||||
#blueman.enable = true;
|
||||
openvpn.servers = {
|
||||
arn = { config = '' config /home/mrflos/Nextcloud/vpn\ ARN/2023/vpn510.conf ''; };
|
||||
};
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
|
|
@ -31,14 +34,7 @@ in
|
|||
layout = "us";
|
||||
displayManager.sddm.enable = true;
|
||||
desktopManager.plasma5.enable = true;
|
||||
desktopManager.plasma5.excludePackages = with pkgs.libsForQt5; [
|
||||
elisa
|
||||
gwenview
|
||||
oxygen
|
||||
khelpcenter
|
||||
plasma-browser-integration
|
||||
];
|
||||
desktopManager.gnome.enable = true;
|
||||
# desktopManager.gnome.enable = true;
|
||||
|
||||
# libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
|
||||
};
|
||||
|
|
@ -47,7 +43,9 @@ in
|
|||
programs = {
|
||||
# conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867
|
||||
ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
|
||||
ssh.startAgent = true;
|
||||
dconf.enable = true;
|
||||
steam.enable = true;
|
||||
firefox.enable = true;
|
||||
chromium = {
|
||||
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:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
@ -93,6 +98,8 @@ in
|
|||
dracula-theme.theme-dracula
|
||||
ms-vscode-remote.remote-ssh
|
||||
gruntfuggly.todo-tree
|
||||
eamodio.gitlens
|
||||
mhutchie.git-graph
|
||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
name = "remote-ssh-edit";
|
||||
|
|
@ -106,44 +113,50 @@ in
|
|||
enableWideVine = true; # DRM support
|
||||
})
|
||||
bitwarden
|
||||
digikam
|
||||
dracula-theme
|
||||
palenight-theme
|
||||
numix-cursor-theme
|
||||
papirus-icon-theme
|
||||
element-desktop
|
||||
filezilla
|
||||
gimp-with-plugins
|
||||
gnome.gnome-tweaks
|
||||
hyprland
|
||||
inkscape-with-extensions
|
||||
inter
|
||||
joplin-desktop
|
||||
kitty
|
||||
kitty-themes
|
||||
libsForQt5.ark
|
||||
libsForQt5.bismuth
|
||||
mattermost-desktop
|
||||
nextcloud-client
|
||||
obsidian
|
||||
onlyoffice-bin
|
||||
signal-desktop
|
||||
tdesktop
|
||||
thunderbird
|
||||
transmission-qt
|
||||
vlc
|
||||
unstable.hyprland
|
||||
unstable.obsidian
|
||||
];
|
||||
|
||||
environment.gnome.excludePackages = (with pkgs; [
|
||||
gnome-photos
|
||||
gnome-tour
|
||||
]) ++ (with pkgs.gnome; [
|
||||
cheese # webcam tool
|
||||
gnome-music
|
||||
gedit # text editor
|
||||
epiphany # web browser
|
||||
geary # email reader
|
||||
gnome-characters
|
||||
tali # poker game
|
||||
iagno # go game
|
||||
hitori # sudoku game
|
||||
atomix # puzzle game
|
||||
yelp # Help view
|
||||
gnome-contacts
|
||||
gnome-initial-setup
|
||||
]);
|
||||
# environment.gnome.excludePackages = (with pkgs; [
|
||||
# gnome-photos
|
||||
# gnome-tour
|
||||
# ]) ++ (with pkgs.gnome; [
|
||||
# cheese # webcam tool
|
||||
# gnome-music
|
||||
# gedit # text editor
|
||||
# epiphany # web browser
|
||||
# geary # email reader
|
||||
# gnome-characters
|
||||
# tali # poker game
|
||||
# iagno # go game
|
||||
# hitori # sudoku game
|
||||
# atomix # puzzle game
|
||||
# yelp # Help view
|
||||
# gnome-contacts
|
||||
# gnome-initial-setup
|
||||
# ]);
|
||||
|
||||
# Do not restart the display manager automatically
|
||||
systemd.services.display-manager.restartIfChanged = lib.mkForce false;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
# 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 = [
|
||||
<home-manager/nixos>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
#programs.home-manager.enable = true;
|
||||
|
||||
home-manager.users.mrflos = { pkgs, ... }: {
|
||||
home.stateVersion = "22.11";
|
||||
home.stateVersion = "23.05";
|
||||
|
||||
accounts.email.accounts = {
|
||||
"mrflos@chmok.net" = {
|
||||
|
|
@ -31,6 +31,27 @@
|
|||
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 = {
|
||||
host = "mail.gandi.net";
|
||||
port = 587;
|
||||
|
|
@ -57,38 +78,77 @@
|
|||
};
|
||||
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
# gtk = {
|
||||
# enable = true;
|
||||
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
# iconTheme = {
|
||||
# name = "Papirus-Dark";
|
||||
# package = pkgs.papirus-icon-theme;
|
||||
# };
|
||||
|
||||
theme = {
|
||||
name = "palenight";
|
||||
package = pkgs.palenight-theme;
|
||||
};
|
||||
# theme = {
|
||||
# name = "dracula";
|
||||
# package = pkgs.dracula-theme;
|
||||
# };
|
||||
|
||||
cursorTheme = {
|
||||
name = "Numix-Cursor";
|
||||
package = pkgs.numix-cursor-theme;
|
||||
};
|
||||
# cursorTheme = {
|
||||
# name = "Numix-Cursor";
|
||||
# package = pkgs.numix-cursor-theme;
|
||||
# };
|
||||
|
||||
gtk3.extraConfig = {
|
||||
Settings = ''
|
||||
gtk-application-prefer-dark-theme=1
|
||||
'';
|
||||
};
|
||||
# gtk3.extraConfig = {
|
||||
# Settings = ''
|
||||
# gtk-application-prefer-dark-theme=1
|
||||
# '';
|
||||
# };
|
||||
|
||||
gtk4.extraConfig = {
|
||||
Settings = ''
|
||||
gtk-application-prefer-dark-theme=1
|
||||
'';
|
||||
};
|
||||
};
|
||||
# gtk4.extraConfig = {
|
||||
# Settings = ''
|
||||
# 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";
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -117,6 +117,8 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
(import (fetchTarball https://github.com/cachix/devenv/archive/v0.6.2.tar.gz)).default
|
||||
direnv
|
||||
php
|
||||
symfony-cli
|
||||
docker-compose
|
||||
nodejs
|
||||
virt-manager
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
};
|
||||
|
||||
# TODO : find what is installing this
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-21.4.0"
|
||||
];
|
||||
# nixpkgs.config.permittedInsecurePackages = [
|
||||
# "electron-21.4.0"
|
||||
# ];
|
||||
}
|
||||
Loading…
Reference in a new issue