Update desktop & user

2 files changed, 86 insertions, 13 deletions

diff --git a/modules/packages/xdg-desktop-portal-gtk.nix b/modules/packages/xdg-desktop-portal-gtk.nix
new file mode 100644
index 0000000..e44ffe1
--- /dev/null
+++ b/modules/packages/xdg-desktop-portal-gtk.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, xdg-desktop-portal
+, gtk3
+, gnome
+, gnome-desktop
+, glib
+, wrapGAppsHook
+, gsettings-desktop-schemas
+, buildPortalsInGnome ? true
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xdg-desktop-portal-gtk";
+  version = "1.15.1";
+
+  src = fetchFromGitHub {
+    owner = "flatpak";
+    repo = "xdg-desktop-portal-gtk";
+    rev = finalAttrs.version;
+    sha256 = "sha256-uXVjKsqoIjqJilJq8ERRzEqGKbkzc+Zl6y+37CAcYro=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    xdg-desktop-portal
+  ] ++ lib.optionals buildPortalsInGnome [
+    gsettings-desktop-schemas # settings exposed by settings portal
+    gnome-desktop
+    gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
+  ];
+
+  mesonFlags = lib.optionals (!buildPortalsInGnome) [
+    "-Dwallpaper=disabled"
+    "-Dsettings=disabled"
+    "-Dappchooser=disabled"
+    "-Dlockdown=disabled"
+  ];
+
+  meta = with lib; {
+    description = "Desktop integration portals for sandboxed apps";
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+  };
+})
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index f250863..6a54fe5 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -4,17 +4,32 @@
 
   users.users.Rory = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "ocp" ];
+    extraGroups = [ "wheel" "libvirtd" "ocp" ];
     packages = with pkgs; [
+      lnav
+      age
+      git
+      lsd
+      duf
+      btop
+      htop
+      kitty.terminfo
+      tmux
+      jq
+      dig
+
+      # - zsh
+      zsh
+      zsh-powerlevel10k
+      zsh-nix-shell
+      zsh-you-should-use
+      zsh-syntax-highlighting
+      zsh-completions
     ];
-    initialPassword = "password";
     openssh.authorizedKeys.keys = [
-      #"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCpmQMHBFOpLfb0Y138VUK1p4FxEPSOz5FRpDK8/eOFwBmEKDjLnT4d/e/Rz2VknCTSKXLMZ4KBMYM014NW3SZR90cDAFwlkdSX638fQlEO3usfALNLWsLbzqzkufw6PKWqrybZvlpwjcacYlRItvit/GH7FLqfiT/G6BdyBErn/lmmcBxF0So0aeba2G/xf7BPPQqqaTqQgE9ml87fdFVw4zVcix823K92SQIx7PkSInpgJwqjLR8cVkL2lkvMdq6IjAEsHAiUYNbAQTUl6xhYa6+Cl8CdvCyINzCpWS3Md2rSH84dZEq0ymZ40orF9JZbHHPgSGFbrg5PUOuJ57iaCPK20z474q2APUJ7aQXiifToZKqcWHFHCj7hqWja1rEt3rQbqRPgttSg5aP3lQ3GXbR/XhdcSYln1QpPTCBxklrfN1P6hF6lWBtGhtGzOvZ5Lt1uofdsK71k5eMwYHTcBnVaMtxbYzR9ihFN6LCNvvnrj+2NvHOiYSCr+y3G4kk= thearcanebrony@DESKTOP-RMRJ2VG"
       #"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICT+53Hy3wbIlNVIomK2RroaimMWrTlUkndjHt1dFuyh root@pfSense-arcane-home.localdomain"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILF2IuNu//0DP/wKMuDvBgVT3YBS2uULsipbdrhJCTM7 thearcanebrony@tab-linux-desktop"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN/kNkY/E5b6rvCQLMaSbpLQ/xoyywIwVVu9uo2j/B6p Rory@RoryNix"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNhsYWo5pEilXQGcn2SOuvzIdy67QpdtC7vnmlJB9WX Administrator@nt-6mnnvobcjimo"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILSJYOygKJIvwhPj+SmTtzOD3eBzwf+kiLeegWQmKGmW TheArcaneBrony@w81vm"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPRTuz83dVThuDVXhDz3w3uYBGJ+JPzdZFT6wvhQXQ3 Rory@Rory-wsl" # work laptop
     ];
     useDefaultShell = true;
@@ -25,12 +40,17 @@
 
   home-manager.users.Rory = {
     #services.gnome-keyring.enable = true;
-    
+    dconf.settings = {
+      "org/virt-manager/virt-manager/connections" = {
+        autoconnect = ["qemu:///system"];
+        uris = ["qemu:///system"];
+      };
+    };
     programs = {
       git = {
         enable = true;
-        userName = "TheArcaneBrony";
-        userEmail = "myrainbowdash949@gmail.com";
+        userName = "Rory&";
+        userEmail = "root@rory.gay";
         extraConfig = {
           safe = {
             directory = "/";
@@ -94,11 +114,6 @@
             "sudo"
           ];
         }; 
-        #plugins = [
-        #  "git"
-        #  "zsh-syntax-highlighting"
-        #  "zsh-autosuggestions"
-        #];
 
         plugins = [
           {