fix system asuna

luqmanishere · Apr 27, 2024 · d6232f0 · d6232f0
1 parent 0944eca
commit d6232f0
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 31 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/browsers/firefox.nix b/home/browsers/firefox.nix
@@ -1,8 +1,5 @@
 {
-  inputs,
-  outputs,
   config,
-  pkgs,
   lib,
   ...
 }:

diff --git a/home/default.nix b/home/default.nix
@@ -40,6 +40,16 @@
 
       # for specific systems
 
+      luqman-asuna = {
+imports = [
+self.homeModules.common
+          ./luqman-home.nix
+self.homeModules.gui
+self.homeModules.wayland
+self.homeModules.misc-gui
+];
+      };
+
       luqman-sinon = {
         imports = [
           self.homeModules.common

diff --git a/home/tools/fonts.nix b/home/tools/fonts.nix
@@ -1,11 +1,12 @@
 {
-  self,
+  flake,
   pkgs,
   lib,
   config,
   ...
 }:
 with lib; let
+  inherit (flake) self;
   cfg = config.modules.tools.fonts;
 in {
   imports = [];

diff --git a/home/wayland-shell/ags/default.nix b/home/wayland-shell/ags/default.nix
@@ -1,11 +1,12 @@
 {
-  inputs,
+  flake,
   lib,
   config,
   pkgs,
   ...
 }:
 with lib; let
+  inherit (flake) inputs;
   cfg = config.modules.wayland-shell.ags;
 in {
   imports = [inputs.ags.homeManagerModules.default];

diff --git a/home/wayland-shell/anyrun/default.nix b/home/wayland-shell/anyrun/default.nix
@@ -1,8 +1,10 @@
 {
-  inputs,
+  flake,
   pkgs,
   ...
-}: {
+}: let
+  inherit (flake) inputs;
+in {
   imports = [inputs.anyrun.homeManagerModules.default];
   config = {
     programs.anyrun = {

diff --git a/home/wayland-shell/hyprland/default.nix b/home/wayland-shell/hyprland/default.nix
@@ -1,11 +1,12 @@
 {
-  inputs,
+  flake,
   config,
   pkgs,
   lib,
   ...
 }:
 with lib; let
+  inherit (flake) inputs;
   cfg = config.hyprland;
 in {
   imports = [

diff --git a/home/wayland-shell/wayper.nix b/home/wayland-shell/wayper.nix
@@ -1,10 +1,11 @@
 {
+  flake,
   config,
-  inputs,
   lib,
   ...
 }:
 with lib; let
+  inherit (flake) inputs;
   cfg = config.modules.wayland-shell.wayper;
 in {
   imports = [inputs.wayper.homeManagerModules.default];

diff --git a/nixos/default.nix b/nixos/default.nix
@@ -16,16 +16,24 @@
         ./dev.nix
         ./shells.nix
       ];
+      common = {
+      home-manager.useGlobalPkgs  = true;
+      home-manager.useUserPackages = true;
+      };
 
       # system specific configurations
 
       # main laptop configuration
       asuna = {
         imports = [
           self.nixosModules.common
-          ./experimental/protonvpn.nix
           ./steam.nix
         ];
+
+# never forget to import important things
+        home-manager.users.luqman = {
+          imports = [self.homeModules.luqman-asuna];
+        };
       };
 
       # wsl setup

diff --git a/systems/asuna/default.nix b/systems/asuna/default.nix
@@ -98,23 +98,23 @@ in {
     udisks2.enable = true;
     tailscale.enable = true;
 
-    protonvpn = {
-      enable = true;
-      autostart = false;
-      interface = {
-        ip = "10.2.0.2/32";
-        privateKeyFile = "/etc/protonkey";
-        dns = {
-          enable = true;
-          ip = "10.2.0.1";
-        };
-      };
-      endpoint = {
-        publicKey = "6vLkUgiS/K8p5dTMwUQo6tiyJ65DrM8E2mwO+QFz/zs=";
-        ip = "138.199.21.206";
-        port = 51820;
-      };
-    };
+    # protonvpn = {
+    #   enable = true;
+    #   autostart = false;
+    #   interface = {
+    #     ip = "10.2.0.2/32";
+    #     privateKeyFile = "/etc/protonkey";
+    #     dns = {
+    #       enable = true;
+    #       ip = "10.2.0.1";
+    #     };
+    #   };
+    #   endpoint = {
+    #     publicKey = "6vLkUgiS/K8p5dTMwUQo6tiyJ65DrM8E2mwO+QFz/zs=";
+    #     ip = "138.199.21.206";
+    #     port = 51820;
+    #   };
+    # };
 
     # TODO: move xremap to dedicated module
     xremap = {

diff --git a/systems/asuna/hardware.nix b/systems/asuna/hardware.nix
@@ -2,8 +2,13 @@
   config,
   pkgs,
   lib,
+  modulesPath,
   ...
 }: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
   boot = {
     loader = {
       systemd-boot.enable = true;
@@ -12,7 +17,7 @@
     };
 
     # use the latest zen kernel
-    kernelPackages = pkgs.linuxKernel.packages.linux_zen;
+    kernelPackages = pkgs.linuxPackages_zen;
 
     initrd = {
       # TODO: resetup impermeanance