Compare commits

..

No commits in common. "0900eeb1abc682697a387df4f4ec7b7151048e8f" and "6712cb63e1a8c0fd54586d824d07dadb4d05e2c0" have entirely different histories.

6 changed files with 21 additions and 31 deletions

View file

@ -33,7 +33,7 @@ self = {
updateScript = pkgs.den-http-get-updater { updateScript = pkgs.den-http-get-updater {
fileLocation = lockFile; fileLocation = lockFile;
previousVersion = lock.nixpkgs.revision; previousVersion = lock.nixpkgs.revision;
versionUrl = "https://channels.nixos.org/nixos-25.05/git-revision"; versionUrl = "https://channels.nixos.org/nixos-24.11/git-revision";
prefetchList = [{ prefetchList = [{
previousHash = lock.nixpkgs.sha256; previousHash = lock.nixpkgs.sha256;
prefetchUrlLocation = { prefetchUrlLocation = {

View file

@ -4,16 +4,16 @@
sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=";
}; };
nixpkgs = { nixpkgs = {
revision = "55d1f923c480dadce40f5231feb472e81b0bab48"; revision = "72841a4a8761d1aed92ef6169a636872c986c76d";
sha256 = "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ="; sha256 = "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=";
}; };
nixpkgs-unstable = { nixpkgs-unstable = {
revision = "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f"; revision = "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f";
sha256 = "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q="; sha256 = "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=";
}; };
nix-bitcoin = { nix-bitcoin = {
revision = "e7e6353b3a72205b037be53eda2e71e24e46b45e"; revision = "52809afbf4112d4c9cfe0438610cd5286deb478b";
sha256 = "sha256-Y53kyw7CQUEUiKPVQQzCMB4OIiZtOoFNurJhhM6Xvx4="; sha256 = "sha256-HKYkzpsXGN/Zhn5GfpOAveWtvgSbO0Neaf6Nr01JsKM=";
}; };
cosmic-modules = { cosmic-modules = {
revision = "77186d5962bb36c907a3ed0f595ad2c44b060bb3"; revision = "77186d5962bb36c907a3ed0f595ad2c44b060bb3";

View file

@ -23,7 +23,7 @@
}) })
vesktop vesktop
unstablePkgs.vscode unstablePkgs.vscode
gimp3 gimp
inkscape inkscape
jitsi-meet-electron jitsi-meet-electron
krita krita

View file

@ -8,7 +8,7 @@
config = { config = {
services.printing.enable = true; services.printing.enable = true;
services.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
@ -27,12 +27,7 @@
kdePackages.kdeconnect-kde kdePackages.kdeconnect-kde
pcmanfm pcmanfm
pwvucontrol pwvucontrol
(qimgv.override { qimgv
opencv4 = opencv4.override {
# https://github.com/NixOS/nixpkgs/issues/383175
enableCuda = false;
};
})
]; ];
programs.mpv = let programs.mpv = let
@ -108,7 +103,7 @@
# Fonts # Fonts
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
corefonts corefonts
nerd-fonts.meslo-lg (nerdfonts.override { fonts = [ "Meslo" ]; })
roboto roboto
]; ];

View file

@ -7,24 +7,19 @@
}: }:
let let
cosmic-configuration = pkgs.stdenv.mkDerivation { cosmic-configuration = pkgs.substituteAllFiles {
name = "cosmic-configuration"; name = "cosmic-configuration";
src = ./cosmic-config; src = ./cosmic-config;
files = [ "." ]; # All files
postInstall = ''
mkdir -p $share/share/cosmic
cp -rt $share/share/cosmic $out/*
'';
outputs = [ "out" "share" ]; outputs = [ "out" "share" ];
dontConfigure = true;
buildPhase = '' wallpaper = builtins.path { path = "${self}/media/wallpaper.png"; };
for file in $(find . -type f); do corner_radii_theme = "2.0";
substituteInPlace "$file" \ corner_radii_panel = "2";
--subst-var-by wallpaper "${builtins.path { path = "${self}/media/wallpaper.png"; }}" \
--subst-var-by corner_radii_theme "2.0" \
--subst-var-by corner_radii_panel "2"
done
'';
installPhase = ''
mkdir -p $out $share/share/cosmic
cp -r ./* $out/
cp -r ./* $share/share/cosmic/
'';
}; };
in in

View file

@ -16,8 +16,8 @@ ranger.overrideAttrs (selfAttrs: superAttrs: {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ranger"; owner = "ranger";
repo = "ranger"; repo = "ranger";
rev = "b00f923911090204139c9e19ba42e9d80aa0889f"; rev = "fa812718c586cfc12c1a4b6237877c79f8b4a521";
hash = "sha256-uMvo+5I5WCJGT5+XRS/NFClDGH4F59ogQJb+RYuraX4="; hash = "sha256-husMv1RxyvvU1X6C6BQn8Lly63Z40Gwr/k7NZX8DNIw=";
}; };
patches = superAttrs.patches or [] ++ [ patches = superAttrs.patches or [] ++ [