This commit is contained in:
jopejoe1 2024-02-17 23:33:17 +01:00
parent 4783db68ff
commit 7c10990c19
7 changed files with 20 additions and 42 deletions

17
flake.lock generated
View file

@ -510,22 +510,6 @@
"type": "github" "type": "github"
} }
}, },
"openrgb": {
"flake": false,
"locked": {
"lastModified": 1708099263,
"narHash": "sha256-XvrmeDyLH6ZZfxi0dHb7fUZYWxRy1aM2QSgCP5O7X2c=",
"owner": "CalcProgrammer1",
"repo": "OpenRGB",
"rev": "4134de5daf77f3e6b87e3014f55f5d81607aeac1",
"type": "gitlab"
},
"original": {
"owner": "CalcProgrammer1",
"repo": "OpenRGB",
"type": "gitlab"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -636,7 +620,6 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-lib": "nixpkgs-lib", "nixpkgs-lib": "nixpkgs-lib",
"openrgb": "openrgb",
"pre-commit-hooks": "pre-commit-hooks_2", "pre-commit-hooks": "pre-commit-hooks_2",
"prismlauncher": "prismlauncher", "prismlauncher": "prismlauncher",
"srvos": "srvos", "srvos": "srvos",

View file

@ -42,10 +42,6 @@
url = "github:vinceliuice/Tela-icon-theme"; url = "github:vinceliuice/Tela-icon-theme";
flake = false; flake = false;
}; };
openrgb = {
url = "gitlab:CalcProgrammer1/OpenRGB";
flake = false;
};
nether = { nether = {
url = "github:Lassulus/nether"; url = "github:Lassulus/nether";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -5,10 +5,6 @@
src = inputs.tela-icon-theme; src = inputs.tela-icon-theme;
}; };
openrgb-git = pkgs.openrgb.overrideAttrs {
src = inputs.openrgb;
};
libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: { libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [ ./adwaita-theming-support.patch ]; patches = (old.patches or [ ]) ++ [ ./adwaita-theming-support.patch ];
doCheck = false; doCheck = false;

View file

@ -111,15 +111,7 @@
xwayland.enable = true; xwayland.enable = true;
kdeconnect.enable = true; kdeconnect.enable = true;
gamemode.enable = true; gamemode.enable = true;
}; appimage.enable = true; # Not upstream jet
boot.binfmt.registrations.appimage = {
wrapInterpreterInShell = false;
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
recognitionType = "magic";
offset = 0;
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
magicOrExtension = ''\x7fELF....AI\x02'';
}; };
nix.settings.system-features = [ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ] nix.settings.system-features = [ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ]

View file

@ -0,0 +1,19 @@
{ config, lib, ... }:
let cfg = config.programs.appimage;
in {
options.programs.appimage = {
enable = lib.mkEnableOption "Enable AppImage Support";
};
config = lib.mkIf cfg.enable {
boot.binfmt.registrations.appimage = {
wrapInterpreterInShell = false;
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
recognitionType = "magic";
offset = 0;
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
magicOrExtension = ''\x7fELF....AI\x02'';
};
};
}

View file

@ -2,6 +2,5 @@
{ {
imports = [ imports = [
./sshfs
]; ];
} }

View file

@ -1,7 +0,0 @@
{ config, lib, pkgs, ... }:
{
config = lib.mkIf (lib.any (fs: fs == "sshfs" || fs == "fuse.sshfs") config.boot.supportedFilesystems) {
system.fsPackages = [ pkgs.sshfs ];
};
}