move more stuff to shared module
This commit is contained in:
parent
5cf1b9254e
commit
407dbcbfcd
8 changed files with 18 additions and 97 deletions
13
cachix.nix
13
cachix.nix
|
|
@ -1,13 +0,0 @@
|
|||
|
||||
# WARN: this file will get overwritten by $ cachix use <name>
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
folder = ./cachix;
|
||||
toImport = name: value: folder + ("/" + name);
|
||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
||||
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||
in {
|
||||
inherit imports;
|
||||
nix.settings.substituters = ["https://cache.nixos.org/"];
|
||||
}
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
};
|
||||
sound = true;
|
||||
graphical = true;
|
||||
gaming = true;
|
||||
};
|
||||
|
||||
age.identityPaths = [ "/home/grimmauld/.ssh/id_rsa" ];
|
||||
|
|
|
|||
32
flake.lock
32
flake.lock
|
|
@ -78,11 +78,11 @@
|
|||
"yafas": "yafas"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710512612,
|
||||
"narHash": "sha256-XMyG8ceRZ3aIqSJy/XlJHzkOaNCudldWq8Zrn2NfgcA=",
|
||||
"lastModified": 1710608887,
|
||||
"narHash": "sha256-zE3+gYT+JpbxA/SBlc8GQ0OBYWwtX0++WpZxEIXUebs=",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "4417bbe33cb131959a9635815faa092c0934b36b",
|
||||
"rev": "73e16a06baf8a9bb273a131b10b142f620c2b610",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -138,11 +138,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710090208,
|
||||
"narHash": "sha256-1W7yDW+kqCr/9SygZwygBayE8HwLnzJq48fMAOZQLAY=",
|
||||
"lastModified": 1710562188,
|
||||
"narHash": "sha256-KHlb4sK9fvp+9DoYWHLyaegoeLV7w8s7CsNMmNlKu1U=",
|
||||
"owner": "girlbossceo",
|
||||
"repo": "conduwuit",
|
||||
"rev": "e888a0a745ac979abe6a687ff24b8c5e7b7b79ed",
|
||||
"rev": "8d8467a4eafd264adb9c710e0638c08ae547dec4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -389,11 +389,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710484139,
|
||||
"narHash": "sha256-vOm70QgvfjHNQa9vmpxPsm1xE4PTmqtkDpe22/ra5cw=",
|
||||
"lastModified": 1710563757,
|
||||
"narHash": "sha256-H5SZIo7O4zg/NqSdM71V2gYH4ex5WbBf6s9ue5s4nL4=",
|
||||
"owner": "martinvonz",
|
||||
"repo": "jj",
|
||||
"rev": "3bb9fd412ac7f021a2fa09503fdec93ac066d7b7",
|
||||
"rev": "8600750fceafbf489d42a99b36b1f48bbc1e416b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -426,11 +426,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710494976,
|
||||
"narHash": "sha256-WDuSPzeKecrolclXHmPk44Ch28+DQXHqYFOJkHSWFgM=",
|
||||
"lastModified": 1710525749,
|
||||
"narHash": "sha256-LpV/mJLeShTPecVQZnIAb9PTCGziuMuGOJQUeAb2u/w=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "642c6e7512f25f1fdc47dfa6a6eaec38c5faa69b",
|
||||
"rev": "0c57815fbf47c69af9ed11fa8ebc1b52158a3ba2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -613,11 +613,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710609877,
|
||||
"narHash": "sha256-lKxTaTTFxsIiv4Z4X3dMIaCtCHS6pxdvEy5EASIIRKA=",
|
||||
"lastModified": 1710623910,
|
||||
"narHash": "sha256-8ccfg6Q+6RbLSwK90D6APl4BItz96+AyEa6FV8S6nbY=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "5e620c121570b823d8b8d6c191c48d8016cd92b3",
|
||||
"revCount": 25,
|
||||
"rev": "ed422e82654443ba6bce726e60e426c2ffd4b37a",
|
||||
"revCount": 27,
|
||||
"type": "git",
|
||||
"url": "https://git.grimmauld.de/Grimmauld/grimm-nix-shared"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -8,15 +8,6 @@
|
|||
|
||||
kdePackages.audiocd-kio
|
||||
|
||||
(writeShellScriptBin "primerun" ''
|
||||
export __NV_PRIME_RENDER_OFFLOAD=1
|
||||
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
|
||||
export __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||
export __VK_LAYER_NV_optimus=NVIDIA_only
|
||||
export DRI_PRIME=1
|
||||
exec "$@"
|
||||
'')
|
||||
|
||||
(writeShellScriptBin "rebuild" ''
|
||||
pkexec nixos-rebuild switch --flake /home/grimmauld/grimm-nixos-laptop
|
||||
'')
|
||||
|
|
|
|||
|
|
@ -1,15 +1,5 @@
|
|||
{pkgs, ...}:
|
||||
{
|
||||
systemd.services.otd-daemon = {
|
||||
description = "opentabletdriver daemon, a user service to make the gui work";
|
||||
after = [ "graphical-session.target" ];
|
||||
wantedBy = [ "xdg-desktop-autostart.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.opentabletdriver}/bin/otd-daemon";
|
||||
Type = "simple";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
opentabletdriver
|
||||
];
|
||||
|
|
|
|||
|
|
@ -20,14 +20,4 @@
|
|||
RUNTIME_PM_ON_BAT="auto";
|
||||
};
|
||||
};
|
||||
programs.gamemode = {
|
||||
enable = true;
|
||||
settings = {
|
||||
general.inhibit_screensaver=0;
|
||||
custom = {
|
||||
start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
|
||||
end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,16 +3,14 @@
|
|||
isNormalUser = true;
|
||||
shell = pkgs.xonsh;
|
||||
description = "grimmauld";
|
||||
extraGroups = [ "networkmanager" "wheel" "input" "video" "lp" "scanner" "libvirtd" "pipewire" ];
|
||||
extraGroups = [ "networkmanager" "wheel" "input" "video" "lp" "scanner" "libvirtd" "pipewire" "gamemode" ];
|
||||
packages = with pkgs; [
|
||||
webcord
|
||||
discord
|
||||
heroic
|
||||
plasma-browser-integration
|
||||
kwrited
|
||||
element-desktop
|
||||
ghidra
|
||||
# firefox
|
||||
kcalc
|
||||
rmview
|
||||
krita
|
||||
|
|
@ -21,20 +19,7 @@
|
|||
prusa-slicer
|
||||
freecad
|
||||
openscad
|
||||
prismlauncher
|
||||
# blender
|
||||
wootility
|
||||
# (callPackage ./theseus-modrinth.nix {})
|
||||
# osu-lazer-bin
|
||||
(pkgs.symlinkJoin {
|
||||
name = "osu";
|
||||
paths = [
|
||||
(pkgs.writeShellScriptBin "osu!" ''
|
||||
exec nice -n -19 gamemoderun primerun ${pkgs.osu-lazer-bin}/bin/'osu!'
|
||||
'')
|
||||
pkgs.osu-lazer-bin
|
||||
];
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -44,12 +29,4 @@
|
|||
enable = true;
|
||||
nativeMessagingHosts.packages = with pkgs; [ passff-host ];
|
||||
};
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
gamescopeSession.env = { DRI_PRIME = "1"; };
|
||||
};
|
||||
|
||||
services.udev.packages = [ pkgs.wooting-udev-rules ];
|
||||
}
|
||||
|
|
|
|||
15
overlay.nix
15
overlay.nix
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
inputs,
|
||||
system,
|
||||
...
|
||||
}: final: prev:
|
||||
{
|
||||
# stable packages
|
||||
stable = import inputs.nixpkgs-stable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
# SwayFX
|
||||
sway-unwrapped = inputs.swayfx.packages.${system}.default;
|
||||
}
|
||||
Loading…
Reference in a new issue