This commit is contained in:
alex 2023-06-17 13:51:24 -04:00
parent 6b9bfdc64e
commit ea762a3958
3 changed files with 56 additions and 58 deletions

View File

@ -6,7 +6,8 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@ -43,21 +44,21 @@
environment.etc.crypttab = { environment.etc.crypttab = {
enable = true; enable = true;
text = '' text = ''
# /etc/crypttab: mappings for encrypted partitions. # /etc/crypttab: mappings for encrypted partitions.
# #
# Each mapped device will be created in /dev/mapper, so your /etc/fstab # Each mapped device will be created in /dev/mapper, so your /etc/fstab
# should use the /dev/mapper/<name> paths for encrypted devices. # should use the /dev/mapper/<name> paths for encrypted devices.
# #
# See crypttab(5) for the supported syntax. # See crypttab(5) for the supported syntax.
# #
# NOTE: Do not list your root (/) partition here, it must be set up # NOTE: Do not list your root (/) partition here, it must be set up
# beforehand by the initramfs (/etc/mkinitcpio.conf). The same applies # beforehand by the initramfs (/etc/mkinitcpio.conf). The same applies
# to encrypted swap, which should be set up with mkinitcpio-openswap # to encrypted swap, which should be set up with mkinitcpio-openswap
# for resume support. # for resume support.
# #
# <name> <device> <password> <options> # <name> <device> <password> <options>
# luks-d515fd8a-a021-4a1e-bd21-5793c3c3a771 UUID=d515fd8a-a021-4a1e-bd21-5793c3c3a771 /crypto_keyfile.bin luks # luks-d515fd8a-a021-4a1e-bd21-5793c3c3a771 UUID=d515fd8a-a021-4a1e-bd21-5793c3c3a771 /crypto_keyfile.bin luks
externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.bin luks externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.bin luks
''; '';
}; };
@ -105,22 +106,7 @@ externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.alex = { users.users.alex = {
isNormalUser = true; isNormalUser = true;
home = "/home/alex";
extraGroups = [ "wheel" "networkmanager" ]; # Enable sudo for the user. extraGroups = [ "wheel" "networkmanager" ]; # Enable sudo for the user.
packages = with pkgs; [
firefox
keepassxc
nextcloud-client
discord
vscode
wineWowPackages.unstableFull
winetricks
mpv
git
lutris
steam
spotify
];
}; };
home-manager.users.alex = import ./home.nix; home-manager.users.alex = import ./home.nix;
@ -168,7 +154,6 @@ externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.
font-manager font-manager
lshw lshw
mesa_22_3 mesa_22_3
nixfmt
pavucontrol pavucontrol
unzip unzip
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
@ -209,6 +194,5 @@ externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?
} }

View File

@ -7,8 +7,21 @@
home.homeDirectory = "/home/alex"; home.homeDirectory = "/home/alex";
# Packages that should be installed to the user profile. # Packages that should be installed to the user profile.
home.packages = [ home.packages = with pkgs; [
pkgs.nixpkgs-fmt discord
firefox
git
keepassxc
lutris
mpv
nextcloud-client
nixpkgs-fmt
spotify
steam
vscode
winetricks
wineWowPackages.unstableFull
yt-dlp
]; ];
# This value determines the Home Manager release that your # This value determines the Home Manager release that your

View File

@ -1,11 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail
if [ -z "$(git status --porcelain)" ] if [ -z "$(git status --porcelain)" ]
then then
git push --force-with-lease git push --force-with-lease
rev=$(git rev-parse HEAD)
sudo nixos-rebuild switch \ sudo nixos-rebuild switch \
--show-trace \ --flake "git+https://git.atauno.com/atau/nixos-config.git?ref=master&rev=$rev"
--flake "git+https://git.atauno.com/atau/nixos-config.git"
else else
echo "Git working directory is unclean, please commit changes" echo "Git working directory is unclean, please commit changes"
exit 1 exit 1