Compare commits

..

No commits in common. "4fb097041844901f37f8f892bb047b5686097dba" and "d7cdd2a2b3950f8ae0f6bcbc8124a736c2e18053" have entirely different histories.

4 changed files with 9 additions and 10 deletions

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669320964, "lastModified": 1668087632,
"narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=", "narHash": "sha256-T/cUx44aYDuLMFfaiVpMdTjL4kpG7bh0VkN6JEM78/E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877", "rev": "5f588eb4a958f1a526ed8da02d6ea1bea0047b9f",
"type": "github" "type": "github"
}, },
"original": { "original": {

@ -16,7 +16,6 @@
./spacenav.nix ./spacenav.nix
./nvim05.nix ./nvim05.nix
./nm-restart.nix ./nm-restart.nix
./tailscale.nix
]; ];
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
@ -108,10 +107,6 @@
services.openssh.forwardX11 = true; services.openssh.forwardX11 = true;
fileSystems."/mnt/aplysia".device = pkgs.lib.mkOverride 10 "//aplysia.auroch-boa.ts.net/export";
time.timeZone = pkgs.lib.mkOverride 10 "US/Pacific";
# nixpkgs.config.packageOverrides = super: let self = super.pkgs; in { # nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
# mesa_drivers = self.mesaDarwinOr ( # mesa_drivers = self.mesaDarwinOr (
# let mo = self.mesa_noglu.override { # let mo = self.mesa_noglu.override {
@ -145,6 +140,6 @@
ACTION=="add", KERNEL=="i2c-[0-9]*", GROUP="wheel", MODE="666" ACTION=="add", KERNEL=="i2c-[0-9]*", GROUP="wheel", MODE="666"
''; '';
system.stateVersion = "22.11"; system.stateVersion = "21.05";
} }

@ -10,7 +10,7 @@
# jabref # jabref
libreoffice-fresh libreoffice-fresh
# calibre # calibre
# goldendict goldendict
xournal xournal
xournalpp xournalpp

@ -42,6 +42,10 @@
xorg.xlsclients xorg.xlsclients
]; ];
nixpkgs.config.packageOverrides = pkgs: with pkgs; {
firefox = firefox-wayland;
};
# services.dbus.socketActivated = true; # services.dbus.socketActivated = true;
programs.sway = { programs.sway = {