update to 24.05

adfaure · Jun 7, 2024 · ec30008 · ec30008
1 parent 1af6180
commit ec30008
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 24 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "My personnal configuration";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     my-dotfiles = {
       url = "github:adfaure/dotfiles";
@@ -12,7 +12,7 @@
       flake = false;
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     emacs-overlay.url = "github:nix-community/emacs-overlay";

diff --git a/homes/base.nix b/homes/base.nix
@@ -86,6 +86,7 @@
       tldr
       # better git diff
       difftastic
+
     ];
   };
 }
diff --git a/homes/graphical.nix b/homes/graphical.nix
@@ -71,10 +71,10 @@
       direnv
       entr
       pandoc
-      nvtop
+      nvtopPackages.full
 
       # Nix file formating
-      nixfmt
+      nixfmt-classic
 
       # GUI applications
       calibre
@@ -94,15 +94,18 @@
 
       mob
       lazygit
-      # Using this for the moment ... https://github.com/NixOS/nixpkgs/issues/273611
-      (lib.throwIf (lib.versionOlder "1.4.16" pkgs.obsidian.version) "Obsidian no longer requires EOL Electron" (
-        pkgs.obsidian.override {
-          electron = pkgs.electron_25.overrideAttrs (_: {
-            preFixup = "patchelf --add-needed ${pkgs.libglvnd}/lib/libEGL.so.1 $out/bin/electron"; # NixOS/nixpkgs#272912
-            meta.knownVulnerabilities = []; # NixOS/nixpkgs#273611
-          });
-        }
-      ))
+
+      obsidian
+
+      # # Using this for the moment ... https://github.com/NixOS/nixpkgs/issues/273611
+      # (lib.throwIf (lib.versionOlder "1.4.16" pkgs.obsidian.version) "Obsidian no longer requires EOL Electron" (
+      #   pkgs.obsidian.override {
+      #     electron = pkgs.electron_25.overrideAttrs (_: {
+      #       preFixup = "patchelf --add-needed ${pkgs.libglvnd}/lib/libEGL.so.1 $out/bin/electron"; # NixOS/nixpkgs#272912
+      #       meta.knownVulnerabilities = []; # NixOS/nixpkgs#273611
+      #     });
+      #   }
+      # ))
     ];
   };
 }
diff --git a/nixos/profiles/common/default.nix b/nixos/profiles/common/default.nix
@@ -42,7 +42,7 @@ with lib; {
 
     gnupg.agent = {
       enable = true;
-      pinentryFlavor = "qt";
+      # pinentryFlavor = "qt";
       enableSSHSupport = true;
     };
 

diff --git a/nixos/profiles/graphical/default.nix b/nixos/profiles/graphical/default.nix
@@ -34,7 +34,7 @@ with lib; {
 
     # Needed for printer discovery
     avahi.enable = true;
-    avahi.nssmdns = true;
+    avahi.nssmdns4 = true;
   };
 
   services.pipewire = {

diff --git a/nixos/services/gnome/default.nix b/nixos/services/gnome/default.nix
@@ -40,7 +40,7 @@ in {
         cheese # webcam tool
         gnome-music
         gnome-terminal
-        gedit # text editor
+        # gedit # text editor
         epiphany # web browser
         geary # email reader
         # evince # document viewer
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,6 +86,7 @@ @@
           tldr
           # better git diff
           difftastic
         ];
       };
     }