From 4fc593a88b109d828fa717278ea9963be7efa45e Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Mon, 18 Sep 2023 15:48:18 +0200
Subject: [PATCH] enigma changes
---
machines/enigma/default.nix | 34 +++++++++++++++++++++-------
machines/enigma/home-julien.nix | 39 ++++++++++++---------------------
2 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/machines/enigma/default.nix b/machines/enigma/default.nix
index 865385b..ff8bc71 100644
--- a/machines/enigma/default.nix
+++ b/machines/enigma/default.nix
@@ -14,6 +14,8 @@
boot.loader.efi.canTouchEfiVariables = true;
+ services.gnome.gnome-browser-connector.enable = true;
+
services.tailscale.enable = true;
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
@@ -21,20 +23,20 @@
services.resolved.enable = true;
-services.xserver.enable = true;
+ services.xserver.enable = true;
-services.xserver.displayManager.gdm.enable = true;
+ services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;
-# Enable OpenGL
+ # Enable OpenGL
hardware.opengl = {
enable = true;
driSupport = true;
-# driSupport32Bit = true;
+ # driSupport32Bit = true;
};
# Load nvidia driver for Xorg and Wayland
- services.xserver.videoDrivers = ["nvidia"];
+ services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = {
@@ -57,7 +59,7 @@ services.xserver.displayManager.gdm.enable = true;
open = true;
# Enable the Nvidia settings menu,
- # accessible via `nvidia-settings`.
+ # accessible via `nvidia-settings`.
nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU.
@@ -65,8 +67,23 @@ services.xserver.displayManager.gdm.enable = true;
};
-boot.initrd.kernelModules = [ "nvidia" ];
-boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
+ boot.initrd.kernelModules = [ "nvidia" ];
+ boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
+
+ services.spotifyd = {
+ enable = true;
+ settings = {
+ global = {
+ username = "julienmalka@icloud.com";
+ password_cmd = "cat /root/spotify_pw";
+ use_mpris = false;
+ };
+ };
+ };
+
+ systemd.services.spotifyd.serviceConfig.DynamicUser = lib.mkForce false;
+
+ programs.xwayland.enable = true;
time.timeZone = "Europe/Paris";
@@ -86,6 +103,7 @@ boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
tailscale
brightnessctl
sbctl
+ ddcutil
];
services.printing.enable = true;
diff --git a/machines/enigma/home-julien.nix b/machines/enigma/home-julien.nix
index c4d7575..19502a7 100644
--- a/machines/enigma/home-julien.nix
+++ b/machines/enigma/home-julien.nix
@@ -24,12 +24,12 @@
nix-direnv.enable = true;
};
-dconf.settings = {
- "org/gnome/desktop/input-sources" = {
- sources = [ (inputs.home-manager.lib.hm.gvariant.mkTuple [ "xkb" "fr" ]) ];
- xkb-options = [ ];
- };
-};
+ dconf.settings = {
+ "org/gnome/desktop/input-sources" = {
+ sources = [ (inputs.home-manager.lib.hm.gvariant.mkTuple [ "xkb" "fr" ]) ];
+ xkb-options = [ ];
+ };
+ };
home.packages = with pkgs;
[
du-dust
@@ -51,18 +51,26 @@ dconf.settings = {
obsidian
zotero
flameshot
+ albert
kitty
networkmanagerapplet
element-desktop
xdg-utils
+ onagre
sops
step-cli
scli
+ spotify-tui
texlive.combined.scheme-full
];
fonts.fontconfig.enable = true;
+ programs.firefox = {
+ enable = true;
+ package = pkgs.firefox-beta;
+ };
+
home.keyboard = {
layout = "fr";
};
@@ -71,25 +79,6 @@ dconf.settings = {
enable = true;
};
- programs.chromium = {
- enable = true;
- commandLineArgs = [
- "--ozone-platform-hint=wayland"
- "--load-media-router-component-extension=1"
- ];
- extensions = [
- { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # uBlock Origin
- { id = "ldlghkoiihaelfnggonhjnfiabmaficg"; } # Alt+Q switcher
- { id = "enjjhajnmggdgofagbokhmifgnaophmh"; } # Resolution Zoom for HiDPI
- { id = "fihnjjcciajhdojfnbdddfaoknhalnja"; } # I don't care about cookies
- { id = "ekhagklcjbdpajgpjgmbionohlpdbjgc"; } # Zotero Connector
- { id = "hlepfoohegkhhmjieoechaddaejaokhf"; } # Refined GitHub
- { id = "nngceckbapebfimnlniiiahkandclblb"; } # Bitwarden
- { id = "dcpihecpambacapedldabdbpakmachpb"; updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/src/updates/updates.xml"; }
- ];
- };
-
-
};