From 6279713ab526b75f0493ed9cfb05566a289ffaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Tue, 25 Feb 2025 22:53:12 +0100 Subject: [PATCH] style: summarize some sections --- SwarselSystems.org | 87 +++++++++++--------------------- profiles/home/common/symlink.nix | 5 +- 2 files changed, 31 insertions(+), 61 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index f5caf98..b2bbada 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -5562,12 +5562,10 @@ Enables the blueman service including the nice system tray icon. :END: In this section we enable compatibility with several network devices I have at home, mainly printers and scanners. -****** Scanners -:PROPERTIES: -:CUSTOM_ID: h:fae5939e-22ac-4532-a10e-0b86013d20ce -:END: This allows me to use my big scanner/printer's scanning function over the network. +This also allows me to use my big scanner/printer's printing function over the network. Most of the settings are driver related. +Avahi is the service used for the network discovery. #+begin_src nix :tangle profiles/nixos/common/networkdevices.nix { pkgs, ... }: @@ -5577,47 +5575,28 @@ This allows me to use my big scanner/printer's scanning function over the networ enable = true; extraBackends = [ pkgs.sane-airscan ]; }; -#+end_src -****** Printers -:PROPERTIES: -:CUSTOM_ID: h:8c13df62-c6d9-4a0a-83be-d77e71628f0b -:END: + # enable discovery and usage of network devices (esp. printers) + services.printing = { + enable = true; + drivers = [ + pkgs.gutenprint + pkgs.gutenprintBin + ]; + browsedConf = '' + BrowseDNSSDSubTypes _cups,_print + BrowseLocalProtocols all + BrowseRemoteProtocols all + CreateIPPPrinterQueues All + BrowseProtocols all + ''; + }; -This allows me to use my big scanner/printer's printing function over the network. Most of the settings are driver related. - -#+begin_src nix :tangle profiles/nixos/common/networkdevices.nix - - # enable discovery and usage of network devices (esp. printers) - services.printing = { - enable = true; - drivers = [ - pkgs.gutenprint - pkgs.gutenprintBin - ]; - browsedConf = '' - BrowseDNSSDSubTypes _cups,_print - BrowseLocalProtocols all - BrowseRemoteProtocols all - CreateIPPPrinterQueues All - BrowseProtocols all - ''; - }; -#+end_src - -****** Avahi (device discovery) -:PROPERTIES: -:CUSTOM_ID: h:80decee9-9151-4892-967e-73d103205770 -:END: - -Avahi is the service used for the network discovery. - -#+begin_src nix :tangle profiles/nixos/common/networkdevices.nix - services.avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; - }; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; } #+end_src @@ -8858,6 +8837,9 @@ This section should be used in order to symlink already existing configuration f As for the `home.sessionVariables`, it should be noted that environment variables that are needed at system start should NOT be loaded here, but instead in `programs.zsh.config.extraSessionCommands` (in the home-manager programs section). This is also where all the wayland related variables are stored. +Also, we link some files to the users XDG configuration home: +Also in firefox `about:config > toolkit.legacyUserProfileCustomizations.stylesheets` to true. + #+begin_src nix :tangle profiles/home/common/symlink.nix { self, ... }: { @@ -8879,22 +8861,13 @@ As for the `home.sessionVariables`, it should be noted that environment variable source = self + /programs/git/.gitmessage; target = ".gitmessage"; }; - "swayidle/config" = { - source = self + /programs/swayidle/config; - target = ".config/swayidle/config"; - }; }; -#+end_src - -Also, we link some files to the users XDG configuration home: -Also in firefox `about:config > toolkit.legacyUserProfileCustomizations.stylesheets` to true. - -#+begin_src nix :tangle profiles/home/common/symlink.nix - xdg.configFile = { - "tridactyl/tridactylrc".source = self + /programs/firefox/tridactyl/tridactylrc; - "tridactyl/themes/base16-codeschool.css".source = self + /programs/firefox/tridactyl/themes/base16-codeschool.css; - }; + xdg.configFile = { + "tridactyl/tridactylrc".source = self + /programs/firefox/tridactyl/tridactylrc; + "tridactyl/themes/base16-codeschool.css".source = self + /programs/firefox/tridactyl/themes/base16-codeschool.css; + "swayidle/config".source = self + /programs/swayidle/config; + }; } #+end_src diff --git a/profiles/home/common/symlink.nix b/profiles/home/common/symlink.nix index 06d120c..71bec26 100644 --- a/profiles/home/common/symlink.nix +++ b/profiles/home/common/symlink.nix @@ -18,14 +18,11 @@ source = self + /programs/git/.gitmessage; target = ".gitmessage"; }; - "swayidle/config" = { - source = self + /programs/swayidle/config; - target = ".config/swayidle/config"; - }; }; xdg.configFile = { "tridactyl/tridactylrc".source = self + /programs/firefox/tridactyl/tridactylrc; "tridactyl/themes/base16-codeschool.css".source = self + /programs/firefox/tridactyl/themes/base16-codeschool.css; + "swayidle/config".source = self + /programs/swayidle/config; }; }