From 6bdb9f82f221c42f479d38c49ee5aad6132b064b Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Wed, 3 Apr 2024 21:43:38 -0600 Subject: [PATCH] grammar fixes --- server/configuration.org | 56 ++++++++++++++--------------------- workstation/configuration.org | 8 ++--- 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/server/configuration.org b/server/configuration.org index 1e67ace..46f2d11 100644 --- a/server/configuration.org +++ b/server/configuration.org @@ -11,10 +11,9 @@ * DECLARATION -Here I will declare the dependencies and variables that will be used multiple -times through the config file, such as the current version of NixOS, -repositories and even some scripts that will be reused on systemd -configurations. +Here I will declare the dependencies and variables that I call multiple times +through the config file, such as the current version of NixOS, repositories and +even some scripts that I reuse on systemd configurations. - version: used by both NixOS and home-manager to dictate the state repository from which to pull configurations, modules and packages. @@ -26,7 +25,7 @@ configurations. - unstable: a sort of overlay that allows to prepend "unstable" to a package, to pull from the unstable channel rather than precompiled binaries on a case by case use. -- jawz*: scripts that will be reused multiple times through the config, such as +- jawz*: scripts that will reuse multiple times through the config, such as on systemd, and as such this feels like a safe way to compile them only once. #+begin_src nix @@ -51,12 +50,6 @@ let "sub-sync" (builtins.readFile ../scripts/sub-sync.sh); jawzStream = pkgs.writeScriptBin "stream-dl" (builtins.readFile ../scripts/stream-dl.sh); - jawzScripts = [ - jawzManageLibrary - jawzTasks - jawzSubs - jawzStream - ]; in { # Remember to close this bracket at the end of the document #+end_src @@ -87,8 +80,8 @@ hosts file with the static IP and hostname of other devices on my network. Also open ports on the firewall for LAN connectivity, and well keeping commented what each port does, I declared the firwewall ports with variables, because I -can not be bothered to figure out whether I need TCP or UDP so let's open both, -and repetition is maddening. +don't care to figure out whether I need TCP or UDP so let's open both, and +repetition is maddening. #+begin_src nix powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; @@ -321,9 +314,6 @@ packages = (with pkgs; [ cli and tui packages, which on their own right are as or more powerful than the 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. @@ -339,12 +329,6 @@ 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 = [ "CascadiaCode" - "ComicShannsMono" - "Iosevka" ]; -}) symbola #+end_src @@ -368,7 +352,10 @@ smartmontools # check hard drie health Here I compile my own scripts into binaries #+begin_src nix -jawzScripts +jawzManageLibrary +jawzTasks +jawzSubs +jawzStream (writeScriptBin "ffmpeg4discord" (builtins.readFile ../scripts/ffmpeg4discord.py)) (writeScriptBin "ffmpreg" (builtins.readFile ../scripts/ffmpreg.sh)) (writeScriptBin "split-dir" (builtins.readFile ../scripts/split-dir.sh)) @@ -450,7 +437,7 @@ Libraries & apps not found on the nix-store and scripts made by me. #+end_src ** NODEJS PACKAGES -Mostly language servers and linters. +Language servers and linters. #+begin_src nix ]) ++ (with pkgs.nodePackages; [ @@ -585,8 +572,8 @@ packages through home-manager. #+begin_src nix programs = { - tmux = { - enable = true; + helix = { + enable = true; }; hstr.enable = true; emacs.enable = true; @@ -731,6 +718,7 @@ of some services. #+begin_src nix programs = { starship.enable = true; + tmux.enable = true; fzf.fuzzyCompletion = true; neovim = { enable = true; @@ -744,7 +732,7 @@ programs = { #+end_src * SERVICES -Miscellaneous services, most of which are managed by systemd. +Miscellaneous services, managed by systemd. - minidlna: allows me to watch my media on my TV. - avahi: allows to discover/connect to devices through their hostname on the @@ -843,12 +831,12 @@ in [ myPkg ]; wantedBy = [ "default.target" ]; path = [ pkgs.nix - jawzChat + jawzStream ]; serviceConfig = { Restart = "on-failure"; RestartSec = 30; - ExecStart = "${jawzChat}/bin/stream-dl ${channel}"; + ExecStart = "${jawzStream}/bin/stream-dl ${channel}"; }; }; in { @@ -858,12 +846,12 @@ in [ myPkg ]; wantedBy = [ "default.target" ]; path = [ pkgs.nix - jawzChat + jawzStream ]; serviceConfig = { Restart = "on-failure"; RestartSec = 30; - ExecStart = "${jawzChat}/bin/stream-dl %I"; + ExecStart = "${jawzStream}/bin/stream-dl %I"; }; }; "stream-johnneal911" = streamService "johnneal911" // { }; @@ -940,7 +928,7 @@ in [ myPkg ]; in { "stream-johnneal911" = streamTimer // { }; "stream-uk2011boy" = streamTimer // { }; - "stream-tomayto\x20picarto" = streamTimmer // { }; + "stream-tomayto\x20picarto" = streamTimer // { }; # tasks = { # enable = true; # description = "Run a tasks script which keeps a lot of things organized"; @@ -983,8 +971,8 @@ fonts.fontconfig.enable = true; #+end_src * HARDWARE -Computer-specific hardware settings. The power management settings are -defaulted to "performance". +Computer-specific hardware settings. The power management settings default to +"performance". - nvidia: GPU drivers. - cpu.intel: microcode patches. diff --git a/workstation/configuration.org b/workstation/configuration.org index 4526167..b0f798d 100644 --- a/workstation/configuration.org +++ b/workstation/configuration.org @@ -438,11 +438,11 @@ pureref # create inspiration/reference boards So far gaming has been a lot less painful than I could have originally anticipated, most everything seems to run seamlessly. -Most packages on this section are set to unstable so we compile the newest -possible binaries, which is handy mostly for frequently developed emulators. +Most packages on this section are unstable so we compile the newest +possible binaries, which is handy for frequently developed emulators. -I never figured out why, but lutris will give me wine errors unless both wine64 -and wineWow are installed. +Lutris will give me wine errors unless both wine64 and wineWow are both +installed. =note= Steam is setup way later on the config file. =note= Roblox uninstalled as there is ongoing drama regarding Linux users.