Compare commits
17 Commits
7a10a92621
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| c1ab929c4e | |||
| 087da792de | |||
| 89d91a98de | |||
| 2e0110ad06 | |||
| e875bc8907 | |||
| 9c6c172a27 | |||
| b77f746c39 | |||
| aafb9e5b6f | |||
| 5f090fee23 | |||
| 1f30f51625 | |||
| de51bbadaa | |||
| 3f5a598f0b | |||
| d43e89900b | |||
| 24872e5e71 | |||
| 74f3632834 | |||
| 58c066387a | |||
| bb17f24446 |
60
flake.lock
generated
60
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749105467,
|
||||
"narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
|
||||
"lastModified": 1762286984,
|
||||
"narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
|
||||
"owner": "serokell",
|
||||
"repo": "deploy-rs",
|
||||
"rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
|
||||
"rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -112,11 +112,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752373701,
|
||||
"narHash": "sha256-d0d7y9gjv9HU0Amws6kHJucR8bxrQ0PfVKxt2ll5cfs=",
|
||||
"lastModified": 1762458864,
|
||||
"narHash": "sha256-O8NI0pOf1GxPaBRhyspWZmtXLo0tzEEvOfMxNh3/8Jo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "fc25398450cdab61af9654928dfef9d101f51140",
|
||||
"rev": "f35d0cb75f0669ac8de18d774b336d3d3560bcde",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -153,7 +153,7 @@
|
||||
"narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
|
||||
"rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -168,11 +168,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742486781,
|
||||
"narHash": "sha256-Q0JINFp8mtpkbvODO2arZJUONfXhYBu8O4oGqUjso2A=",
|
||||
"lastModified": 1757014957,
|
||||
"narHash": "sha256-iPw1uXPUb4mPSZ/Uneop+1veSN5fEYCrsJwq71zLADs=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "14454885f19e63584cc3ce557e97488541f15883",
|
||||
"revCount": 77,
|
||||
"rev": "71bb31643363b4a42948505d41f4e1c83a21c868",
|
||||
"revCount": 88,
|
||||
"type": "git",
|
||||
"url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
|
||||
},
|
||||
@@ -190,11 +190,11 @@
|
||||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752278584,
|
||||
"narHash": "sha256-QaT8PpCR1IaUMa12ou2MlvNCzYVWgTQfVWJGXyFvY5c=",
|
||||
"lastModified": 1762200934,
|
||||
"narHash": "sha256-Bv4ZKRPsIc6W7qF1I2fevxFETqRNuG3XOsiRIfJ7YlQ=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "f30ae9b9e740116d044935c9c0c68bd1c2ce8432",
|
||||
"rev": "1d05a3c26dbb9d4b1cd644e10713a70d8740cb6a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -210,11 +210,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751313918,
|
||||
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
|
||||
"lastModified": 1762304480,
|
||||
"narHash": "sha256-ikVIPB/ea/BAODk6aksgkup9k2jQdrwr4+ZRXtBgmSs=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
|
||||
"rev": "b8c7ac030211f18bd1f41eae0b815571853db7a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -242,11 +242,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1751984180,
|
||||
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
|
||||
"lastModified": 1762111121,
|
||||
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
|
||||
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -258,11 +258,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1744868846,
|
||||
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
|
||||
"lastModified": 1760596604,
|
||||
"narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
|
||||
"rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -289,11 +289,11 @@
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751606940,
|
||||
"narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
|
||||
"lastModified": 1760998189,
|
||||
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
|
||||
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -305,11 +305,11 @@
|
||||
"spectrum": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751265943,
|
||||
"narHash": "sha256-XoHSo6GEElzRUOYAEg/jlh5c8TDsyDESFIux3nU/NMc=",
|
||||
"lastModified": 1759482047,
|
||||
"narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "37c8663fab86fdb202fece339ef7ac7177ffc201",
|
||||
"revCount": 904,
|
||||
"rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9",
|
||||
"revCount": 996,
|
||||
"type": "git",
|
||||
"url": "https://spectrum-os.org/git/spectrum"
|
||||
},
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
overlays.emacs
|
||||
])
|
||||
modules.home-manager-darwin
|
||||
lix-module.nixosModules.default
|
||||
# lix-module.nixosModules.default
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -116,10 +116,10 @@
|
||||
};
|
||||
};
|
||||
# This is highly advised, and will prevent many possible mistakes
|
||||
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
|
||||
# checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
|
||||
|
||||
hydraJobs = {
|
||||
inherit (me-emacs) packages;
|
||||
# inherit (me-emacs) packages;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,4 +2,5 @@
|
||||
boot.binfmt.emulatedSystems = [
|
||||
"riscv64-linux"
|
||||
];
|
||||
boot.binfmt.preferStaticEmulators = true;
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ in {
|
||||
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
package = pkgs.nextcloud31;
|
||||
package = pkgs.nextcloud32;
|
||||
hostName = "localhost";
|
||||
settings = {
|
||||
trusted_domains = [
|
||||
@@ -22,8 +22,7 @@ in {
|
||||
];
|
||||
|
||||
trusted_proxies = [
|
||||
"cloud.crompton.cc"
|
||||
"nextcloud.syzygial.cc"
|
||||
"127.0.0.1"
|
||||
];
|
||||
|
||||
overwriteprotocol = "https";
|
||||
|
||||
@@ -18,7 +18,8 @@ in {
|
||||
};
|
||||
|
||||
systemd.services.tandoor-recipes = {
|
||||
environment.GUNICORN_MEDIA = lib.mkForce null;
|
||||
# https://github.com/TandoorRecipes/recipes/issues/3617
|
||||
environment.GUNICORN_MEDIA = "1"; #lib.mkForce null;
|
||||
serviceConfig = {
|
||||
EnvironmentFile = config.sops.secrets.tandoor-pass.path;
|
||||
};
|
||||
|
||||
@@ -59,9 +59,7 @@ in
|
||||
services.emacs = {
|
||||
# Emacsclient behaving weirdly
|
||||
# enable = true;
|
||||
package = pkgs.me-emacs.override {
|
||||
withNativeCompilation = false;
|
||||
};
|
||||
package = pkgs.me-emacs;
|
||||
};
|
||||
|
||||
environment.variables = {
|
||||
@@ -146,9 +144,7 @@ in
|
||||
];
|
||||
|
||||
environment.systemPackages = (with pkgs; [
|
||||
(me-emacs.override {
|
||||
withNativeCompilation = false;
|
||||
})
|
||||
me-emacs
|
||||
svgbob
|
||||
(aspellWithDicts (p: with p;[
|
||||
en
|
||||
@@ -224,4 +220,5 @@ in
|
||||
# Used for backwards compatibility, please read the changelog before changing.
|
||||
# $ darwin-rebuild changelog
|
||||
system.stateVersion = 4;
|
||||
system.primaryUser = "universelaptop";
|
||||
}
|
||||
|
||||
@@ -34,6 +34,9 @@
|
||||
|
||||
# ccache, y'know for blenders and whatnots
|
||||
./ccache.nix
|
||||
|
||||
# So we can run riscv 'natively'
|
||||
./riscv.nix
|
||||
];
|
||||
|
||||
fileSystems."/home/universe/tmp" = {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
./audio.nix
|
||||
./graphics.nix
|
||||
# ./dwl.nix # Sadly, nVidia seems to be too broken too often on wayland
|
||||
./dwm.nix
|
||||
./dwm.nix
|
||||
# ./niri.nix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -91,8 +91,8 @@ in {
|
||||
# Recommended by upstream, required for screencast support
|
||||
# https://github.com/YaLTeR/niri/wiki/Important-Software#portals
|
||||
extraPortals = [
|
||||
#pkgs.xdg-desktop-portal-gnome
|
||||
#pkgs.xdg-desktop-portal-gtk
|
||||
pkgs.xdg-desktop-portal-gnome
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
|
||||
wlr.enable = true;
|
||||
|
||||
@@ -41,6 +41,16 @@
|
||||
enable = true;
|
||||
background = "#000000";
|
||||
};
|
||||
services.xserver.config = lib.mkAfter ''
|
||||
Section "InputClass"
|
||||
Identifier "joystick catchall"
|
||||
MatchIsJoystick "on"
|
||||
MatchDevicePath "/dev/input/event*"
|
||||
Driver "joystick"
|
||||
Option "StartKeysEnabled" "False"
|
||||
Option "StartMouseEnabled" "False"
|
||||
EndSection
|
||||
'';
|
||||
environment.sessionVariables = {
|
||||
GTK_THEME="Adwaita-dark";
|
||||
};
|
||||
|
||||
@@ -1,7 +1,106 @@
|
||||
{ config, pkgs, lib, ... }: {
|
||||
{ config, pkgs, lib, ... }: let
|
||||
launch_emacs = pkgs.writeScript "emacsclient-or-start" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
emacsclient --create-frame --alternate-editor=""
|
||||
'';
|
||||
in {
|
||||
imports = [
|
||||
./wayland.nix
|
||||
];
|
||||
|
||||
programs.niri.enable = true;
|
||||
services.displayManager.sessionPackages = [ pkgs.dwl ];
|
||||
#services.gnome.gnome-keyring.enable = lib.mkDefault true;
|
||||
systemd.packages = [ pkgs.dwl ];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
wlroots_0_19 = prev.wlroots_0_18.overrideAttrs (old: {
|
||||
src = final.fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = "d305934ebe6852785a1f425ee96861f0b7280d76"; # 0.19-prev # 25-01-25
|
||||
hash = "sha256-NnPSC5p/phTFe+nWp9vl8LUbmBO/RXSSUuDZ2boucXY=";
|
||||
};
|
||||
});
|
||||
dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let
|
||||
dwl-patches = pkgs.fetchgit {
|
||||
url = "https://codeberg.org/dwl/dwl-patches.git";
|
||||
rev = "4a869141fa643d9be792a9aa44a42cf7f7f882ad";
|
||||
hash = "sha256-xlaK9xMrc+KDNecsyByRIxXmPEZ2dmP4FQ0bMojsyws=";
|
||||
};
|
||||
patches = let
|
||||
dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch";
|
||||
in [
|
||||
(dwl-patch "ipc")
|
||||
(dwl-patch "restore-monitor")
|
||||
(dwl-patch "regexrules")
|
||||
(dwl-patch "autostart")
|
||||
];
|
||||
in {
|
||||
version = "21-09-2024";
|
||||
|
||||
src = final.fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dwl";
|
||||
repo = "dwl";
|
||||
rev = "d1c2f434983562bd7d2ace15ab0c05155be603bc";
|
||||
hash = "sha256-SpfjQfzvbpDiihziyKGPoBwvp3evgCQQhhjldAE/MwY=";
|
||||
};
|
||||
|
||||
patches = (old.patches or []) ++ patches;
|
||||
postPatch = (old.postPatch or "") + ''
|
||||
export termcmd=${pkgs.foot}/bin/foot
|
||||
export editcmd=${launch_emacs}
|
||||
export menucmd=${pkgs.fuzzel}/bin/fuzzel
|
||||
export barcmd=${pkgs.waybar}/bin/waybar
|
||||
export playcmd=${pkgs.writeScript "playerctl-play-pause" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
${pkgs.playerctl}/bin/playerctl play-pause
|
||||
''}
|
||||
export scrncmd=${pkgs.writeScript "screenshot-region" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
${pkgs.slurp}/bin/slurp | ${pkgs.grim}/bin/grim -g - - | ${pkgs.wl-clipboard}/bin/wl-copy
|
||||
''}
|
||||
substituteAll ${./dwl/config.def.h} ./config.def.h
|
||||
'';
|
||||
postInstall = ''
|
||||
chmod ugo+x $out/share/wayland-sessions/dwl.desktop
|
||||
'';
|
||||
passthru.providedSessions = ["dwl"];
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
security = {
|
||||
polkit.enable = true;
|
||||
pam.services.swaylock = { };
|
||||
};
|
||||
|
||||
services.graphical-desktop.enable = true;
|
||||
|
||||
services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
dwl
|
||||
waybar
|
||||
foot
|
||||
pwvucontrol
|
||||
];
|
||||
}
|
||||
{ config, pkgs, lib, ... }: {
|
||||
programs.niri.enable = true;
|
||||
|
||||
environment.sessionVariables = {
|
||||
# Breaks WebCord
|
||||
# NIXOS_OZONE_WL=1;
|
||||
WLR_NO_HARDWARE_CURSORS=1;
|
||||
SDL_VIDEODRIVER="wayland";
|
||||
QT_QPA_PLATFORM="wayland-egl";
|
||||
QT_WAYLAND_DISABLE_WINDOW_DECORATIONS="1";
|
||||
__JAVA_AWT_WM_NONREPARENTING=1;
|
||||
GTK_THEME="Adwaita-dark";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -55,20 +55,20 @@
|
||||
blender_cuda = prev.blender.override {
|
||||
cudaSupport = true;
|
||||
};
|
||||
blender = final.blender_cuda.withPackages (p: with p; [
|
||||
# OpenCAMLib support
|
||||
shapely
|
||||
equation
|
||||
opencamlib
|
||||
# NeuroMorphoVis support
|
||||
matplotlib
|
||||
seaborn
|
||||
pandas
|
||||
pillow
|
||||
h5py
|
||||
morphio
|
||||
# TODO add BluePy support?
|
||||
]);
|
||||
# blender = final.blender_cuda.withPackages (p: with p; [
|
||||
# # OpenCAMLib support
|
||||
# shapely
|
||||
# equation
|
||||
# opencamlib
|
||||
# # NeuroMorphoVis support
|
||||
# matplotlib
|
||||
# seaborn
|
||||
# pandas
|
||||
# pillow
|
||||
# h5py
|
||||
# morphio
|
||||
# # TODO add BluePy support?
|
||||
# ]);
|
||||
# Update RX and Aseprite
|
||||
rx = prev.rx.overrideAttrs (old: {
|
||||
version = "git";
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.wlr.enable = true;
|
||||
xdg.portal.config.common.default = "*";
|
||||
# On X11: Steam requires a compositor for BigPicture
|
||||
programs.steam.enable = true;
|
||||
# Game compat
|
||||
programs.gamemode.enable = true;
|
||||
|
||||
6
machines/universedesktop/riscv.nix
Normal file
6
machines/universedesktop/riscv.nix
Normal file
@@ -0,0 +1,6 @@
|
||||
{ config, pkgs, lib, ... }: {
|
||||
boot.binfmt.emulatedSystems = [
|
||||
"riscv64-linux"
|
||||
];
|
||||
boot.binfmt.preferStaticEmulators = true;
|
||||
}
|
||||
Reference in New Issue
Block a user