marc/samfelag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NixOS upgrade 23.05 -> 23.11

Browse Source
This commit is contained in:
marc
2023-12-29 17:05:01 +01:00
parent b898d0af42
commit fffa64bc44
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/shell/sh/002-aliases.sh
View File

@@ -1,5 +1,5 @@
[[ -x "$(command -v exa)" ]] && { [[ -x "$(command -v eza)" ]] && {
alias ll="exa --group-directories-first --color=auto --git -la" alias ll="eza --group-directories-first --color=auto --git -la"
} || { } || {
alias ll="ls -alh --color=always --group-directories-first" alias ll="ls -alh --color=always --group-directories-first"
} }

16
flake.lock generated
View File

@@ -77,16 +77,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692099905, "lastModified": 1703367386,
"narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -141,16 +141,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1692525914, "lastModified": 1703467016,
"narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=", "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "475d5ae2c4cb87b904545bdb547af05681198fcc", "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View File

@@ -4,10 +4,10 @@
inputs = { inputs = {
# - Nixpkgs ---------------------------------- # - Nixpkgs ----------------------------------
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
# - Home-Manager ----------------------------- # - 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"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# - NUR -------------------------------------- # - NUR --------------------------------------

2
hosts/reykjavik/default.nix
View File

@@ -86,5 +86,5 @@ in
# - Extra / Temporary -------------------------- # - Extra / Temporary --------------------------
programs.dconf.enable = true; # Inkscape crashes programs.dconf.enable = true; # Inkscape crashes
fonts.fonts = []; fonts.packages = [];
} }

2
modules/app/alacritty.nix
View File

@@ -15,7 +15,7 @@ in
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
iosevka iosevka
(nerdfonts.override { fonts = [ "Iosevka" ]; }) (nerdfonts.override { fonts = [ "Iosevka" ]; })
]; ];

2
modules/desktop/i3.nix
View File

@@ -25,7 +25,7 @@ in {
playerctl playerctl
]; ];
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
iosevka iosevka
(nerdfonts.override { fonts = [ "Iosevka" ]; }) (nerdfonts.override { fonts = [ "Iosevka" ]; })
]; ];

4
modules/editors/emacs.nix
View File

@@ -31,7 +31,7 @@ in {
## Opt deps ## Opt deps
fd fd
imagemagick imagemagick
pinentry_emacs pinentry-emacs
zstd zstd
## Modules deps ## Modules deps
@@ -49,7 +49,7 @@ in {
graphviz graphviz
]; ];
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
iosevka iosevka
emacs-all-the-icons-fonts emacs-all-the-icons-fonts
]; ];

18
modules/gaming/steam.nix
View File

@@ -9,15 +9,15 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
nixpkgs.config.packageOverrides = pkgs: { # nixpkgs.config.packageOverrides = pkgs: {
steam = pkgs.steam.override { # steam = pkgs.steam.override {
extraPkgs = pkgs: with pkgs; [ # extraPkgs = pkgs: with pkgs; [
pango # pango
libthai # libthai
harfbuzz # harfbuzz
]; # ];
}; # };
}; # };
programs.steam = { programs.steam = {
enable = true; enable = true;

2
modules/shell/utils.nix
View File

@@ -10,7 +10,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
bat bat
exa eza
fd fd
fzf fzf
jq jq

4
modules/shell/zsh.nix
View File

@@ -14,7 +14,7 @@ in
zsh-powerlevel10k zsh-powerlevel10k
]; ];
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
iosevka iosevka
(nerdfonts.override { fonts = [ "Iosevka" ]; }) (nerdfonts.override { fonts = [ "Iosevka" ]; })
]; ];
@@ -26,7 +26,7 @@ in
enableAutosuggestions = true; enableAutosuggestions = true;
enableCompletion = true; enableCompletion = true;
enableSyntaxHighlighting = true; syntaxHighlighting.enable = true;
initExtra = '' initExtra = ''
# Source generic (bash) configuration # Source generic (bash) configuration