don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

fix merge conflicts

Browse source
This commit is contained in:
Don Harper 2022-12-28 13:54:19 -06:00
commit def2e7f6fa
4 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TODO Normal file
View file

@ -0,0 +1,3 @@
add HP 810RG1 profile
add ssd to all
fix eve????

BIN
pkgs/linuxx64-22.12.0.12.tar.gz Normal file
View file

Binary file not shown.

2
user/don/home.nix
View file

@ -10,6 +10,7 @@
home.packages = [ home.packages = [
pkgs.aspell pkgs.aspell
pkgs.authy
pkgs.bc pkgs.bc
pkgs.bitwarden pkgs.bitwarden
pkgs.bitwarden-cli pkgs.bitwarden-cli
@ -85,6 +86,7 @@
#programs.home-manager.enable = true; #programs.home-manager.enable = true;
programs.go.enable = true; programs.go.enable = true;
programs.light.enable = true;
programs.keychain = { programs.keychain = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;

18
workstation/configuration.nix
View file

@ -40,7 +40,8 @@
#services.xserver.enable = false; #services.xserver.enable = false;
# Enable the GNOME Desktop Environment. # Enable the GNOME Desktop Environment.
#services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true;
#services.xserver.desktopManager.gnome.enable = false; #services.xserver.desktopManager.gnome.enable = false;
# Configure keymap in X11 # Configure keymap in X11
@ -54,6 +55,7 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
services.udisks2.enable = true; services.udisks2.enable = true;
services.nscd.enableNsncd = true;
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true; sound.enable = true;
@ -63,6 +65,14 @@
extraBackends = [ pkgs.sane-airscan ]; extraBackends = [ pkgs.sane-airscan ];
}; };
security.rtkit.enable = true; security.rtkit.enable = true;
# services.kmscon = {
# enable = false;
# extraOptions = "--term xterm-256color";
# fonts = [ { name = "Source Code Pro"; package = pkgs.source-code-pro; } ];
# extraConfig = ''
# font-size=10
# '';
# };
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
@ -86,7 +96,7 @@
users.users.don = { users.users.don = {
isNormalUser = true; isNormalUser = true;
description = "Don Harper"; description = "Don Harper";
extraGroups = [ "networkmanager" "wheel" "scanner" "lp" ]; extraGroups = [ "networkmanager" "wheel" "scanner" "lp" "video" ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
]; ];
@ -117,6 +127,8 @@
tmux tmux
tmuxp tmuxp
topgrade topgrade
toot
tut
#vim #vim
wget wget
zoom-us zoom-us
@ -198,7 +210,7 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# 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 = "22.05"; # Did you read the comment? system.stateVersion = "22.11"; # Did you read the comment?
# nixpkgs.config.firefox.enableGnomeExtenions = true; # nixpkgs.config.firefox.enableGnomeExtenions = true;
# services.gnome.gnome-browser-connector.enable = true; # services.gnome.gnome-browser-connector.enable = true;
programs.msmtp = { programs.msmtp = {