Compare commits

...

11 Commits

Author SHA1 Message Date
c1ab929c4e Disable hydra/checks 2025-11-10 10:43:19 -05:00
087da792de hippocampus: Nextcloud 31 -> 32 2025-11-06 16:03:38 -05:00
89d91a98de flake.lock: Update
Flake lock file updates:

• Updated input 'deploy-rs':
    'github:serokell/deploy-rs/6bc76b872374845ba9d645a2f012b764fecd765f' (2025-06-05)
  → 'github:serokell/deploy-rs/9c870f63e28ec1e83305f7f6cb73c941e699f74f' (2025-11-04)
• Updated input 'home-manager':
    'github:nix-community/home-manager/e4bf85da687027cfc4a8853ca11b6b86ce41d732' (2025-07-21)
  → 'github:nix-community/home-manager/f35d0cb75f0669ac8de18d774b336d3d3560bcde' (2025-11-06)
• Updated input 'lix-module':
    'b90bf629bb.tar.gz?narHash=sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7%2Bb8%3D' (2025-01-18)
  → 'b90bf629bb.tar.gz?narHash=sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7%2Bb8%3D&rev=b90bf629bbd835e61f1317b99e12f8c831017006' (2025-01-18)
• Updated input 'me-emacs':
    'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=14454885f19e63584cc3ce557e97488541f15883' (2025-03-20)
  → 'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=71bb31643363b4a42948505d41f4e1c83a21c868' (2025-09-04)
• Updated input 'microvm':
    'github:astro/microvm.nix/5e193f2c5cf9285f2b478ebd55bb1feebb5abdbf' (2025-07-21)
  → 'github:astro/microvm.nix/1d05a3c26dbb9d4b1cd644e10713a70d8740cb6a' (2025-11-03)
• Updated input 'microvm/spectrum':
    'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=37c8663fab86fdb202fece339ef7ac7177ffc201' (2025-06-30)
  → 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=c5d5786d3dc938af0b279c542d1e43bce381b4b9' (2025-10-03)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/e04a388232d9a6ba56967ce5b53a8a6f713cdfcf' (2025-06-30)
  → 'github:LnL7/nix-darwin/b8c7ac030211f18bd1f41eae0b815571853db7a2' (2025-11-05)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c87b95e25065c028d31a94f06a62927d18763fdf' (2025-07-19)
  → 'github:NixOS/nixpkgs/b3d51a0365f6695e7dd5cdf3e180604530ed33b4' (2025-11-02)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/2c8def626f54708a9c38a5861866660395bb3461' (2025-07-15)
  → 'github:Mic92/sops-nix/5a7d18b5c55642df5c432aadb757140edfeb70b3' (2025-10-20)
• Updated input 'sops-nix/nixpkgs':
    'github:NixOS/nixpkgs/ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c' (2025-04-17)
  → 'github:NixOS/nixpkgs/3cbe716e2346710d6e1f7c559363d14e11c32a43' (2025-10-16)
2025-11-06 15:38:52 -05:00
2e0110ad06 hippocampus: fix nextcloud trusted_proxies 2025-11-06 15:34:55 -05:00
e875bc8907 Merge branch 'main' of https://git.syzygial.cc/Syzygial/NixMachines 2025-10-03 14:49:49 -04:00
9c6c172a27 universedesktop: steam comment 2025-09-25 22:59:02 -04:00
b77f746c39 universedesktop: niri progress 2025-09-25 22:58:18 -04:00
aafb9e5b6f universeair: remove ppsp 2025-09-03 15:50:27 -04:00
5f090fee23 universeair: emacs: remove override 2025-09-03 15:49:52 -04:00
1f30f51625 Merge branch 'main' of https://git.syzygial.cc/Syzygial/NixMachines 2025-09-03 15:44:01 -04:00
de51bbadaa universeair: update darwin deps & stats 2025-09-03 15:43:54 -04:00
8 changed files with 144 additions and 47 deletions

60
flake.lock generated
View File

@@ -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": 1753132348,
"narHash": "sha256-0i3jU9AHuNXb0wYGzImnVwaw+miE0yW13qfjC0F+fIE=",
"lastModified": 1762458864,
"narHash": "sha256-O8NI0pOf1GxPaBRhyspWZmtXLo0tzEEvOfMxNh3/8Jo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e4bf85da687027cfc4a8853ca11b6b86ce41d732",
"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": 1753137325,
"narHash": "sha256-IBqQyEkphl2/a4IHqgnguQGGEA8lAzgB2QLgAQYXHP8=",
"lastModified": 1762200934,
"narHash": "sha256-Bv4ZKRPsIc6W7qF1I2fevxFETqRNuG3XOsiRIfJ7YlQ=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "5e193f2c5cf9285f2b478ebd55bb1feebb5abdbf",
"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": 1752950548,
"narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
"lastModified": 1762111121,
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
"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": 1752544651,
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
"lastModified": 1760998189,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "2c8def626f54708a9c38a5861866660395bb3461",
"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"
},

View File

@@ -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;
};
};
}

View File

@@ -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";

View File

@@ -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";
}

View File

@@ -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
];
}

View File

@@ -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;

View File

@@ -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";
};
}

View File

@@ -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;