diff --git a/flake.lock b/flake.lock index e5cfe28..8f30188 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715526530, - "narHash": "sha256-1ot3VxxbRexDAbk70n0yLt7EEEzypAGK3ut+YV7m/Mg=", + "lastModified": 1717177033, + "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=", "owner": "nix-community", "repo": "disko", - "rev": "94a818d8b914e06c04c21b5f0bafbb4b96ee8b47", + "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c", "type": "github" }, "original": { @@ -61,16 +61,16 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -100,16 +100,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", + "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 feb8870..a7aa479 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "My Nix Configs"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-wsl = { diff --git a/src/user/modules/bash/default.nix b/src/user/modules/bash/default.nix index d1d8e92..14d1e71 100644 --- a/src/user/modules/bash/default.nix +++ b/src/user/modules/bash/default.nix @@ -20,7 +20,11 @@ in ripgrep.enable = true; eza = { enable = true; - enableAliases = true; + enableBashIntegration = true; + enableFishIntegration = false; + enableZshIntegration = false; + enableNushellIntegration = false; + enableIonIntegration = false; }; }; }; diff --git a/src/user/modules/gui/modules/wm/sway/default.nix b/src/user/modules/gui/modules/wm/sway/default.nix index fa276e2..314bfbe 100644 --- a/src/user/modules/gui/modules/wm/sway/default.nix +++ b/src/user/modules/gui/modules/wm/sway/default.nix @@ -33,7 +33,7 @@ in qt = { enable = true; style.package = pkgs.juno-theme; - platformTheme = "gtk"; + platformTheme.name = "gtk"; }; home.packages = with pkgs; [ diff --git a/src/user/modules/security/modules/gpg/default.nix b/src/user/modules/security/modules/gpg/default.nix index 65368e8..4406c72 100644 --- a/src/user/modules/security/modules/gpg/default.nix +++ b/src/user/modules/security/modules/gpg/default.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ pkgs, lib, config, ... }: with lib; let @@ -22,7 +22,7 @@ in enableSshSupport = true; enableBashIntegration = true; enableScDaemon = true; - pinentryFlavor = "tty"; + pinentryPackage = pkgs.pinentry-tty; }; }; } diff --git a/src/user/modules/utils/modules/neovim/config/pkgs.nix b/src/user/modules/utils/modules/neovim/config/pkgs.nix index 4406904..69a6cf3 100644 --- a/src/user/modules/utils/modules/neovim/config/pkgs.nix +++ b/src/user/modules/utils/modules/neovim/config/pkgs.nix @@ -2,7 +2,7 @@ let lsp = with pkgs; [ - nil nixfmt + nil nixfmt-rfc-style marksman shfmt sumneko-lua-language-server stylua haskell-language-server hlint