tsv
/
Nix-Config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap system configuration in a Flake

This commit is contained in:
Trevor Vallender 2023-03-09 18:49:28 +00:00
parent da96cb3bb5
commit da2d0899ce
6 changed files with 105 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/apply-system.bash
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
pushd ~/.my_config pushd ~/.my_config
sudo nixos-rebuild switch -I nixos-config=./system/configuration.nix sudo nixos-rebuild switch --flake .#
popd popd

4
bin/update-system.bash
View File

@ -1,6 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
sudo nix-channel --update pushd ~/.my_config
nix flake update --recreate-lock-file
popd
pushd ~/.my_config/bin pushd ~/.my_config/bin
./apply-system.bash ./apply-system.bash
popd popd

77
flake.lock Normal file
View File

@ -0,0 +1,77 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
"lastModified": 1678271387,
"narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "36999b8d19eb6eebb41983ef017d7e0095316af2",
"type": "github"
},
"original": {
"id": "home-manager",
"type": "indirect"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1678293141,
"narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1678293141,
"narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2"
}
},
"utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

19
flake.nix Normal file
View File

@ -0,0 +1,19 @@
{
description = "~tsv's system config";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};
outputs = inputs@{ nixpkgs, home-manager, ... }: {
nixosConfigurations = {
ritchie = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./system/configuration.nix
];
};
};
};
}

6
system/configuration.nix
View File

@ -44,6 +44,11 @@ in
nix.settings.trusted-users = [ "root" "tsv" ]; nix.settings.trusted-users = [ "root" "tsv" ];
nix = {
extraOptions = "experimental-features = nix-command flakes";
package = pkgs.nixFlakes;
};
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
@ -77,7 +82,6 @@ in
services.openssh.enable = true; services.openssh.enable = true;
system.copySystemConfiguration = true;
system.stateVersion = "22.11"; # Don't change this system.stateVersion = "22.11"; # Don't change this
} }

2
users/tsv/home.nix
View File

@ -18,7 +18,6 @@
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
home.sessionVariables = { home.sessionVariables = {
@ -60,7 +59,6 @@
wine wine
winetricks winetricks
zoom-us zoom-us
(import (fetchTarball https://github.com/cachix/devenv/archive/v0.6.tar.gz)).default
]; ];
programs.tmux = { programs.tmux = {