[NixOS] Fixes

This commit is contained in:
Ivan Malison 2021-07-10 17:12:39 -06:00
parent 5e1d8be3a5
commit 285745975b
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 37 additions and 55 deletions

View File

@ -1,28 +0,0 @@
set-option -g default-command "zsh"
unbind C-o
set -g prefix C-q
bind-key C-q send-prefix
set -gw mode-keys emacs
set-option -g status on
bind-key @ command-prompt -p "create pane from:" "join-pane -s ':%%'"
bind-key ^ command-prompt -p "swap window:,with window:" "swap-window -s %1 -t %2"
set-option -g status-fg blue
set-option -g status-bg black
set-option -g status-interval 2
set-option -g status-utf8 on
set-option -g status-justify "centre"
set-option -g status-left-length 60
set-option -g status-right-length 90
# Set up resize-pane keys
bind-key + resize-pane -D 3
bind-key / resize-pane -L 3
bind-key - resize-pane -U 3
bind-key * resize-pane -R 3
bind-key -t emacs-copy M-w copy-pipe "zsh -c 'oscopy'"
source ~/.tmux.powerline

View File

@ -3,6 +3,7 @@
imports = [ imports = [
./users.nix ./users.nix
./fonts.nix ./fonts.nix
./essential-packages.nix
]; ];
nixpkgs.overlays = [ nixpkgs.overlays = [
@ -34,6 +35,24 @@
''; '';
networking.networkmanager = { networking.networkmanager = {
enable = true; enable = true;
enableStrongSwan = true;
packages = [ pkgs.networkmanager-l2tp ];
extraConfig = ''
[main]
rc-manager=resolvconf
'';
};
programs.zsh.enable = true;
services.avahi = {
enable = true;
nssmdns = true;
publish = {
enable = true;
domain = true;
userServices = true;
};
}; };
# Audio # Audio
@ -44,17 +63,31 @@
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
# Keyboard # Keyboard/Keymap
console.keyMap = "us"; console.keyMap = "us";
i18n = {
defaultLocale = "en_US.UTF-8";
};
# Update timezone automatically # Update timezone automatically
services.tzupdate.enable = true; services.tzupdate.enable = true;
programs.zsh.enable = true;
# TODO: Add a comment explaining what this does. # TODO: Add a comment explaining what this does.
services.gnome.at-spi2-core.enable = true; services.gnome.at-spi2-core.enable = true;
services.openssh.enable = true;
services.autorandr.enable = true;
services.locate.enable = true;
virtualisation.docker.enable = true;
programs.adb.enable = true;
hardware.keyboard.zsa.enable = true;
services.xserver = { services.xserver = {
exportConfiguration = true; exportConfiguration = true;
enable = true; enable = true;

View File

@ -2,7 +2,7 @@
imports = [ imports = [
../raspberry-pi.nix ../raspberry-pi.nix
# ../plex.nix # ../plex.nix
./internet-computer.nix ../internet-computer.nix
]; ];
networking.hostName = "biskcomp"; networking.hostName = "biskcomp";

View File

@ -4,9 +4,6 @@
imports = [ imports = [
<nixos-hardware/raspberry-pi/4> <nixos-hardware/raspberry-pi/4>
./base.nix ./base.nix
./fonts.nix
./internet-computer.nix
./essential-packages.nix
]; ];
hardware.raspberry-pi."4".fkms-3d.enable = true; hardware.raspberry-pi."4".fkms-3d.enable = true;
@ -53,30 +50,12 @@
options = [ "noatime" ]; options = [ "noatime" ];
}; };
# Define a user account. Don't forget to set a password with passwd.
users.users.imalison = {
isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable sudo for the user.
};
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
raspberrypi-eeprom raspberrypi-eeprom
]; ];
services.openssh.enable = true;
services.avahi = {
enable = true;
nssmdns = true;
publish = {
enable = true;
domain = true;
userServices = true;
};
};
nix = { nix = {
autoOptimiseStore = true; autoOptimiseStore = true;
gc = { gc = {
@ -85,6 +64,4 @@
options = "--delete-older-than 30d"; options = "--delete-older-than 30d";
}; };
}; };
system.stateVersion = "21.05"; # Did you read the comment?
} }