Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ssd fixes

Browse Source
This commit is contained in:
Grimmauld 2024-09-29 14:57:54 +02:00
parent c37a6082d3
commit bbad415a38
Signed by: Grimmauld
GPG Key ID: C2946668769F91FB
10 changed files with 5926 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/graphics/sway.nix
View File

@ -139,8 +139,8 @@ in
[ ]
++ (build_definition_lines sway_conf.definitions)
++ (build_keybind_lines sway_conf.keybinds)
++ (build_exec_lines "exec" sway_conf.autolaunch)
++ (build_exec_lines "exec_always" sway_conf.execAlways)
++ (build_exec_lines "exec" sway_conf.autolaunch)
++ (build_mode_lines sway_conf.modes)
++ optional (sway_conf.extraConfig != "") sway_conf.extraConfig
);

1
common/tooling/default.nix
View File

@ -23,6 +23,7 @@ in
./lsp.nix
./helix.nix
./git.nix
./wine.nix
./c.nix
./java.nix
./ranger.nix

33
common/tooling/wine.nix Normal file
View File

@ -0,0 +1,33 @@
{ pkgs, config, lib, ... }:
let
inherit (config.grimmShared) enable tooling;
inherit (lib)
mkOption
types
getExe
mkIf
;
in
{
config = mkIf (enable && tooling.enable) {
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
virtualisation.spiceUSBRedirection.enable = true;
# dconf.settings = {
# "org/virt-manager/virt-manager/connections" = {
# autoconnect = ["qemu:///system"];
# uris = ["qemu:///system"];
# };
# };
environment.systemPackages = with pkgs; [
winetricks
wineWow64Packages.stagingFull
dotnetCorePackages.dotnet_9.sdk
jetbrains.rider
mono4
(mono4.overrideAttrs { version="4.6.1"; sha256=""; })
];
};
}

5785
custom/ncspot/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

85
custom/ncspot/package.nix Normal file
View File

@ -0,0 +1,85 @@
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, ncurses
, openssl
, darwin
, withALSA ? stdenv.isLinux, alsa-lib
, withClipboard ? true, libxcb, python3
, withCover ? false, ueberzug
, withPulseAudio ? stdenv.isLinux, libpulseaudio
, withPortAudio ? stdenv.isDarwin, portaudio
, withMPRIS ? stdenv.isLinux, withNotify ? true, dbus
, withCrossterm ? true
, nix-update-script
, testers
, ncspot
}: let
inherit (darwin.apple_sdk.frameworks) Cocoa;
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "1.1.1";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "4ac180816da1d5caab356e71c8c56570e26ba1e8";
hash = "sha256-2WGFvugH/U2GH6/a/uSG0sbuu14u2BItKlc9esvueQc=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"librespot-audio-0.5.0-dev" = "sha256-0LjNHLgZ91UrC3qefXzR4Pl+eh6+vyrkG2qaPDwWpAg=";
};
};
nativeBuildInputs = [ pkg-config ]
++ lib.optional withClipboard python3;
buildInputs = [ ncurses ]
++ lib.optional stdenv.isLinux openssl
++ lib.optional withALSA alsa-lib
++ lib.optional withClipboard libxcb
++ lib.optional withCover ueberzug
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withPortAudio portaudio
++ lib.optional (withMPRIS || withNotify) dbus
++ lib.optional stdenv.isDarwin Cocoa;
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DNCURSES_UNCTRL_H_incl";
buildNoDefaultFeatures = true;
buildFeatures = [ "cursive/pancurses-backend" ]
++ lib.optional withALSA "alsa_backend"
++ lib.optional withClipboard "share_clipboard"
++ lib.optional withCover "cover"
++ lib.optional withPulseAudio "pulseaudio_backend"
++ lib.optional withPortAudio "portaudio_backend"
++ lib.optional withMPRIS "mpris"
++ lib.optional withCrossterm "crossterm_backend"
++ lib.optional withNotify "notify";
postInstall = ''
install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/${pname}.desktop
install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/${pname}.png
'';
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion { package = ncspot; };
};
meta = with lib; {
description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
homepage = "https://github.com/hrkfdn/ncspot";
changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = with maintainers; [ liff ];
mainProgram = "ncspot";
};
}

8
custom/rfindup/package.nix
View File

@ -5,17 +5,17 @@
}:
rustPlatform.buildRustPackage {
pname = "rfindup";
version = "unstable-2024-05-16";
version = "unstable-2024-09-24";
src = fetchFromGitea {
domain = "git.grimmauld.de";
owner = "Grimmauld";
repo = "rfindup";
rev = "fe2c39e74c667593896ce03033cccdffda6b288d";
hash = "sha256-N23sKOfir07WIFbjdHNku7nLTtRd7A5tfs7kvdeCyeU=";
rev = "ee4d9997702d6e7c6735436f2b33e15e20669745";
hash = "sha256-nbC/nM6orM19Qh/1bpN6gxOqvhCO4cVBumgEFl9G4Rs=";
};
cargoHash = "sha256-MD7ViPWkL/aYECWj1f+NdVrPVwwFTd8GyyKSUUgXXHE=";
cargoHash = "sha256-l7uRTGV2iYbWbJSvs+YHwMSYmVW3FHa7sgbO2mub7a0=";
meta = {
description = "tool to find files by name in parent directories";

22
nix/sources.json
View File

@ -5,10 +5,10 @@
"homepage": null,
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "bcaea0865985eb3e24ce978e2ca5bb4f680f150b",
"sha256": "15fgkb32cqkzb9z03akbaz2qv6i3h1zs9rwy94fkp78cr2yxfizb",
"rev": "f27ebcdcaf296f24b7a662facefec6b4d492b5c5",
"sha256": "15mshy4nc956nlzfq1rcaaglwsi500p3rk0nbghqbwipg0cij9f7",
"type": "tarball",
"url": "https://github.com/ezKEa/aagl-gtk-on-nix/archive/bcaea0865985eb3e24ce978e2ca5bb4f680f150b.tar.gz",
"url": "https://github.com/ezKEa/aagl-gtk-on-nix/archive/f27ebcdcaf296f24b7a662facefec6b4d492b5c5.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"agenix": {
@ -41,10 +41,10 @@
"homepage": "https://nyx.chaotic.cx",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "93e6cdc6335d9c7652e89466b5e05a3cce836906",
"sha256": "11d9jyd8yw0xnpimgwsi0vw2i63f5hkw9x0g7pmnk0542k50xms6",
"rev": "a803a24630c8d6108d88f2e35cf6c6d801c187b6",
"sha256": "11wkfs8diw9syg9fcdgxr271rd7dn1zlxlnv9280zlbgxmnhzi3f",
"type": "tarball",
"url": "https://github.com/chaotic-cx/nyx/archive/93e6cdc6335d9c7652e89466b5e05a3cce836906.tar.gz",
"url": "https://github.com/chaotic-cx/nyx/archive/a803a24630c8d6108d88f2e35cf6c6d801c187b6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"glibc-eac": {
@ -62,13 +62,13 @@
"lix-module": {
"branch": "main",
"repo": "https://git.lix.systems/lix-project/nixos-module.git",
"rev": "353b25f0b6da5ede15206d416345a2ec4195b5c8",
"rev": "b0e6f359500d66670cc16f521e4f62d6a0a4864e",
"type": "git"
},
"lix-pkg": {
"branch": "main",
"repo": "https://git.lix.systems/lix-project/lix.git",
"rev": "80202e3ca314c21547c48f3a23d3f629cd9ddb87",
"rev": "5f298f74c92402a8390b01c736463b17b36277e3",
"type": "git"
},
"nixos-mailserver": {
@ -95,10 +95,10 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"sha256": "1llzyzw7a0jqdn7p3px0sqa35jg24v5pklwxdybwbmbyr2q8cf5j",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"sha256": "0mr3vfnl8h0214ml7l5hsaq2g9174r3ra0hzcvlqk9kg024siwbf",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/345c263f2f53a3710abe117f28a5cb86d0ba4059.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/9357f4f23713673f310988025d9dc261c20e70c6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"ranger_udisk_menu": {

1
overlays/default.nix
View File

@ -39,5 +39,6 @@
./glibc-eac.nix
./factorio.nix
./ranger.nix
./ncspot.nix
];
}

4
overlays/ncspot.nix Normal file
View File

@ -0,0 +1,4 @@
{ prev, config, ... }:
{
ncspot = prev.callPackage ../custom/ncspot/package.nix { };
}

2
sway/default.nix
View File

@ -161,7 +161,7 @@
autolaunch = [
(getExe' pkgs.dbus "dbus-update-activation-environment")
(getExe' pkgs.xdg-user-dirs "xdg-user-dirs-update")
''${getExe' pkgs.coreutils-full "sleep"} 5 && ${getExe' pkgs.blueman "blueman-applet"}''
''${getExe' pkgs.coreutils-full "sleep"} 3 && ${getExe' pkgs.blueman "blueman-applet"}''
(getExe' pkgs.lxqt.lxqt-policykit "lxqt-policykit-agent")
(getExe' config.hardware.opentabletdriver.package "otd-daemon")
pkgs.swaynotificationcenter