ludovico
/
dotfiles
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Update!!!

This commit is contained in:
Ludovico 2023-04-01 08:42:36 +10:00
parent 5891eb7063
commit 97d740dc04
No known key found for this signature in database
GPG Key ID: 3911DD276CFE779C
15 changed files with 21 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
flake.lock
View File

@ -41,7 +41,8 @@
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixos"
"digga",
"nixpkgs"
],
"utils": "utils"
},
@ -84,9 +85,7 @@
"digga": {
"inputs": {
"darwin": "darwin",
"deploy": [
"deploy"
],
"deploy": "deploy",
"devshell": "devshell",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
@ -218,22 +217,6 @@
}
},
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1650374568,
@ -384,21 +367,6 @@
}
},
"flake-utils_7": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_8": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@ -867,31 +835,8 @@
"type": "github"
}
},
"nvfetcher": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_7",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1672979485,
"narHash": "sha256-LrY0K1yya3nvRlGDc98wm68ozVj7E6a1EXXEr7eHp8E=",
"owner": "berberman",
"repo": "nvfetcher",
"rev": "0a9ac5fd07b52467d81163b1f8c94c12e5c9aff9",
"type": "github"
},
"original": {
"owner": "berberman",
"repo": "nvfetcher",
"type": "github"
}
},
"root": {
"inputs": {
"deploy": "deploy",
"digga": "digga",
"emacs-overlay": "emacs-overlay",
"flake-compat": "flake-compat_3",
@ -907,7 +852,6 @@
"nixos-wsl": "nixos-wsl",
"nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur",
"nvfetcher": "nvfetcher",
"spicetify-nix": "spicetify-nix",
"stable": "stable",
"swayfx": "swayfx"
@ -956,7 +900,7 @@
},
"spicetify-nix": {
"inputs": {
"flake-utils": "flake-utils_8",
"flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_7",
"spicetify-cli": "spicetify-cli"
},
@ -992,7 +936,7 @@
},
"swayfx": {
"inputs": {
"flake-compat": "flake-compat_7",
"flake-compat": "flake-compat_6",
"nixpkgs": "nixpkgs_8"
},
"locked": {

14
flake.nix
View File

@ -25,7 +25,6 @@
digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.nixlib.follows = "nixos";
digga.inputs.home-manager.follows = "home";
digga.inputs.deploy.follows = "deploy";
home.url = "github:nix-community/home-manager";
home.inputs.nixpkgs.follows = "nixos";
@ -37,15 +36,9 @@
impermanence.url = "github:nix-community/impermanence";
deploy.url = "github:serokell/deploy-rs";
deploy.inputs.nixpkgs.follows = "nixos";
emacs-overlay.url = "github:nix-community/emacs-overlay";
emacs-overlay.inputs.nixpkgs.follows = "nixos";
nvfetcher.url = "github:berberman/nvfetcher";
nvfetcher.inputs.nixpkgs.follows = "nixos";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nixpkgs-wayland.inputs.nixpkgs.follows = "nixos";
@ -68,8 +61,6 @@
impermanence,
nixos-hardware,
nur,
nvfetcher,
deploy,
...
} @ inputs:
digga.lib.mkFlake
@ -97,10 +88,7 @@
our = self.lib;
});
})
nur.overlay
nvfetcher.overlays.default
(import ./pkgs)
];
@ -156,7 +144,5 @@
devshell = ./shell;
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {};
};
}

4
hosts/sforza/default.nix
View File

@ -19,8 +19,8 @@
loader.systemd-boot.configurationLimit = 5;
loader.efi.canTouchEfiVariables = true;
loader.efi.efiSysMountPoint = "/boot";
# kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
kernelPackages = pkgs.linuxPackages_xanmod_latest;
# kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
supportedFilesystems = ["ntfs"];
};

5
hosts/sforza/hardware-configuration.nix
View File

@ -38,6 +38,11 @@
fsType = "vfat";
};
fileSystems."/Stuff" = {
device = "/dev/disk/by-uuid/01D95CE318FF5AE0";
fsType = "ntfs";
};
swapDevices = [
{device = "/dev/disk/by-uuid/a4c8f5c5-6d30-4161-a726-69f57d9d4af5";}
];

2
hosts/sforza/persist.nix
View File

@ -25,7 +25,9 @@
directories = [
"/var/log"
"/var/lib/bluetooth"
"/var/lib/libvirt"
"/var/lib/nixos"
"/var/lib/pipewire"
"/var/lib/systemd/coredump"
"/etc/NetworkManager/system-connections"
"/etc/nixos"

1
overlays/overrides.nix
View File

@ -3,7 +3,6 @@ channels: _final: _prev: {
inherit
(channels.stable)
deploy-rs
cachix
;
}

22
pkgs/_sources/generated.json
View File

@ -1,22 +0,0 @@
{
"manix": {
"cargoLocks": null,
"date": "2021-04-20",
"extract": null,
"name": "manix",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "mlvzk",
"repo": "manix",
"rev": "d08e7ca185445b929f097f8bfb1243a8ef3e10e4",
"sha256": "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=",
"type": "github"
},
"version": "d08e7ca185445b929f097f8bfb1243a8ef3e10e4"
}
}

20
pkgs/_sources/generated.nix
View File

@ -1,20 +0,0 @@
# This file was generated by nvfetcher, please do not modify it manually.
{
fetchgit,
fetchurl,
fetchFromGitHub,
dockerTools,
}: {
manix = {
pname = "manix";
version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
src = fetchFromGitHub {
owner = "mlvzk";
repo = "manix";
rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
fetchSubmodules = false;
sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
};
date = "2021-04-20";
};
}

145
pkgs/albion-online.nix
View File

@ -1,145 +0,0 @@
# src
# https://github.com/SuperPaintman/dotfiles/blob/57484e960e4505e0f486f9134680977bb643fa2f/nixos/pkgs/games/albion-online/default.nix#L16
{
stdenv,
lib,
fetchurl,
unzip,
runtimeShell,
steam-run,
imagemagick,
makeDesktopItem,
}:
stdenv.mkDerivation rec {
pname = "albion-online";
version = "20220719102235";
src = fetchurl {
url = "https://live.albiononline.com/clients/${version}/albion-online-setup";
sha256 = "17bskrxzk35vlxp0y0rr1nf2kan8cmfr6wvfx9izq1m0486bpscj";
};
dontConfigure = true;
dontBuild = true;
dontStrip = true;
dontFixup = true;
nativeBuildInputs = [unzip];
sourceRoot = ".";
unpackPhase = ''
unzip $src || true
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,opt}
cp -r data $out/opt/albion-online
cat <<EOF > $out/bin/.Albion-Online-Launcher
#!${runtimeShell}
set -euo pipefail
if [ "x\$HOME" = "x" ]; then
exit 1
fi
mkdir -p "\$HOME/.local/share/Albion-Online"
chmod 700 "\$HOME/.local/share/Albion-Online"
mkdir -p "\$HOME/.local/share/Albion-Online/launcher"
chmod 700 "\$HOME/.local/share/Albion-Online/launcher"
for f in $out/opt/albion-online/launcher/*; do
if [ "x\$(basename "\$f")" = "xAlbion-Online" ]; then
continue
fi
if [ -e "\$HOME/.local/share/Albion-Online/launcher/\$(basename "\$f")" ]; then
rm "\$HOME/.local/share/Albion-Online/launcher/\$(basename "\$f")"
fi
ln -s "\$f" "\$HOME/.local/share/Albion-Online/launcher/\$(basename "\$f")"
done
# Lancher reads the dirname of this file :(.
if [ ! -f "\$HOME/.local/share/Albion-Online/launcher/Albion-Online" ]; then
cp "$out/opt/albion-online/launcher/Albion-Online" "\$HOME/.local/share/Albion-Online/launcher/Albion-Online"
fi
for name in game_x64 staging_x64; do
mkdir -p "\$HOME/.local/share/Albion-Online/\$name"
chmod 700 "\$HOME/.local/share/Albion-Online/\$name"
done
export QT_QPA_PLATFORM_PLUGIN_PATH="\$HOME/.local/share/Albion-Online/launcher/plugins/platforms"
export QT_PLUGIN_PATH="\$HOME/.local/share/Albion-Online/launcher/plugins/"
export QT_QPA_PLATFORM="xcb;eglfs"
export __GL_GlslUseCollapsedArrays=0
"\$HOME/.local/share/Albion-Online/launcher/Albion-Online" --no-sandbox "$@"
EOF
chmod +x $out/bin/.Albion-Online-Launcher
cat <<EOF > $out/bin/Albion-Online-Launcher
#!${runtimeShell}
export LD_LIBRARY_PATH="$out/opt/albion-online/launcher"
${steam-run}/bin/steam-run "$out/bin/.Albion-Online-Launcher"
EOF
chmod +x $out/bin/Albion-Online-Launcher
cat <<EOF > $out/bin/Albion-Online
#!${runtimeShell}
export LD_LIBRARY_PATH="$out/opt/albion-online/launcher"
${steam-run}/bin/steam-run "\$HOME/.local/share/Albion-Online/game_x64/Albion-Online"
EOF
chmod +x $out/bin/Albion-Online
runHook postInstall
'';
desktopItemGame = makeDesktopItem {
name = "albion-online";
desktopName = "Albion Online";
exec = "@out@/bin/Albion-Online";
icon = "AlbionOnline";
fileValidation = false;
};
desktopItemLauncher = makeDesktopItem {
name = "albion-online-launcher";
desktopName = "Albion Online Launcher";
exec = "@out@/bin/Albion-Online-Launcher";
icon = "AlbionOnline";
fileValidation = false;
};
postInstall = ''
mkdir -p $out/share/{applications,pixmaps}
for d in ${desktopItemGame} ${desktopItemLauncher}; do
install -Dm644 -t $out/share/applications \
$d/share/applications/*
done
for f in $out/share/applications/*; do
substituteInPlace "$f" \
--replace "@out@" "$out"
done
ln -s "$out/opt/albion-online/AlbionOnline.xpm" "$out/share/pixmaps/AlbionOnline.xpm"
for size in 16 24 32 64 128; do
mkdir -p "$out/share/icons/hicolor/''${size}x''${size}/apps"
${imagemagick}/bin/convert \
-resize ''${size}x''${size} \
"$out/opt/albion-online/AlbionOnline.xpm" \
"$out/share/icons/hicolor/''${size}x''${size}/apps/AlbionOnline.png"
done
'';
}

5
pkgs/default.nix
View File

@ -1,11 +1,6 @@
final: prev: {
# keep sources this first
sources = prev.callPackage (import ./_sources/generated.nix) {};
# then, call packages with `final.callPackage`
google-sans = final.callPackage ./google-sans.nix {};
multicolor-sddm-theme = final.callPackage ./multicolor-sddm-theme.nix {};
spotify = final.callPackage ./spotify.nix {};
TLauncher = final.callPackage ./TLauncher {};
albion-online = final.callPackage ./albion-online.nix {};
}

5
pkgs/sources.toml
View File

@ -1,5 +0,0 @@
# nvfetcher.toml
[manix]
src.git = "https://github.com/mlvzk/manix"
fetch.github = "mlvzk/manix"

1
profiles/core/common.nix
View File

@ -21,7 +21,6 @@
git
bottom
jq
manix
moreutils
nix-index
nmap

2
profiles/graphical/games.nix
View File

@ -21,8 +21,8 @@
};
home-manager.users.${config.vars.username} = {
home.packages = with pkgs; [
# inputs.self.packages.${pkgs.system}.albion-online
gamescope
mangohud
inputs.self.packages.${pkgs.system}.TLauncher
];
};

14
profiles/graphical/pipewire.nix
View File

@ -6,17 +6,15 @@
alsa.support32Bit = true;
pulse.enable = true;
wireplumber.enable = true;
# config.pipewire-pulse = {
# "context.exec" = [
# {
# path = "pactl";
# args = "load-module module-switch-on-connect";
# }
# ];
# };
};
environment.etc = {
"pipewire/pipewire-pulse.conf.d/00-autoswitch.conf".text = ''
pulse.cmd = [
{ cmd = "load-module" args = "module-always-sink" flags = [ ] }
{ cmd = "load-module" args = "module-switch-on-connect" }
]
'';
"wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true,

10
shell/devos.nix
View File

@ -1,7 +1,6 @@
{
pkgs,
extraModulesPath,
inputs,
lib,
...
}: let
@ -14,7 +13,6 @@
nodePackages
shfmt
treefmt
nvfetcher-bin
nixos-generators
;
@ -34,13 +32,6 @@ in {
commands =
[
(devos nixUnstable)
{
category = "devos";
name = nvfetcher-bin.pname;
help = nvfetcher-bin.meta.description;
command = "cd $PRJ_ROOT/pkgs; ${nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
}
(formatter treefmt)
]
++ lib.optionals (!pkgs.stdenv.buildPlatform.isi686) [
@ -48,6 +39,5 @@ in {
]
++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
(devos nixos-generators)
(devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
];
}