diff --git a/config/shell/sh/002-aliases.sh b/config/shell/sh/002-aliases.sh index 15d00a4..54aad01 100644 --- a/config/shell/sh/002-aliases.sh +++ b/config/shell/sh/002-aliases.sh @@ -1,5 +1,5 @@ -[[ -x "$(command -v exa)" ]] && { - alias ll="exa --group-directories-first --color=auto --git -la" +[[ -x "$(command -v eza)" ]] && { + alias ll="eza --group-directories-first --color=auto --git -la" } || { alias ll="ls -alh --color=always --group-directories-first" } diff --git a/flake.lock b/flake.lock index ce9f7cd..a93b985 100644 --- a/flake.lock +++ b/flake.lock @@ -77,16 +77,16 @@ ] }, "locked": { - "lastModified": 1692099905, - "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", + "lastModified": 1703367386, + "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", + "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -141,16 +141,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1692525914, - "narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=", + "lastModified": 1703467016, + "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "475d5ae2c4cb87b904545bdb547af05681198fcc", + "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 17b6bf9..a916c3e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,10 @@ inputs = { # - Nixpkgs ---------------------------------- - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; # - Home-Manager ----------------------------- - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # - NUR -------------------------------------- diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix index 518a6e7..b0b55d7 100644 --- a/hosts/reykjavik/default.nix +++ b/hosts/reykjavik/default.nix @@ -86,5 +86,5 @@ in # - Extra / Temporary -------------------------- programs.dconf.enable = true; # Inkscape crashes - fonts.fonts = []; + fonts.packages = []; } diff --git a/modules/app/alacritty.nix b/modules/app/alacritty.nix index 2ea6aad..ed0ff7d 100644 --- a/modules/app/alacritty.nix +++ b/modules/app/alacritty.nix @@ -15,7 +15,7 @@ in fonts.fontconfig.enable = true; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ iosevka (nerdfonts.override { fonts = [ "Iosevka" ]; }) ]; diff --git a/modules/desktop/i3.nix b/modules/desktop/i3.nix index 8e776bb..06078a5 100644 --- a/modules/desktop/i3.nix +++ b/modules/desktop/i3.nix @@ -25,7 +25,7 @@ in { playerctl ]; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ iosevka (nerdfonts.override { fonts = [ "Iosevka" ]; }) ]; diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix index cc772cb..18137a2 100644 --- a/modules/editors/emacs.nix +++ b/modules/editors/emacs.nix @@ -31,7 +31,7 @@ in { ## Opt deps fd imagemagick - pinentry_emacs + pinentry-emacs zstd ## Modules deps @@ -49,7 +49,7 @@ in { graphviz ]; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ iosevka emacs-all-the-icons-fonts ]; diff --git a/modules/gaming/steam.nix b/modules/gaming/steam.nix index f7f731b..5101ece 100644 --- a/modules/gaming/steam.nix +++ b/modules/gaming/steam.nix @@ -9,15 +9,15 @@ in }; config = lib.mkIf cfg.enable { - nixpkgs.config.packageOverrides = pkgs: { - steam = pkgs.steam.override { - extraPkgs = pkgs: with pkgs; [ - pango - libthai - harfbuzz - ]; - }; - }; + # nixpkgs.config.packageOverrides = pkgs: { + # steam = pkgs.steam.override { + # extraPkgs = pkgs: with pkgs; [ + # pango + # libthai + # harfbuzz + # ]; + # }; + # }; programs.steam = { enable = true; diff --git a/modules/shell/utils.nix b/modules/shell/utils.nix index a0f84d1..c924faf 100644 --- a/modules/shell/utils.nix +++ b/modules/shell/utils.nix @@ -10,7 +10,7 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ bat - exa + eza fd fzf jq diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index 166d21f..a73ce39 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -14,7 +14,7 @@ in zsh-powerlevel10k ]; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ iosevka (nerdfonts.override { fonts = [ "Iosevka" ]; }) ]; @@ -26,7 +26,7 @@ in enableAutosuggestions = true; enableCompletion = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; initExtra = '' # Source generic (bash) configuration