From 331ab11fe16f9ea4ee21c0f4b70181fe6f3969d1 Mon Sep 17 00:00:00 2001
From: Martin Benonisen <m.s.benonisen@usit.uio.no>
Date: Mon, 18 Mar 2024 14:09:49 +0100
Subject: [PATCH] nizplz

---
 hosts/zedd/configuration.nix | 25 +++++++++++++++++--------
 system/default.nix           |  2 +-
 system/programs.nix          |  1 -
 system/users.nix             | 15 +++------------
 user/default.nix             |  1 -
 user/zsh/default.nix         |  3 +--
 6 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/hosts/zedd/configuration.nix b/hosts/zedd/configuration.nix
index 1f55cbd..091ca57 100644
--- a/hosts/zedd/configuration.nix
+++ b/hosts/zedd/configuration.nix
@@ -26,14 +26,23 @@
     XDG_BIN_HOME = "$HOME/.local/bin";
     PATH = [ "${XDG_BIN_HOME}" ];
   };
-  xdg.portal = {
-    enable = true;
-    xdgOpenUsePortal = true;
-    extraPortals = (with pkgs; [
-      # unstable.xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ]);
-  };
+  xdg.portal =
+    {
+      enable = true;
+      xdgOpenUsePortal = true;
+      config = {
+        i3 = {
+          default = [
+            "gtk"
+          ];
+        };
+      };
+      extraPortals = (with pkgs; [
+        # unstable.xdg-desktop-portal-hyprland
+        xdg-desktop-portal-gtk
+      ]);
+
+    };
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
diff --git a/system/default.nix b/system/default.nix
index 86d86fd..8da58f5 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1 +1 @@
-{ imports = [ ./users ./services ./hardware ./fonts ./security ./programs ] }
+{ imports = [ ./users.nix ./services.nix ./hardware.nix ./fonts.nix ./security.nix ./programs.nix ]; }
diff --git a/system/programs.nix b/system/programs.nix
index aa56db3..a4a77b2 100644
--- a/system/programs.nix
+++ b/system/programs.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }: {
 
-  programs.zsh.enable = true;
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
diff --git a/system/users.nix b/system/users.nix
index 11294f8..8ef33fd 100644
--- a/system/users.nix
+++ b/system/users.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }: {
+  programs.zsh.enable = true;
+  environment.shells = with pkgs; [ zsh ];
 
-  users.defaultUserShell = pkgs.zsh;
   users.users.mbeno = {
     shell = pkgs.zsh;
     isNormalUser = true;
@@ -15,15 +16,5 @@
       #  thunderbird
     ];
   };
-  security.sudo.extraRules = [
-    {
-      users = [ "mbeno" ];
-      commands = [
-        {
-          command = "ALL";
-          options = [ "NOPASSWD" ]; # "SETENV" # Adding the following could be a good idea
-        }
-      ];
-    }
-  ];
+
 }
diff --git a/user/default.nix b/user/default.nix
index a099bc2..aaed0ad 100644
--- a/user/default.nix
+++ b/user/default.nix
@@ -22,7 +22,6 @@
       ];
       firefox.enable = true;
       tmux.enable = true;
-      hyprland.enable = true;
       home = {
         username = "${user}";
         homeDirectory = "/home/${user}";
diff --git a/user/zsh/default.nix b/user/zsh/default.nix
index 8905860..8d932a3 100644
--- a/user/zsh/default.nix
+++ b/user/zsh/default.nix
@@ -16,8 +16,7 @@
       # Prompt stuff
       autoload -Uz promptinit
       promptinit
-      prompt pure
-      export PATH="''${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
+      prompt agnoster
     '';
     zplug = {
       enable = true;