deprekated/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates & make bandcamp + mopidy work

Browse source
This commit is contained in:
Kate 2025-01-26 14:42:14 +01:00
parent 8c984a2516
commit 490fac55f2
10 changed files with 105 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
flake.lock generated
View file

@ -162,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737085297, "lastModified": 1737504076,
"narHash": "sha256-0gpgsX7hCauT6pblVg+hrDnt83lPoYzq/2BqqyvU8Tc=", "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "09414c7e2def24a5c52e588017b8524bcb68972a", "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -482,11 +482,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737075266, "lastModified": 1737704314,
"narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -526,11 +526,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1737086202, "lastModified": 1737739244,
"narHash": "sha256-33tcNERQt1R7tr/W7pvQj8R6NJktyTOKMIfY16RHLK8=", "narHash": "sha256-D0hxQ9BkIV6J9c6uoEFt667LMhl2LvX6ptHUWK6VP8I=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0d14c2b67a407825e3427bf079b31de069d9653a", "rev": "523bd9dce89c29cda3b50f78911d534556775f5f",
"revCount": 16626, "revCount": 16683,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -569,11 +569,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1737109534, "lastModified": 1737746480,
"narHash": "sha256-ONWusynmMvogEBeCTeZewIDmY4kZYxgv9D/TSL5kH70=", "narHash": "sha256-Lccg6b+Sz6TSDj4BpLZhugauwDa/CyCjF7E6W3VvYa0=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "ce46857ea5bcd4e40040d46c6f495fa387fb812a", "rev": "afeb7877090d50d02c1ecab3159b328b85a44868",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -602,11 +602,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737102881, "lastModified": 1737697331,
"narHash": "sha256-5Lyjc7NduC+5t/Ypuj8DwjfJmdxetzELj6noRNBY8fQ=", "narHash": "sha256-9k77pFW2ANx8bZc+RcF6YP9McFZsUCWWY+XwBX0P3/Q=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "b4add625b2ffdad3e003b3e437891daacf53a12f", "rev": "748d90b443b9f20134020c21760b5b6c2c42a7de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -698,11 +698,11 @@
}, },
"nix-hardware": { "nix-hardware": {
"locked": { "locked": {
"lastModified": 1736978406, "lastModified": 1737590910,
"narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b678606690027913f3434dea3864e712b862dde5", "rev": "9368027715d8dde4b84c79c374948b5306fdd2db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -757,11 +757,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736978406, "lastModified": 1737590910,
"narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b678606690027913f3434dea3864e712b862dde5", "rev": "9368027715d8dde4b84c79c374948b5306fdd2db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -851,11 +851,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1736916166, "lastModified": 1737672001,
"narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -914,11 +914,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1736883708, "lastModified": 1737632463,
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -930,11 +930,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1736883708, "lastModified": 1737632463,
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1142,11 +1142,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736993991, "lastModified": 1737657729,
"narHash": "sha256-kPDt3QgeIsct9f375LIGmSoZKl7Z4AVzXX+9U0VV5PI=", "narHash": "sha256-TIDR1zKoP2uaqRot/LnarugfAC9U7geycjbJqA1naVM=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a88c4d264a4379b7fe5a9e75ed51bea96f8dd407", "rev": "e594886eb0951a0a0c28ffa333a9df6fb13857a1",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -131,6 +131,7 @@
./nixos/services/tailscale.nix ./nixos/services/tailscale.nix
agenix.nixosModules.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
]; ];
@ -165,8 +166,8 @@
./nixos/configs/gui ./nixos/configs/gui
./nixos/configs/flatpak.nix ./nixos/configs/flatpak.nix
./nixos/configs/music-server
./nixos/configs/fonts-linux.nix ./nixos/configs/fonts-linux.nix
./nixos/configs/music-server.nix
./nixos/overlays/fixup-signal ./nixos/overlays/fixup-signal
./nixos/overlays/fixup-imhex.nix ./nixos/overlays/fixup-imhex.nix

15
nixos/configs/gui/niri.nix
View file

@ -184,6 +184,21 @@ in
default-column-width = { }; default-column-width = { };
} }
# Make anki flashcard windows modal floats.
{
matches = [{
app-id = "^anki$";
title = "Add";
}];
open-floating = true;
default-floating-position = {
x = 0;
y = 0;
relative-to = "top-right";
};
}
# Talon windows should show over other ones. # Talon windows should show over other ones.
{ {
matches = [ { app-id = "talon"; } ]; matches = [ { app-id = "talon"; } ];

BIN
nixos/configs/music-server/bandcamp.cfg.age Normal file
View file

Binary file not shown.

13
nixos/configs/music-server.nix → nixos/configs/music-server/default.nix
View file

@ -3,11 +3,12 @@
# #
# vim: et:ts=2:sw=2: # vim: et:ts=2:sw=2:
# #
{ pkgs, ... }: { pkgs, config, ... }:
{ {
age.secrets.bandcamp.file = ./bandcamp.cfg.age;
home-manager.users.deprekated = home-manager.users.deprekated =
{ pkgs, config, ... }: { pkgs, ... }:
{ {
# Use mopidy as our music server. # Use mopidy as our music server.
@ -23,13 +24,19 @@
settings = { settings = {
# Use tidal, for now. # Tidal for streaming more-commercial music.
tidal = { tidal = {
enabled = true; enabled = true;
quality = "LOSSLESS"; quality = "LOSSLESS";
}; };
}; };
# Probvide our bandcamp authentication as an extra config file.
extraConfigFiles = [
config.age.secrets.bandcamp.path
];
}; };
# Translate our commands over MPRIS2. # Translate our commands over MPRIS2.

10
nixos/hosts/trailblazer/default.nix
View file

@ -141,6 +141,16 @@ in
# Enable fingerprint reader. # Enable fingerprint reader.
services.fprintd.enable = true; services.fprintd.enable = true;
# Enable steam.
programs.gamescope = {
enable = true;
capSysNice = true;
};
programs.steam = {
enable = true;
gamescopeSession.enable = true;
};
# #
# Niri configuration for our monitors. # Niri configuration for our monitors.
# #

5
nixos/packages/gui.pkgs.nix
View file

@ -62,7 +62,7 @@ with pkgs;
krita krita
xournalpp xournalpp
kdePackages.itinerary kdePackages.itinerary
deprekages.notion-app #deprekages.notion-app
# PDFs. # PDFs.
(zathuraPkgs.override { useMupdf = false; }).zathuraWrapper (zathuraPkgs.override { useMupdf = false; }).zathuraWrapper
@ -79,6 +79,9 @@ with pkgs;
deprekages.argos deprekages.argos
tidal-hifi tidal-hifi
vlc vlc
# Learning
anki
] ]
# Linux-only packages. # Linux-only packages.

8
packages/notion-app/default.nix
View file

@ -2,7 +2,7 @@
stdenv, stdenv,
fetchurl, fetchurl,
fetchzip, fetchzip,
electron_31, electron_33,
_7zz, _7zz,
asar, asar,
writeScriptBin, writeScriptBin,
@ -15,11 +15,11 @@ let
notion-app-unwrapped = stdenv.mkDerivation rec { notion-app-unwrapped = stdenv.mkDerivation rec {
name = "notion-app-unwrapped"; name = "notion-app-unwrapped";
version = "3.15.0"; version = "4.4.0";
src = fetchurl { src = fetchurl {
url = "https://desktop-release.notion-static.com/Notion-${version}.dmg"; url = "https://desktop-release.notion-static.com/Notion-${version}.dmg";
hash = "sha256-Pdd2/aS2xtZoM9awc0CO4I7wpumJ6OkZZc9kTKZHkE8="; hash = "sha256-FHPru5Byub8DKAmtqr8EYqGiikslEJBS/zV4PVfFiE8=";
}; };
betterSqlite3 = fetchzip { betterSqlite3 = fetchzip {
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
# Launch # Launch
cd ${notion-app-unwrapped}/lib/notion-app/app cd ${notion-app-unwrapped}/lib/notion-app/app
exec ${electron_31}/bin/electron . $WL_ARGS "$@" exec ${electron_33}/bin/electron . $WL_ARGS "$@"
''; '';
desktopFile = '' desktopFile = ''

24
secrets.nix Normal file
View file

@ -0,0 +1,24 @@
#
# Secret database for agenix.
#
# vim: et:ts=2:sw=2:
#
let
# Systems we want to target.
trailblazer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcJM0wcR6I53htsvN3A+2kcoln+N89z8bWt7g1PxjZk root@trailblazer";
rekey-users = [
"age1yubikey1qtgvszdcz3n9a707l3k2mhaql9mdm6sqe69mr2hypl8n0qxs5m52sgu9wdd" # Kate
"age1yubikey1qfmkkc57a34f6zd9wh0vm9f20tv85nqkmyh80ygyzwynpaq9nhgkw4wd3zz" # Kate
"age1yubikey1qt5cjhklyek73awwaducjgn0g7l93xeuvcnudnac23kdyem2k7v7zlmn6p0" # Kate
"age1yubikey1qgkz2s97uzquemxx694vvqp2dj6328zpf4l3rj3mqfcnguvuhxcguw8fgxy" # Kate
];
# Combined pubkeys for use below.
all-machine-pubkeys = [
trailblazer
] ++ rekey-users;
in
{
"nixos/configs/music-server/bandcamp.cfg.age".publicKeys = all-machine-pubkeys;
}

4
xonsh/rc.xsh
View file

@ -68,8 +68,8 @@ def try_source(filename):
# #
$GCC_COLOR = "auto" $GCC_COLOR = "auto"
$GCC_COLORS = "auto" $GCC_COLORS = "auto"
$EDITOR="kak" $EDITOR="nvim"
$VISUAL="kak" $VISUAL=$EDITOR
# Start off with some empty local variables; these will hopefully be populated # Start off with some empty local variables; these will hopefully be populated