From ce7165e391735c60137c663cdad9b01a374d64ed Mon Sep 17 00:00:00 2001 From: Chaos Date: Sun, 4 Dec 2022 16:10:00 +0000 Subject: [PATCH] run deadnix on nixfiles --- extras/shenanigans-hotspot.nix | 3 +- home/gui/environments/sway/sway.nix | 1 - home/home-folders.nix | 6 +-- home/programming/editors/vscode.nix | 7 +-- hosts/darwin.nix | 1 - hosts/hetzner-vm/hetzner-vm.nix | 9 +--- .../hetzner-vm/modules/mailserver/default.nix | 6 +-- .../hetzner-vm/modules/mailserver/dovecot.nix | 13 +---- .../modules/mailserver/firewall.nix | 2 +- .../hetzner-vm/modules/mailserver/postfix.nix | 9 ++-- hosts/hetzner-vm/modules/piped/default.nix | 1 - hosts/hetzner-vm/profiles/mailserver.nix | 2 +- .../profiles/mpd-broadcast/hosts/lappy.nix | 2 +- .../mpd-broadcast/hosts/raspberry.nix | 2 +- hosts/macmini/default.nix | 6 +-- hosts/nixos-live/nixos-live.nix | 1 - hosts/nixos.nix | 12 +---- hosts/raspberry/raspberry.nix | 1 - hosts/raspberry/services/router.nix | 6 +-- hosts/rescue/rescue.nix | 54 ------------------- hosts/storage/profiles/rclone-sync.nix | 8 +-- hosts/storage/storage.nix | 6 --- hosts/tablet/hardware.nix | 5 +- hosts/tablet/profiles/misskey-dev.nix | 2 +- hosts/tablet/secrets.nix | 2 +- hosts/tablet/tablet.nix | 8 +-- hosts/vault/secrets.nix | 2 +- hosts/vault/vault.nix | 11 +--- modules/nixos/secrets.nix | 16 +++--- overlay/default.nix | 2 +- overlay/gobar/default.nix | 3 -- overlay/piped/backend/default.nix | 1 - overlay/piped/frontend/default.nix | 3 -- overlay/piped/frontend/yarn.nix | 3 -- overlay/zar/default.nix | 1 - profiles/base-darwin/nix.nix | 1 - profiles/base/access.nix | 2 - profiles/base/home.nix | 1 - profiles/base/programs.nix | 2 +- profiles/base/services.nix | 3 -- profiles/connectivity/network_manager/nm.nix | 6 +-- profiles/dnscrypt/dnscrypt.nix | 7 +-- profiles/gaming/steam.nix | 2 +- profiles/gui/base/default.nix | 6 +-- profiles/gui/environments/sway/sway.nix | 6 +-- profiles/laptop/default.nix | 6 +-- profiles/usb-automount.nix | 6 +-- users/chaos.nix | 2 +- users/root.nix | 2 +- 49 files changed, 41 insertions(+), 228 deletions(-) delete mode 100644 hosts/rescue/rescue.nix delete mode 100644 profiles/base/services.nix diff --git a/extras/shenanigans-hotspot.nix b/extras/shenanigans-hotspot.nix index 57d42db..8fc87bf 100644 --- a/extras/shenanigans-hotspot.nix +++ b/extras/shenanigans-hotspot.nix @@ -3,7 +3,6 @@ pkgs, nixpkgs, config, - tree, ... }: let wifiInterface = "shenanigans0"; @@ -50,7 +49,7 @@ in { ]; systemd.services.wifi-relay = let - inherit (pkgs) iptables gnugrep; + inherit (pkgs) iptables; in { description = "iptables rules for wifi-relay"; after = ["dhcpd4.service"]; diff --git a/home/gui/environments/sway/sway.nix b/home/gui/environments/sway/sway.nix index 356f371..99f60fa 100644 --- a/home/gui/environments/sway/sway.nix +++ b/home/gui/environments/sway/sway.nix @@ -45,7 +45,6 @@ menu = "${pkgs.rofi}/bin/rofi -show run"; cfg = config.wayland.windowManager.sway.config; pactl = "${pkgs.pulseaudio}/bin/pactl"; - pacmd = "${pkgs.pulseaudio}/bin/pacmd"; in { bars = [ { diff --git a/home/home-folders.nix b/home/home-folders.nix index afd7581..6e30117 100644 --- a/home/home-folders.nix +++ b/home/home-folders.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: { +{config, ...}: { systemd.user.tmpfiles.rules = map (dir: "d ${config.home.homeDirectory}/${dir} - ${config.home.username} users") [ "Projects" "Temp" diff --git a/home/programming/editors/vscode.nix b/home/programming/editors/vscode.nix index e1361cc..67f35ae 100644 --- a/home/programming/editors/vscode.nix +++ b/home/programming/editors/vscode.nix @@ -1,9 +1,4 @@ -{ - config, - nixosConfig, - pkgs, - ... -}: let +{nixosConfig, ...}: let font-size = if nixosConfig.networking.hostName == "tablet" then 18 diff --git a/hosts/darwin.nix b/hosts/darwin.nix index 17c67db..3fbc342 100644 --- a/hosts/darwin.nix +++ b/hosts/darwin.nix @@ -1,5 +1,4 @@ { - self, nixpkgs-unstable, nix-darwin-unstable, tree, diff --git a/hosts/hetzner-vm/hetzner-vm.nix b/hosts/hetzner-vm/hetzner-vm.nix index 0f1a826..ceb8537 100644 --- a/hosts/hetzner-vm/hetzner-vm.nix +++ b/hosts/hetzner-vm/hetzner-vm.nix @@ -1,11 +1,4 @@ -{ - modulesPath, - tree, - config, - pkgs, - lib, - ... -}: { +{tree, ...}: { imports = with tree; [ users.root diff --git a/hosts/hetzner-vm/modules/mailserver/default.nix b/hosts/hetzner-vm/modules/mailserver/default.nix index 31d88c0..975e6a4 100644 --- a/hosts/hetzner-vm/modules/mailserver/default.nix +++ b/hosts/hetzner-vm/modules/mailserver/default.nix @@ -50,11 +50,7 @@ in { accounts = mkOption { # where name = email for login - type = types.attrsOf (types.submodule ({ - config, - name, - ... - }: { + type = types.attrsOf (types.submodule ({name, ...}: { options = { name = mkOption { type = types.str; diff --git a/hosts/hetzner-vm/modules/mailserver/dovecot.nix b/hosts/hetzner-vm/modules/mailserver/dovecot.nix index 194a1a8..ef5f01d 100644 --- a/hosts/hetzner-vm/modules/mailserver/dovecot.nix +++ b/hosts/hetzner-vm/modules/mailserver/dovecot.nix @@ -11,18 +11,7 @@ passwdDir = "/run/dovecot2"; passwdFile = "${passwdDir}/passwd"; - bool2int = x: - if x - then "1" - else "0"; - postfixCfg = config.services.postfix; - dovecot2Cfg = config.services.dovecot2; - - stateDir = "/var/lib/dovecot"; - - passwordFiles = - lib.mapAttrs (name: value: value.passwordFile) mail_config.accounts; genPasswdScript = pkgs.writeScript "generate-password-file" '' #!${pkgs.stdenv.shell} @@ -36,7 +25,7 @@ for f in ${ builtins.toString - (lib.mapAttrsToList (name: value: value.passwordFile) + (lib.mapAttrsToList (_: value: value.passwordFile) mail_config.accounts) }; do if [ ! -f "$f" ]; then diff --git a/hosts/hetzner-vm/modules/mailserver/firewall.nix b/hosts/hetzner-vm/modules/mailserver/firewall.nix index 579441f..6c69bb3 100644 --- a/hosts/hetzner-vm/modules/mailserver/firewall.nix +++ b/hosts/hetzner-vm/modules/mailserver/firewall.nix @@ -5,7 +5,7 @@ }: let mail_config = config.mailserver; in { - config = lib.mkIf config.mailserver.enable { + config = lib.mkIf mail_config.enable { networking.firewall = { allowedTCPPorts = [ # SMTP diff --git a/hosts/hetzner-vm/modules/mailserver/postfix.nix b/hosts/hetzner-vm/modules/mailserver/postfix.nix index d10d35f..41eceb0 100644 --- a/hosts/hetzner-vm/modules/mailserver/postfix.nix +++ b/hosts/hetzner-vm/modules/mailserver/postfix.nix @@ -14,13 +14,10 @@ /^Message-ID:\s+<(.*?)@.*?>/ REPLACE Message-ID: <$1@${mail_config.fqdn}> ''; - inetSocket = addr: port: "inet:[${toString port}@${addr}]"; - unixSocket = sock: "unix:${sock}"; - # Merge several lookup tables. A lookup table is a attribute set where # - the key is an address (user@example.com) or a domain (@example.com) # - the value is a list of addresses - mergeLookupTables = tables: lib.zipAttrsWith (n: v: lib.flatten v) tables; + mergeLookupTables = tables: lib.zipAttrsWith (_: v: lib.flatten v) tables; # valiases_postfix :: Map String [String] valiases_postfix = mergeLookupTables (lib.flatten (lib.mapAttrsToList @@ -80,7 +77,9 @@ in { partOf = ["postfix.service"]; before = ["postfix-setup.service"]; script = '' - cat ${aliases_accounts_file} ${mail_config.extra_aliases_file} > /run/postfix_extra_aliases + cat ${aliases_accounts_file} > /run/postfix_extra_aliases + echo >> /run/postfix_extra_aliases + cat ${mail_config.extra_aliases_file} >> /run/postfix_extra_aliases ''; }; diff --git a/hosts/hetzner-vm/modules/piped/default.nix b/hosts/hetzner-vm/modules/piped/default.nix index 1510b82..2a98f9f 100644 --- a/hosts/hetzner-vm/modules/piped/default.nix +++ b/hosts/hetzner-vm/modules/piped/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: with lib; let diff --git a/hosts/hetzner-vm/profiles/mailserver.nix b/hosts/hetzner-vm/profiles/mailserver.nix index 52bf611..42bcf48 100644 --- a/hosts/hetzner-vm/profiles/mailserver.nix +++ b/hosts/hetzner-vm/profiles/mailserver.nix @@ -14,7 +14,7 @@ in { $config['username_domain_forced'] = true; ''; - extra_aliases_file = "/tmp/e"; + extra_aliases_file = "${secrets.private_mail_aliases.path}"; accounts = { "chaos@owo.monster" = { diff --git a/hosts/hetzner-vm/profiles/mpd-broadcast/hosts/lappy.nix b/hosts/hetzner-vm/profiles/mpd-broadcast/hosts/lappy.nix index 91fdf49..fcb7c08 100644 --- a/hosts/hetzner-vm/profiles/mpd-broadcast/hosts/lappy.nix +++ b/hosts/hetzner-vm/profiles/mpd-broadcast/hosts/lappy.nix @@ -1,5 +1,5 @@ {pkgs, ...}: let - sink_name = "roc-lappy"; + #sink_name = "roc-lappy"; description = "Lappy ROC Output"; ip_addr = "100.115.10.34"; in { diff --git a/hosts/hetzner-vm/profiles/mpd-broadcast/hosts/raspberry.nix b/hosts/hetzner-vm/profiles/mpd-broadcast/hosts/raspberry.nix index 73ec320..9020c8c 100644 --- a/hosts/hetzner-vm/profiles/mpd-broadcast/hosts/raspberry.nix +++ b/hosts/hetzner-vm/profiles/mpd-broadcast/hosts/raspberry.nix @@ -1,5 +1,5 @@ {pkgs, ...}: let - sink_name = "roc-raspberry"; + #sink_name = "roc-raspberry"; description = "Raspberry ROC Output"; ip_addr = "100.118.202.64"; #ip_addr = "100.115.10.34"; diff --git a/hosts/macmini/default.nix b/hosts/macmini/default.nix index 1384247..b152c6d 100644 --- a/hosts/macmini/default.nix +++ b/hosts/macmini/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - tree, - ... -}: { +{tree, ...}: { users.users.chaos = { name = "chaos"; home = "/Users/chaos"; diff --git a/hosts/nixos-live/nixos-live.nix b/hosts/nixos-live/nixos-live.nix index 06aa522..9260bbf 100644 --- a/hosts/nixos-live/nixos-live.nix +++ b/hosts/nixos-live/nixos-live.nix @@ -2,7 +2,6 @@ config, tree, modulesPath, - pkgs, lib, ... }: { diff --git a/hosts/nixos.nix b/hosts/nixos.nix index 992dcd1..6da2a78 100644 --- a/hosts/nixos.nix +++ b/hosts/nixos.nix @@ -1,8 +1,4 @@ -{ - self, - nixpkgs-unstable, - ... -} @ inputs: let +{nixpkgs-unstable, ...} @ inputs: let mkTree = inputs.tree-input.tree; metaTree = mkTree ((import ../treeConfig.nix {}) // {inherit inputs;}); tree = metaTree.impure; @@ -42,12 +38,6 @@ in { modules = defaultModules ++ [./tablet/tablet.nix ./tablet/hardware.nix]; }; - rescue-x86_64 = nixosUnstableSystem { - specialArgs = defaultSpecialArgs; - system = "x86_64-linux"; - modules = defaultModules ++ [./rescue/rescue.nix]; - }; - hetzner-vm = nixosUnstableSystem { specialArgs = defaultSpecialArgs; system = "x86_64-linux"; diff --git a/hosts/raspberry/raspberry.nix b/hosts/raspberry/raspberry.nix index d025b04..502c6c0 100644 --- a/hosts/raspberry/raspberry.nix +++ b/hosts/raspberry/raspberry.nix @@ -1,7 +1,6 @@ { tree, modulesPath, - config, pkgs, lib, ... diff --git a/hosts/raspberry/services/router.nix b/hosts/raspberry/services/router.nix index b0cb8b0..6998daf 100644 --- a/hosts/raspberry/services/router.nix +++ b/hosts/raspberry/services/router.nix @@ -1,8 +1,4 @@ -{ - lib, - tree, - ... -}: let +{tree, ...}: let externalInterface = "eth0"; wifiInterface = "wlan0"; ssid = "Test Wifi"; diff --git a/hosts/rescue/rescue.nix b/hosts/rescue/rescue.nix deleted file mode 100644 index 4be2100..0000000 --- a/hosts/rescue/rescue.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - tree, - modulesPath, - config, - pkgs, - lib, - ... -}: { - imports = with tree; [ - users.root - users.chaos - profiles.base - profiles.gui - profiles.gui.environments.sway - profiles.connectivity.network_manager - profiles.connectivity.ios - profiles.tor - (modulesPath + "/installer/cd-dvd/installation-cd-base.nix") - ]; - - home-manager.users.root = { - imports = with tree; [home.base home.dev.all]; - }; - home-manager.users.chaos = { - imports = with tree; [ - home.base - home.gui - home.gui.environments.sway - home.dev.all - home.network_manager - home.apps.vivaldi - home.programming - home.programming.languages.nix - ]; - }; - - isoImage.squashfsCompression = "zstd -Xcompression-level 1"; - - users.users.root.initialPassword = "password"; - users.users.chaoticryptidz.initialPassword = "password"; - - # let vscode, vivaldi, etc work. - security.unprivilegedUsernsClone = true; - - networking = { - hostName = "rescue"; - networkmanager.enable = true; - wireless.enable = lib.mkForce false; - }; - - time.timeZone = "Europe/London"; - - system.stateVersion = "21.11"; -} diff --git a/hosts/storage/profiles/rclone-sync.nix b/hosts/storage/profiles/rclone-sync.nix index 44ac333..c0d1f7c 100644 --- a/hosts/storage/profiles/rclone-sync.nix +++ b/hosts/storage/profiles/rclone-sync.nix @@ -1,10 +1,4 @@ -{ - config, - lib, - ... -}: let - secrets = config.services.secrets.secrets; -in { +{lib, ...}: { services.rclone-sync = let sync_defaults = { serviceConfig = {after = ["secrets-init.service"];}; diff --git a/hosts/storage/storage.nix b/hosts/storage/storage.nix index ca30597..5f28977 100644 --- a/hosts/storage/storage.nix +++ b/hosts/storage/storage.nix @@ -1,13 +1,10 @@ { - modulesPath, tree, config, pkgs, - lib, ... }: let secrets = config.services.secrets.secrets; - ports = import ./ports.nix {}; in { imports = with tree; [ users.root @@ -54,9 +51,6 @@ in { script = let vault_username = "storage"; vault_password_file = "${secrets.vault_password.path}"; - - config_dir = "/home/storage/.config/rclone"; - config_file = "/home/storage/.config/rclone/rclone.conf"; in '' VAULT_ADDR="https://vault.owo.monster" \ vault login -no-print -method=userpass username=${vault_username} password=$(cat ${vault_password_file}) diff --git a/hosts/tablet/hardware.nix b/hosts/tablet/hardware.nix index 891416c..7baa81e 100644 --- a/hosts/tablet/hardware.nix +++ b/hosts/tablet/hardware.nix @@ -1,7 +1,4 @@ -{tree, ...}: let - usb_data = import ../../data/usb_data.nix {}; - drive_data = import ../../data/normal_drive_data.nix {}; -in { +{tree, ...}: { boot = { loader = { systemd-boot.enable = true; diff --git a/hosts/tablet/profiles/misskey-dev.nix b/hosts/tablet/profiles/misskey-dev.nix index 24ea8c2..ab8c097 100644 --- a/hosts/tablet/profiles/misskey-dev.nix +++ b/hosts/tablet/profiles/misskey-dev.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { services.postgresql = { enable = true; ensureUsers = [ diff --git a/hosts/tablet/secrets.nix b/hosts/tablet/secrets.nix index 057924b..447ed23 100644 --- a/hosts/tablet/secrets.nix +++ b/hosts/tablet/secrets.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { services.secrets = { enable = true; secrets = { diff --git a/hosts/tablet/tablet.nix b/hosts/tablet/tablet.nix index 997f683..dd9187a 100644 --- a/hosts/tablet/tablet.nix +++ b/hosts/tablet/tablet.nix @@ -1,10 +1,4 @@ -{ - tree, - config, - pkgs, - lib, - ... -}: { +{tree, ...}: { imports = with tree; [ users.root users.chaos diff --git a/hosts/vault/secrets.nix b/hosts/vault/secrets.nix index 67fac83..d75ca18 100644 --- a/hosts/vault/secrets.nix +++ b/hosts/vault/secrets.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { services.secrets = { enable = true; secrets = { diff --git a/hosts/vault/vault.nix b/hosts/vault/vault.nix index 885ac0c..f20bd67 100644 --- a/hosts/vault/vault.nix +++ b/hosts/vault/vault.nix @@ -1,13 +1,4 @@ -{ - modulesPath, - tree, - config, - pkgs, - lib, - ... -}: let - secrets = config.services.secrets.secrets; -in { +{tree, ...}: { imports = with tree; [ users.root diff --git a/modules/nixos/secrets.nix b/modules/nixos/secrets.nix index fc9e9ef..00ff58d 100644 --- a/modules/nixos/secrets.nix +++ b/modules/nixos/secrets.nix @@ -1,7 +1,7 @@ { - config, lib, pkgs, + config, ... }: with lib; let @@ -59,11 +59,7 @@ in { }; secrets = mkOption { - type = types.attrsOf (types.submodule ({ - config, - name, - ... - }: { + type = types.attrsOf (types.submodule ({name, ...}: { options = { user = mkOption { type = types.str; @@ -119,8 +115,8 @@ in { } ''; - manualSecrets = filterAttrs (name: secret: secret.manual) cfg.secrets; - nonManualSecrets = filterAttrs (name: secret: !secret.manual) cfg.secrets; + manualSecrets = filterAttrs (_: secret: secret.manual) cfg.secrets; + nonManualSecrets = filterAttrs (_: secret: !secret.manual) cfg.secrets; initScript = '' @@ -141,7 +137,7 @@ in { ${cfg.extraFunctions} '' - + (lib.concatStringsSep "\n" (lib.mapAttrsToList (name: secret: '' + + (lib.concatStringsSep "\n" (lib.mapAttrsToList (_name: secret: '' if [[ ! -f "${secret.path}" ]]; then echo "Initializing Secret ${secret.path}" else @@ -156,7 +152,7 @@ in { '') nonManualSecrets)) + (lib.concatStringsSep "\n" (lib.mapAttrsToList - (name: secret: '' + (_name: secret: '' if [[ ! -f "${secret.path}" ]]; then echo "Manual Secret ${secret.path} Doesn't Exist" exit 1 diff --git a/overlay/default.nix b/overlay/default.nix index e600162..e22af24 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,4 +1,4 @@ -final: prev: { +final: _prev: { comic-sans = final.callPackage ./comic-sans {}; comic-code = final.callPackage ./comic-code {}; roc-toolkit-patched = final.callPackage ./roc-toolkit-patched {}; diff --git a/overlay/gobar/default.nix b/overlay/gobar/default.nix index 8c2bbfa..f9d2cea 100644 --- a/overlay/gobar/default.nix +++ b/overlay/gobar/default.nix @@ -1,9 +1,6 @@ { - stdenv, fetchFromGitLab, buildGoModule, - lib, - go, }: buildGoModule rec { pname = "gobar"; diff --git a/overlay/piped/backend/default.nix b/overlay/piped/backend/default.nix index e8fd47d..48f8513 100644 --- a/overlay/piped/backend/default.nix +++ b/overlay/piped/backend/default.nix @@ -2,7 +2,6 @@ stdenv, runtimeShell, fetchFromGitHub, - makeWrapper, jdk, jre, gradle, diff --git a/overlay/piped/frontend/default.nix b/overlay/piped/frontend/default.nix index 25f01bb..5081341 100644 --- a/overlay/piped/frontend/default.nix +++ b/overlay/piped/frontend/default.nix @@ -1,7 +1,4 @@ { - stdenv, - nodejs, - nodePackages, mkYarnPackage, rsync, fetchFromGitHub, diff --git a/overlay/piped/frontend/yarn.nix b/overlay/piped/frontend/yarn.nix index 27c6477..4195112 100644 --- a/overlay/piped/frontend/yarn.nix +++ b/overlay/piped/frontend/yarn.nix @@ -1,9 +1,6 @@ { fetchurl, - fetchgit, linkFarm, - runCommand, - gnutar, }: rec { offline_cache = linkFarm "offline" packages; packages = [ diff --git a/overlay/zar/default.nix b/overlay/zar/default.nix index e8eaedc..2e7fd72 100644 --- a/overlay/zar/default.nix +++ b/overlay/zar/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitLab, - lib, zig, }: stdenv.mkDerivation rec { diff --git a/profiles/base-darwin/nix.nix b/profiles/base-darwin/nix.nix index 3ac0ae7..925f53c 100644 --- a/profiles/base-darwin/nix.nix +++ b/profiles/base-darwin/nix.nix @@ -2,7 +2,6 @@ inputs, pkgs, config, - lib, ... }: { nix = { diff --git a/profiles/base/access.nix b/profiles/base/access.nix index d63c5bc..3c777df 100644 --- a/profiles/base/access.nix +++ b/profiles/base/access.nix @@ -1,6 +1,4 @@ { - tree, - config, lib, pkgs, ... diff --git a/profiles/base/home.nix b/profiles/base/home.nix index 85905fa..006bd3b 100644 --- a/profiles/base/home.nix +++ b/profiles/base/home.nix @@ -2,7 +2,6 @@ inputs, tree, config, - pkgs, lib, ... }: diff --git a/profiles/base/programs.nix b/profiles/base/programs.nix index 8a30afa..3d0cfd7 100644 --- a/profiles/base/programs.nix +++ b/profiles/base/programs.nix @@ -1 +1 @@ -{config, ...}: {programs.mtr.enable = true;} +{...}: {programs.mtr.enable = true;} diff --git a/profiles/base/services.nix b/profiles/base/services.nix deleted file mode 100644 index f456bac..0000000 --- a/profiles/base/services.nix +++ /dev/null @@ -1,3 +0,0 @@ -{config, ...}: { - #services.localtimed.enable = true; -} diff --git a/profiles/connectivity/network_manager/nm.nix b/profiles/connectivity/network_manager/nm.nix index 0003f7b..9680976 100644 --- a/profiles/connectivity/network_manager/nm.nix +++ b/profiles/connectivity/network_manager/nm.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: { +{lib, ...}: { networking = { networkmanager = { enable = true; diff --git a/profiles/dnscrypt/dnscrypt.nix b/profiles/dnscrypt/dnscrypt.nix index a16b107..200536a 100644 --- a/profiles/dnscrypt/dnscrypt.nix +++ b/profiles/dnscrypt/dnscrypt.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{...}: { networking = { resolvconf.useLocalResolver = true; networkmanager.dns = "none"; diff --git a/profiles/gaming/steam.nix b/profiles/gaming/steam.nix index 24e0dee..fbc810f 100644 --- a/profiles/gaming/steam.nix +++ b/profiles/gaming/steam.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { programs.steam = { enable = true; remotePlay.openFirewall = true; diff --git a/profiles/gui/base/default.nix b/profiles/gui/base/default.nix index 92db9dc..4812909 100644 --- a/profiles/gui/base/default.nix +++ b/profiles/gui/base/default.nix @@ -1,5 +1 @@ -{ - config, - pkgs, - ... -}: {fonts.fonts = with pkgs; [comic-sans comic-code];} +{pkgs, ...}: {fonts.fonts = with pkgs; [comic-sans comic-code];} diff --git a/profiles/gui/environments/sway/sway.nix b/profiles/gui/environments/sway/sway.nix index 00ad488..405e677 100644 --- a/profiles/gui/environments/sway/sway.nix +++ b/profiles/gui/environments/sway/sway.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { programs.sway.enable = true; programs.xwayland.enable = true; #services.xserver.enable = true; diff --git a/profiles/laptop/default.nix b/profiles/laptop/default.nix index 12e8f86..3254c1c 100644 --- a/profiles/laptop/default.nix +++ b/profiles/laptop/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { services.xserver.libinput.enable = true; services.tlp.enable = true; powerManagement.enable = true; diff --git a/profiles/usb-automount.nix b/profiles/usb-automount.nix index dfb2e2a..e81c5f5 100644 --- a/profiles/usb-automount.nix +++ b/profiles/usb-automount.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: let +{pkgs, ...}: let usb_data = import ../data/usb_data.nix {}; mapper_name = "usb_unencrypted_afterboot"; mapper_path = "/dev/mapper/${mapper_name}"; diff --git a/users/chaos.nix b/users/chaos.nix index 29b0111..75ac166 100644 --- a/users/chaos.nix +++ b/users/chaos.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{...}: { users.users.chaos = { uid = 1000; isNormalUser = true; diff --git a/users/root.nix b/users/root.nix index e2c2330..e6ceb64 100644 --- a/users/root.nix +++ b/users/root.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{...}: { users.users.root = { openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAeN3T1aZkTm5xS0b66cRDyKUbdEQCFyzVWXeW+eIbsa chaos@chaos"