Compare commits
No commits in common. "9508c7391abbdcdb882c63019dde26add02b0eb1" and "82e38f62f02e2b07a3dce4e4913cc12dfe5945ba" have entirely different histories.
9508c7391a
...
82e38f62f0
84
flake.lock
84
flake.lock
|
|
@ -29,11 +29,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678356895,
|
||||
"narHash": "sha256-o1Tnh8StrfPomHNYtoH2GmzSdt2W2CC3bgEt8lGbZhw=",
|
||||
"lastModified": 1677608641,
|
||||
"narHash": "sha256-sbSZhceOflqZIePzUrHiRB4bv4OHObs7NrhzICCUcC4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "5ac0d2b9ccdb3dd52d0dcbc79e78b2c7a3fed2b1",
|
||||
"rev": "545383bd7de8e3f100356fea217698379d8f5c31",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -50,11 +50,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678343136,
|
||||
"narHash": "sha256-QguZ3BUGFEQW/TVU2hkgAyd6IfeIWZYRZYGosCCuT1U=",
|
||||
"lastModified": 1677722715,
|
||||
"narHash": "sha256-QDJSAVe2tJ4SbfmdphNc6Jxg9MIlDEDSLo7g10IMdeQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "c618f417276c7e754e90b032bd2a958f2fd9c589",
|
||||
"rev": "7ddd30bdc2782831f673423da2e3697e17976f2f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -156,11 +156,11 @@
|
|||
},
|
||||
"flake-utils_6": {
|
||||
"locked": {
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -177,11 +177,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678285456,
|
||||
"narHash": "sha256-2rIk5OFGQmoFX1MWntKGPVCZvy5yQMX3ZCYz7i8+yb0=",
|
||||
"lastModified": 1677711157,
|
||||
"narHash": "sha256-6/c88G/5i/SzjTcGix4e9d60aIRDlTZ0aVJ2iXSO/DA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b0be47978de5cfd729a79c3f57ace4c86364ff45",
|
||||
"rev": "a7d3f51e9e01cecebe9e00bf417bc2111c2a9202",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -216,11 +216,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678278683,
|
||||
"narHash": "sha256-DEvrBazt2y/mJvfiWmmZCQTxo6qCovaclF5zQN5cDUU=",
|
||||
"lastModified": 1677576021,
|
||||
"narHash": "sha256-rW0sdc7GyeLzK0UR10htjSn19Gnid+MLl+qshxRQ0xI=",
|
||||
"owner": "idris-lang",
|
||||
"repo": "idris2",
|
||||
"rev": "79116320dd1c698047e8579a5182dbe2031792bb",
|
||||
"rev": "20ecc025698c408d4a5034691be829486fa6c99e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -323,11 +323,11 @@
|
|||
},
|
||||
"nixlib": {
|
||||
"locked": {
|
||||
"lastModified": 1677373009,
|
||||
"narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=",
|
||||
"lastModified": 1636849918,
|
||||
"narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea",
|
||||
"rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -344,11 +344,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678351966,
|
||||
"narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=",
|
||||
"lastModified": 1676297861,
|
||||
"narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-generators",
|
||||
"rev": "0c043999b16caba6fb571af2d228775729829943",
|
||||
"rev": "1e0a05219f2a557d4622bc38f542abb360518795",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -359,11 +359,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1678350133,
|
||||
"narHash": "sha256-sUxDtERkqq0oGU5eGtlem5zE5ga801yXfpc3XlPfC4k=",
|
||||
"lastModified": 1677591639,
|
||||
"narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "6e303a505ad31a8e68a7f0d43e2170e81c16919b",
|
||||
"rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -374,11 +374,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1678230755,
|
||||
"narHash": "sha256-SFAXgNjNTXzcAideXcP0takfUGVft/VR5CACmYHg+Fc=",
|
||||
"lastModified": 1677624842,
|
||||
"narHash": "sha256-4DF9DbDuK4/+KYx0L6XcPBeDHUFVCtzok2fWtwXtb5w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a7cc81913bb3cd1ef05ed0ece048b773e1839e51",
|
||||
"rev": "d70f5cd5c3bef45f7f52698f39e7cc7a89daa7f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -406,11 +406,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1677948530,
|
||||
"narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=",
|
||||
"lastModified": 1677560965,
|
||||
"narHash": "sha256-Tqwt5alTtMnbYUPKCYRYZqlfbjprLgDWqjMhXpFMQ6k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d51554151a91cd4543a7620843cc378e3cbc767e",
|
||||
"rev": "40968a3aa489191cf4b7ba85cf2a54d8a75c8daa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -422,11 +422,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1678293141,
|
||||
"narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=",
|
||||
"lastModified": 1677587185,
|
||||
"narHash": "sha256-zYT66MAYwctAQqI5VBw3LbBXiSKdB8vuMAqCGG8onbE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d",
|
||||
"rev": "68196a61c26748d3e53a6803de3d2f8c69f27831",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -560,11 +560,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1678199120,
|
||||
"narHash": "sha256-G8z2A1NvywTOATMTvx+FPxMf4PC91p0Z7fONx5PYW+4=",
|
||||
"lastModified": 1677587269,
|
||||
"narHash": "sha256-5wSIpApcKSQP5Rl6lB5SBPZgPUgqyC7G/dHYbWmkn40=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "ecc32c2f8517576b26060915bcb0cdb00cafd060",
|
||||
"rev": "7f01ae877dfd26277a52630c9e40724db23ff8fc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -603,11 +603,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678264398,
|
||||
"narHash": "sha256-COgbuQH/oAQZUBFTTQgSifabzZ5/GRCCbBIqZJjR3s0=",
|
||||
"lastModified": 1677594933,
|
||||
"narHash": "sha256-qUoODrgbHRDKcg5r1Wsck01zIsJyKi/G4R2YAQafXPQ=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "00e9e9cd46600d68dd98a392025d4894c3711b58",
|
||||
"rev": "27018a9084006b8371b1f833882adfb85bd23004",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -690,11 +690,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678325558,
|
||||
"narHash": "sha256-TYuMGs3SqDn7RDuPPa8t7nAE+Ml3GFoN5m96zkRwaS8=",
|
||||
"lastModified": 1676381420,
|
||||
"narHash": "sha256-aDRnfGrk/xi7zkuterN78p8/wdM5Iy6vz74uqd/JFWw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "15ddd83dc3c50484633944984848a30be1d2dbf6",
|
||||
"rev": "4640199aeafcbb63cfbe8318bdf06f4402134f66",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
17
flake.nix
17
flake.nix
|
|
@ -56,8 +56,9 @@
|
|||
scripts.url = "git+https://git.sr.ht/~thatonelutenist/Scripts?ref=trunk";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, sops-nix
|
||||
, home-manager, darwin, nixos-generators, wsl, nix-on-droid, ... }@inputs:
|
||||
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:
|
||||
let
|
||||
makeNixosSystem =
|
||||
{ system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }:
|
||||
|
|
@ -214,22 +215,22 @@
|
|||
# Special handling for discord, as it's unfree _and_ insecure!
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [ "electron-16.2.3" ];
|
||||
permittedInsecurePackages = [ "electron-13.6.9" ];
|
||||
};
|
||||
};
|
||||
in {
|
||||
packages = flake-utils.lib.flattenTree {
|
||||
discordWayland = pkgs.callPackage ./packages/discord/default.nix rec {
|
||||
pname = "discord-electron";
|
||||
binaryName = "DiscordCanary";
|
||||
binaryName = "Discord";
|
||||
desktopName = "Discord (Wayland)";
|
||||
version = "0.0.149";
|
||||
version = "0.0.22";
|
||||
src = pkgs.fetchurl {
|
||||
url =
|
||||
"https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY=";
|
||||
"https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c=";
|
||||
};
|
||||
electron = pkgs.electron_22;
|
||||
electron = pkgs.electron_13;
|
||||
};
|
||||
swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -68,14 +68,7 @@ with nLib; {
|
|||
})
|
||||
# JavaScript/TypeScript Development
|
||||
(mkIf devel.js {
|
||||
home.packages = with unstable;
|
||||
with nodePackages; [
|
||||
nodejs
|
||||
yarn
|
||||
typescript
|
||||
deno
|
||||
vscode-langservers-extracted
|
||||
];
|
||||
home.packages = with pkgs; [ nodejs yarn nodePackages.typescript deno ];
|
||||
})
|
||||
# Raku Development
|
||||
(mkIf devel.raku { home.packages = with pkgs; [ rakudo zef ]; })
|
||||
|
|
|
|||
|
|
@ -53,6 +53,15 @@
|
|||
${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)";
|
||||
|
|
@ -62,9 +71,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
|
||||
|
|
@ -75,16 +84,21 @@
|
|||
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
|
||||
];
|
||||
|
|
|
|||
|
|
@ -75,7 +75,4 @@
|
|||
locations."/" = { proxyPass = "http://localhost:3000"; };
|
||||
};
|
||||
|
||||
# Update later than everyone else, since this one hosts our updates
|
||||
system.autoUpgrade.dates = "6:00";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,9 +126,6 @@
|
|||
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 = {
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ with lib; {
|
|||
enable = true;
|
||||
allowReboot = true;
|
||||
# Update from the flake
|
||||
flake = "git+https://git.stranger.systems/nix/System";
|
||||
flake = "git+https://git.sr.ht/~thatonelutenist/system-flake?ref=trunk";
|
||||
# Attempt to update daily at 2AM
|
||||
dates = lib.mkDefault "2:00";
|
||||
dates = "2:00";
|
||||
};
|
||||
})
|
||||
# Systemd user service cludge
|
||||
|
|
|
|||
Loading…
Reference in New Issue