nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:9508c7391abbdcdb882c63019dde26add02b0eb1
Branches Tags
nix:trunk
..
compare: nix:82e38f62f02e2b07a3dce4e4913cc12dfe5945ba
Branches Tags
nix:trunk

No commits in common. "9508c7391abbdcdb882c63019dde26add02b0eb1" and "82e38f62f02e2b07a3dce4e4913cc12dfe5945ba" have entirely different histories.
9508c7391a ... 82e38f62f0

7 changed files with 72 additions and 70 deletions
Show Stats Expand all files Collapse all files

84
flake.lock
View File

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

17
flake.nix
View File

@ -56,8 +56,9 @@
scripts.url = "git+https://git.sr.ht/~thatonelutenist/Scripts?ref=trunk"; scripts.url = "git+https://git.sr.ht/~thatonelutenist/Scripts?ref=trunk";
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, sops-nix outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixos-hardware
, home-manager, darwin, nixos-generators, wsl, nix-on-droid, ... }@inputs: , fenix, emacs, sops-nix, home-manager, darwin, java, quilt-server
, nixos-generators, wsl, nix-on-droid, idris2, scripts }@inputs:
let let
makeNixosSystem = makeNixosSystem =
{ system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }: { system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }:
@ -214,22 +215,22 @@
# Special handling for discord, as it's unfree _and_ insecure! # Special handling for discord, as it's unfree _and_ insecure!
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ "electron-16.2.3" ]; permittedInsecurePackages = [ "electron-13.6.9" ];
}; };
}; };
in { in {
packages = flake-utils.lib.flattenTree { packages = flake-utils.lib.flattenTree {
discordWayland = pkgs.callPackage ./packages/discord/default.nix rec { discordWayland = pkgs.callPackage ./packages/discord/default.nix rec {
pname = "discord-electron"; pname = "discord-electron";
binaryName = "DiscordCanary"; binaryName = "Discord";
desktopName = "Discord (Wayland)"; desktopName = "Discord (Wayland)";
version = "0.0.149"; version = "0.0.22";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = url =
"https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY="; hash = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c=";
}; };
electron = pkgs.electron_22; electron = pkgs.electron_13;
}; };
swayimg = pkgs.callPackage ./packages/swayimg/default.nix { }; swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
}; };

9
home-manager/common/programs/devel.nix
View File

@ -68,14 +68,7 @@ with nLib; {
}) })
# JavaScript/TypeScript Development # JavaScript/TypeScript Development
(mkIf devel.js { (mkIf devel.js {
home.packages = with unstable; home.packages = with pkgs; [ nodejs yarn nodePackages.typescript deno ];
with nodePackages; [
nodejs
yarn
typescript
deno
vscode-langservers-extracted
];
}) })
# Raku Development # Raku Development
(mkIf devel.raku { home.packages = with pkgs; [ rakudo zef ]; }) (mkIf devel.raku { home.packages = with pkgs; [ rakudo zef ]; })

22
home-manager/linux/programs/communications.nix
View File

@ -53,6 +53,15 @@
${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://app.cinny.in"''; ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://app.cinny.in"'';
terminal = false; 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 { messagesItem = pkgs.makeDesktopItem {
name = "messages"; name = "messages";
desktopName = "Messages (Chromium)"; desktopName = "Messages (Chromium)";
@ -62,9 +71,9 @@
}; };
in [ in [
# Discord # Discord
inputs.self.packages.${pkgs.system}.discordWayland # inputs.self.packages.${pkgs.system}.discordWayland
betterdiscordctl # betterdiscordctl
# discordItem discordItem
# Desktop matrix client # Desktop matrix client
(enableWayland element-desktop "element-desktop") (enableWayland element-desktop "element-desktop")
# Desktop signal client # Desktop signal client
@ -75,16 +84,21 @@
tdesktop tdesktop
# Desktop mastodon client # Desktop mastodon client
# TODO: Reenable when unbroken on unstable # TODO: Reenable when unbroken on unstable
tootle # tootle
# zulip # zulip
unstable.zulip unstable.zulip
zulipWayland zulipWayland
# Zoom (for work, sadly)
unstable.zoom-us
# Teams (also for work)
unstable.teams
# Cinny for pretty matrix # Cinny for pretty matrix
cinnyItem cinnyItem
# chromium # chromium
(enableWayland chromium "chromium") (enableWayland chromium "chromium")
# Wayland workaround packages # Wayland workaround packages
fbChromeDesktopItem fbChromeDesktopItem
teamsItem
# Messages # Messages
messagesItem messagesItem
]; ];

3
machines/fusion/configuration.nix
View File

@ -75,7 +75,4 @@
locations."/" = { proxyPass = "http://localhost:3000"; }; locations."/" = { proxyPass = "http://localhost:3000"; };
}; };
# Update later than everyone else, since this one hosts our updates
system.autoUpgrade.dates = "6:00";
} }

3
machines/matrix/configuration.nix
View File

@ -126,9 +126,6 @@
startAt = "*-*-* 4:00:00"; startAt = "*-*-* 4:00:00";
}; };
# Install our utilties
environment.systemPackages = with pkgs; [ matrix-synapse-tools.synadm ];
# Setup a task to cleanup the database # Setup a task to cleanup the database
systemd.services.synapse-db-cleanup = { systemd.services.synapse-db-cleanup = {
serviceConfig = { serviceConfig = {

4
modules/linux/linux/base.nix
View File

@ -39,9 +39,9 @@ with lib; {
enable = true; enable = true;
allowReboot = true; allowReboot = true;
# Update from the flake # 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 # Attempt to update daily at 2AM
dates = lib.mkDefault "2:00"; dates = "2:00";
}; };
}) })
# Systemd user service cludge # Systemd user service cludge