Syzygial/NixMachines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Syzygial:f32f66b09cc708d5518ca568901c5d3ece840192
Branches Tags
Syzygial:main
...
compare: Syzygial:47eaf75bfba39ceda8d79e8dcd8df6f266c3c3eb
Branches Tags
Syzygial:main

5 Commits
f32f66b09c ... 47eaf75bfb

Author SHA1 Message Date
David Crompton
47eaf75bfb Fixup displaymanger format 2024-05-04 16:23:27 -04:00
David Crompton
b9fbcb5864 Move Desktop things to Desktop.nix 2024-05-04 16:20:05 -04:00
David Crompton
683f19d596 Cleanup Overlays 2024-05-04 16:13:09 -04:00
David Crompton
e9f36c71ce Emacs New Overlay 2024-05-04 16:10:00 -04:00
David Crompton
cd235b33c4 flake.lock: Update 
Flake lock file updates:

• Updated input 'me-emacs':
    'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=d3452d3f0a30162a8acdf11f452ac0ef3a3f5670' (2024-01-29)
  → 'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=116b93e52a97d4922f086b004fa9e8043ba8931c' (2024-05-04)
 2024-05-04 15:58:41 -04:00
7 changed files with 79 additions and 128 deletions
Expand all files Collapse all files

8
flake.lock generated
View File

@@ -88,11 +88,11 @@
]
},
"locked": {
"lastModified": 1706555256,
"narHash": "sha256-nBLS68TsIbwd04oQRISqk/xaehZYWzGNDmdBOWpKWXw=",
"lastModified": 1714853356,
"narHash": "sha256-2I7uFSeTAF0b8MU+Apb2JoczlAYmEAxj+ke/eWe1boA=",
"ref": "refs/heads/master",
"rev": "d3452d3f0a30162a8acdf11f452ac0ef3a3f5670",
"revCount": 46,
"rev": "a25078b1c1afd3fd887042ac8187bd9b300a6e83",
"revCount": 51,
"type": "git",
"url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
},

71
flake.nix
View File

@@ -11,58 +11,43 @@
};
outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@attrs: let
hydraGitea = (final: prev: {
hydra_unstable = prev.hydra_unstable.overrideAttrs
(old: {
doCheck = false;
patches = [
(final.fetchpatch {
name = "hydra-gitea-push-patch";
url = "https://patch-diff.githubusercontent.com/raw/NixOS/hydra/pull/1227.patch";
sha256 = "A4dN/4zLMKLYaD38lu87lzAWH/3EUM7G5njx7Q4W47w=";
})
];
});
});
nvidiaContainer = import ./nvidiacontainer-overlay.nix nixpkgs;
hydraGitea = import ./overlays/hydra.nix;
nvidiaContainer = import ./overlays/nvidiacontainer.nix nixpkgs;
me-emacs-overlay = me-emacs.overlays.default;
# Configuration for `nixpkgs`
nixpkgsConfig = {
config = { allowUnfree = true; };
};
me-emacs-overlay = (final: prev: {
me-emacs = me-emacs.packages."x86_64-linux".emacs;
# Will in future be macports based
mac-emacs = me-emacs.packages."aarch64-darwin".emacs;
});
pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux";
pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux";
in {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = attrs;
modules =
[
({ config, pkgs, ... }: {
nixpkgs.overlays = [ hydraGitea nvidiaContainer ];
})
./machines/hippocampus/configuration.nix
sops-nix.nixosModules.sops
];
};
nixosConfigurations.universedesktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = attrs;
modules =
[
({ config, pkgs, ... }: {
nixpkgs.overlays = [ me-emacs-overlay ];
})
./machines/universedesktop/configuration.nix
sops-nix.nixosModules.sops
];
nixosConfigurations = {
nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = attrs;
modules =
[
({ config, pkgs, ... }: {
nixpkgs.overlays = [ hydraGitea nvidiaContainer ];
})
./machines/hippocampus/configuration.nix
sops-nix.nixosModules.sops
];
};
universedesktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = attrs;
modules =
[
({ config, pkgs, ... }: {
nixpkgs.overlays = [ me-emacs-overlay ];
})
./machines/universedesktop/configuration.nix
sops-nix.nixosModules.sops
];
};
};
darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";

5
machines/universeair/configuration.nix
View File

@@ -52,11 +52,12 @@ in
services.emacs = {
# Emacsclient behaving weirdly
# enable = true;
package = pkgs.mac-emacs;
package = pkgs.me-emacs;
};
environment.variables = {
EDITOR = "emacs";
EDITOR = "emacs -nw";
VISUAL = "emacs";
};
environment.systemPackages = (with pkgs; [

80
machines/universedesktop/configuration.nix
View File

@@ -82,71 +82,6 @@
users.users.brltty.isSystemUser = true;
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the GNOME Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
programs.xwayland.enable = true;
# Configure keymap in X11
services.xserver.layout = "us";
# services.xserver.xkbOptions = "grp:switch";
# services.xserver.extraLayouts = {
# bqn = {
# description = "BQN Symbol Modifiers";
# languages = ["eng"];
# symbolsFile = pkgs.fetchurl {
# url = "https://raw.githubusercontent.com/mlochbaum/BQN/master/editors/bqn";
# sha256 = "F2fgLlWghcOrMu0BXGiyNHa0qh9YUyQE80GK0BWU2EY=";
# };
# };
# };
# # services.xserver.xkbOptions = {
# };
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound.
#sound.enable = true;
#hardware.pulseaudio.enable = true;
# rtkit is optional but recommended
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
# jack.enable = true;
};
# services.pipewire.extraConfig.pipewire."92-low-latency" = {
# context.properties = {
# default.clock.rate = 48000;
# default.clock.quantum = 32;
# default.clock.min-quantum = 32;
# default.clock.max-quantum = 32;
# };
# context.modules = [
# {
# name = "libpipewire-module-protocol-pulse";
# args = {
# pulse.min.req = "32/48000";
# pulse.default.req = "32/48000";
# pulse.max.req = "32/48000";
# pulse.min.quantum = "32/48000";
# pulse.max.quantum = "32/48000";
# };
# }
# ];
# stream.properties = {
# node.latency = "32/48000";
# resample.quality = 1;
# };
# };
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
users.groups.net = {};
@@ -172,20 +107,7 @@
nixpkgs.config.allowUnfree = true;
services.xserver.videoDrivers = [ "nvidia" ];
# Wayland support
hardware = {
opengl.enable = true;
opengl.driSupport = true;
opengl.driSupport32Bit = true;
nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
open = false;
};
};
services.fwupd.enable = true;
programs.adb.enable = true;

30
machines/universedesktop/programs/desktop.nix
View File

@@ -9,6 +9,36 @@
};
})];
# Wayland support
hardware = {
opengl.enable = true;
opengl.driSupport = true;
opengl.driSupport32Bit = true;
nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
open = false;
};
};
services.xserver.enable = true;
services.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
programs.xwayland.enable = true;
# Configure keymap in X11
services.xserver.xkb.layout = "us";
# Enable sound.
# rtkit is optional but recommended
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
# jack.enable = true;
};
# Bitwarden Outdaed Nodejs
nixpkgs.config.permittedInsecurePackages = [
"openssl-1.1.1v"

13
overlays/hydra.nix Normal file
View File

@@ -0,0 +1,13 @@
(final: prev: {
hydra_unstable = prev.hydra_unstable.overrideAttrs
(old: {
doCheck = false;
patches = [
(final.fetchpatch {
name = "hydra-gitea-push-patch";
url = "https://patch-diff.githubusercontent.com/raw/NixOS/hydra/pull/1227.patch";
sha256 = "A4dN/4zLMKLYaD38lu87lzAWH/3EUM7G5njx7Q4W47w=";
})
];
});
});

0
nvidiacontainer-overlay.nix → overlays/nvidiacontainer.nix
View File