flake updates

flake.lock

@@ -64,7 +64,9 @@
     },
     "emacs-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
@@ -237,7 +239,7 @@
       "inputs": {
         "flake-compat": "flake-compat_4",
         "gitignore": "gitignore_2",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
@@ -759,7 +761,7 @@
       "inputs": {
         "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1725758175,
@@ -953,22 +955,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1741010256,
-        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1725103162,
         "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
@@ -984,7 +970,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1719082008,
         "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
@@ -1000,7 +986,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1741010256,
         "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
@@ -1101,7 +1087,7 @@
         "nix-flatpak": "nix-flatpak",
         "nix-rice": "nix-rice",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-stable": "nixpkgs-stable_4",
         "sops-nix": "sops-nix",
         "wezterm": "wezterm",

flake.nix

@@ -12,7 +12,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch
+    nix-flatpak = {
+      url = "github:gmodena/nix-flatpak"; # unstable branch
+    };
 
     emacs-lsp-booster = {
       url = "github:slotThe/emacs-lsp-booster-flake";
@@ -24,7 +26,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    emacs-overlay.url = "github:nix-community/emacs-overlay";
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     nix-rice = {
       url = "github:bertof/nix-rice";

homes/emenel/dotfiles/dot_config/wezterm/launcher.lua

@@ -53,4 +53,15 @@ config.enable_tab_bar = false;
 
 config.enable_kitty_keyboard = true
 
+config.skip_close_confirmation_for_processes_named = {
+  'bash',
+  'sh',
+  'zsh',
+  'fish',
+  'bluetuith',
+  'yazi',
+  'btop++',
+  'clipse'
+}
+
 return config

hosts/eddie/configuration.nix

@@ -31,14 +31,13 @@
       inputs.emacs-lsp-booster.overlays.default
 
       (final: prev: {
-        wineWowPackages.stagingFull =
-          nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs
-            (old: {
-              patches = old.patches ++ [ ../../patches/wine-6006.patch ];
-              waylandSupport = true;
-              fontconfigSupport = true;
-              vulkanSupport = true;
-            });
+        wineWowPackages.stagingFull = nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs
+          (old: {
+            patches = old.patches ++ [ ../../patches/wine-6006.patch ];
+            waylandSupport = true;
+            fontconfigSupport = true;
+            vulkanSupport = true;
+          });
       })
 
       (final: prev: {

modules/home/desktop.nix

@@ -50,7 +50,7 @@
       sane-airscan
       xsane
 
-      nix-config.pkgs-stable.bitwarden-cli
+      bitwarden-cli
       bitwarden-desktop
       tailscale
       trayscale
@@ -89,7 +89,7 @@
 
       switcheroo
 
-      nix-config.pkgs-stable.blender
+      blender
       davinci-resolve-studio
       steam
       processing
@@ -174,7 +174,7 @@
     };
     iconTheme = {
       name = "Colloid";
-      package = nix-config.pkgs-stable.colloid-icon-theme;
+      package = pkgs.colloid-icon-theme;
     };
   };
 
@@ -230,6 +230,10 @@
       name = "Steam (nvidia-offload)";
       exec = "nvidia-offload ${pkgs.steam}/bin/steam";
     };
+    bluetuith = {
+      name = "Bluetuith (bluetooth manager)";
+      exec = "/home/emenel/.local/bin/wezapp bluetuith";
+    };
   };
 
   xdg.configFile."halloy/config.toml".source = ../../homes/emenel/dotfiles/dot_config/halloy/config.toml;

modules/home/shell-conf.nix

@@ -34,6 +34,7 @@
     gettext
     gnumake
     nix-du
+    nix-melt
     usbutils
     pciutils
     util-linux

overlays/bitwig-studio.nix

@@ -1,4 +0,0 @@
-self: super: {
-
-
-}