flake.nix

@@ -9,7 +9,8 @@
 {
   description = "Kabbone's peronal NixOS Flake config";
 
-  inputs = {
+  inputs =                                                                  # All flake references used to build my NixOS setup. These are dependencies.
+    {
       nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";                  # Nix Packages
       nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
       nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@@ -46,64 +47,28 @@
         inputs.nixpkgs.follows = "nixpkgs";
       };
 
-  };
-
-  outputs = { 
-    self,
-    nixpkgs,
-    nixpkgs-unstable,
-    nixos-hardware,
-    home-manager,
-    home-manager-unstable,
-    agenix,
-    jovian-nixos,
-    microvm,
-    impermanence,
-    lanzaboote,
-    ...
-  } @ inputs: rec {
-    inherit (self) outputs;
-    systems = [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
-
-    forAllSystems = nixpkgs.lib.genAttrs systems;
-  #in {
-    # Your custom packages
-    # Accessible through 'nix build', 'nix shell', etc
-    packages = forAllSystems (system: import ./packages nixpkgs.legacyPackages.${system});
-    # Formatter for your nix files, available through 'nix fmt'
-    # Other options beside 'alejandra' include 'nixpkgs-fmt'
-    formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
-
-    # Your custom packages and modifications, exported as overlays
-    overlays = import ./overlays {inherit inputs;};
-    # Reusable nixos modules you might want to export
-    # These are usually stuff you would upstream into nixpkgs
-    #nixosModules = import ./modules/kabbone;
-    # Reusable home-manager modules you might want to export
-    # These are usually stuff you would upstream into home-manager
-    #homeManagerModules = import ./modules/home-manager;
-
-
-    nixosConfigurations = (                                               # NixOS configurations
-      import ./hosts {                                                    # Imports ./hosts/default.nix
-        inherit (nixpkgs) lib;
-        inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote;   # Also inherit home-manager so it does not need to be defined here.
-        nix.allowedUsers = [ "@wheel" ];
-        security.sudo.execWheelOnly = true;
-      }
-    );
-
-    hydraJobs = {
-      "steamdeck" = nixosConfigurations.steamdeck.config.system.build.toplevel;
-      "hades" = nixosConfigurations.hades.config.system.build.toplevel;
-      "nasbak" = nixosConfigurations.nasbak.config.system.build.toplevel;
-      "jupiter" = nixosConfigurations.jupiter.config.system.build.toplevel;
-      "lifebook" = nixosConfigurations.lifebook.config.system.build.toplevel;
-      "kabtop" = nixosConfigurations.kabtop.config.system.build.toplevel;
-      "dmz" = nixosConfigurations.dmz.config.system.build.toplevel;
     };
-  };
+
+  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:   # Function that tells my flake which to use and what do what to do with the dependencies.
+    rec {
+        nixosConfigurations = (                                               # NixOS configurations
+          import ./hosts {                                                    # Imports ./hosts/default.nix
+            inherit (nixpkgs) lib;
+            inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote;   # Also inherit home-manager so it does not need to be defined here.
+            nix.allowedUsers = [ "@wheel" ];
+            security.sudo.execWheelOnly = true;
+          }
+        );
+        hydraJobs = {
+          "steamdeck" = nixosConfigurations.steamdeck.config.system.build.toplevel;
+          "hades" = nixosConfigurations.hades.config.system.build.toplevel;
+          "nasbak" = nixosConfigurations.nasbak.config.system.build.toplevel;
+          "jupiter" = nixosConfigurations.jupiter.config.system.build.toplevel;
+          "lifebook" = nixosConfigurations.lifebook.config.system.build.toplevel;
+          "kabtop" = nixosConfigurations.kabtop.config.system.build.toplevel;
+          "dmz" = nixosConfigurations.dmz.config.system.build.toplevel;
+        };
+    };
+
+
 }

hosts/configuration_desktop.nix

@@ -47,7 +47,6 @@
   };
 
   security = {
-    pam.services.login.enableGnomeKeyring = true;
     rtkit.enable = true;
     pki.certificateFiles = [
       ./rootCA.pem
@@ -188,9 +187,6 @@
     '';
   };
   nixpkgs.config.allowUnfree = true;        # Allow proprietary software.
-  nixpkgs.config.permittedInsecurePackages = [
-    "olm-3.2.16"
-  ];
 
   system = {                                # NixOS settings
     autoUpgrade = {                         # Allow auto update

hosts/desktop/default.nix

@@ -57,7 +57,7 @@
   environment = {
     systemPackages = [
       pkgs.linux-firmware
-      #pkgs-kabbone.corosync-qdevice
+      pkgs-kabbone.corosync-qdevice
     ];
   };
 

hosts/desktop/home.nix

@@ -30,6 +30,7 @@
       thunderbird
       streamlink
       streamlink-twitch-gui-bin
+      element-desktop
       #nheko
       pulsemixer
       #yubioath-flutter

hosts/home.nix

@@ -64,7 +64,6 @@
       vimiv-qt
       freecad
       discord
-      nheko
 
 # Fileanagement
       kdePackages.ark

hosts/lifebook/home.nix

@@ -30,6 +30,7 @@
       thunderbird
       streamlink
       streamlink-twitch-gui-bin
+      element-desktop
       intel-gpu-tools
       pulsemixer
       

hosts/steamdeck/home.nix

@@ -35,6 +35,7 @@
       thunderbird
       streamlink
       streamlink-twitch-gui-bin
+      element-desktop
       pulsemixer
       #yuzu-early-access
       

modules/services/default.nix

@@ -19,7 +19,6 @@
   #./udiskie.nix
   #./redshift.nix
   ./kanshi.nix
-  ./keyring.nix
 ]
 
 # picom, polybar and sxhkd are pulled from desktop module

modules/services/keyring.nix

@@ -1,14 +0,0 @@
-#
-# Screenshots
-#
-
-{ pkgs, user, ... }:
-
-{
-  services = {                                    # sxhkd shortcut = Printscreen button (Print)
-    gnome-keyring = {
-      enable = true;
-    };
-  };
-  home.packages = with pkgs; [ gcr seahorse ];
-}

modules/wm/sway/home.nix

@@ -95,7 +95,7 @@
             #{ command = "exec ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"; }
             { command = "${pkgs.thunderbird}/bin/thunderbird"; }
             { command = "${pkgs.firefox}/bin/firefox"; }
-            { command = "${pkgs.nheko}/bin/nheko"; }
+            { command = "${pkgs.element-desktop}/bin/element-desktop"; }
         ];
     
         workspaceAutoBackAndForth = true;

overlays/default.nix

@@ -1,19 +0,0 @@
-{inputs, ...}: {
-  # This one brings our custom packages from the 'pkgs' directory
-  additions = final: _prev: import ../packages {pkgs = final;};
-
-  modifications = final: prev: {
-    mealie = final.unstable.mealie;
-  };
-
-  
-  # When applied, the unstable nixpkgs set (declared in the flake inputs) will
-  # be accessible through 'pkgs.unstable'
-  unstable-packages = final: _prev: {
-    unstable = import inputs.nixpkgs-unstable {
-      system = final.system;
-      config.allowUnfree = true;
-    };
-  };
-}
-

packages/default.nix

@@ -1,4 +1,4 @@
 { pkgs, ... }:
 {
-#  corosync-qdevice = pkgs.callPackage ./corosync-qdevice.nix {};
+  corosync-qdevice = pkgs.callPackage ./corosync-qdevice.nix {};
 }