Bump to 23.11
This commit is contained in:
parent
bb026f9a6d
commit
2bb530b378
22
flake.lock
generated
22
flake.lock
generated
@ -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"
|
||||
}
|
||||
|
@ -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";
|
||||
};
|
||||
};
|
||||
|
@ -40,7 +40,7 @@
|
||||
useGlobalPkgs = true;
|
||||
};
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
|
@ -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")
|
||||
|
@ -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; [
|
||||
|
@ -22,8 +22,8 @@
|
||||
glances
|
||||
tree
|
||||
]
|
||||
++ lib.optional (!stdenv.isDarwin) pastebinit;
|
||||
++ lib.optional (!pkgs.stdenv.isDarwin) pastebinit;
|
||||
|
||||
stateVersion = "23.05";
|
||||
stateVersion = "23.11";
|
||||
};
|
||||
}
|
||||
|
@ -191,10 +191,12 @@
|
||||
IdentitiesOnly yes
|
||||
ServerAliveInterval 3600
|
||||
Include config.d/*
|
||||
'' + lib.optionalString pkgs.stdenv.isDarwin ''
|
||||
${if pkgs.stdenv.isDarwin then
|
||||
''
|
||||
AddKeysToAgent yes
|
||||
UseKeychain yes
|
||||
TCPKeepAlive no
|
||||
'' else ""}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
@ -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 ""}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user