From 3bce82d841824e3d12992ba0777b2ab375b47c33 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sun, 24 Sep 2023 18:44:47 -0600 Subject: [PATCH] config workstation as a builder bugfix: .bashrc dirs rename more bugfixx sdksa --- server/configuration.org | 78 +++++++++++++++++-------------- server/hardware-configuration.nix | 12 +---- server/nginx.nix | 1 - workstation/configuration.org | 71 ++++++++++++++-------------- 4 files changed, 79 insertions(+), 83 deletions(-) diff --git a/server/configuration.org b/server/configuration.org index 56f1c95..8b8717f 100755 --- a/server/configuration.org +++ b/server/configuration.org @@ -164,14 +164,14 @@ nix = let featuresList = [ automatic = true; dates = "weekly"; }; - # buildMachines = [ { - # hostName = "workstation"; - # system = "x86_64-linux"; - # sshUser = "nixremote"; - # maxJobs = 4; - # speedFactor = 1; - # supportedFeatures = featuresList; - # } ]; + buildMachines = [ { + hostName = "workstation"; + system = "x86_64-linux"; + sshUser = "nixremote"; + maxJobs = 14; + speedFactor = 1; + supportedFeatures = featuresList; + } ]; distributedBuilds = true; settings = { cores = 6; @@ -238,6 +238,10 @@ into "Too many files open" errors. #+begin_src nix security = { + acme = { + acceptTerms = true; + defaults.email = myEmail; + }; rtkit.enable = true; sudo = { enable = true; @@ -294,7 +298,7 @@ users = { group = "nixremote"; home = "/var/nixremote/"; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiyTwryzw8CblPldplDpVUkXD9C1fXVgO8LeXdE5cuR root@battlestation" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN6HsajaTL+nTJtSIu00M5WJwgt/7fyU59gBr2R7tbnv root@server" ]; }; }; @@ -306,8 +310,9 @@ users.users.jawz = { ]; initialPassword = "password"; openssh = { - authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacero\cdreyes@100CDREYES" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDXxfFRSgII4w/S1mrekPQdfXNifqRxwJa0wpQo72wB jawz@workstation"; + authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacero\cdreyes@100CDREYES" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDXxfFRSgII4w/S1mrekPQdfXNifqRxwJa0wpQo72wB jawz@workstation" ]; }; #+end_src @@ -332,6 +337,30 @@ packages on the previous section. =note= exa is no longer maintained, and will soon be replaced by eza, a maintained fork. + +** HUNSPELL +These dictionaries work with Firefox, Doom Emacs and LibreOffice. + +#+begin_src nix +hunspell +hunspellDicts.it_IT +hunspellDicts.es_MX +hunspellDicts.en_CA +#+end_src + +** CUSTOMIZATION PACKAGES +Themes and other customization, making my DE look the way I want is one of the +main draws of Linux for me. + +#+begin_src nix +# Fonts +(nerdfonts.override { + fonts = [ "Agave" "CascadiaCode" "SourceCodePro" + "Ubuntu" "FiraCode" "Iosevka" ]; +}) +symbola +#+end_src + ** COMMAND-LINE PACKAGES #+begin_src nix @@ -470,29 +499,6 @@ Mostly language servers and linters. pnpm # Package manager #+end_src -** HUNSPELL -These dictionaries work with Firefox, Doom Emacs and LibreOffice. - -#+begin_src nix -hunspell -hunspellDicts.it_IT -hunspellDicts.es_MX -hunspellDicts.en_CA -#+end_src - -** CUSTOMIZATION PACKAGES -Themes and other customization, making my DE look the way I want is one of the -main draws of Linux for me. - -#+begin_src nix -# Fonts -(nerdfonts.override { - fonts = [ "Agave" "CascadiaCode" "SourceCodePro" - "Ubuntu" "FiraCode" "Iosevka" ]; -}) -symbola -#+end_src - ** CLOSING USER PACKAGES #+begin_src nix @@ -565,8 +571,8 @@ programs.bash = { fi nixos-reload () { - nixfmt /home/jawz/Development/NixOS/workstation/*.nix - sudo nixos-rebuild switch -I nixos-config=/home/jawz/Development/NixOS/workstation/configuration.nix + nixfmt /home/jawz/Development/NixOS/server/*.nix + sudo nixos-rebuild switch -I nixos-config=/home/jawz/Development/NixOS/server/configuration.nix } ''; }; diff --git a/server/hardware-configuration.nix b/server/hardware-configuration.nix index 011e1d6..6868453 100755 --- a/server/hardware-configuration.nix +++ b/server/hardware-configuration.nix @@ -1,14 +1,4 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -let - unstable = import - (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") { - config = config.nixpkgs.config; - }; -in { +{ config, lib, pkgs, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { #plymouth = { enable = true; }; diff --git a/server/nginx.nix b/server/nginx.nix index 7b557d4..6f0e5ae 100755 --- a/server/nginx.nix +++ b/server/nginx.nix @@ -3,7 +3,6 @@ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: - let localhost = "127.0.0.1"; battlestation = "192.168.1.64"; diff --git a/workstation/configuration.org b/workstation/configuration.org index 1f5e252..5bf6d10 100644 --- a/workstation/configuration.org +++ b/workstation/configuration.org @@ -364,6 +364,37 @@ Begin the block to install user packages. packages = (with pkgs; [ #+end_src +** HUNSPELL +These dictionaries are compatible with Firefox, Doom Emacs and LibreOffice. + +#+begin_src nix +hunspell +hunspellDicts.it_IT +hunspellDicts.es_MX +hunspellDicts.en_CA +#+end_src + +** CUSTOMIZATION PACKAGES +Themes and other customization, making my DE look the way I want is one of the +main draws of Linux for me. + +#+begin_src nix +# Themes +adw-gtk3 +gnome.gnome-tweaks # tweaks for the gnome desktop environment +# gradience # theme customizer, allows you to modify adw-gtk3 themes + +# Fonts +(nerdfonts.override { + fonts = [ "Agave" "CascadiaCode" "SourceCodePro" + "Ubuntu" "FiraCode" "Iosevka" ]; +}) +symbola +(papirus-icon-theme.override { + color = "adwaita"; +}) +#+end_src + ** GUI PACKAGES All of my GUI applications categorized to make it easier to identify what each application does, and the justification for is existence on my system. @@ -633,44 +664,14 @@ Mostly language servers and linters. pnpm # Package manager #+end_src -** HUNSPELL -These dictionaries are compatible with Firefox, Doom Emacs and LibreOffice. - -#+begin_src nix -hunspell -hunspellDicts.it_IT -hunspellDicts.es_MX -hunspellDicts.en_CA -#+end_src - -** CUSTOMIZATION PACKAGES -Themes and other customization, making my DE look the way I want is one of the -main draws of Linux for me. - -#+begin_src nix -# Themes -adw-gtk3 -gnome.gnome-tweaks # tweaks for the gnome desktop environment -# gradience # theme customizer, allows you to modify adw-gtk3 themes - -# Fonts -(nerdfonts.override { - fonts = [ "Agave" "CascadiaCode" "SourceCodePro" - "Ubuntu" "FiraCode" "Iosevka" ]; -}) -symbola -(papirus-icon-theme.override { - color = "adwaita"; -}) -#+end_src - ** GNOME EXTENSIONS The last line can be commented to allow for the installation of gnome-extensions from the unstable channel. #+begin_src nix -# lm_sensors # for extension, displays cpu temp -libgda # for pano shell extension +]) ++ (with pkgs; [ + # lm_sensors # for extension, displays cpu temp + libgda # for pano shell extension ]) ++ (with pkgs.gnomeExtensions; [ appindicator # applets for open applications panel-scroll # scroll well to change workspaces @@ -763,9 +764,9 @@ programs.bash = { nixos-reload () { NIXOSDIR=/home/jawz/Development/NixOS nix-store --add-fixed sha256 $NIXOSDIR/scripts/PureRef-1.11.1_x64.Appimage - nixfmt $NIXOSDIR/battlestation/*.nix + nixfmt $NIXOSDIR/workstation/*.nix sudo unbuffer nixos-rebuild switch -I \ - nixos-config=$NIXOSDIR/battlestation/configuration.nix \ + nixos-config=$NIXOSDIR/workstation/configuration.nix \ |& nom } '';