peperunas/nixos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump to 23.11

Browse Source
This commit is contained in:
Giulio De Pasquale 2023-12-02 18:41:15 +01:00
parent bb026f9a6d
commit 2bb530b378
8 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flake.lock generated
View File

@ -7,27 +7,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700392168, "lastModified": 1700814205,
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"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"
} }
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1700390070, "lastModified": 1701253981,
"narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,16 +39,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1700565382, "lastModified": 1701536542,
"narHash": "sha256-fn7daU1uz0BDWyRmOqm1N8rvnGCYB0kHjzKB5MeG2P8=", "narHash": "sha256-Jk65QjAyukaNpFyQ0f+avjLqrfkdBnHWOw9zBRpC5vo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "767986a42765f97edb87e9134133cb3057fcecb3", "rev": "667b105a9a32ca6b6edc831748e3c12e186220be",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.05", "ref": "release-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View File

@ -1,9 +1,9 @@
{ {
inputs = { 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"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

2
lib/host.nix
View File

@ -40,7 +40,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
}; };
system.stateVersion = "23.05"; system.stateVersion = "23.11";
} }
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager

4
lib/user.nix
View File

@ -1,4 +1,4 @@
{ pkgs, home-manager, mkHomeRole, ... }: { pkgs, stdenv, home-manager, mkHomeRole, ... }:
{ {
mkUser = { name, roles ? [ ] }: mkUser = { name, roles ? [ ] }:
@ -39,7 +39,7 @@
home = { home = {
username = name; username = name;
homeDirectory = homeDirectory =
if pkgs.stdenv.isLinux then "/home/${name}" else "/Users/${name}"; if stdenv.isLinux then "/home/${name}" else "/Users/${name}";
}; };
} }
(mkHomeRole "common") (mkHomeRole "common")

2
roles/common.nix
View File

@ -29,7 +29,7 @@
fonts = { fonts = {
fontconfig.enable = true; fontconfig.enable = true;
fonts = with pkgs; [ cascadia-code victor-mono ]; packages = with pkgs; [ cascadia-code victor-mono ];
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

4
roles/home/common.nix
View File

@ -22,8 +22,8 @@
glances glances
tree tree
] ]
++ lib.optional (!stdenv.isDarwin) pastebinit; ++ lib.optional (!pkgs.stdenv.isDarwin) pastebinit;
stateVersion = "23.05"; stateVersion = "23.11";
}; };
} }

14
roles/home/ssh.nix
View File

@ -146,7 +146,7 @@
user = "git"; user = "git";
identityFile = "~/.ssh/github"; identityFile = "~/.ssh/github";
}; };
"code.iti.illinois.edu" = { "code.iti.illinois.edu" = {
user = "gitlab"; user = "gitlab";
identityFile = "~/.ssh/github"; identityFile = "~/.ssh/github";
@ -190,11 +190,13 @@
extraConfig = '' extraConfig = ''
IdentitiesOnly yes IdentitiesOnly yes
ServerAliveInterval 3600 ServerAliveInterval 3600
Include config.d/* Include config.d/*
'' + lib.optionalString pkgs.stdenv.isDarwin '' ${if pkgs.stdenv.isDarwin then
AddKeysToAgent yes ''
UseKeychain yes AddKeysToAgent yes
TCPKeepAlive no UseKeychain yes
TCPKeepAlive no
'' else ""}
''; '';
}; };
} }

5
roles/home/zsh.nix
View File

@ -1,4 +1,4 @@
{ pkgs, lib, stdenv, ... }: { pkgs, lib, ... }:
{ {
home.packages = with pkgs; [ any-nix-shell ]; home.packages = with pkgs; [ any-nix-shell ];
@ -21,8 +21,7 @@
any-nix-shell zsh --info-right | source /dev/stdin any-nix-shell zsh --info-right | source /dev/stdin
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
'' + lib.optional (stdenv.isDarwin) '' ${if pkgs.stdenv.isDarwin then "export PATH=$PATH:/opt/homebrew/bin" else ""}
export PATH=$PATH:/opt/homebrew/bin
''; '';
}; };
} }