adjust emoji package, flake naming, wrapper directory and small fixes

https://nixos.org/manual/nixos/unstable/release-notes#sec-release-23.11
NixOS/nixpkgs#221181

desktop/environment.nix

@@ -27,7 +27,7 @@
     packages = with pkgs; [
       noto-fonts
       noto-fonts-cjk
-      noto-fonts-emoji
+      noto-fonts-color-emoji
       # Noto + NerdFont => Noto-Nerdfonts
       (nerdfonts.override { fonts = [ "Noto" ]; })
       # Microsoft TrueType core fonts

desktop/packages.nix

@@ -2,6 +2,7 @@
 
 {
   users.users."keks".packages = with pkgs; [
+    gnome.gnome-calculator
     keepassxc
     nextcloud-client
     pdfgrep

development/NixOS-wrappers/default.nix

@@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./cage-shell.nix
+  ];
+}

development/base-devel.nix

@@ -15,7 +15,6 @@
     nix-index
     nmap
     psmisc
-    pstree
     pv
     ripgrep
     screen

development/default.nix

@@ -1,10 +1,10 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   imports = [
     ./base-devel.nix
     ./desktop.nix
     ./neovim.nix
-    ./nix-cage.nix
+    ./NixOS-wrappers
   ];
 }

files/packages/files-cleanup/bin/cleanup.sh

@@ -23,7 +23,7 @@ rm -r /home/*/.var/app/org.mozilla.firefox/cache
 
 ### delete temporary flatpak overrides
 ### they are now managed by nix
-### /var/lib/flatpak/overrides -> /etc/flatpak/overrides -> pkgs.flatpak-overrides
+### /var/lib/flatpak/overrides -> pkgs.flatpak-overrides
 rm -fr /home/*/.local/share/flatpak/overrides
 
 ### delete old Tab Group backups

flake.nix

@@ -3,11 +3,15 @@
     nixpkgs-stable.url = "nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
-    home-manager = {
-      #url = "github:nix-community/home-manager/release-23.05";
+    home-manager-stable = {
+      url = "github:nix-community/home-manager/release-23.05";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+    home-manager-unstable = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+
     tuxedo-nixos = {
       url = "github:blitz/tuxedo-nixos";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -22,9 +26,10 @@
     self,
     nixpkgs-stable,
     nixpkgs-unstable,
-    home-manager,
+    home-manager-stable,
+    home-manager-unstable,
     lanzaboote,
-    tuxedo-nixos
+    tuxedo-nixos,
   }@inputs: {
     nixosConfigurations = {
 
@@ -40,7 +45,7 @@
         };
         modules = [
           ./machines/cookieclicker.nix
-          home-manager.nixosModules.home-manager
+          home-manager-unstable.nixosModules.home-manager
           lanzaboote.nixosModules.lanzaboote
         ];
       };
@@ -56,7 +61,7 @@
         };
         modules = [
           ./machines/cookiethinker.nix
-          home-manager.nixosModules.home-manager
+          home-manager-unstable.nixosModules.home-manager
           tuxedo-nixos.nixosModules.default
           lanzaboote.nixosModules.lanzaboote
         ];

scripts/install/desktop/21-flatpak.sh

@@ -7,8 +7,7 @@ flatpak remote-add --if-not-exists \
 # essential apps
 flatpak install -y 'flathub' \
 	com.github.hluk.copyq \
-	com.github.tchx84.Flatseal \
-	org.gnome.Calculator
+	com.github.tchx84.Flatseal
 
 # browser
 flatpak install -y 'flathub' \

scripts/install/laptop/21-flatpak.sh

@@ -12,7 +12,6 @@ flatpak install -y \
 	com.github.tchx84.Flatseal \
 	io.gitlab.librewolf-community \
 	org.ferdium.Ferdium \
-	org.gnome.Calculator \
 	org.kde.okular \
 	org.mozilla.firefox \
 	org.mozilla.Thunderbird

services/system/files-cleanup.nix

@@ -43,6 +43,7 @@
             "-/root/.dbus"
             "-/root/.local"
             "-/home/keks/.cache"
+            "-/home/keks/.local/share/flatpak/overrides"
             "-/home/keks/.var/app/io.gitlab.librewolf-community/cache"
             "-/home/keks/.var/app/org.kde.kdenlive/cache"
             "-/home/keks/.var/app/org.mozilla.firefox/cache"