major cleanup

2024-07-16 00:26:09 +02:00 · 2024-07-16 00:26:09 +02:00 · 09b862349f
commit 09b862349f
parent a2e26298af
54 changed files with 55 additions and 57 deletions
--- a/hosts/chmura/default.nix
+++ b/hosts/chmura/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./services
        ./trollface.pl
--- a/hosts/chmura/profile.nix
+++ b/hosts/chmura/profile.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ../../options/boot/systemd-boot.nix
        ../../options/common/binary-caches.nix
--- a/hosts/chmura/programs.nix
+++ b/hosts/chmura/programs.nix
@ -45,4 +45,3 @@ in {
        ];
    };
 }
-
--- a/hosts/chmura/services/default.nix
+++ b/hosts/chmura/services/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./anki-sync-server.nix
        ./conduit.nix
--- a/hosts/chmura/services/freshrss.nix
+++ b/hosts/chmura/services/freshrss.nix
@ -1,4 +1,4 @@
-_: {
+{
    services.freshrss = {
        enable = true;
        baseUrl = "http://f.jacekpoz.pl";
--- a/hosts/chmura/services/grafana.nix
+++ b/hosts/chmura/services/grafana.nix
@ -1,4 +1,4 @@
-_: {
+{
    services.grafana = {
        enable = true;
        settings.server = {
--- a/hosts/chmura/services/i2pd.nix
+++ b/hosts/chmura/services/i2pd.nix
@ -1,4 +1,4 @@
-_: {
+{
    services.i2pd = {
        enable = true;
        ifname = "enp6s0";
--- a/hosts/chmura/services/ntfy-sh.nix
+++ b/hosts/chmura/services/ntfy-sh.nix
@ -1,4 +1,4 @@
-_: {
+{
    services.ntfy-sh = {
        enable = true;
        settings = {
--- a/hosts/chmura/services/restic.nix
+++ b/hosts/chmura/services/restic.nix
@ -1,4 +1,4 @@
-_: {
+{
    services.restic = {
        server = {
            enable = true;
--- a/hosts/chmura/services/stalwart.nix
+++ b/hosts/chmura/services/stalwart.nix
@ -1,4 +1,4 @@
-_: {
+{
    users.users.stalwart = {
        isSystemUser = true;
        group = "stalwart";
--- a/hosts/chmura/services/sudo-parental-control.nix
+++ b/hosts/chmura/services/sudo-parental-control.nix
@ -1,5 +1,8 @@
-_: {
-    services.caddy.virtualHosts."sudo-parental-control.jacekpoz.pl".extraConfig = ''
-        reverse_proxy localhost:8000
-    '';
+{
+    services.caddy = {
+        enable = true;
+        virtualHosts."sudo-parental-control.jacekpoz.pl".extraConfig = ''
+            reverse_proxy localhost:8000
+        '';
+    };
 }
--- a/hosts/chmura/services/transmission.nix
+++ b/hosts/chmura/services/transmission.nix
@ -1,4 +1,4 @@
-_: {
+{
    services.transmission = {
        enable = true;
        home = "/media/Torrent";
--- a/hosts/chmura/system.nix
+++ b/hosts/chmura/system.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.other.system = {
        hostname = "chmura";
        username = "chmura";
--- a/hosts/chmura/trollface.pl/default.nix
+++ b/hosts/chmura/trollface.pl/default.nix
@ -1,4 +1,4 @@
-_ : {
+{
    services.caddy = {
        enable = true;
        virtualHosts."trollface.pl".extraConfig = ''
--- a/hosts/del/default.nix
+++ b/hosts/del/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./quickshell
        ./configuration.nix
--- a/hosts/del/git.nix
+++ b/hosts/del/git.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.programs.git = {
        enable = true;
        userName = "jacekpoz";
--- a/hosts/del/profile.nix
+++ b/hosts/del/profile.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ../../options/boot/systemd-boot.nix
        ../../options/common/binary-caches.nix
--- a/hosts/del/quickshell/default.nix
+++ b/hosts/del/quickshell/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.programs.quickshell = {
        enable = true;
        enabledConfigs = [
--- a/hosts/del/ssh.nix
+++ b/hosts/del/ssh.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.services.ssh = {
        daemon.enable = false;
        agent = {
--- a/hosts/del/system.nix
+++ b/hosts/del/system.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.other = {
        system = {
            hostname = "niks";
--- a/hosts/niks/default.nix
+++ b/hosts/niks/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./quickshell
        ./configuration.nix
--- a/hosts/niks/git.nix
+++ b/hosts/niks/git.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.programs.git = {
        enable = true;
        userName = "jacekpoz";
--- a/hosts/niks/profile.nix
+++ b/hosts/niks/profile.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ../../options/boot/systemd-boot.nix
        ../../options/common/binary-caches.nix
--- a/hosts/niks/quickshell/default.nix
+++ b/hosts/niks/quickshell/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.programs.quickshell = {
        enable = true;
        enabledConfigs = [
--- a/hosts/niks/restic.nix
+++ b/hosts/niks/restic.nix
@ -1,4 +1,4 @@
-_: {
+{
    services.restic.backups = {
        chmuraBackup = {
            extraOptions = [
--- a/hosts/niks/ssh.nix
+++ b/hosts/niks/ssh.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.services.ssh = {
        daemon.enable = false;
        agent = {
--- a/hosts/niks/system.nix
+++ b/hosts/niks/system.nix
@ -1,4 +1,4 @@
-_: {
+{
    myOptions.other = {
        system = {
            hostname = "niks";
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./agenix.nix
        ./git.nix
--- a/modules/default.nix
+++ b/modules/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./cli
        ./gui
@ -7,4 +7,3 @@ _: {
        ./tui
    ];
 }
-
--- a/modules/gui/default.nix
+++ b/modules/gui/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./hypr
        ./quickshell
--- a/modules/gui/foot.nix
+++ b/modules/gui/foot.nix
@ -22,6 +22,7 @@ in {
        environment.sessionVariables = {
            TERM = "foot";
        };
+
        home-manager.users.${username} = {
            programs.foot = {
                enable = true;
--- a/modules/gui/gtklock.nix
+++ b/modules/gui/gtklock.nix
@ -12,7 +12,6 @@ in {
    options.myOptions.programs.gtklock.enable = mkEnableOption "gtklock";
    
    config = mkIf cfg.enable {
-
        # https://github.com/NixOS/nixpkgs/issues/158025
        security.pam.services.gtklock.text = "auth include login";

--- a/modules/gui/hypr/default.nix
+++ b/modules/gui/hypr/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./idle.nix
        ./land.nix
--- a/modules/gui/swaylock.nix
+++ b/modules/gui/swaylock.nix
@ -13,7 +13,6 @@ in {
    options.myOptions.programs.swaylock.enable = mkEnableOption "swaylock";

    config = mkIf cfg.enable {
-
        # https://github.com/NixOS/nixpkgs/issues/158025
        security.pam.services.swaylock.text = "auth include login";

--- a/modules/other/default.nix
+++ b/modules/other/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./hardware.nix
        ./home-manager.nix
--- a/modules/other/xdg.nix
+++ b/modules/other/xdg.nix
@ -5,7 +5,6 @@
    inherit (config.myOptions.other.system) username;
    hmCfg = config.home-manager.users.${username};
 in {
-
    environment.sessionVariables = {
        ANDROID_HOME = "${hmCfg.xdg.dataHome}/android";
        CARGO_HOME = "${hmCfg.xdg.dataHome}/cargo";
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./dunst.nix
        ./greetd.nix
--- a/modules/tui/default.nix
+++ b/modules/tui/default.nix
@ -1,4 +1,4 @@
-_: {
+{
    imports = [
        ./btop.nix
        ./helix.nix
--- a/options/boot/systemd-boot.nix
+++ b/options/boot/systemd-boot.nix
@ -1,4 +1,4 @@
-_: {
+{
    boot.loader = {
        systemd-boot = {
            enable = true;
--- a/options/common/binary-caches.nix
+++ b/options/common/binary-caches.nix
@ -1,4 +1,4 @@
-_: {
+{
    nix.settings = {
        substituters = [
            "https://nix-community.cachix.org"
--- a/options/common/cpu/amd.nix
+++ b/options/common/cpu/amd.nix
@ -1,4 +1,4 @@
-_: {
+{
    hardware.cpu.amd.updateMicrocode = true;

    boot.initrd.kernelModules = [ "amdgpu" ];
--- a/options/common/cpu/intel.nix
+++ b/options/common/cpu/intel.nix
@ -1,3 +1,3 @@
-_: {
+{
    services.thermald.enable = true;
 }
--- a/options/common/disable-nano.nix
+++ b/options/common/disable-nano.nix
@ -1,4 +1,4 @@
-_: {
+{
    # neovim supremacy
    programs.nano.enable = false;
 }
--- a/options/common/disk.nix
+++ b/options/common/disk.nix
@ -1,4 +1,4 @@
-_: {
+{
    services = {
        btrfs.autoScrub = {
            enable = true;
--- a/options/common/libvirt.nix
+++ b/options/common/libvirt.nix
@ -19,5 +19,4 @@
    users.users.${config.myOptions.other.system.username} = {
        extraGroups = [ "libvirtd" ];
    };
-
 }
--- a/options/common/oomd.nix
+++ b/options/common/oomd.nix
@ -1,4 +1,4 @@
-_: {
+{
    systemd.oomd = {
        enable = true;
        enableSystemSlice = true;
--- a/options/common/timezone.nix
+++ b/options/common/timezone.nix
@ -1,3 +1,3 @@
-_: {
+{
    time.timeZone = "Europe/Warsaw";
 }
--- a/options/desktop/asusd.nix
+++ b/options/desktop/asusd.nix
@ -1,4 +1,4 @@
-_: {
+{
    services.asusd = {
        enable = true;
        enableUserService = true;
--- a/options/desktop/bluetooth.nix
+++ b/options/desktop/bluetooth.nix
@ -1,4 +1,4 @@
-_: {
+{
    hardware.bluetooth = {
        enable = true;
        input.General.ClassicBondedOnly = true;
--- a/options/desktop/dev/malloc-perturb.nix
+++ b/options/desktop/dev/malloc-perturb.nix
@ -1,4 +1,4 @@
-_: {
+{
    environment.sessionVariables = {
        MALLOC_PERTURB_ = "$(($(head -200 /dev/urandom | cksum | cut -f1 -d ' ') % 255 + 1))";
    };
--- a/options/desktop/opentabletdriver.nix
+++ b/options/desktop/opentabletdriver.nix
@ -1,4 +1,4 @@
-_: {
+{
    hardware.opentabletdriver = {
        enable = true;
        daemon.enable = true;
--- a/options/desktop/random-mac.nix
+++ b/options/desktop/random-mac.nix
@ -1,3 +1,3 @@
-_: {
+{
    networking.networkmanager.wifi.macAddress = "random";
 }
--- a/options/desktop/waydroid.nix
+++ b/options/desktop/waydroid.nix
@ -1,3 +1,3 @@
-_: {
+{
    virtualisation.waydroid.enable = true;
 }
--- a/options/desktop/wayland.nix
+++ b/options/desktop/wayland.nix
@ -1,4 +1,4 @@
-_: {
+{
    environment.sessionVariables = {
        NIXOS_OZONE_WL = "1";
    };