From 2bb530b378a5af17a7176687dec98a081b91ac2c Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Sat, 2 Dec 2023 18:41:15 +0100 Subject: [PATCH] Bump to 23.11 --- flake.lock | 22 +++++++++++----------- flake.nix | 4 ++-- lib/host.nix | 2 +- lib/user.nix | 4 ++-- roles/common.nix | 2 +- roles/home/common.nix | 4 ++-- roles/home/ssh.nix | 14 ++++++++------ roles/home/zsh.nix | 5 ++--- 8 files changed, 29 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index f6f78eb..6d7af95 100644 --- a/flake.lock +++ b/flake.lock @@ -7,27 +7,27 @@ ] }, "locked": { - "lastModified": 1700392168, - "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, "nixos-unstable": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -39,16 +39,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700565382, - "narHash": "sha256-fn7daU1uz0BDWyRmOqm1N8rvnGCYB0kHjzKB5MeG2P8=", + "lastModified": 1701536542, + "narHash": "sha256-Jk65QjAyukaNpFyQ0f+avjLqrfkdBnHWOw9zBRpC5vo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "767986a42765f97edb87e9134133cb3057fcecb3", + "rev": "667b105a9a32ca6b6edc831748e3c12e186220be", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9b8f89f..efd6db4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,9 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/lib/host.nix b/lib/host.nix index 816eede..38963c5 100644 --- a/lib/host.nix +++ b/lib/host.nix @@ -40,7 +40,7 @@ useGlobalPkgs = true; }; - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } home-manager.nixosModules.home-manager diff --git a/lib/user.nix b/lib/user.nix index 16382ee..5b4a371 100644 --- a/lib/user.nix +++ b/lib/user.nix @@ -1,4 +1,4 @@ -{ pkgs, home-manager, mkHomeRole, ... }: +{ pkgs, stdenv, home-manager, mkHomeRole, ... }: { mkUser = { name, roles ? [ ] }: @@ -39,7 +39,7 @@ home = { username = name; homeDirectory = - if pkgs.stdenv.isLinux then "/home/${name}" else "/Users/${name}"; + if stdenv.isLinux then "/home/${name}" else "/Users/${name}"; }; } (mkHomeRole "common") diff --git a/roles/common.nix b/roles/common.nix index 1987fad..a76150c 100644 --- a/roles/common.nix +++ b/roles/common.nix @@ -29,7 +29,7 @@ fonts = { fontconfig.enable = true; - fonts = with pkgs; [ cascadia-code victor-mono ]; + packages = with pkgs; [ cascadia-code victor-mono ]; }; environment.systemPackages = with pkgs; [ diff --git a/roles/home/common.nix b/roles/home/common.nix index 072a3a0..4f1d737 100644 --- a/roles/home/common.nix +++ b/roles/home/common.nix @@ -22,8 +22,8 @@ glances tree ] - ++ lib.optional (!stdenv.isDarwin) pastebinit; + ++ lib.optional (!pkgs.stdenv.isDarwin) pastebinit; - stateVersion = "23.05"; + stateVersion = "23.11"; }; } diff --git a/roles/home/ssh.nix b/roles/home/ssh.nix index 322f7d1..abaa8cd 100644 --- a/roles/home/ssh.nix +++ b/roles/home/ssh.nix @@ -146,7 +146,7 @@ user = "git"; identityFile = "~/.ssh/github"; }; - + "code.iti.illinois.edu" = { user = "gitlab"; identityFile = "~/.ssh/github"; @@ -190,11 +190,13 @@ extraConfig = '' IdentitiesOnly yes ServerAliveInterval 3600 - Include config.d/* - '' + lib.optionalString pkgs.stdenv.isDarwin '' - AddKeysToAgent yes - UseKeychain yes - TCPKeepAlive no + Include config.d/* + ${if pkgs.stdenv.isDarwin then + '' + AddKeysToAgent yes + UseKeychain yes + TCPKeepAlive no + '' else ""} ''; }; } diff --git a/roles/home/zsh.nix b/roles/home/zsh.nix index f884d28..7b08452 100644 --- a/roles/home/zsh.nix +++ b/roles/home/zsh.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, ... }: +{ pkgs, lib, ... }: { home.packages = with pkgs; [ any-nix-shell ]; @@ -21,8 +21,7 @@ any-nix-shell zsh --info-right | source /dev/stdin source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh - '' + lib.optional (stdenv.isDarwin) '' - export PATH=$PATH:/opt/homebrew/bin + ${if pkgs.stdenv.isDarwin then "export PATH=$PATH:/opt/homebrew/bin" else ""} ''; }; }