ashe
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update nixOS to 23.11

Browse Source
main
Ashelyn Dawn 5 months ago committed by Ashelyn Rose
parent e70227adc0
commit ef430a5ccf
No known key found for this signature in database
GPG Key ID: D1980B8C6F349BC1
6 changed files with 53 additions and 67 deletions
Show Stats Download Patch File Download Diff File

1
common/grub.nix
Unescape Escape View File

@ -4,6 +4,5 @@ let
cfg = config.ashe.system;
in {
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = cfg.disk;
}

6
common/system.nix
Unescape Escape View File

@ -9,7 +9,9 @@ in {
services.xserver.enable = cfg.x11;
users.defaultUserShell = cfg.shell;
programs.zsh.enable = true;
environment.systemPackages = with pkgs; [
zsh
neovim
git
vim
@ -19,7 +21,7 @@ in {
services.openssh = {
enable = true;
passwordAuthentication = true;
permitRootLogin = "no";
settings.PasswordAuthentication = true;
settings.PermitRootLogin = "no";
};
}

19
deploy/shell.sh
Unescape Escape View File

@ -0,0 +1,19 @@
#!/usr/bin/env bash
set -e
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
cd $SCRIPT_DIR/..
echo "Building Nix environment in docker"
IMAGE=$(docker build . -q -f ./deploy/Dockerfile)
echo "Starting interactive shell"
docker run \
--name "nixos-shell" \
--rm \
--mount type=bind,src=$(pwd)/,dst=/deploy/ \
--mount type=bind,src=$(pwd)/deploy/.ssh/,dst=/root/.ssh/,readonly=true \
--mount type=volume,src=nixCache,dst=/nix/ \
-it $IMAGE \
bash

88
flake.lock
Unescape Escape View File

@ -100,20 +100,19 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils_5"
]
},
"locked": {
"lastModified": 1685325875,
"narHash": "sha256-tevlLIMPeVNNYPd9UgjHApAUoFAnw9iohqUyj+LPp88=",
"lastModified": 1700814205,
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b372d7f8d5518aaba8a4058a453957460481afbc",
"rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.11",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
@ -353,16 +352,16 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1686929285,
"narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=",
"lastModified": 1700787330,
"narHash": "sha256-4VIBCyfqnEsdVP/SgKZ3rudwzxGdEqpKfgoWETs/I6k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "93fddcf640ceca0be331210ba3101cee9d91c13d",
"rev": "7f7851dfc570812c305d89438681b715a4f7beba",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
@ -434,7 +433,7 @@
"private": {
"inputs": {
"nixpkgs": "nixpkgs_6",
"utils": "utils_6"
"utils": "utils_5"
},
"locked": {
"lastModified": 1699856138,
@ -470,7 +469,7 @@
"inputs": {
"nix-filter": "nix-filter_4",
"nixpkgs": "nixpkgs_7",
"utils": "utils_7"
"utils": "utils_6"
},
"locked": {
"lastModified": 1694976446,
@ -501,21 +500,6 @@
"type": "github"
}
},
"systems_10": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
@ -640,7 +624,7 @@
"inputs": {
"nix-filter": "nix-filter_5",
"nixpkgs": "nixpkgs_8",
"utils": "utils_8"
"utils": "utils_7"
},
"locked": {
"lastModified": 1687029231,
@ -660,7 +644,7 @@
"inputs": {
"nix-filter": "nix-filter_6",
"nixpkgs": "nixpkgs_9",
"utils": "utils_9"
"utils": "utils_8"
},
"locked": {
"lastModified": 1685398072,
@ -680,7 +664,7 @@
"inputs": {
"nix-filter": "nix-filter_7",
"nixpkgs": "nixpkgs_10",
"utils": "utils_10"
"utils": "utils_9"
},
"locked": {
"lastModified": 1700340363,
@ -700,7 +684,7 @@
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_12",
"utils": "utils_11"
"utils": "utils_10"
},
"locked": {
"lastModified": 1684903753,
@ -752,24 +736,6 @@
"type": "github"
}
},
"utils_11": {
"inputs": {
"systems": "systems_10"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"locked": {
"lastModified": 1667395993,
@ -826,11 +792,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@ -844,11 +810,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@ -862,11 +828,11 @@
"systems": "systems_6"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
@ -898,11 +864,11 @@
"systems": "systems_8"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {

4
flake.nix
Unescape Escape View File

@ -1,8 +1,8 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
deploy-rs.url = "github:serokell/deploy-rs";
home-manager.url = "github:nix-community/home-manager/release-22.11";
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
private.url = "git+ssh://git@git.tempest.dev/ashe/nixos-config-private";
tmpfiles.url = "git+http://git.tempest.dev/ashe/tmpfiles";

2
hosts/nyx/configuration.nix
Unescape Escape View File

@ -16,7 +16,7 @@
"https://cache.nixos.org/"
];
nix.trustedUsers = [ "rose" ];
nix.settings.trusted-users = [ "rose" ];
nix.settings.trusted-public-keys = [
"hemera.tempest.local:Tb4edCxlB4YNGJNnVYrpNkTmG82tCChVNXdes33y2kY="
];

Write Preview
Loading…
Cancel
Save