diff --git a/flake.lock b/flake.lock index 2bc4176..f784c92 100644 --- a/flake.lock +++ b/flake.lock @@ -61,16 +61,16 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -141,16 +141,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a53ae01..a5aa531 100644 --- 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 index 7578dcf..8c5bb22 100644 --- 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 index 1a0e3c8..a55201e 100644 --- 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 index 1e8a23c..f76c47e 100644 --- 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 index 3e6ac8e..0cfc4a2 100644 --- 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 index 70bed26..85d1c41 100644 --- 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