PapaTutuWawa/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: PapaTutuWawa:7816818f0c5a540daafaae143102206946be2896
Branches Tags
PapaTutuWawa:master
..
compare: PapaTutuWawa:16dc290cfa626fa7a43220a5e4bbaa2e87dda12a
Branches Tags
PapaTutuWawa:master

No commits in common. "7816818f0c5a540daafaae143102206946be2896" and "16dc290cfa626fa7a43220a5e4bbaa2e87dda12a" have entirely different histories.
7816818f0c ... 16dc290cfa

11 changed files with 108 additions and 97 deletions
Show Stats Expand all files Collapse all files

116
flake.lock
View File

@ -24,11 +24,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1665824418, "lastModified": 1662958374,
"narHash": "sha256-OZX8io9UKzxFAwdRvf4uOThDFpGtlbMyi13RbqIpmoY=", "narHash": "sha256-MpyHx+UjOA8Zi0r0dRKRL509Wqz7JFWI7XFJJstL10w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "08445dd7824253ee8580f06127460a7d14e942cf", "rev": "46c1067b0b397df28de5e8f551d2df54f7da7a93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,21 +134,6 @@
} }
}, },
"flake-utils_6": { "flake-utils_6": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_7": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -169,11 +154,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1665655007, "lastModified": 1662759269,
"narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=", "narHash": "sha256-lt8bAfEZudCQb+MxoNKmenhMTXhu3RCCyLYxU9t5FFk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8cbc6500dfca22d907054f68c564019b3b6cf295", "rev": "9f7fe353b613d0e45d7a5cdbd1f13c96c15803dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,11 +221,11 @@
"utils": "utils_3" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1665655007, "lastModified": 1660330190,
"narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=", "narHash": "sha256-RgQUtZGmdb9fRkdBcI8x1KYuykbQCBaeY6ejFls7hFM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8cbc6500dfca22d907054f68c564019b3b6cf295", "rev": "8675cfa549e1240c9d2abb1c878bc427eefcf926",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -355,36 +340,13 @@
"type": "github" "type": "github"
} }
}, },
"nixgl": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": [
"ostylk-home",
"pkg-unstable"
]
},
"locked": {
"lastModified": 1661367362,
"narHash": "sha256-Qc8MXcV+YCPREu8kk6oggk23ZBKLqeQRAIsLbHEviPE=",
"owner": "guibou",
"repo": "nixGL",
"rev": "7165ffbccbd2cf4379b6cd6d2edd1620a427e5ae",
"type": "github"
},
"original": {
"owner": "guibou",
"ref": "main",
"repo": "nixGL",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1665839131, "lastModified": 1662714967,
"narHash": "sha256-0KYo13PfwvPw5i/SC+hGy3hsgR++Co7SIzv+0e9YOnM=", "narHash": "sha256-IOTq5tAGGmBFj7tQbkcyLE261JUeTUucEE3p0WLZ4qM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "674d05f9ae2249d606a0e6fc63e522d2031a27ac", "rev": "1fec8fda86dac5701146c77d5f8a414b14ed1ff6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,10 +374,9 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1665643254, "lastModified": 0,
"narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", "narHash": "sha256-HBcM19nGhI3IWwPNVlYb0MZ8VW6iKp4JbAVkeIHVykc=",
"path": "/nix/store/9z3mf509n245ydbsx13ygcp7w4yc3s5g-source", "path": "/nix/store/5356r3f8pfz731rwcm1xrwaqqcbrq8gg-source",
"rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -441,11 +402,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1662996720, "lastModified": 1654953433,
"narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=", "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5f326e2a403e1cebaec378e72ceaf5725983376d", "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,11 +418,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1665732960, "lastModified": 1662911228,
"narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", "narHash": "sha256-oJOrB2lEeBLaO8g1DKG5PK9a1zyOWypkscrEfxxEj8A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4428e23312933a196724da2df7ab78eb5e67a88e", "rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -563,11 +524,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1665843281, "lastModified": 1662966217,
"narHash": "sha256-OvRNNVJuismkTkpFjh3/B5vKZ6g0FK5mrx3jOsyUqmA=", "narHash": "sha256-jLOh0txlWYlvvSUJmPLdfdaaUuoqRJjGPEEUKF2ya94=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "335b2a8147ae0db34321842a0e2705f96091f210", "rev": "fbba74f5057f1941066ecca23c681adf6738e5c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -611,18 +572,17 @@
"impermanence": "impermanence_2", "impermanence": "impermanence_2",
"libwacom-surface": "libwacom-surface", "libwacom-surface": "libwacom-surface",
"linux-surface": "linux-surface", "linux-surface": "linux-surface",
"nixgl": "nixgl",
"pkg-compile": "pkg-compile", "pkg-compile": "pkg-compile",
"pkg-stable": "pkg-stable", "pkg-stable": "pkg-stable",
"pkg-unstable": "pkg-unstable", "pkg-unstable": "pkg-unstable",
"rnix-lsp": "rnix-lsp_2" "rnix-lsp": "rnix-lsp_2"
}, },
"locked": { "locked": {
"lastModified": 1665757700, "lastModified": 1660515901,
"narHash": "sha256-ewx+XtdjZSwoY148+FMAhnhkReb8wnXdB4jd48e/ew4=", "narHash": "sha256-5sQVUgj9vnDW8hPIrynGviUXFPADrrL9X4qm3SLbqPM=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "2f221bae4c04e89b371c64995b36c3fab48f82fe", "rev": "48fa0996c44bc160802faaad2692ccfbbfb2647b",
"revCount": 109, "revCount": 98,
"type": "git", "type": "git",
"url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git" "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
}, },
@ -665,11 +625,11 @@
}, },
"pkg-unstable": { "pkg-unstable": {
"locked": { "locked": {
"lastModified": 1665643254, "lastModified": 1660162369,
"narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", "narHash": "sha256-pZukMP4zCA1FaBg0xHxf7KdE/Nv/C5YbDID7h2L8O7A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", "rev": "3a11db5f408095b8f08b098ec2066947f4b72ce2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,7 +735,7 @@
}, },
"tablet-mode_2": { "tablet-mode_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
@ -794,11 +754,11 @@
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1653893745,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -824,11 +784,11 @@
}, },
"utils_3": { "utils_3": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1653893745,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
hosts/miku.nix
View File

@ -77,7 +77,7 @@
direnv.enable = true; direnv.enable = true;
office.enable = true; office.enable = true;
plasma = { plasma = {
enable = true; enable = false;
sddm = { sddm = {
backgroundImage = pkgs.fetchurl { backgroundImage = pkgs.fetchurl {
url = "https://cdn.donmai.us/original/d3/1b/__manjuu_prinz_eugen_roon_bismarck_friedrich_der_grosse_and_3_more_azur_lane_drawn_by_zaphn__d31bf4ac564d60f8787818842c369e7f.jpg"; url = "https://cdn.donmai.us/original/d3/1b/__manjuu_prinz_eugen_roon_bismarck_friedrich_der_grosse_and_3_more_azur_lane_drawn_by_zaphn__d31bf4ac564d60f8787818842c369e7f.jpg";
@ -90,14 +90,14 @@
}; };
services = { services = {
gamemode.enable = true; gamemode.enable = true;
gnome.enable = false; gnome.enable = true;
logiops.enable = true; logiops.enable = true;
input-remapper = { input-remapper = {
enable = true; enable = true;
postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\""; postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
}; };
gdm = { gdm = {
enable = false; enable = true;
}; };
}; };
system = { system = {
@ -188,10 +188,6 @@
libinput.enable = true; libinput.enable = true;
}; };
earlyoom.enable = lib.mkForce false; earlyoom.enable = lib.mkForce false;
udev.extraRules = ''
ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52b", ATTR{power/wakeup}="disabled", ATTR{driver/1-7/power/wakeup}="disabled"
'';
}; };
hardware = { hardware = {

BIN
lib/ports.nix Normal file
View File

Binary file not shown.

1
modules/default.nix
View File

@ -3,6 +3,7 @@
# Hardware modules # Hardware modules
./hardware/mobile.nix ./hardware/mobile.nix
./hardware/surface-pro6.nix ./hardware/surface-pro6.nix
./hardware/wifi.nix
# Programs # Programs
./programs/alacritty ./programs/alacritty

6
modules/desktop/plasma.nix
View File

@ -160,13 +160,9 @@ in {
breeze-gtk breeze-gtk
bismuth bismuth
gwenview gwenview
yakuake yakuake
kdeplasma-addons
plasma-nm
] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages; ] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages;
packages = with pkgs; [ packages = with pkgs; [
kde-rounded-corners
index-fm index-fm
rsibreak rsibreak
kalendar kalendar

BIN
modules/hardware/wifi.nix Normal file
View File

Binary file not shown.

2
modules/users/alexander.nix
View File

@ -24,7 +24,7 @@
programs.ssh = { programs.ssh = {
enable = true; enable = true;
matchBlocks = let matchBlocks = let
sshPort = 3434; sshPort = (import ../../lib/ports.nix).sshPort;
in { in {
ayame = { ayame = {
port = sshPort; port = sshPort;

2
overlays/sandbox.nix
View File

@ -85,8 +85,6 @@ in {
additionalBlacklist = [ "/mnt" ]; additionalBlacklist = [ "/mnt" ];
additionalMounts = [ additionalMounts = [
"/mnt/Storage/Games/LeagueOfLegends" "/mnt/Storage/Games/LeagueOfLegends"
"/mnt/Storage/Games/Origin"
"/mnt/Storage/Games/SteamLibrary"
"/mnt/tmp" "/mnt/tmp"
]; ];
mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ]; mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ];

60
overlays/simple.nix
View File

@ -68,4 +68,64 @@ final: prev:
}; };
discord-app = prev.discord-app.override { chromium = prev.ungoogled-chromium; }; discord-app = prev.discord-app.override { chromium = prev.ungoogled-chromium; };
lapce = prev.lapce.overrideAttrs (old: rec {
version = "0.1.2";
src = prev.fetchFromGitHub {
owner = "lapce";
repo = "lapce";
rev = "v${version}";
sha256 = "1pn3ikh72z5y1ywx3bilghrzrwqc1inds2yxnz37l8s1azf3nzlc";
};
cargoDeps = old.cargoDeps.overrideAttrs (_: {
inherit src;
outputHash = "sha256-spmRgwTh0Sg+OvT/s85xEvOfs2DdCihnX6Ya+sDyePM=";
});
nativeBuildInputs = with prev; old.nativeBuildInputs ++ [
wrapGAppsHook
];
buildInputs = with prev; old.buildInputs ++ [
libglvnd
glib cairo pango atk gdk-pixbuf gtk3
];
preFixup = ''
patchelf \
--add-needed ${prev.vulkan-loader}/lib/libvulkan.so.1 \
--add-needed ${prev.libglvnd}/lib/libGL.so.1 \
$out/bin/lapce
'';
});
# See https://github.com/NixOS/nixpkgs/issues/171320
# Fixes XWayland crashing after a resume.
xwayland = prev.xwayland.overrideAttrs (old: rec {
version = "21.1.4";
src = prev.fetchurl {
url = "mirror://xorg/individual/xserver/xwayland-${version}.tar.xz";
sha256 = "sha256-GfZ5XzHPqOs1Kx5bPDefIu5gIOmHAf8sxnnajE8RWfc=";
};
});
# See
# https://github.com/NixOS/nixpkgs/commit/2bf8d8c0162507d08f9fc48e36ce7225f4879bd4
libsForQt5 = prev.libsForQt5.overrideScope' (finalp: prevp: {
plasma5 = prevp.plasma5.overrideScope' (finalq: prevq: {
plasma-mobile = prevq.plasma-mobile.overrideAttrs (old: {
buildInputs = with prevp; old.buildInputs ++ [
plasma-workspace
];
});
});
});
plasma5Packages = prev.plasma5Packages.overrideScope' (finalp: prevp: {
plasma5 = prevp.plasma5.overrideScope' (finalq: prevq: {
plasma-mobile = prevq.plasma-mobile.overrideAttrs (old: {
buildInputs = with prevp; old.buildInputs ++ [
plasma-workspace
];
});
});
});
} }

4
packages/tools/games/replaysorcery/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, { stdenv, lib,
pkg-config, cmake, ffmpeg, libdrm, libpulseaudio, xorg, libnotify, pkgconfig, cmake, ffmpeg, libdrm, libpulseaudio, xorg, libnotify,
fetchgit }: fetchgit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config cmake pkgconfig cmake
]; ];
buildInputs = [ buildInputs = [

4
packages/tools/virtualisation/evdev-proxy/default.nix
View File

@ -1,7 +1,7 @@
{ {
lib lib
, rustPlatform , rustPlatform
, pkg-config, udev , pkgconfig, udev
, fetchFromGitHub , fetchFromGitHub
}: }:
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
patches = [ ./add-evdev-selector.patch ]; patches = [ ./add-evdev-selector.patch ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ udev ]; buildInputs = [ udev ];