Flake parts completed

2024-10-21 17:40:25 +02:00 · 2024-10-21 17:40:25 +02:00 · 8e9044edd5
commit 8e9044edd5
parent 97f500a3bf
10 changed files with 389 additions and 576 deletions
--- a/flake.nix
+++ b/flake.nix
@ -43,579 +43,401 @@
    # emanote.url = "github:srid/emanote";
  };

-  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-    systems = import inputs.systems;
-    imports = [
-      inputs.git-hooks-nix.flakeModule
-    ];
-    perSystem = { config, pkgs, system, ... }: {
-      _module.args.pkgs = import inputs.nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-        overlays = [
-          inputs.nix-rice.overlays.default
-          # inputs.self.overlays.rice.default
-          inputs.self.overlays.packages
+  outputs = inputs:
+    let
+      nix-config = {
+        allowUnfree = true;
+        extraOptions = "experimental-features = nix-command flakes";
+        permittedInsecurePackages = [
+          "electron-27.3.11" # LogSeq
        ];
      };

-      pre-commit.settings.hooks = {
-        deadnix.enable = true;
-        nixpkgs-fmt.enable = true;
-        statix.enable = true;
+
+      basic_module = {
+        nixpkgs = {
+          config = nix-config;
+          overlays = [
+            # Nix rice
+            inputs.nix-rice.overlays.default
+            inputs.self.overlays.rice
+
+            # packages
+            inputs.self.overlays.packages
+            inputs.self.overlays.overrides
+          ];
+        };
+        nix = {
+          inherit (nix-config) extraOptions;
+          registry = {
+            nixpkgs = { from = { id = "nixpkgs"; type = "indirect"; }; to = { owner = "nixos"; repo = "nixpkgs"; type = "github"; }; };
+            stable = { from = { id = "stable"; type = "indirect"; }; flake = inputs.nixpkgs; };
+            unstable = { from = { id = "unstable"; type = "indirect"; }; flake = inputs.nixpkgs-u; };
+          };
+        };
      };

-      devShells.default = pkgs.mkShell {
-        shellHook = ''
-          ${config.pre-commit.installationScript}
-        '';
-      };
+      # Home manager configuration
+      homeManagerModules = [
+        inputs.home-manager.nixosModules.default
+        {
+          home-manager = {
+            useGlobalPkgs = true;
+            useUserPackages = true;
+          };
+        }
+      ];
+      homeManagerUModules = [
+        inputs.home-manager-u.nixosModules.default
+        { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }
+      ];

-      formatter = pkgs.nixpkgs-fmt;

-      packages = {
-        inherit
-          (pkgs)
-          keyboard-switch
-          sddm-sugar-dark
-          sddm-theme-clairvoyance
-          wl-clipedit
-          wl-lockscreen
-          wl-update-background
-          ;
-      };
-    };
+      commonModules = [
+        # Nix configuration
+        basic_module

-    flake = {
-      overlays = {
-        default = inputs.self.overlays.packages;
+        # S3 cache read
+        ./modules/nixos/s3_cache_read.nix

-        rice = import ./rice.nix;
+        # Agenix configuration
+        inputs.agenix.nixosModules.default
+        {
+          age.secrets = {
+            wg_psk.file = ./secrets/wg_psk.age;
+            baldur_wg_priv.file = ./secrets/baldur_wg_priv.age;
+            oppo_wg_priv.file = ./secrets/oppo_wg_priv.age;
+          };
+        }

-        packages = self: _super: {
-          keyboard-switch = self.callPackage ./pkgs/keyboard-switch { };
-          sddm-sugar-dark = self.callPackage ./pkgs/sddm-sugar-dark { };
-          sddm-theme-clairvoyance = self.callPackage ./pkgs/sddm-theme-clairvoyance { };
-          wl-clipedit = self.callPackage ./pkgs/wl-clipedit { };
-          wl-lockscreen = self.callPackage ./pkgs/wl-lockscreen { };
-          wl-update-background = self.callPackage ./pkgs/wl-update-background { };
+        ./modules/nixos/users/bertof.nix
+
+        # Some basic defaults
+        ./modules/nixos/basics
+      ];
+
+
+      odinCommonModules = [
+        inputs.nixos-hardware.nixosModules.common-cpu-intel
+        inputs.nixos-hardware.nixosModules.common-pc-laptop
+        inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
+        ./instances/odin/hardware-configuration.nix
+        ./instances/odin/common_configuration.nix
+
+        # S3 cache write
+        ./modules/nixos/s3_cache_write.nix
+
+        # ./modules/nixos/pro_audio.nix
+        ./modules/nixos/kdeconnect.nix
+        ./modules/nixos/steam.nix
+
+        ./modules/nixos/hyprland.nix
+        { home-manager.users.bertof.imports = [ ./modules/hm/hyprland.nix ]; }
+
+        ./modules/nixos/musa.nix
+      ] ++ homeManagerUModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; }];
+
+
+      installerModules = commonModules ++ [ ./modules/nixos/installer.nix ];
+
+
+    in
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = import inputs.systems;
+      imports = [
+        inputs.git-hooks-nix.flakeModule
+      ];
+      perSystem = { config, pkgs, system, ... }: {
+        _module.args.pkgs = import inputs.nixpkgs {
+          inherit system;
+          config = nix-config;
+          overlays = [
+            inputs.nix-rice.overlays.default
+            # inputs.self.overlays.rice.default
+            inputs.self.overlays.packages
+          ];
        };

-        overrides = self: super: {
-          google-chrome = super.google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; };
-          sddm-theme-clairvoyance = self.callPackage ./custom/sddm-theme-clairvoyance { wallpaper = ./wallpapers/background.jpg; };
-          way-lockscreen = self.callPackage ./custom/way-lockscreen { palette = self.rice.colorPalette; font = self.rice.font.normal; };
+        pre-commit.settings.hooks = {
+          deadnix.enable = true;
+          nixpkgs-fmt.enable = true;
+          statix.enable = true;
        };

-        # two-channels = (self: _: {
-        #   stable_pkgs = import inputs.nixpkgs {
-        #     inherit config overlays;
-        #     inherit (self) system;
-        #   };
-        #   unstable_pkgs = import inputs.nixpkgs-u {
-        #     inherit config overlays;
-        #     inherit (self) system;
-        #   };
-        # });
+        devShells.default = pkgs.mkShell {
+          shellHook = ''
+            ${config.pre-commit.installationScript}
+            LOCAL_KEY = "/etc/nix/key";
+          '';
+        };
+
+        formatter = pkgs.nixpkgs-fmt;
+
+        packages = {
+          inherit
+            (pkgs)
+            keyboard-switch
+            sddm-sugar-dark
+            sddm-theme-clairvoyance
+            wl-clipedit
+            wl-lockscreen
+            wl-update-background
+            ;


+          # Installer ISO
+          install-iso = inputs.nixos-generators.nixosGenerate {
+            inherit system;
+            modules = installerModules;
+            format = "install-iso";
+          };
+          # RAW base image
+          raw-base-image = inputs.nixos-generators.nixosGenerate {
+            inherit system;
+            modules = installerModules;
+            format = "raw-efi";
+          };
+          # VMDK base image
+          vmdk-base-image = inputs.nixos-generators.nixosGenerate {
+            system = "x86_64-linux";
+            modules = installerModules;
+            format = "vmware";
+          };
+          # Aarch64 base image
+          aarch64-base-image = inputs.nixos-generators.nixosGenerate {
+            system = "aarch64-linux";
+            modules = installerModules;
+            format = "sd-aarch64";
+          };
+          # Installer DigitalOcean
+          do-image = inputs.nixos-generators.nixosGenerate {
+            inherit system;
+            modules = installerModules;
+            format = "do";
+          };
+
+        };
+      };
+
+      flake = {
+
+        overlays = {
+          default = inputs.self.overlays.packages;
+
+          rice = import ./rice.nix;
+
+          packages = self: _super: {
+            keyboard-switch = self.callPackage ./pkgs/keyboard-switch { };
+            sddm-sugar-dark = self.callPackage ./pkgs/sddm-sugar-dark { };
+            sddm-theme-clairvoyance = self.callPackage ./pkgs/sddm-theme-clairvoyance { };
+            wl-clipedit = self.callPackage ./pkgs/wl-clipedit { };
+            wl-lockscreen = self.callPackage ./pkgs/wl-lockscreen { };
+            wl-update-background = self.callPackage ./pkgs/wl-update-background { };
+          };
+
+          overrides = self: super: {
+            google-chrome = super.google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; };
+            sddm-theme-clairvoyance = super.sddm-theme-clairvoyance.override { wallpaper = ./wallpapers/background.jpg; };
+            wl-lockscreen = super.wl-lockscreen.override { strPalette = self.lib.nix-rice.palette.toRgbaShortHex self.rice.colorPalette; font = self.rice.font.normal; };
+          };
+
+          # two-channels = (self: _: {
+          #   stable_pkgs = import inputs.nixpkgs {
+          #     inherit config overlays;
+          #     inherit (self) system;
+          #   };
+          #   unstable_pkgs = import inputs.nixpkgs-u {
+          #     inherit config overlays;
+          #     inherit (self) system;
+          #   };
+          # });
+        };
+
+        nixosConfigurations =
+          {
+
+            thor = inputs.nixpkgs-u.lib.nixosSystem {
+              system = "x86_64-linux";
+              modules =
+                commonModules
+                ++ [
+                  ./instances/thor/hardware-configuration.nix
+                  inputs.nixos-hardware.nixosModules.common-cpu-amd
+                  inputs.nixos-hardware.nixosModules.common-pc-ssd
+                  ./instances/thor/configuration.nix
+
+                  # S3 cache write
+                  ./modules/nixos/s3_cache_write.nix
+
+                  ./modules/nixos/pro_audio.nix
+                  ./modules/nixos/kdeconnect.nix
+                  ./modules/nixos/steam.nix
+
+                  ./modules/nixos/plymouth.nix
+                  ./modules/nixos/hyprland.nix
+                  {
+                    home-manager.users.bertof.imports = [
+                      ./modules/hm/hyprland.nix
+                      ./modules/hm/swayidle.nix
+                    ];
+                  }
+
+                  ./modules/nixos/musa.nix
+                ]
+                ++ homeManagerUModules
+                ++ [{ home-manager.users.bertof = import ./instances/thor/hm.nix; }];
+            };
+
+            odin-nvidia = inputs.nixpkgs-u.lib.nixosSystem {
+              system = "x86_64-linux";
+              modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-nvidia.nix ];
+            };
+
+            odin = inputs.nixpkgs-u.lib.nixosSystem {
+              system = "x86_64-linux";
+              modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-intel.nix ];
+            };
+
+            heimdall = inputs.nixpkgs.lib.nixosSystem {
+              system = "x86_64-linux";
+              modules =
+                commonModules
+                ++ [
+                  inputs.nixos-hardware.nixosModules.common-cpu-amd
+                  inputs.nixos-hardware.nixosModules.common-gpu-amd
+                  inputs.nixos-hardware.nixosModules.common-pc-ssd
+                  ./modules/nixos/server
+
+                  ./instances/heimdall/hardware-configuration.nix
+                  ./instances/heimdall/configuration.nix
+
+                  ./modules/nixos/users/tiziano.nix
+
+                  ./modules/nixos/torrentbox.nix
+                  ./modules/nixos/minio.nix
+                  ./modules/nixos/rclone.nix
+                  ./modules/nixos/nextcloud.nix
+                  # ./modules/nixos/ntfy.nix
+                  # S3 cache read
+                  ./modules/nixos/s3_cache_read.nix
+                ]
+                ++ homeManagerModules
+                ++ [{ home-manager.users.bertof = import ./instances/heimdall/hm.nix; }];
+            };
+
+            freya = inputs.nixpkgs.lib.nixosSystem {
+              system = "aarch64-linux";
+              modules =
+                commonModules
+                ++ [
+                  inputs.nixos-hardware.nixosModules.raspberry-pi-4
+                  (
+                    { lib, ... }:
+                    {
+                      boot.supportedFilesystems = lib.mkForce [
+                        "btrfs"
+                        "reiserfs"
+                        "vfat"
+                        "f2fs"
+                        "xfs"
+                        "ntfs"
+                        "cifs"
+                      ];
+                    }
+                  )
+                  ./modules/nixos/server
+
+                  ./instances/freya/hardware-configuration.nix
+                  ./instances/freya/configuration.nix
+
+                  ./modules/nixos/users/tiziano.nix
+
+                  ./modules/nixos/torrentbox.nix
+                  ./modules/nixos/minio.nix
+                  # ./modules/nixos/nextcloud.nix
+                  ./modules/nixos/ntfy.nix
+                  # S3 cache read
+                  ./modules/nixos/s3_cache_read.nix
+                ]
+                ++ homeManagerModules
+                ++ [{ home-manager.users.bertof = import ./instances/freya/hm.nix; }];
+            };
+
+            baldur = inputs.nixpkgs.lib.nixosSystem {
+              system = "x86_64-linux";
+              modules = commonModules ++ [
+                ./modules/nixos/server
+                ./instances/baldur/hardware-configuration.nix
+                ./instances/baldur/configuration.nix
+                # ./modules/nixos/digitalocean.nix
+
+                ./modules/nixos/users/tiziano.nix
+                # S3 cache read
+                ./modules/nixos/s3_cache_read.nix
+              ]
+                # ++ homeManagerModules ++ [{
+                #   home-manager.users.bertof = import ./instances/baldur/hm.nix;
+                #   home-manager.users.tiziano = import ./instances/baldur/hm_tiziano.nix;
+                # }]
+              ;
+            };
+
+            loki = inputs.nixpkgs.lib.nixosSystem {
+              system = "x86_64-linux";
+              modules =
+                commonModules
+                ++ [
+                  ./modules/nixos/server
+
+                  inputs.nixos-hardware.nixosModules.common-cpu-intel
+                  inputs.nixos-hardware.nixosModules.common-pc-ssd
+                  ./instances/loki/hardware-configuration.nix
+                  ./instances/loki/configuration.nix
+
+                  ./modules/nixos/users/tiziano.nix
+                  # S3 cache read
+                  ./modules/nixos/s3_cache_read.nix
+                ]
+                ++ homeManagerModules
+                ++ [
+                  {
+                    home-manager.users.bertof = import ./instances/loki/hm.nix;
+                    home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
+                  }
+                ];
+            };
+
+            # # Deploy-rs checks
+            # checks = builtins.mapAttrs (_system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
+
+            # Map nodes to Deploy-rs deployments
+            deploy.nodes = {
+              baldur = {
+                hostname = "baldur.bertof.net";
+                profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.baldur; };
+              };
+              freya = {
+                hostname = "freya.tsn";
+                profiles.system = { user = "root"; path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos inputs.self.nixosConfigurations.freya; };
+              };
+              heimdall = {
+                hostname = "heimdall.tsn";
+                profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.heimdall; };
+              };
+              loki = {
+                hostname = "loki.tsn";
+                profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.loki; };
+              };
+              odin = {
+                hostname = "odin.tsn";
+                profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.odin; };
+              };
+              thor = {
+                hostname = "thor.tsn";
+                profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.thor; };
+              };
+            };
+          };
      };
    };
-  };
 }
-
-# outputs =
-#   { self
-#   , nixpkgs
-#   , nixpkgs-u
-#   , home-manager
-#   , home-manager-u
-#   , agenix
-#   , deploy-rs
-#   , flake-utils
-#   , nixos-generators
-#   , nixos-hardware
-#   , nix-rice
-#   , pre-commit-hooks
-#   , ...
-#   }:
-#   let
-#     config = {
-#       allowUnfree = true;
-#       extraOptions = "experimental-features = nix-command flakes";
-#       permittedInsecurePackages = [
-#         "electron-27.3.11" # LogSeq
-#       ];
-#     };
-#
-#     overlays = [
-#       # Combine stable and unstable packages
-#       (self: _: {
-#         stable_pkgs = import nixpkgs {
-#           inherit config overlays;
-#           inherit (self) system;
-#         };
-#         unstable_pkgs = import nixpkgs-u {
-#           inherit config overlays;
-#           inherit (self) system;
-#         };
-#       })
-#
-#       # Nix rice
-#       nix-rice.overlays.default
-#       (import ./rice.nix)
-#
-#       # Flakes packages
-#       (self: super: {
-#         clipedit = self.callPackage ./custom/clipedit { };
-#         wl-clipedit = self.callPackage ./custom/wl-clipedit { };
-#         update-background = self.callPackage ./custom/update-background {
-#           backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+";
-#         };
-#         lockscreen = self.callPackage ./custom/lockscreen {
-#           palette = self.rice.colorPalette;
-#           font = self.rice.font.normal;
-#         };
-#         way-lockscreen = self.callPackage ./custom/way-lockscreen {
-#           palette = self.rice.colorPalette;
-#           font = self.rice.font.normal;
-#         };
-#         sddm-theme-clairvoyance = self.callPackage ./custom/sddm-theme-clairvoyance {
-#           wallpaper = ./wallpapers/background.jpg;
-#         };
-#         keyboard-switch = self.callPackage ./custom/keyboard-switch { };
-#         sddm-sugar-dark = self.callPackage ./custom/sddm-sugar-dark { };
-#         google-chrome = super.google-chrome.override {
-#           commandLineArgs = [
-#             "--password-store=gnome"
-#             "--force-dark-mode"
-#           ];
-#         };
-#         logseq = super.logseq.override { electron = super.electron_27; };
-#       })
-#     ];
-#
-#     basic =
-#       with flake-utils.lib;
-#       eachDefaultSystem (
-#         system:
-#         let
-#           pkgs = import nixpkgs { inherit system config overlays; };
-#         in
-#         {
-#           checks = {
-#             pre-commit-check = pre-commit-hooks.lib.${system}.run {
-#               src = ./.;
-#               hooks = {
-#                 deadnix.enable = true;
-#                 nixpkgs-fmt.enable = true;
-#                 statix.enable = true;
-#               };
-#             };
-#           };
-#
-#           devShells.default = pkgs.mkShell {
-#             buildInputs = [
-#               # deploy-rs.packages.${system}.deploy-rs
-#               pkgs.deploy-rs
-#             ];
-#             shellHook = ''
-#               ${self.checks.${system}.pre-commit-check.shellHook}
-#             '';
-#             LOCAL_KEY = "/etc/nix/key";
-#           };
-#
-#           formatter = pkgs.nixpkgs-fmt;
-#         }
-#       );
-#
-#     nix_configuration = {
-#       nixpkgs = {
-#         inherit overlays config;
-#       };
-#       nix = {
-#         inherit (config) extraOptions;
-#         registry = {
-#           nixpkgs = {
-#             from = {
-#               id = "nixpkgs";
-#               type = "indirect";
-#             };
-#             to = {
-#               owner = "nixos";
-#               repo = "nixpkgs";
-#               type = "github";
-#             };
-#           };
-#           stable = {
-#             from = {
-#               id = "stable";
-#               type = "indirect";
-#             };
-#             flake = nixpkgs;
-#           };
-#           unstable = {
-#             from = {
-#               id = "unstable";
-#               type = "indirect";
-#             };
-#             flake = nixpkgs-u;
-#           };
-#         };
-#       };
-#     };
-#
-#     # Home manager configuration
-#     homeManagerModules = [
-#       home-manager.nixosModules.default
-#       {
-#         home-manager = {
-#           useGlobalPkgs = true;
-#           useUserPackages = true;
-#         };
-#       }
-#     ];
-#
-#     homeManagerUModules = [
-#       home-manager-u.nixosModules.default
-#       { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }
-#     ];
-#
-#     commonModules = [
-#       # Nix configuration
-#       nix_configuration
-#
-#       # S3 cache read
-#       ./modules/nixos/s3_cache_read.nix
-#
-#       # Agenix configuration
-#       agenix.nixosModules.default
-#       {
-#         age.secrets = {
-#           # oauth_proxy_client_credentials.file = ./secrets/oauth_proxy_client_credentials.age;
-#           # spotify_password = { file = ./secrets/spotify_password.age; owner = "bertof"; };
-#           wg_psk = {
-#             file = ./secrets/wg_psk.age;
-#           };
-#           baldur_wg_priv = {
-#             file = ./secrets/baldur_wg_priv.age;
-#           };
-#           oppo_wg_priv = {
-#             file = ./secrets/oppo_wg_priv.age;
-#           };
-#         };
-#       }
-#
-#       ./modules/nixos/users/bertof.nix
-#
-#       # Some basic defaults
-#       ./modules/nixos/basics
-#     ];
-#
-#     installerModules = commonModules ++ [ ./modules/nixos/installer.nix ];
-#
-#     thorConfig = {
-#       nixosConfigurations = {
-#         thor = nixpkgs-u.lib.nixosSystem {
-#           system = "x86_64-linux";
-#           modules =
-#             commonModules
-#             ++ [
-#               ./instances/thor/hardware-configuration.nix
-#               nixos-hardware.nixosModules.common-cpu-amd
-#               nixos-hardware.nixosModules.common-pc-ssd
-#               ./instances/thor/configuration.nix
-#
-#               # S3 cache write
-#               ./modules/nixos/s3_cache_write.nix
-#
-#               ./modules/nixos/pro_audio.nix
-#               ./modules/nixos/kdeconnect.nix
-#               ./modules/nixos/steam.nix
-#
-#               ./modules/nixos/plymouth.nix
-#               ./modules/nixos/hyprland.nix
-#               {
-#                 home-manager.users.bertof.imports = [
-#                   ./modules/hm/hyprland.nix
-#                   ./modules/hm/swayidle.nix
-#                 ];
-#               }
-#
-#               ./modules/nixos/musa.nix
-#             ]
-#             ++ homeManagerUModules
-#             ++ [{ home-manager.users.bertof = import ./instances/thor/hm.nix; }];
-#         };
-#       };
-#     };
-#
-#     odinConfig = {
-#       nixosConfigurations =
-#         let
-#           odinCommonModules = [
-#             nixos-hardware.nixosModules.common-cpu-intel
-#             nixos-hardware.nixosModules.common-pc-laptop
-#             nixos-hardware.nixosModules.common-pc-laptop-ssd
-#             ./instances/odin/hardware-configuration.nix
-#             ./instances/odin/common_configuration.nix
-#
-#             # S3 cache write
-#             ./modules/nixos/s3_cache_write.nix
-#
-#             # ./modules/nixos/pro_audio.nix
-#             ./modules/nixos/kdeconnect.nix
-#             ./modules/nixos/steam.nix
-#
-#             ./modules/nixos/hyprland.nix
-#             { home-manager.users.bertof.imports = [ ./modules/hm/hyprland.nix ]; }
-#
-#             ./modules/nixos/musa.nix
-#           ] ++ homeManagerUModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; }];
-#         in
-#         rec {
-#           odin-nvidia = nixpkgs-u.lib.nixosSystem {
-#             system = "x86_64-linux";
-#             modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-nvidia.nix ];
-#           };
-#
-#           odin-intel = nixpkgs-u.lib.nixosSystem {
-#             system = "x86_64-linux";
-#             modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-intel.nix ];
-#           };
-#
-#           odin = odin-intel;
-#         };
-#     };
-#
-#     heimdallConfig = {
-#       nixosConfigurations = {
-#         heimdall = nixpkgs.lib.nixosSystem {
-#           system = "x86_64-linux";
-#           modules =
-#             commonModules
-#             ++ [
-#               nixos-hardware.nixosModules.common-cpu-amd
-#               nixos-hardware.nixosModules.common-gpu-amd
-#               nixos-hardware.nixosModules.common-pc-ssd
-#               ./modules/nixos/server
-#
-#               ./instances/heimdall/hardware-configuration.nix
-#               ./instances/heimdall/configuration.nix
-#
-#               ./modules/nixos/users/tiziano.nix
-#
-#               ./modules/nixos/torrentbox.nix
-#               ./modules/nixos/minio.nix
-#               ./modules/nixos/rclone.nix
-#               ./modules/nixos/nextcloud.nix
-#               # ./modules/nixos/ntfy.nix
-#               # S3 cache read
-#               ./modules/nixos/s3_cache_read.nix
-#             ]
-#             ++ homeManagerModules
-#             ++ [{ home-manager.users.bertof = import ./instances/heimdall/hm.nix; }];
-#         };
-#       };
-#     };
-#
-#     freyaConfig = {
-#       nixosConfigurations = {
-#         freya = nixpkgs.lib.nixosSystem {
-#           system = "aarch64-linux";
-#           modules =
-#             commonModules
-#             ++ [
-#               nixos-hardware.nixosModules.raspberry-pi-4
-#               (
-#                 { lib, ... }:
-#                 {
-#                   boot.supportedFilesystems = lib.mkForce [
-#                     "btrfs"
-#                     "reiserfs"
-#                     "vfat"
-#                     "f2fs"
-#                     "xfs"
-#                     "ntfs"
-#                     "cifs"
-#                   ];
-#                 }
-#               )
-#               ./modules/nixos/server
-#
-#               ./instances/freya/hardware-configuration.nix
-#               ./instances/freya/configuration.nix
-#
-#               ./modules/nixos/users/tiziano.nix
-#
-#               ./modules/nixos/torrentbox.nix
-#               ./modules/nixos/minio.nix
-#               # ./modules/nixos/nextcloud.nix
-#               ./modules/nixos/ntfy.nix
-#               # S3 cache read
-#               ./modules/nixos/s3_cache_read.nix
-#             ]
-#             ++ homeManagerModules
-#             ++ [{ home-manager.users.bertof = import ./instances/freya/hm.nix; }];
-#         };
-#       };
-#     };
-#
-#     baldurConfig = {
-#       nixosConfigurations = {
-#         baldur = nixpkgs.lib.nixosSystem {
-#           system = "x86_64-linux";
-#           modules = commonModules ++ [
-#             ./modules/nixos/server
-#             ./instances/baldur/hardware-configuration.nix
-#             ./instances/baldur/configuration.nix
-#             # ./modules/nixos/digitalocean.nix
-#
-#             ./modules/nixos/users/tiziano.nix
-#             # S3 cache read
-#             ./modules/nixos/s3_cache_read.nix
-#           ]
-#             # ++ homeManagerModules ++ [{
-#             #   home-manager.users.bertof = import ./instances/baldur/hm.nix;
-#             #   home-manager.users.tiziano = import ./instances/baldur/hm_tiziano.nix;
-#             # }]
-#           ;
-#         };
-#       };
-#     };
-#
-#     lokiConfig = {
-#       nixosConfigurations = {
-#         loki = nixpkgs.lib.nixosSystem {
-#           system = "x86_64-linux";
-#           modules =
-#             commonModules
-#             ++ [
-#               ./modules/nixos/server
-#
-#               nixos-hardware.nixosModules.common-cpu-intel
-#               nixos-hardware.nixosModules.common-pc-ssd
-#               ./instances/loki/hardware-configuration.nix
-#               ./instances/loki/configuration.nix
-#
-#               ./modules/nixos/users/tiziano.nix
-#               # S3 cache read
-#               ./modules/nixos/s3_cache_read.nix
-#             ]
-#             ++ homeManagerModules
-#             ++ [
-#               {
-#                 home-manager.users.bertof = import ./instances/loki/hm.nix;
-#                 home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
-#               }
-#             ];
-#         };
-#       };
-#     };
-#
-#     deployments = {
-#       # Deploy-rs checks
-#       checks = builtins.mapAttrs (_system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
-#
-#       # Map nodes to Deploy-rs deployments
-#       deploy.nodes = {
-#         baldur = {
-#           hostname = "baldur.bertof.net";
-#           profiles.system = {
-#             user = "root";
-#             path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.baldur;
-#           };
-#         };
-#         freya = {
-#           hostname = "freya.tsn";
-#           profiles.system = {
-#             user = "root";
-#             path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.freya;
-#           };
-#         };
-#         heimdall = {
-#           hostname = "heimdall.tsn";
-#           profiles.system = {
-#             user = "root";
-#             path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.heimdall;
-#           };
-#         };
-#         loki = {
-#           hostname = "loki.tsn";
-#           profiles.system = {
-#             user = "root";
-#             path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki;
-#           };
-#         };
-#         odin = {
-#           hostname = "odin.tsn";
-#           profiles.system = {
-#             user = "root";
-#             path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.odin;
-#           };
-#         };
-#         thor = {
-#           hostname = "thor.tsn";
-#           profiles.system = {
-#             user = "root";
-#             path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.thor;
-#           };
-#         };
-#       };
-#     };
-#
-#     images =
-#       with flake-utils.lib;
-#       eachSystem
-#         [
-#           system.x86_64-linux
-#           system.aarch64-linux
-#         ]
-#         (system: {
-#           packages = {
-#             # Installer ISO
-#             install-iso = nixos-generators.nixosGenerate {
-#               inherit system;
-#               modules = installerModules;
-#               format = "install-iso";
-#             };
-#             # RAW base image
-#             raw-base-image = nixos-generators.nixosGenerate {
-#               system = flake-utils.lib.system.x86_64-linux;
-#               modules = installerModules;
-#               format = "raw-efi";
-#             };
-#             # VMDK base image
-#             vmdk-base-image = nixos-generators.nixosGenerate {
-#               system = flake-utils.lib.system.x86_64-linux;
-#               modules = installerModules;
-#               format = "vmware";
-#             };
-#             # Aarch64 base image
-#             aarch64-base-image = nixos-generators.nixosGenerate {
-#               system = flake-utils.lib.system.aarch64-linux;
-#               modules = installerModules;
-#               format = "sd-aarch64";
-#             };
-#             # Installer DigitalOcean
-#             do-image = nixos-generators.nixosGenerate {
-#               inherit system;
-#               modules = installerModules;
-#               format = "do";
-#             };
-#           };
-#         });
-#
-#   in
-#   builtins.foldl' nixpkgs.lib.recursiveUpdate { } [
-#     basic
-#     thorConfig
-#     odinConfig
-#     freyaConfig
-#     baldurConfig
-#     heimdallConfig
-#     lokiConfig
-#     deployments
-#     images
-#   ];
-# }
--- a/instances/odin/configuration-nvidia.nix
+++ b/instances/odin/configuration-nvidia.nix
@ -8,7 +8,7 @@

  boot = {
    initrd.kernelModules = [ "i915" ];
-    kernelPackages = pkgs.unstable_pkgs.linuxPackages;
+    # kernelPackages = pkgs.unstable_pkgs.linuxPackages;
  };

  hardware.nvidia =
--- a/instances/odin/hm.nix
+++ b/instances/odin/hm.nix
@ -56,9 +56,6 @@
        wireguard-tools
        xournalpp
        zoom-us
-        ;
-      inherit (pkgs.unstable_pkgs)
-        # heroic
        proton-pass;
    };
  };
@ -142,7 +139,7 @@
    ../../modules/hm/syncthing.nix
    # ../../modules/hm/thunar.nix
    # ../../modules/hm/twmn.nix
-    ../../modules/hm/update_background.nix
+    # ../../modules/hm/update_background.nix
    ../../modules/hm/vim.nix
    ../../modules/hm/virtualization.nix
    ../../modules/hm/webapp.nix
--- a/instances/thor/hm.nix
+++ b/instances/thor/hm.nix
@ -61,7 +61,7 @@
        xournalpp
        zoom-us
        ;
-      inherit (pkgs.unstable_pkgs) heroic;
+      inherit (pkgs) heroic;
    };
  };

@ -134,11 +134,10 @@
    ../../modules/hm/syncthing.nix
    # ../../modules/hm/thunar.nix
    # ../../modules/hm/twmn.nix
-    ../../modules/hm/update_background.nix
+    # ../../modules/hm/update_background.nix
    ../../modules/hm/vim.nix
    ../../modules/hm/virtualization.nix
    ../../modules/hm/webapp.nix
-    ../../modules/hm/wl_update_background.nix
    ../../modules/hm/xresources.nix
    ../../modules/hm/zathura.nix
    ../../modules/hm/yazi.nix
--- a/modules/hm/biblio.nix
+++ b/modules/hm/biblio.nix
@ -2,6 +2,6 @@
 {
  home.packages = builtins.attrValues {
    # inherit (pkgs) calibre;
-    inherit (pkgs.unstable_pkgs) mangal;
+    inherit (pkgs) mangal;
  };
 }
--- a/modules/hm/development/kubernetes.nix
+++ b/modules/hm/development/kubernetes.nix
@ -19,7 +19,7 @@
      pkgs.k9s
      pkgs.awscli2
      pkgs.lens
-      pkgs.unstable_pkgs.kubevirt
+      pkgs.kubevirt
    ];
  };
 }
--- a/modules/hm/helix.nix
+++ b/modules/hm/helix.nix
@ -15,7 +15,6 @@
  };
  programs.helix = {
    enable = true;
-    package = pkgs.unstable_pkgs.helix;
    languages.language = [
      {
        name = "nix";
--- a/modules/hm/swayidle.nix
+++ b/modules/hm/swayidle.nix
@ -7,11 +7,11 @@
    events = [
      {
        event = "before-sleep";
-        command = "${pkgs.way-lockscreen}/bin/way-lockscreen";
+        command = "${pkgs.wl-lockscreen}/bin/wl-lockscreen";
      }
      {
        event = "lock";
-        command = "${pkgs.way-lockscreen}/bin/way-lockscreen";
+        command = "${pkgs.wl-lockscreen}/bin/wl-lockscreen";
      }
    ];
    timeouts = [
@ -22,7 +22,7 @@
      }
      {
        timeout = 120;
-        command = "${pkgs.brillo}/bin/brillo -e -S 0; ${pkgs.way-lockscreen}/bin/way-lockscreen";
+        command = "${pkgs.brillo}/bin/brillo -e -S 0; ${pkgs.wl-lockscreen}/bin/wl-lockscreen";
        resumeCommand = "${pkgs.brillo}/bin/brillo -e -S 100";
      }
    ];
--- a/modules/hm/yazi.nix
+++ b/modules/hm/yazi.nix
@ -15,7 +15,6 @@
    enable = true;
    enableBashIntegration = true;
    enableZshIntegration = true;
-    package = pkgs.unstable_pkgs.yazi;
    settings = {
      manager = {
        sort_by = "natural";
--- a/modules/hm/zellij.nix
+++ b/modules/hm/zellij.nix
@ -3,10 +3,7 @@ let
  strPalette = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.colorPalette;
 in
 {
-  programs.zellij = {
-    enable = true;
-    package = pkgs.unstable_pkgs.zellij;
-  };
+  programs.zellij.enable = true;

  home.shellAliases = {
    "ze" = "zellij";