flake.nix

@@ -40,12 +40,6 @@
         system = "x86_64-linux";
         modules = [
           ./thelio76/configuration.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.alex = import ./nixos76/alex/home.nix;
-          }
         ];
       };
       nixosConfigurations.ursa-minor = nixpkgs.lib.nixosSystem

nixos76/alex/home.nix

@@ -8,24 +8,18 @@
 
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
-    aseprite
-    audacity
     blender
     darktable
-    digikam
     discord
-    famistudio
     firefox
     flameshot
     gimp-with-plugins
     gnucash
-    godot_4
     grafx2
     jellyfin-media-player
     keepassxc
     krita
     libreoffice
-    lmms
     lutris
     moonlight-qt
     mpv
@@ -33,7 +27,6 @@
     nixpkgs-fmt
     obsidian
     picard
-    rawtherapee
     spotify
     steam
     syncthing

nixos76/system/hardware-configuration.nix

@@ -5,8 +5,7 @@
 
 {
   imports =
-    [
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ];
@@ -15,19 +14,18 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    {
+    { device = "/dev/disk/by-uuid/6d62467a-ccc1-44ed-a1cc-f473b3962c64";
-      device = "/dev/disk/by-uuid/6d62467a-ccc1-44ed-a1cc-f473b3962c64";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    {
+    { device = "/dev/disk/by-uuid/2330-1A62";
-      device = "/dev/disk/by-uuid/2330-1A62";
       fsType = "vfat";
     };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/fda4f9fe-383f-477c-b2a2-c07f7efcc161"; }];
+    [ { device = "/dev/disk/by-uuid/fda4f9fe-383f-477c-b2a2-c07f7efcc161"; }
+    ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

thelio76/configuration.nix

@@ -6,33 +6,26 @@
 
 {
   imports =
-    [
+    [ # Include the results of the hardware scan.
-      # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
 
-  hardware.system76.enableAll = true;
-
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-25.9.0"
-  ];
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   boot.initrd.systemd.enable = true;
-  boot.kernelParams = [ "quiet" ];
+  boot.kernelParams = ["quiet"];
   
   boot.plymouth.enable = true;
-  boot.plymouth.theme = "fade-in";
+  boot.plymouth.theme="fade-in";
 
   boot.initrd.luks.devices."luks-7d758c82-9079-46a6-8bb2-05d5016ed623".device = "/dev/disk/by-uuid/7d758c82-9079-46a6-8bb2-05d5016ed623";
   environment.etc.crypttab.text = ''
     luks-9870176e-53f3-493e-94d8-560994fa8f35 UUID=9870176e-53f3-493e-94d8-560994fa8f35 /luks-9870176e-53f3-493e-94d8-560994fa8f35 nofail
-  '';
+'';
 
  	
   fileSystems."/home/alex/Documents" = {
@@ -103,12 +96,54 @@
   # services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
+	nixpkgs.config.permittedInsecurePackages = [
+                "electron-25.9.0"
+              ];
+       
+
+
   users.users.alex = {
     isNormalUser = true;
     description = "Alex";
     extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+      aseprite
+      audacity
+      blender
+      darktable
+      digikam
+      discord
+      famistudio
+      firefox
+      flameshot
+      gimp-with-plugins
+      git
+      godot_4
+      gnucash
+      keepassxc
+      # kdePackages.kdenlive
+      krita
+      libreoffice
+      lmms
+      lutris
+      mpv
+      nextcloud-client
+      nixpkgs-fmt
+      obsidian
+      picard
+      spotify
+      steam
+      syncthing
+      rawtherapee
+      vim
+      vscode
+      yt-dlp
+    ];
   };
 
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [

thelio76/hardware-configuration.nix

@@ -5,8 +5,7 @@
 
 {
   imports =
-    [
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
@@ -15,25 +14,23 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    {
+    { device = "/dev/disk/by-uuid/5b17c208-6c1b-4317-b59c-6596b1857f1f";
-      device = "/dev/disk/by-uuid/5b17c208-6c1b-4317-b59c-6596b1857f1f";
       fsType = "ext4";
     };
 
   boot.initrd.luks.devices."luks-b748a776-5e2c-4809-927e-1f4c051b9460".device = "/dev/disk/by-uuid/b748a776-5e2c-4809-927e-1f4c051b9460";
 
   fileSystems."/boot" =
-    {
+    { device = "/dev/disk/by-uuid/EB52-074B";
-      device = "/dev/disk/by-uuid/EB52-074B";
       fsType = "vfat";
     };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/19de8142-e695-4425-a8cc-27e062204882"; }];
+    [ { device = "/dev/disk/by-uuid/19de8142-e695-4425-a8cc-27e062204882"; }
+    ];
 
   fileSystems."/run/media/alex/External" =
-    {
+    { device = "/dev/disk/by-uuid/5057a0e6-649f-487f-a17c-11e379f9af19";
-      device = "/dev/disk/by-uuid/5057a0e6-649f-487f-a17c-11e379f9af19";
       fsType = "auto";
     };
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking