flake: update

storvik · Feb 20, 2024 · bf76279 · bf76279
1 parent fa8308d
commit bf76279
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 76 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -87,10 +87,10 @@
           hostname = "storvik-nixos-matebook";
           machine = "matebook";
         };
-        storvik-nixos-nuc = mkSystem {
+        home-server = mkSystem {
           inherit pkgs system;
           username = "storvik";
-          hostname = "storvik-nixos-nuc";
+          hostname = "home-server";
           machine = "intel-nuc";
         };
         retronix = mkSystem {
@@ -123,13 +123,13 @@
       live-iso = self.nixosConfigurations.live-iso.config.system.build.isoImage;
 
       deploy.nodes = {
-        storvik-nixos-nuc = {
+        home-server = {
           sshUser = "storvik";
           sshOpts = [ "-A" ];
           hostname = "192.168.1.14";
           profiles.system = {
             user = "root";
-            path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.storvik-nixos-nuc;
+            path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.home-server;
           };
         };
         retronix = {

diff --git a/hosts/storvik-nixos-nuc/home.nix → hosts/home-server/home.nix b/hosts/storvik-nixos-nuc/home.nix → hosts/home-server/home.nix
diff --git a/hosts/storvik-nixos-nuc/nixos.nix → hosts/home-server/nixos.nix b/hosts/storvik-nixos-nuc/nixos.nix → hosts/home-server/nixos.nix
diff --git a/hosts/storvik-live/nixos.nix b/hosts/storvik-live/nixos.nix
@@ -34,7 +34,7 @@
 
   # Set ssh key and password
   users.users.storvik = {
-    passwordFile = config.sops.secrets.user_password.path;
+    hashedPasswordFile = config.sops.secrets.user_password.path;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG/cetz89/SRWucBZPsARH8pnHwXCW9MGrHmNJyhHMCC petterstorvik@gmail.com" # matebook
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBoFq88oaivkC4bqCUINV6DRwg6Qfkd+a8gC6Mc68EKB petter.storvik@goodtech.no" # lenovo

diff --git a/modules/hm-modules/desktop-hyprland.nix b/modules/hm-modules/desktop-hyprland.nix
@@ -46,8 +46,7 @@ in
 
       wayland.windowManager.hyprland = {
         enable = true;
-        systemdIntegration = true;
-        recommendedEnvironment = true;
+        systemd.enable = true;
         extraConfig = ''
           $mod = SUPER
 

diff --git a/modules/nixos/desktop-gnome.nix b/modules/nixos/desktop-gnome.nix
@@ -21,10 +21,12 @@ in
 
         # Enable the X11 windowing system.
         enable = true;
-        layout = "us";
-        xkbModel = "pc105";
-        xkbVariant = "altgr-intl";
-        xkbOptions = "ctrl:nocaps";
+        xkb = {
+          layout = "us";
+          model = "pc105";
+          variant = "altgr-intl";
+          options = "ctrl:nocaps";
+        };
 
         # Enable touchpad support.
         libinput.enable = true;

diff --git a/modules/nixos/remote.nix b/modules/nixos/remote.nix
@@ -20,7 +20,9 @@ in
     };
 
     # TODO: Make this possible to toggle
-    security.pam.enableSSHAgentAuth = true;
+    # TODO: Figure out how to use this, see
+    # https://github.com/NixOS/nixpkgs/issues/31611
+    security.pam.sshAgentAuth.enable = true;
     security.pam.services.sudo.sshAgentAuth = true;
     security.pam.services.su.requireWheel = true;