Compare commits
5 commits
6712cb63e1
...
0900eeb1ab
Author | SHA1 | Date | |
---|---|---|---|
0900eeb1ab | |||
9239fdc7db | |||
b1e0daf1e3 | |||
8550725910 | |||
81518b6f0c |
6 changed files with 31 additions and 21 deletions
|
@ -33,7 +33,7 @@ self = {
|
|||
updateScript = pkgs.den-http-get-updater {
|
||||
fileLocation = lockFile;
|
||||
previousVersion = lock.nixpkgs.revision;
|
||||
versionUrl = "https://channels.nixos.org/nixos-24.11/git-revision";
|
||||
versionUrl = "https://channels.nixos.org/nixos-25.05/git-revision";
|
||||
prefetchList = [{
|
||||
previousHash = lock.nixpkgs.sha256;
|
||||
prefetchUrlLocation = {
|
||||
|
|
8
lock.nix
8
lock.nix
|
@ -4,16 +4,16 @@
|
|||
sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=";
|
||||
};
|
||||
nixpkgs = {
|
||||
revision = "72841a4a8761d1aed92ef6169a636872c986c76d";
|
||||
sha256 = "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=";
|
||||
revision = "55d1f923c480dadce40f5231feb472e81b0bab48";
|
||||
sha256 = "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=";
|
||||
};
|
||||
nixpkgs-unstable = {
|
||||
revision = "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f";
|
||||
sha256 = "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=";
|
||||
};
|
||||
nix-bitcoin = {
|
||||
revision = "52809afbf4112d4c9cfe0438610cd5286deb478b";
|
||||
sha256 = "sha256-HKYkzpsXGN/Zhn5GfpOAveWtvgSbO0Neaf6Nr01JsKM=";
|
||||
revision = "e7e6353b3a72205b037be53eda2e71e24e46b45e";
|
||||
sha256 = "sha256-Y53kyw7CQUEUiKPVQQzCMB4OIiZtOoFNurJhhM6Xvx4=";
|
||||
};
|
||||
cosmic-modules = {
|
||||
revision = "77186d5962bb36c907a3ed0f595ad2c44b060bb3";
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
})
|
||||
vesktop
|
||||
unstablePkgs.vscode
|
||||
gimp
|
||||
gimp3
|
||||
inkscape
|
||||
jitsi-meet-electron
|
||||
krita
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
config = {
|
||||
services.printing.enable = true;
|
||||
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
|
@ -27,7 +27,12 @@
|
|||
kdePackages.kdeconnect-kde
|
||||
pcmanfm
|
||||
pwvucontrol
|
||||
qimgv
|
||||
(qimgv.override {
|
||||
opencv4 = opencv4.override {
|
||||
# https://github.com/NixOS/nixpkgs/issues/383175
|
||||
enableCuda = false;
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
programs.mpv = let
|
||||
|
@ -103,7 +108,7 @@
|
|||
# Fonts
|
||||
fonts.packages = with pkgs; [
|
||||
corefonts
|
||||
(nerdfonts.override { fonts = [ "Meslo" ]; })
|
||||
nerd-fonts.meslo-lg
|
||||
roboto
|
||||
];
|
||||
|
||||
|
|
|
@ -7,19 +7,24 @@
|
|||
}:
|
||||
|
||||
let
|
||||
cosmic-configuration = pkgs.substituteAllFiles {
|
||||
cosmic-configuration = pkgs.stdenv.mkDerivation {
|
||||
name = "cosmic-configuration";
|
||||
src = ./cosmic-config;
|
||||
files = [ "." ]; # All files
|
||||
postInstall = ''
|
||||
mkdir -p $share/share/cosmic
|
||||
cp -rt $share/share/cosmic $out/*
|
||||
'';
|
||||
outputs = [ "out" "share" ];
|
||||
|
||||
wallpaper = builtins.path { path = "${self}/media/wallpaper.png"; };
|
||||
corner_radii_theme = "2.0";
|
||||
corner_radii_panel = "2";
|
||||
dontConfigure = true;
|
||||
buildPhase = ''
|
||||
for file in $(find . -type f); do
|
||||
substituteInPlace "$file" \
|
||||
--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
|
||||
|
||||
|
|
|
@ -16,8 +16,8 @@ ranger.overrideAttrs (selfAttrs: superAttrs: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "ranger";
|
||||
repo = "ranger";
|
||||
rev = "fa812718c586cfc12c1a4b6237877c79f8b4a521";
|
||||
hash = "sha256-husMv1RxyvvU1X6C6BQn8Lly63Z40Gwr/k7NZX8DNIw=";
|
||||
rev = "b00f923911090204139c9e19ba42e9d80aa0889f";
|
||||
hash = "sha256-uMvo+5I5WCJGT5+XRS/NFClDGH4F59ogQJb+RYuraX4=";
|
||||
};
|
||||
|
||||
patches = superAttrs.patches or [] ++ [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue