Merge branch 'main' of http://nas.local:3000/Administrateur/Nixos

flake.nix

@@ -59,6 +59,7 @@
                 home-manager = home-manager;
                 nixpkgs = nixpkgs;
                 nixpkgs-unstable = nixpkgs-unstable;
+                flatpaks = nix-flatpak;
               };
               modules = [
                 (import-tree ./overlays/nixos)

hosts/nixos/home/users/alistreaza.nix

@@ -1,9 +1,16 @@
-{ import-tree, ... }:
+{
+  pkgs,
+  flatpaks,
+  import-tree,
+  ...
+}:
 {
   home-manager.users.alistreaza = {
     imports = [
       (import-tree ../../../../modules/home/common)
       (import-tree ../../../../modules/home/nixos)
+
+      flatpaks.homeManagerModules.nix-flatpak
     ];
 
     home = {
@@ -31,6 +38,9 @@
     home.firefox.enable = true;
     home.firefox.privacy = true;
 
+    # Apps installation
+    home.packages = with pkgs; [ zed-editor ];
+
     # The state version is required and should stay at the version you
     # originally installed.
     home.stateVersion = "26.05";

hosts/nixos/system/hardware-configuration.nix

@@ -1,45 +1,32 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/eb35b14e-3473-40f4-96ad-284204b9d615";
+    { device = "/dev/disk/by-uuid/7dec9162-bb50-43c9-b889-b371f0991394";
-    fsType = "btrfs";
+      fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/5D52-D5CA";
+    { device = "/dev/disk/by-uuid/67A5-1ECA";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0022"
-      "dmask=0022"
-    ];
     };
 
-  swapDevices = [ ];
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/06328505-6421-46e8-b82e-f74f5d7656c9"; }
+    ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/nixos/system/os.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   # System services
@@ -17,13 +17,18 @@
   # System configurations
   os.keyboard.apple.enable = true;
 
-  # Virtualisation Apps
+  # Podman & Cuda
-  os.virtualisation.cuda.enable = false;
+  os.virtualisation.cuda.enable = true;
   os.virtualisation.podman.enable = true;
 
   # Shells configurations
+  os.flatpak.enable = true;
   os.shells.gnome.enable = true;
 
+  # Apps configurations
+  os.flatpak.gtk = true;
+  os.virtualisation.podman.gtk = true;
+
   # Terminal
   programs.ssh.enableAskPassword = false; # No-window git push fix
 

modules/home/nixos/apps/firefox.nix

@@ -43,6 +43,7 @@ in
         settings = mkMerge [
           {
             # Vertical tabs
+            "browser.nova.enabled" = true;
             "sidebar.revamp" = true;
             "sidebar.verticalTabs" = true;
             "sidebar.new-sidebar.has-used" = true;

modules/home/nixos/shells/gnome.nix

@@ -17,23 +17,29 @@ in
         default = true;
         description = "Enable the PaperWM extension.";
       };
-
       app-hider = mkOption {
         type = types.bool;
         default = true;
         description = "Enable the App Hider extension.";
       };
-
       dash-to-panel = mkOption {
         type = types.bool;
         default = true;
         description = "Enable the Dash to Panel extension.";
       };
-
+      blur-my-shell = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Enable the Blur My Shell extension.";
+      };
+      dynamic-music-pill = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Enable the Dynamic Music Pill extension.";
+      };
     };
   };
   config = mkIf cfg.enable {
-
     home.packages = mkMerge [
       [
         pkgs.numix-icon-theme
@@ -42,8 +48,9 @@ in
       (mkIf cfg.extensions.paperwm [ pkgs.gnomeExtensions.paperwm ])
       (mkIf cfg.extensions.app-hider [ pkgs.gnomeExtensions.app-hider ])
       (mkIf cfg.extensions.dash-to-panel [ pkgs.gnomeExtensions.dash-to-panel ])
+      (mkIf cfg.extensions.blur-my-shell [ pkgs.gnomeExtensions.blur-my-shell ])
+      (mkIf cfg.extensions.dynamic-music-pill [ pkgs.gnomeExtensions.dynamic-music-pill ])
     ];
-
     dconf = {
       enable = true;
       settings = mkMerge [
@@ -57,7 +64,6 @@ in
               ])
             ];
           };
-
           # We define the interface settings to use a teal accent color and prefer dark color scheme.
           "org/gnome/desktop/interface" = {
             accent-color = "teal";
@@ -68,7 +74,6 @@ in
           "org/gnome/desktop/wm/preferences" = {
             button-layout = "appmenu:maximize,minimize,close";
           };
-
           # We define the shell settings to enable user extensions
           # and enable the PaperWM, App Hider, and Dash to Panel extensions if they are enabled in the configuration.
           "org/gnome/shell" = {
@@ -79,9 +84,30 @@ in
                 (mkIf cfg.extensions.paperwm [ paperwm.extensionUuid ])
                 (mkIf cfg.extensions.app-hider [ app-hider.extensionUuid ])
                 (mkIf cfg.extensions.dash-to-panel [ dash-to-panel.extensionUuid ])
+                (mkIf cfg.extensions.blur-my-shell [ blur-my-shell.extensionUuid ])
+                (mkIf cfg.extensions.dynamic-music-pill [ dynamic-music-pill.extensionUuid ])
               ];
           };
         }
+        (mkIf cfg.extensions.dynamic-music-pill {
+          "org/gnome/shell/extensions/dynamic-music-pill" = {
+            vertical-offset = 0;
+            target-container = 3;
+
+            edge-margin = 10;
+            border-radius = 5;
+            panel-pill-height = 32;
+
+            visualizer-height = 16;
+            visualizer-padding = 10;
+            visualizer-bar-width = 1;
+
+            enable-shadow = false;
+            has-seen-first-hint = true;
+            pill-dynamic-width = false;
+            enable-transparency = false;
+          };
+        })
         (mkIf cfg.extensions.app-hider {
           "org/gnome/shell/extensions/app-hider" = {
             hidden-apps = [
@@ -92,6 +118,26 @@ in
             ];
           };
         })
+        (mkIf cfg.extensions.blur-my-shell {
+          "org/gnome/shell/extensions/blur-my-shell" = {
+            rounded-blur-found = false;
+          };
+          "org/gnome/shell/extensions/blur-my-shell/panel" = {
+            blur = false;
+          };
+          "org/gnome/shell/extensions/blur-my-shell/appfolder" = {
+            sigma = 30;
+            blur = true;
+            brightness = 0.6;
+            style-dialogs = 3;
+          };
+          "org/gnome/shell/extensions/blur-my-shell/applications" = {
+            blur = false;
+          };
+          "org/gnome/shell/extensions/blur-my-shell/coverflow-alt-tab" = {
+            blur = false;
+          };
+        })
         (mkIf cfg.extensions.dash-to-panel {
           "org/gnome/shell/extensions/dash-to-panel" = {
             prefs-opened = false;

modules/system/nixos/flatpak.nix

@@ -5,15 +5,23 @@ let
 in
 {
   options.os.flatpak = {
+    gtk = mkEnableOption "Flatpak app install";
     enable = mkEnableOption "System pipewire service";
   };
   config = mkIf cfg.enable {
 
-    services.flatpak.enable = true;
+    services.flatpak = {
-    services.flatpak.update.auto = {
+      enable = true;
+      update.auto = {
         enable = true;
         onCalendar = "weekly"; # Default value
       };
+      packages =
+        [ ]
+        ++ lib.optionals cfg.gtk [
+          "io.github.flattool.Warehouse"
+        ];
+    };
 
   };
 }

modules/system/nixos/games/proton.nix

@@ -0,0 +1,22 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib;
+let
+  cfg = config.os.protonge;
+in
+{
+  options.os.protonge = {
+    enable = mkEnableOption "System pipewire service";
+  };
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [
+      umu-launcher
+    ];
+
+  };
+}

modules/system/nixos/games/steam.nix

@@ -0,0 +1,29 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib;
+let
+  cfg = config.os.steam;
+in
+{
+  options.os.steam = {
+    enable = mkEnableOption "System pipewire service";
+  };
+  config = mkIf cfg.enable {
+
+    programs.steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
+      extraCompatPackages = with pkgs; [
+        proton-ge-bin
+      ];
+    };
+
+    programs.gamemode.enable = true;
+
+  };
+}

modules/system/nixos/shells/gnome.nix

@@ -30,12 +30,9 @@ in
         gnome-user-docs
       ];
 
-      systemPackages =
+      systemPackages = with pkgs; [
-        with pkgs;
-        [
         papers
         nautilus
-          gnome-text-editor
       ];
     };
 

modules/system/nixos/virtualisations/podman.nix

@@ -12,12 +12,16 @@ let
 in
 {
   options.os.virtualisation.podman = {
-    enable = mkEnableOption "System docker service";
+    gtk = mkEnableOption "Podman app install";
+    enable = mkEnableOption "System podman service";
   };
   config = mkIf cfg.enable {
 
     virtualisation = {
-      containers.enable = true;
+      containers = {
+        enable = true;
+        registries.search = [ "docker.io" ];
+      };
       podman = {
         enable = true;
         dockerCompat = true;
@@ -27,9 +31,7 @@ in
     };
 
     environment = {
-      systemPackages = with pkgs; [
+      systemPackages = with pkgs; [ podman-compose ] ++ lib.optionals cfg.gtk [ pods ];
-        podman-compose
-      ];
     };
 
     users.groups.podman.members = users;

overlays/nixos/overlays.nix

@@ -19,6 +19,10 @@
     ) (nixpkgs.lib.toList pkg.meta.license)
     || builtins.elem (nixpkgs.lib.getName pkg) [
       "nvidia-x11"
+    ]
+    || builtins.elem (nixpkgs.lib.getName pkg) [
+      "steam"
+      "steam-unwrapped"
     ];
 
   nixpkgs.overlays = [