This commit is contained in:
Matt Nish-Lapidus 2025-04-29 14:06:35 -04:00
parent c1f3e7033b
commit 1a2c966939
9 changed files with 243 additions and 187 deletions

147
flake.lock generated
View file

@ -30,11 +30,11 @@
]
},
"locked": {
"lastModified": 1745502102,
"narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
"lastModified": 1745812220,
"narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
"owner": "nix-community",
"repo": "disko",
"rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
"rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
"type": "github"
},
"original": {
@ -90,11 +90,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1745511950,
"narHash": "sha256-vO7gtC4nVqfTf1ZEg9gksds/Xesvim4qy+8ewF91ufo=",
"lastModified": 1745947312,
"narHash": "sha256-a8LQtoKeHOh920ocOD3RtBe8sHw/TFdxxLWAbCoEOAU=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "2e939b25ef18fd3efbd60829fc7f87c8235cdd40",
"rev": "d6a9fa089a3442f1fb2d98b4e4dd6f847b7b5964",
"type": "github"
},
"original": {
@ -166,6 +166,22 @@
"type": "github"
}
},
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@ -362,11 +378,11 @@
]
},
"locked": {
"lastModified": 1745494811,
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
"lastModified": 1745894335,
"narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
"rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
"type": "github"
},
"original": {
@ -524,11 +540,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1745259435,
"narHash": "sha256-0YzPTkbbIT/HN5QnUlhWcxsTMRWZv7a9H2Ghr5I1Xdo=",
"lastModified": 1745586094,
"narHash": "sha256-OFNwjWM/qEdligy+rFllJbEbja+/GVMvR8trNyKObD8=",
"owner": "hyprwm",
"repo": "hyprlock",
"rev": "eb28a71756ef63d39763c81fc797da30fdcddc9d",
"rev": "82808290d9edc517b11171c6d93e361827339409",
"type": "github"
},
"original": {
@ -724,11 +740,11 @@
]
},
"locked": {
"lastModified": 1745477852,
"narHash": "sha256-QvJJ3BHhPOhotJuuIYEzZwwtXUBwXBl2aVJy7FBe29k=",
"lastModified": 1745701677,
"narHash": "sha256-ajEl9nV4XFW7H98XCPUshzYL+K0+gVqEWUC4+MBAUFw=",
"owner": "viperML",
"repo": "nh",
"rev": "418c6620f80f064b38011d0f44c1240c67169cc5",
"rev": "7c913894581c21a8669384a366dc486c136ea7d5",
"type": "github"
},
"original": {
@ -749,11 +765,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1745483403,
"narHash": "sha256-fNemxNtPugDzCK7ofPApufFhD4EW5PiA0v3+aS1O6rY=",
"lastModified": 1745930532,
"narHash": "sha256-EX5+jM58PfHFZE16N76RuG/P6alr6aiEzsp502QmWZE=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "17ebd40a372527ad20cc799b1835beaf7abf7200",
"rev": "02f863b4795ec1f792ae15a97559b1160db34781",
"type": "github"
},
"original": {
@ -782,11 +798,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1745351516,
"narHash": "sha256-nQRp1Q+kV137Dsk7WCsnq6zQA7YrvRll2wVcG7wZpHA=",
"lastModified": 1745913113,
"narHash": "sha256-/Iph65fWHox7tVyfzw0+AGyCqL2FGuHSt+xjFUsxbOk=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "6ab055a4b968ccf115a1be3b65b0d5ec4d7c33f1",
"rev": "5f117c61dc4dd91564e02b32836e98dd0e648246",
"type": "github"
},
"original": {
@ -894,11 +910,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1745503349,
"narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
"lastModified": 1745907084,
"narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
"rev": "f1e52a018166e1a324f832de913e12c0e55792d0",
"type": "github"
},
"original": {
@ -952,11 +968,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1745279238,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"lastModified": 1745868005,
"narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
"rev": "330d0a4167924b43f31cc9406df363f71b768a02",
"type": "github"
},
"original": {
@ -968,11 +984,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1745279238,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"lastModified": 1745868005,
"narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
"rev": "330d0a4167924b43f31cc9406df363f71b768a02",
"type": "github"
},
"original": {
@ -1000,11 +1016,11 @@
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1745279238,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"lastModified": 1745868005,
"narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
"rev": "330d0a4167924b43f31cc9406df363f71b768a02",
"type": "github"
},
"original": {
@ -1047,16 +1063,32 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1745794561,
"narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1745391562,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"owner": "nixos",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@ -1152,6 +1184,7 @@
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_4",
"sops-nix": "sops-nix",
"waybar": "waybar",
"wezterm": "wezterm",
"xwayland-satellite": "xwayland-satellite",
"yazi": "yazi"
@ -1421,6 +1454,26 @@
"type": "github"
}
},
"waybar": {
"inputs": {
"flake-compat": "flake-compat_5",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1745487176,
"narHash": "sha256-eF1l/KB8eXKTNf+CJ34gh5si3RZCZzme/W9StA+oTiw=",
"owner": "Alexays",
"repo": "Waybar",
"rev": "0332d2ebf84392c82c86d615079f762f27de94ba",
"type": "github"
},
"original": {
"owner": "Alexays",
"ref": "master",
"repo": "Waybar",
"type": "github"
}
},
"website-builder": {
"inputs": {
"nixpkgs": [
@ -1456,11 +1509,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1745509896,
"narHash": "sha256-ZJKuo0GiwSIQhbYH2W4dTb0TnjClOx60OpShYe4ntsM=",
"lastModified": 1745557788,
"narHash": "sha256-qvdqjJ0WPX0EtXIh2f6WXb+PJb73lpQBJqbVz5Zctr4=",
"owner": "wez",
"repo": "wezterm",
"rev": "dae1a54d74709f9d2d779f2151a25e609d6ce821",
"rev": "1439661dc9a8b565a8d9d23aee27d43a9864f676",
"type": "github"
},
"original": {
@ -1479,11 +1532,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1745372360,
"narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=",
"lastModified": 1745730655,
"narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "c31679aa41966ee9272bb240703755cb1e7c72e3",
"rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153",
"type": "github"
},
"original": {
@ -1512,11 +1565,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1745372360,
"narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=",
"lastModified": 1745730655,
"narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "c31679aa41966ee9272bb240703755cb1e7c72e3",
"rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153",
"type": "github"
},
"original": {
@ -1534,11 +1587,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1745331753,
"narHash": "sha256-7z3LRLlMSC00ADskNU1BUvnOM1F3cOEQ6LS2ZhHVXY0=",
"lastModified": 1745943869,
"narHash": "sha256-hpeirSrnaUXAH6Pmaafz+acBkAf38q8DOkhOG3m4alc=",
"owner": "sxyazi",
"repo": "yazi",
"rev": "bfad57d86f66e72805c5d12ab9be0c853eccf548",
"rev": "fbf8345d90502ef4fa4bee099c0e8fd1ec6ea859",
"type": "github"
},
"original": {

View file

@ -31,6 +31,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
waybar.url = "github:Alexays/Waybar/master";
xwayland-satellite = {
url = "github:Supreeeme/xwayland-satellite";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -1,4 +1,4 @@
{ pkgs, nix-config, lib, ... }:
{ pkgs, nix-config, inputs, lib, ... }:
{
@ -12,147 +12,149 @@
sway-launcher-desktop
];
home.packages = lib.mkMerge [
(with nix-config.packages.x86_64-linux; [
filen-desktop
])
home.packages = with pkgs; [
(with pkgs; [
appimage-run
libappimage
transmission_4-gtk
wl-clipboard
clipse
wayland-utils
libheif.out
rpi-imager
freecad
flatpak
prusa-slicer
via
vial
pdfarranger
tdf
pdfchain
pdftk
zathura
gpu-viewer
foliate
wl-mirror
soundconverter
wmctrl
filen-desktop
filen-cli
scribus
gimp3
szyszka
# godot_4
# gdtoolkit_4
appimage-run
libappimage
transmission_4-gtk
wl-clipboard
clipse
wayland-utils
libheif.out
rpi-imager
freecad
flatpak
prusa-slicer
via
vial
pdfarranger
tdf
pdfchain
pdftk
zathura
gpu-viewer
foliate
wl-mirror
soundconverter
wmctrl
epsonscan2
sane-airscan
xsane
scribus
gimp3
bitwarden-cli
bitwarden-desktop
tailscale
trayscale
font-manager
# godot_4
# gdtoolkit_4
papers
newsflash
epsonscan2
sane-airscan
xsane
stirling-pdf
ripdrag
bitwarden-cli
bitwarden-desktop
tailscale
trayscale
font-manager
polychromatic
papers
newsflash
swayidle
emojify
smile
stirling-pdf
ripdrag
impression
zoom-us
nyxt
ungoogled-chromium
obsidian
vlc
discord
slack
signal-desktop-bin
libreoffice
hyphenDicts.en_US
plex-mpv-shim
plexamp
polychromatic
switcheroo
swayidle
emojify
smile
blender
davinci-resolve-studio
processing
zotero
fractal
handbrake
gmic
krita
krita-plugin-gmic
rawtherapee
inkscape
impression
zoom-us
nyxt
ungoogled-chromium
obsidian
vlc
discord
slack
signal-desktop-bin
libreoffice
hyphenDicts.en_US
plex-mpv-shim
plexamp
# (kicad.override {
# addons = with pkgs.kicadAddons; [ kikit kikit-library ];
# })
switcheroo
turbocase
openscad-unstable
openscad-lsp
blender
davinci-resolve-studio
processing
zotero
fractal
handbrake
gmic
krita
krita-plugin-gmic
rawtherapee
inkscape
picard
plugdata
pavucontrol
qpwgraph
clapper
ardour
oculante
halloy
paleta
wayback
protonplus
fstl
# (kicad.override {
# addons = with pkgs.kicadAddons; [ kikit kikit-library ];
# })
librewolf
turbocase
openscad-unstable
openscad-lsp
wl-color-picker
picard
plugdata
pavucontrol
qpwgraph
clapper
ardour
oculante
halloy
paleta
wayback
protonplus
fstl
# screen recording and streaming
kooha
obs-studio
obs-studio-plugins.wlrobs
obs-studio-plugins.obs-gstreamer
librewolf
wineWowPackages.stagingFull
winetricks
wl-color-picker
virt-manager
# screen recording and streaming
kooha
obs-studio
obs-studio-plugins.wlrobs
obs-studio-plugins.obs-gstreamer
gnome-photos
gnome-tweaks
nautilus
nautilus-open-any-terminal
turtle
gnome-online-accounts
gnome-online-accounts-gtk
wineWowPackages.stagingFull
winetricks
wordbook
virt-manager
protonup
mangohud
dualsensectl.out
gnome-photos
gnome-tweaks
nautilus
nautilus-open-any-terminal
turtle
gnome-online-accounts
gnome-online-accounts-gtk
wpaperd
wordbook
zulip
revolt-desktop
])
protonup
mangohud
dualsensectl.out
wpaperd
# zulip
# revolt-desktop
inputs.xwayland-satellite.packages.x86_64-linux.default
];
home.pointerCursor = {
@ -183,23 +185,23 @@
};
};
# qt = {
# enable = true;
# platformTheme = {
# name = "gtk";
# };
# style = {
# package = pkgs.adwaita-qt;
# name = "adwaita-dark";
# };
# };
qt = {
enable = true;
platformTheme = {
name = "gtk";
};
style = {
package = pkgs.adwaita-qt;
name = "adwaita-dark";
};
};
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
gtk-theme = lib.mkForce "Colloid-Grey-Dark-Nord";
};
};
};
fonts = {
fontconfig = {

View file

@ -4,7 +4,7 @@
home.packages = with pkgs; [
mpc
ncmpcpp
# music-player
rmpc
];
programs.fish.shellAliases = { "ncm" = "ncmpcpp"; };

View file

@ -57,14 +57,6 @@
])
];
xdg.desktopEntries = {
bitwig-labwc = {
name = "Bitwig (labwc)";
exec = "${pkgs.labwc}/bin/labwc -S bitwig-studio";
categories = ["Application" "Audio" "Music"];
};
};
home.file.".local/share/The Usual Suspects/Vavra" = {
recursive = true;
source = ../../packages/the-usual-suspects/vavra;

View file

@ -92,7 +92,7 @@ in
environment = {
DISPLAY = ":0";
XDG_CURRENT_DESKTOP = "niri";
# XDG_CURRENT_DESKTOP = "niri";
XDG_SESSION_TYPE = "wayland";
ELECTRON_OZONE_PLATFORM_HINT = "auto";
};
@ -180,6 +180,7 @@ in
{ app-id = "Open Folder$"; }
{ app-id = "Configure Krita"; }
{ app-id = "Create new document Krita"; }
{ app-id = "(unset)"; }
];
open-floating = true;
}

View file

@ -118,6 +118,10 @@
name: "Queue",
pane: Pane(Queue),
),
(
name: "Genre",
pane: Pane(Browser(root_tag: "genre", separator: ";")),
),
(
name: "Artists",
pane: Pane(Artists),

View file

@ -53,6 +53,8 @@
manix
caligula
rink
dua
tree

View file

@ -1,11 +1,11 @@
{ pkgs, ... }:
{ inputs, pkgs, ... }:
with pkgs.lib.nix-rice;
let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
in {
programs.waybar = {
enable = true;
package = pkgs.waybar;
package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
systemd = {
enable = true;
};