diff --git a/flake.lock b/flake.lock index 38bb83b..445cd22 100644 --- a/flake.lock +++ b/flake.lock @@ -273,16 +273,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1731880681, + "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -324,16 +324,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729044727, - "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index bac6482..f193853 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "NixOS and Home Manager configuration for Milo's laptops"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.url = "github:LnL7/nix-darwin"; diff --git a/home-manager/fragments/git.nix b/home-manager/fragments/git.nix index 2b7df05..c5cdf4c 100644 --- a/home-manager/fragments/git.nix +++ b/home-manager/fragments/git.nix @@ -2,7 +2,6 @@ , lib , pkgs , lpkgs -, upkgs , ... }: @@ -148,7 +147,6 @@ in programs.jujutsu = { enable = true; - package = upkgs.jujutsu; settings = { user = { name = "Milo Moisson"; diff --git a/home-manager/fragments/helix.nix b/home-manager/fragments/helix.nix index 2302090..c9f0762 100644 --- a/home-manager/fragments/helix.nix +++ b/home-manager/fragments/helix.nix @@ -2,7 +2,6 @@ , config , pkgs , lpkgs -, upkgs , lib , ... }: @@ -96,7 +95,6 @@ in taplo typst-lsp vscode-langservers-extracted - upkgs.vue-language-server yaml-language-server ] ++ lib.optionals (!flags.onlyCached) [ lpkgs.wakatime-ls diff --git a/home-manager/fragments/tools.nix b/home-manager/fragments/tools.nix index da3e120..9615134 100644 --- a/home-manager/fragments/tools.nix +++ b/home-manager/fragments/tools.nix @@ -21,7 +21,6 @@ in man-pages # TUIs - upkgs.binsider btop glow @@ -44,13 +43,13 @@ in pv ripgrep speedtest-go - upkgs.srgn + srgn sshfs tealdeer termimage tokei trash-cli - upkgs.wcurl + wcurl ]) ++ lib.optionals (!flags.onlyCached) [ lpkgs.otree lpkgs.sweep diff --git a/home-manager/fragments/vm.nix b/home-manager/fragments/vm.nix index 2f2e6d0..24a92d3 100644 --- a/home-manager/fragments/vm.nix +++ b/home-manager/fragments/vm.nix @@ -2,7 +2,6 @@ , config , lib , pkgs -, upkgs , ... }: @@ -268,7 +267,7 @@ in (map (modifier: { "${modifier}+Return" = "exec ${cfg-sway.terminal}"; - "${modifier}+Shift+Return" = "exec ${lib.getExe' pkgs.gnome.nautilus "nautilus"}"; + "${modifier}+Shift+Return" = "exec ${lib.getExe' pkgs.nautilus "nautilus"}"; "${modifier}+Shift+q" = "kill"; "${modifier}+d" = "exec ${cfg-sway.menu}"; "${modifier}+Space" = "exec ${makoctl} dismiss"; @@ -343,7 +342,6 @@ in services.darkman = { enable = true; - package = upkgs.darkman; settings.usegeoclue = true; darkModeScripts.gtk-theme = '' diff --git a/home-manager/fragments/xdg-mime.nix b/home-manager/fragments/xdg-mime.nix index c35be7c..2b66076 100644 --- a/home-manager/fragments/xdg-mime.nix +++ b/home-manager/fragments/xdg-mime.nix @@ -23,7 +23,7 @@ in { assertion = config.programs.firefox.enable; message = "`xdg-mime` fragment depends on `firefox` program"; } { assertion = config.programs.imv.enable; message = "`xdg-mime` fragment depends on `imv` program"; } { assertion = config.programs.kitty.enable; message = "`xdg-mime` fragment depends on `kitty` program"; } - { assertion = lib.lists.count (drv: (drv.pname or "") == pkgs.gnome.nautilus.pname) config.home.packages > 0; message = "`xdg-mime` fragment depends on `nautilus` program"; } + { assertion = lib.lists.count (drv: (drv.pname or "") == pkgs.nautilus.pname) config.home.packages > 0; message = "`xdg-mime` fragment depends on `nautilus` program"; } ]; xdg.mimeApps = { diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index c3194eb..45c4f0d 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -70,7 +70,7 @@ in packages = with pkgs; [ # Unfree spotify - upkgs.unityhub + unityhub ## JetBrains jetbrains-toolbox jetbrains.datagrip @@ -80,24 +80,25 @@ in audacity blender bottles - calibre - cura + # TODO: wait for fix in stable + # calibre + # cura element-desktop evince - gnome.file-roller - gnome.gnome-disk-utility - gnome.nautilus - gnome.simple-scan + file-roller + gnome-disk-utility heroic insomnia libreoffice-qt localsend lutris mpv + nautilus obs-studio pavucontrol prismlauncher rawtherapee + simple-scan transmission_4-gtk vesktop wdisplays diff --git a/nixos/profiles/laptop.nix b/nixos/profiles/laptop.nix index ed6b880..091e6ed 100644 --- a/nixos/profiles/laptop.nix +++ b/nixos/profiles/laptop.nix @@ -32,10 +32,7 @@ in "10.2.3.154" = [ "printer.epita" ]; }; - hardware.opengl = { - enable = true; - driSupport = true; - }; + hardware.graphics.enable = true; boot = { kernelParams = [ "quiet" ]; diff --git a/overlays/patches.nix b/overlays/patches.nix index 38490b7..405df3a 100644 --- a/overlays/patches.nix +++ b/overlays/patches.nix @@ -8,8 +8,8 @@ with final.lib; src = prev.fetchFromGitHub { owner = "mrnossiom"; repo = "swaylock"; - rev = "0e09892e93b82f6de2fcf10a773d5fbf9de61d73"; - hash = "sha256-IzgrQv/oJEyvlVlZCm/2LOhpxR4KfSz7llSq3s9t/qM="; + rev = "5aebb558663bebb09b86d6c4ca9b760791507b88"; + hash = "sha256-1XotT0XKoDyg7ytzoqgxdHHA64oce4b8CZU53luI5j0="; }; }); } diff --git a/shells.nix b/shells.nix index 1adf913..24d93d3 100644 --- a/shells.nix +++ b/shells.nix @@ -12,6 +12,7 @@ in lpkgs.agenix home-manager just + nix-tree ]); # Add presets that I can quickly use