flake.nix

@@ -52,8 +52,7 @@
     musnix.url = "github:musnix/musnix";
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs-stable,
     nixpkgs,
@@ -61,14 +60,11 @@
     nur,
     home-manager,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
     system = "x86_64-linux";
     pkgs = import nixpkgs {
       inherit system;
-        config = {
+      config = {allowUnfree = true;};
-          allowUnfree = true;
-        };
       overlays = [
         overlay-stable
         overlay-master
@@ -104,15 +100,16 @@
         config.allowUnfree = true;
       };
     };
-    in
+  in {
-    {
     nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
       inherit system;
       inherit pkgs;
       specialArgs = {
         inherit inputs;
       };
-        modules = genericModules ++ [
+      modules =
+        genericModules
+        ++ [
           # Import nixos modules here
           ./hosts/gabbielaptop/configuration.nix
           ./modules/nh.nix
@@ -122,13 +119,19 @@
           inputs.aagl.nixosModules.default
           inputs.lanzaboote.nixosModules.lanzaboote
           inputs.musnix.nixosModules.musnix
+          #         inputs.stylix.nixosModules.stylix
+          #	        inputs.home-manager.nixosModules.home-manager
+          #	        inputs.nixvim.homeManagerModules.nixvim
           {nix.settings = inputs.aagl.nixConfig;} # Setup cachix for aagl projects
+          #     	  { home-manager.users.blue = ./home-manager/home.nix; }
         ];
     };
     nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
       inherit system;
       inherit pkgs;
-        modules = genericModules ++ [
+      modules =
+        genericModules
+        ++ [
           inputs.disko.nixosModules.disko
           inputs.satisfactory-server.nixosModules.satisfactory
           ./hosts/biggerpi/configuration.nix
@@ -150,7 +153,5 @@
         inputs.nix-flatpak.homeManagerModules.nix-flatpak
       ];
     };
-      # set formatter, using nixfmt-tree here
-      formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree;
   };
 }

home-manager/direnv.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{config, ...}: {
-{
   programs.direnv = {
     enable = true;
     enableZshIntegration = true;

home-manager/eza.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   programs.eza = {
     enable = true;

home-manager/firefox.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.floorp = {
     enable = true;
     profiles.blue = {

home-manager/home.nix

@@ -2,8 +2,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   home.username = "blue";
   home.homeDirectory = "/home/blue";
 
@@ -22,15 +21,49 @@
     ./firefox.nix
     ./zellij.nix
     ./obs-studio.nix
-    ./packages.nix
   ];
 
   home.stateVersion = "24.05";
 
   services.gnome-keyring.enable = true; # used for nextcloud-client
 
+  # General use home packages that dont require a separate module
+  home.packages = with pkgs; [
+    grimblast # Screenshot tool
+    powerline-fonts # Fonts
+    nix-output-monitor # Provides a dependency graph for nix builds
+    bitwarden-desktop # Integrates with bitwarden extension
+    wofi # Wayland app launcher
+    nvtopPackages.amd # GPU monitor, more detailed than BTOP-rocm
+    signal-desktop # Signal messenger client
+    nautilus # File manager (move to option maybe)
+    element-desktop # Matrix client
+    stable.jetbrains.idea-community # IDE
+    reaper # Paid DAW, using free trial
+    telegram-desktop # Telegram messenger client
+    pavucontrol # Useful audio control GUI
+    stable.prismlauncher # Minecraft launcher
+    virt-manager # QEMU manager
+    bat # cat but with syntax highlighting
+    bc # terminal calculator
+
+    # Audio Plugins
+    calf
+    zam-plugins
+    lsp-plugins
+
+    ardour # DAW
+    gimp3 # GNU Image Manipulation Program, pretty self explanatory
+    
+    networkmanagerapplet # Tray icon for managing networking
+    blueman # Tray icon for managing bluetooth
+  ];
+  services.flatpak.packages = [
+    "io.mrarm.mcpelauncher" # Minecraft bedrock edition launcher
+  ];
+
   home.sessionVariables = {
-    DEFAULT_BROWSER = "${lib.getExe pkgs.floorp}";
+    DEFAULT_BROWSER = "${lib.getExe pkgs.firefox}";
     # Allow XWayland apps to not be weird after turning off xwayland scaling in hyprland.conf
     GDK_SCALE = 1;
     XCURSOR_SIZE = 24;

home-manager/hyprland.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   # Enable Hyprland compositor
   wayland.windowManager.hyprland = {
     enable = true;

home-manager/hyprlock.nix

@@ -1,5 +1,4 @@
-{ pkgs, lib, ... }:
+{pkgs, lib, ... }: {
-{
   programs.hyprlock = {
     enable = true;
     settings = {

home-manager/nextcloud.nix

@@ -1,4 +1,4 @@
-{...}:
+{ config, pkgs, ... }:
 {
   services.nextcloud-client = {
     enable = true;

home-manager/nvf.nix

@@ -2,8 +2,7 @@
   config,
   pkgs,
   ...
-}:
+}: {
-{
   programs.nvf = {
     enable = true;
     settings = {

home-manager/obs-studio.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
         programs.obs-studio = {
                 enable = true;
                 plugins = with pkgs.obs-studio-plugins; [

home-manager/packages.nix

@@ -1,51 +0,0 @@
-{pkgs, ...}:{
-  # packages that i dont need to use a module for
-  home.packages = with pkgs; [
-    grimblast # Screenshot tool
-    powerline-fonts # Fonts
-    nix-output-monitor # Provides a dependency graph for nix builds
-    bitwarden-desktop # Integrates with bitwarden extension
-    wofi # Wayland app launcher
-    nvtopPackages.amd # GPU monitor, more detailed than BTOP-rocm
-    signal-desktop # Signal messenger client
-    nautilus # File manager (move to option maybe)
-    element-desktop # Matrix client
-    stable.jetbrains.idea-community # IDE
-    telegram-desktop # Telegram messenger client
-    pavucontrol # Useful audio control GUI
-    stable.prismlauncher # Minecraft launcher
-    virt-manager # QEMU manager
-    bat # cat but with syntax highlighting
-    bc # terminal calculator
-    wget # download files
-    vesktop # discord client
-    thunderbird # email client
-    fastfetch # silly specs display
-    ungoogled-chromium # useful when a website breaks in firefox
-    qbittorrent # torrent client
-    zip # lets you zip files
-    unzip # lets you unzip files
-    vlc # media player
-    vial # gui for qmk stuff
-    qmk # qmk configurator
-    wl-clipboard # command-line copy/paste
-    lutris # game launcher
-    tenacity # small DAW
-    davinci-resolve # video editor
-    libreoffice # office suite
-
-    # Audio Plugins
-    calf
-    zam-plugins
-    lsp-plugins # not language servers, its an audio thing trust me
-
-    ardour # DAW
-    gimp3 # GNU Image Manipulation Program, pretty self explanatory
-
-    networkmanagerapplet # Tray icon for managing networking
-    blueman # Tray icon for managing bluetooth
-  ];
-  services.flatpak.packages = [
-    "io.mrarm.mcpelauncher" # Minecraft bedrock edition launcher
-  ];
-}

home-manager/stylix.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/heetch.yaml";

home-manager/waybar.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-{
   programs.waybar = {
     enable = true;
     systemd.enable = true; # using these instead of exec-once beacuse SOME packages (swaync) dont let you disable them

home-manager/zellij.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   programs.zellij = {
     enable = true;
     enableZshIntegration = true;

hosts/gabbielaptop/configuration.nix

@@ -3,8 +3,7 @@
   pkgs,
   config,
   ...
-}:
+}: {
-{
   imports = [
     ./hardware-configuration.nix
   ];
@@ -73,10 +72,7 @@
   };
   programs.regreet = {
     enable = true;
-    cageArgs = [
+    cageArgs = ["-m" "last"];
-      "-m"
-      "last"
-    ];
   };
 
   # Enable the Hyprland WM functionality for NixOS (xdg portals etc.)

modules/packages.nix

@@ -1,10 +1,21 @@
 {
+  config,
+  lib,
   pkgs,
   ...
-}:
+}: {
-{
   # All system packages required from nixos-unstable by default
   environment.systemPackages = with pkgs; [
+    neovim # nano is installed by default
+    wget
+    vesktop
+    thunderbird
+    kdePackages.bluedevil
+    fastfetch
+    ungoogled-chromium
+    qbittorrent
+    p7zip
+    unrar
     wineWowPackages.stable
     wine
     (wine.override {wineBuild = "wine64";})
@@ -12,8 +23,21 @@
     wineWowPackages.staging
     winetricks
     wineWowPackages.waylandFull
+    vlc
+    protonmail-bridge
     pciutils
+    vial
+    qmk
     dmidecode
+    wl-clipboard
+    lutris
+    tree
+    tenacity
+    home-manager
+    davinci-resolve
+    v4l-utils
+    libreoffice
+    nixfmt-rfc-style
     nixd
     qemu
   ];