From d32311cc44a907d3be4f482aa76e878dc4bf0dcf Mon Sep 17 00:00:00 2001 From: Tristan Date: Thu, 4 May 2023 15:07:17 +0100 Subject: [PATCH] animations and clean stuff --- system/global/home.nix | 8 ++--- system/global/system.nix | 1 + system/work/home.nix | 3 +- system/work/system.nix | 63 ++++++++++++++++++++-------------------- system/zenix/system.nix | 1 - 5 files changed, 39 insertions(+), 37 deletions(-) diff --git a/system/global/home.nix b/system/global/home.nix index fb86744..ae467fa 100644 --- a/system/global/home.nix +++ b/system/global/home.nix @@ -256,14 +256,14 @@ in drop_shadow = no } - bezier=overshot, 0.05, 0.9, 0.1, 1.1 + bezier = overshot, 0.05, 0.9, 0.1, 1.1 bezier = linear, 0.0, 0.0, 1.0, 1.0 animations { enabled = 1 - animation = windows, 1, 5, default - animation = border, 1, 5, default - animation = fade, 1, 10,default + animation = windows, 1, 1, default, popin + animation = border, 1, 1, default + animation = fade, 1, 1, default animation = workspaces, 1, 3, overshot animation = borderangle,1, 50, linear, loop } diff --git a/system/global/system.nix b/system/global/system.nix index f027edc..5e3cf92 100644 --- a/system/global/system.nix +++ b/system/global/system.nix @@ -14,6 +14,7 @@ networking.networkmanager.enable = true; programs.nm-applet.enable = true; + services.tailscale.enable = true; time.timeZone = "Europe/London"; diff --git a/system/work/home.nix b/system/work/home.nix index 8e6ed24..7c26150 100644 --- a/system/work/home.nix +++ b/system/work/home.nix @@ -83,8 +83,9 @@ }; }; - wayland.windowManager.hyprland.enable = true; + # wayland.windowManager.hyprland.enable = lib.mkForce false; # wayland.windowManager.sway.enable = true; + # wayland.windowManager.sway.package = pkgs.swayfx; wayland.windowManager.sway.config = { input = { "type:keyboard" = { diff --git a/system/work/system.nix b/system/work/system.nix index 399d5b9..e900628 100644 --- a/system/work/system.nix +++ b/system/work/system.nix @@ -26,44 +26,44 @@ plugins = [ pkgs.networkmanager-openvpn ]; }; }; - + boot.kernel.sysctl = { "net.ipv4.ip_unprivileged_port_start" = 53; }; system.stateVersion = "22.11"; # do not change - + security.pki.certificates = [ # mkcert root CA '' - -----BEGIN CERTIFICATE----- - MIIEtTCCAx2gAwIBAgIQJFzbDr6Qu0RdwlB9iBsKjjANBgkqhkiG9w0BAQsFADBz - MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExJDAiBgNVBAsMG3RyaXN0 - YW5ARkNTLVRyaXN0YW4tTml4Ym9vazErMCkGA1UEAwwibWtjZXJ0IHRyaXN0YW5A - RkNTLVRyaXN0YW4tTml4Ym9vazAeFw0yMzA0MjcwOTA5MDBaFw0zMzA0MjcwOTA5 - MDBaMHMxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTEkMCIGA1UECwwb - dHJpc3RhbkBGQ1MtVHJpc3Rhbi1OaXhib29rMSswKQYDVQQDDCJta2NlcnQgdHJp - c3RhbkBGQ1MtVHJpc3Rhbi1OaXhib29rMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A - MIIBigKCAYEA0rfztOVR6WnW/y/eSjVYPg9Hukegmj4JiPyYWWGwDU2WDFnZNL3h - g66YIngid/1tK/xau793oL5tSlxASCi/8v+UCu946p71iVnEM6GiI5bmLA2yV6DB - gbb6OQ5WCLfoOwOHW5jchlXpFstMsTGAyck3D8n0ndebQQc6YbOQG4RFyTftwI3g - 2oy8Vl8NKyRL2V3NIPx16OkmLDhzo0bKHQAvPc+QUYfKRRn7UlUyfTy/ILwa0ezt - 5KcggU/OMT68eFSp3LItUhRu1zSygCDk2zhJq8ieb5BypvSBWj/mSZtucpoasl72 - txiRCN7yrGw21Z34KdqVF+mI0bWVEZESu1/93HzsEcy9SUX/tF11t/Zb5WAF3kFH - dk0UMRTayhKZuxCRmGIqjLrItUli2tDy+QTzNU0XZAaUokqk3to5GoXSij9H0MdJ - VRA8Y2Mdp+l16MMgLMG5gR9KVnCyM1bkqFJpR+xt8xyeAljI9hFVTyI4i36nUWoi - ITdpBUkaOSoVAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAG - AQH/AgEAMB0GA1UdDgQWBBQnpJfEOuRFXN0YJwf3R2EiWtApHDANBgkqhkiG9w0B - AQsFAAOCAYEAQx3kukopMjvybhbKsx/aU7CynjRCIbbONE10dX9fw7AtjQRB8Vcm - hlsW13MmM6DxroY6taWD8KLZxRNJeHoWdjN689sAbIlnaLrry7XDx5wtsBGfZh3j - vtFzSqHumxa1LjEQPUetTFp6YNgqDDyB53pU/Xfahwda8PCEOEqAsEveYyPqu0I1 - MxNdPa/exE2HJxXZarWQ4pcqReykIVale+WbdOmSaT9cnA+E82hshhq3X6Aeti5s - DmIzY//L1LuNs0bXD4ECyMHA8Pgu3JyhnCIu8cxAKyOnM63P9iKZq5c9NASbvGgT - DNlxgyFqDQEI5k8Q2INM/6ZlJKcKRlIh1Nxd2PXl68IA0dWftBGydCGPPPcSdGCy - vA3XfPrgbuqdJjuPjQggMyajJsg2Y7b9YBL7XIBcwKqnSCxoDORGRQEy47sTaT8a - /BqBUuDPQbCF8MZcbsfwQP4pj8E/YyiSQCSZwQVpwVbZNBSOvcq28h0TEzDnAoHG - ey1rgb0TA5zi - -----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- + MIIEtTCCAx2gAwIBAgIQJFzbDr6Qu0RdwlB9iBsKjjANBgkqhkiG9w0BAQsFADBz + MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExJDAiBgNVBAsMG3RyaXN0 + YW5ARkNTLVRyaXN0YW4tTml4Ym9vazErMCkGA1UEAwwibWtjZXJ0IHRyaXN0YW5A + RkNTLVRyaXN0YW4tTml4Ym9vazAeFw0yMzA0MjcwOTA5MDBaFw0zMzA0MjcwOTA5 + MDBaMHMxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTEkMCIGA1UECwwb + dHJpc3RhbkBGQ1MtVHJpc3Rhbi1OaXhib29rMSswKQYDVQQDDCJta2NlcnQgdHJp + c3RhbkBGQ1MtVHJpc3Rhbi1OaXhib29rMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A + MIIBigKCAYEA0rfztOVR6WnW/y/eSjVYPg9Hukegmj4JiPyYWWGwDU2WDFnZNL3h + g66YIngid/1tK/xau793oL5tSlxASCi/8v+UCu946p71iVnEM6GiI5bmLA2yV6DB + gbb6OQ5WCLfoOwOHW5jchlXpFstMsTGAyck3D8n0ndebQQc6YbOQG4RFyTftwI3g + 2oy8Vl8NKyRL2V3NIPx16OkmLDhzo0bKHQAvPc+QUYfKRRn7UlUyfTy/ILwa0ezt + 5KcggU/OMT68eFSp3LItUhRu1zSygCDk2zhJq8ieb5BypvSBWj/mSZtucpoasl72 + txiRCN7yrGw21Z34KdqVF+mI0bWVEZESu1/93HzsEcy9SUX/tF11t/Zb5WAF3kFH + dk0UMRTayhKZuxCRmGIqjLrItUli2tDy+QTzNU0XZAaUokqk3to5GoXSij9H0MdJ + VRA8Y2Mdp+l16MMgLMG5gR9KVnCyM1bkqFJpR+xt8xyeAljI9hFVTyI4i36nUWoi + ITdpBUkaOSoVAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAG + AQH/AgEAMB0GA1UdDgQWBBQnpJfEOuRFXN0YJwf3R2EiWtApHDANBgkqhkiG9w0B + AQsFAAOCAYEAQx3kukopMjvybhbKsx/aU7CynjRCIbbONE10dX9fw7AtjQRB8Vcm + hlsW13MmM6DxroY6taWD8KLZxRNJeHoWdjN689sAbIlnaLrry7XDx5wtsBGfZh3j + vtFzSqHumxa1LjEQPUetTFp6YNgqDDyB53pU/Xfahwda8PCEOEqAsEveYyPqu0I1 + MxNdPa/exE2HJxXZarWQ4pcqReykIVale+WbdOmSaT9cnA+E82hshhq3X6Aeti5s + DmIzY//L1LuNs0bXD4ECyMHA8Pgu3JyhnCIu8cxAKyOnM63P9iKZq5c9NASbvGgT + DNlxgyFqDQEI5k8Q2INM/6ZlJKcKRlIh1Nxd2PXl68IA0dWftBGydCGPPPcSdGCy + vA3XfPrgbuqdJjuPjQggMyajJsg2Y7b9YBL7XIBcwKqnSCxoDORGRQEy47sTaT8a + /BqBUuDPQbCF8MZcbsfwQP4pj8E/YyiSQCSZwQVpwVbZNBSOvcq28h0TEzDnAoHG + ey1rgb0TA5zi + -----END CERTIFICATE----- '' ]; @@ -78,13 +78,14 @@ setSocketVariable = true; }; }; - + services.greetd = { settings = rec { sway_session = { command = "sway"; user = "tristan"; }; + # default_session = lib.mkForce sway_session; }; }; diff --git a/system/zenix/system.nix b/system/zenix/system.nix index f843d71..568f6e1 100644 --- a/system/zenix/system.nix +++ b/system/zenix/system.nix @@ -12,7 +12,6 @@ services.openssh.enable = true; - services.tailscale.enable = true; networking.firewall.checkReversePath = "loose"; system.stateVersion = "22.11"; # do not change