Change update source

Revert "Update flake"
This reverts commit b5c9a4e1c7.
2023-03-14 11:33:47 -04:00 · 2023-03-11 15:28:46 -05:00 · 2023-03-11 12:53:40 -05:00 · 2023-03-09 05:41:04 -05:00 · 2023-03-09 05:40:59 -05:00 · 2023-03-09 05:18:40 -05:00
7 changed files with 70 additions and 72 deletions
--- a/flake.lock
+++ b/flake.lock
@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1677608641,
-        "narHash": "sha256-sbSZhceOflqZIePzUrHiRB4bv4OHObs7NrhzICCUcC4=",
+        "lastModified": 1678356895,
+        "narHash": "sha256-o1Tnh8StrfPomHNYtoH2GmzSdt2W2CC3bgEt8lGbZhw=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "545383bd7de8e3f100356fea217698379d8f5c31",
+        "rev": "5ac0d2b9ccdb3dd52d0dcbc79e78b2c7a3fed2b1",
        "type": "github"
      },
      "original": {
@ -50,11 +50,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1677722715,
-        "narHash": "sha256-QDJSAVe2tJ4SbfmdphNc6Jxg9MIlDEDSLo7g10IMdeQ=",
+        "lastModified": 1678343136,
+        "narHash": "sha256-QguZ3BUGFEQW/TVU2hkgAyd6IfeIWZYRZYGosCCuT1U=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "7ddd30bdc2782831f673423da2e3697e17976f2f",
+        "rev": "c618f417276c7e754e90b032bd2a958f2fd9c589",
        "type": "github"
      },
      "original": {
@ -156,11 +156,11 @@
    },
    "flake-utils_6": {
      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
        "type": "github"
      },
      "original": {
@ -177,11 +177,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1677711157,
-        "narHash": "sha256-6/c88G/5i/SzjTcGix4e9d60aIRDlTZ0aVJ2iXSO/DA=",
+        "lastModified": 1678285456,
+        "narHash": "sha256-2rIk5OFGQmoFX1MWntKGPVCZvy5yQMX3ZCYz7i8+yb0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a7d3f51e9e01cecebe9e00bf417bc2111c2a9202",
+        "rev": "b0be47978de5cfd729a79c3f57ace4c86364ff45",
        "type": "github"
      },
      "original": {
@ -216,11 +216,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1677576021,
-        "narHash": "sha256-rW0sdc7GyeLzK0UR10htjSn19Gnid+MLl+qshxRQ0xI=",
+        "lastModified": 1678278683,
+        "narHash": "sha256-DEvrBazt2y/mJvfiWmmZCQTxo6qCovaclF5zQN5cDUU=",
        "owner": "idris-lang",
        "repo": "idris2",
-        "rev": "20ecc025698c408d4a5034691be829486fa6c99e",
+        "rev": "79116320dd1c698047e8579a5182dbe2031792bb",
        "type": "github"
      },
      "original": {
@ -323,11 +323,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1636849918,
-        "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
+        "lastModified": 1677373009,
+        "narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
+        "rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea",
        "type": "github"
      },
      "original": {
@ -344,11 +344,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1676297861,
-        "narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=",
+        "lastModified": 1678351966,
+        "narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "1e0a05219f2a557d4622bc38f542abb360518795",
+        "rev": "0c043999b16caba6fb571af2d228775729829943",
        "type": "github"
      },
      "original": {
@ -359,11 +359,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1677591639,
-        "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=",
+        "lastModified": 1678350133,
+        "narHash": "sha256-sUxDtERkqq0oGU5eGtlem5zE5ga801yXfpc3XlPfC4k=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce",
+        "rev": "6e303a505ad31a8e68a7f0d43e2170e81c16919b",
        "type": "github"
      },
      "original": {
@ -374,11 +374,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1677624842,
-        "narHash": "sha256-4DF9DbDuK4/+KYx0L6XcPBeDHUFVCtzok2fWtwXtb5w=",
+        "lastModified": 1678230755,
+        "narHash": "sha256-SFAXgNjNTXzcAideXcP0takfUGVft/VR5CACmYHg+Fc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d70f5cd5c3bef45f7f52698f39e7cc7a89daa7f0",
+        "rev": "a7cc81913bb3cd1ef05ed0ece048b773e1839e51",
        "type": "github"
      },
      "original": {
@ -406,11 +406,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1677560965,
-        "narHash": "sha256-Tqwt5alTtMnbYUPKCYRYZqlfbjprLgDWqjMhXpFMQ6k=",
+        "lastModified": 1677948530,
+        "narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "40968a3aa489191cf4b7ba85cf2a54d8a75c8daa",
+        "rev": "d51554151a91cd4543a7620843cc378e3cbc767e",
        "type": "github"
      },
      "original": {
@ -422,11 +422,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1677587185,
-        "narHash": "sha256-zYT66MAYwctAQqI5VBw3LbBXiSKdB8vuMAqCGG8onbE=",
+        "lastModified": 1678293141,
+        "narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "68196a61c26748d3e53a6803de3d2f8c69f27831",
+        "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d",
        "type": "github"
      },
      "original": {
@ -560,11 +560,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1677587269,
-        "narHash": "sha256-5wSIpApcKSQP5Rl6lB5SBPZgPUgqyC7G/dHYbWmkn40=",
+        "lastModified": 1678199120,
+        "narHash": "sha256-G8z2A1NvywTOATMTvx+FPxMf4PC91p0Z7fONx5PYW+4=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "7f01ae877dfd26277a52630c9e40724db23ff8fc",
+        "rev": "ecc32c2f8517576b26060915bcb0cdb00cafd060",
        "type": "github"
      },
      "original": {
@ -603,11 +603,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1677594933,
-        "narHash": "sha256-qUoODrgbHRDKcg5r1Wsck01zIsJyKi/G4R2YAQafXPQ=",
+        "lastModified": 1678264398,
+        "narHash": "sha256-COgbuQH/oAQZUBFTTQgSifabzZ5/GRCCbBIqZJjR3s0=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "27018a9084006b8371b1f833882adfb85bd23004",
+        "rev": "00e9e9cd46600d68dd98a392025d4894c3711b58",
        "type": "github"
      },
      "original": {
@ -690,11 +690,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1676381420,
-        "narHash": "sha256-aDRnfGrk/xi7zkuterN78p8/wdM5Iy6vz74uqd/JFWw=",
+        "lastModified": 1678325558,
+        "narHash": "sha256-TYuMGs3SqDn7RDuPPa8t7nAE+Ml3GFoN5m96zkRwaS8=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "4640199aeafcbb63cfbe8318bdf06f4402134f66",
+        "rev": "15ddd83dc3c50484633944984848a30be1d2dbf6",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -56,9 +56,8 @@
    scripts.url = "git+https://git.sr.ht/~thatonelutenist/Scripts?ref=trunk";
  };

-  outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixos-hardware
-    , fenix, emacs, sops-nix, home-manager, darwin, java, quilt-server
-    , nixos-generators, wsl, nix-on-droid, idris2, scripts }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, sops-nix
+    , home-manager, darwin, nixos-generators, wsl, nix-on-droid, ... }@inputs:
    let
      makeNixosSystem =
        { system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }:
@ -215,22 +214,22 @@
          # Special handling for discord, as it's unfree _and_ insecure!
          config = {
            allowUnfree = true;
-            permittedInsecurePackages = [ "electron-13.6.9" ];
+            permittedInsecurePackages = [ "electron-16.2.3" ];
          };
        };
      in {
        packages = flake-utils.lib.flattenTree {
          discordWayland = pkgs.callPackage ./packages/discord/default.nix rec {
            pname = "discord-electron";
-            binaryName = "Discord";
+            binaryName = "DiscordCanary";
            desktopName = "Discord (Wayland)";
-            version = "0.0.22";
+            version = "0.0.149";
            src = pkgs.fetchurl {
              url =
-                "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-              hash = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c=";
+                "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
+              hash = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY=";
            };
-            electron = pkgs.electron_13;
+            electron = pkgs.electron_22;
          };
          swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
        };
--- a/home-manager/common/programs/devel.nix
+++ b/home-manager/common/programs/devel.nix
@ -68,7 +68,14 @@ with nLib; {
    })
    # JavaScript/TypeScript Development
    (mkIf devel.js {
-      home.packages = with pkgs; [ nodejs yarn nodePackages.typescript deno ];
+      home.packages = with unstable;
+        with nodePackages; [
+          nodejs
+          yarn
+          typescript
+          deno
+          vscode-langservers-extracted
+        ];
    })
    # Raku Development
    (mkIf devel.raku { home.packages = with pkgs; [ rakudo zef ]; })
--- a/home-manager/linux/programs/communications.nix
+++ b/home-manager/linux/programs/communications.nix
@ -53,15 +53,6 @@
            ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://app.cinny.in"'';
          terminal = false;
        };
-        # Discord
-        discordItem = pkgs.makeDesktopItem {
-          name = "discord";
-          desktopName = "Discord (Chromium)";
-          exec = ''
-            ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://discord.com/app"'';
-          terminal = false;
-        };
-        # Messages
        messagesItem = pkgs.makeDesktopItem {
          name = "messages";
          desktopName = "Messages (Chromium)";
@ -71,9 +62,9 @@
        };
      in [
        # Discord
-        # inputs.self.packages.${pkgs.system}.discordWayland
-        # betterdiscordctl
-        discordItem
+        inputs.self.packages.${pkgs.system}.discordWayland
+        betterdiscordctl
+        # discordItem
        # Desktop matrix client
        (enableWayland element-desktop "element-desktop")
        # Desktop signal client
@ -84,21 +75,16 @@
        tdesktop
        # Desktop mastodon client
        # TODO: Reenable when unbroken on unstable
-        # tootle
+        tootle
        # zulip
        unstable.zulip
        zulipWayland
-        # Zoom (for work, sadly)
-        unstable.zoom-us
-        # Teams (also for work)
-        unstable.teams
        # Cinny for pretty matrix
        cinnyItem
        # chromium
        (enableWayland chromium "chromium")
        # Wayland workaround packages
        fbChromeDesktopItem
-        teamsItem
        # Messages
        messagesItem
      ];
--- a/machines/fusion/configuration.nix
+++ b/machines/fusion/configuration.nix
@ -75,4 +75,7 @@
    locations."/" = { proxyPass = "http://localhost:3000"; };
  };

+  # Update later than everyone else, since this one hosts our updates
+  system.autoUpgrade.dates = "6:00";
+
 }
--- a/machines/matrix/configuration.nix
+++ b/machines/matrix/configuration.nix
@ -126,6 +126,9 @@
    startAt = "*-*-* 4:00:00";
  };

+  # Install our utilties
+  environment.systemPackages = with pkgs; [ matrix-synapse-tools.synadm ];
+
  # Setup a task to cleanup the database
  systemd.services.synapse-db-cleanup = {
    serviceConfig = {
--- a/modules/linux/linux/base.nix
+++ b/modules/linux/linux/base.nix
@ -39,9 +39,9 @@ with lib; {
        enable = true;
        allowReboot = true;
        # Update from the flake
-        flake = "git+https://git.sr.ht/~thatonelutenist/system-flake?ref=trunk";
+        flake = "git+https://git.stranger.systems/nix/System";
        # Attempt to update daily at 2AM
-        dates = "2:00";
+        dates = lib.mkDefault "2:00";
      };
    })
    # Systemd user service cludge
Author	SHA1	Message	Date
Nathan McCarty	9508c7391a	Change update source	2023-03-14 11:33:47 -04:00
Nathan McCarty	2220fa33ce	Revert "Update flake" This reverts commit `b5c9a4e1c7`.	2023-03-11 15:28:46 -05:00
Nathan McCarty	b5c9a4e1c7	Update flake	2023-03-11 12:53:40 -05:00
Nathan McCarty	9223e75f8f	Tweak webdev	2023-03-09 05:41:04 -05:00
Nathan McCarty	b61f6038c5	Update flake	2023-03-09 05:40:59 -05:00
Nathan McCarty	de90672f23	Update discord	2023-03-09 05:18:40 -05:00
Nathan McCarty	c51d9616c7	Add synadm to matrix.community.rs	2023-03-03 19:52:10 -05:00
Nathan McCarty	756967d609	Add tootle back	2023-03-03 19:26:05 -05:00
Nathan McCarty	354363233a	Switch back to electron discord	2023-03-03 19:24:56 -05:00
Nathan McCarty	f7d6d363f6	Simplify flake.nix a lil	2023-03-02 00:21:37 -05:00