Merge branch 'main' of git.saragerretsen.nl:Hertog/HermitNix

god config fuckery that I will fix later

Hosts/hertog-laptop/packages.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ config, pkgs, inputs, nix-flatpak, ... }:
 let
   mini-text = pkgs.callPackage ../../Programs/MiniText { };
   hyperplane = pkgs.callPackage ../../Programs/Hyperplane { };
@@ -16,6 +16,13 @@ in
     pkgs.ibm-plex
   ];
   
+  services.flatpak = {
+    enable = true;
+    packages = [
+      "com.kristianduske.TrenchBroom"
+    ];
+  };
+
   environment = {
     # Systemwide installed packages
     systemPackages = with pkgs; [
@@ -23,7 +30,6 @@ in
       gnome.gnome-control-center
       gnome.nautilus
       gnome.file-roller
-      swaybg
       alacritty
       gnome-text-editor
       warp
@@ -31,6 +37,10 @@ in
       pamixer
       hyperplane
       mini-text
+      # Sway nees this
+      swaybg
+      xdg-desktop-portal
+      xdg-desktop-portal-wlr
     ];
   };
 }

Users/Hertog/sway.nix

@@ -140,6 +140,8 @@ in
       terminal = "alacritty";
       menu = "wofi --show drun";
       startup = [
+      	{command = "exec --no-startup-id /usr/lib/xdg-desktop-portal -r";}
+	{command = "export XDG_CURRENT_DESKTOP=sway";}
         {command = "export QT_QPA_PLATFORM=wayland";}
         {command = "swaybg -i /etc/nixos/Assets/background.svg";}
         {command = "keepassxc /home/hertog/Documents/Belangrijk/Wachtwoorden.kdbx";}

Users/Hertog/zsh.nix

@@ -13,6 +13,7 @@
       update = "sudo nixos-rebuild switch --flake /etc/nixos/#laptop";
       vim = "nix run git+https://git.saragerretsen.nl/Hertog/HertogVim";
       vimUpdate = "nix run --refresh git+https://git.saragerretsen.nl/Hertog/HertogVim";
+      sudovim = "sudo nix run git+https://git.saragerretsen.nl/Hertog/HertogVim";
     };
     plugins = [
       {

flake.lock

@@ -39,6 +39,21 @@
         "url": "https://iceshrimp.dev/iceshrimp/packaging"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1707510453,
+        "narHash": "sha256-5mDsmJvY/GmGAlVF4VvYoTmXYQAbHEUNbV3LFiXkLls=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "739d714ec57470efd5d391f1e9963b9b3d94305f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1702453208,
@@ -90,6 +105,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "iceshrimp": "iceshrimp",
+        "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2"
       }

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
+    nix-flatpak.url = "github:gmodena/nix-flatpak";
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -15,7 +16,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, iceshrimp, nixos-hardware, ... }@inputs: 
+  outputs = { self, nixpkgs, nix-flatpak, home-manager, iceshrimp, nixos-hardware, ... }@inputs: 
   let
     system = "x86_64-linux";
     currentSystem = system;
@@ -43,6 +44,8 @@
           ./System/audio.nix
           # Appliances is where printer support is enabled but also things like flipperzero flashing
           ./System/appliances.nix
+	  # Needed to install flatpaks decleratively
+	  nix-flatpak.nixosModules.nix-flatpak
           # Systemwide installed pacakges userpackages are set through home-manager
           ./System/packages.nix
           ./Programs/steam.nix