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

Compare commits

base: PapaTutuWawa:507474099247df8c30cb4f229d2affd791f7c838
Branches Tags
PapaTutuWawa:master
..
compare: PapaTutuWawa:d8c7f5ff145b3f4a30d7d514f3c91767323b2425
Branches Tags
PapaTutuWawa:master

No commits in common. "507474099247df8c30cb4f229d2affd791f7c838" and "d8c7f5ff145b3f4a30d7d514f3c91767323b2425" have entirely different histories.
5074740992 ... d8c7f5ff14

14 changed files with 20 additions and 338 deletions
Show Stats Expand all files Collapse all files

228
flake.lock
View File

@ -33,27 +33,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-helper": {
"inputs": {
"nixpkgs": [
"ostylk-home",
"pkg-unstable"
]
},
"locked": {
"lastModified": 1645120126,
"narHash": "sha256-bAJO50lRaOUz+lQk+3cd+7Yz8+QGL3YyG8kpeHLtKMc=",
"ref": "master",
"rev": "35e3f54ad63695b2c00e650c17b30280d49e7232",
"revCount": 5,
"type": "git",
"url": "https://dev.ostylk.de/NixDistro/FlakeHelper.git"
},
"original": {
"type": "git",
"url": "https://dev.ostylk.de/NixDistro/FlakeHelper.git"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1644229661,
@ -114,21 +93,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
@ -170,50 +134,6 @@
"type": "github" "type": "github"
} }
}, },
"home-stable": {
"inputs": {
"nixpkgs": [
"ostylk-home",
"pkg-stable"
]
},
"locked": {
"lastModified": 1647175256,
"narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-21.11",
"repo": "home-manager",
"type": "github"
}
},
"home-unstable": {
"inputs": {
"nixpkgs": [
"ostylk-home",
"pkg-unstable"
]
},
"locked": {
"lastModified": 1648078876,
"narHash": "sha256-oa3RA0Z0UwEZ1M5kQOT9oUVd4ew3XePOu2oDTenFd98=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ac9404115362c901ffe5c5c215f76f74b79d5eda",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1640808801, "lastModified": 1640808801,
@ -247,24 +167,6 @@
"type": "github" "type": "github"
} }
}, },
"naersk_2": {
"inputs": {
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1639947939,
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
"owner": "nix-community",
"repo": "naersk",
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1647447644, "lastModified": 1647447644,
@ -399,35 +301,6 @@
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": {
"lastModified": 1645010845,
"narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=",
"path": "/nix/store/hkl03hpzvq0pj2qkc56485dd8fm27nng-source",
"rev": "2128d0aa28edef51fd8fef38b132ffc0155595df",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1642190797,
"narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1645373091, "lastModified": 1645373091,
"narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=", "narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=",
@ -477,67 +350,11 @@
"rev": "a1d35e75bf019737281854551d8e5c4aff76e6f7", "rev": "a1d35e75bf019737281854551d8e5c4aff76e6f7",
"revCount": 167, "revCount": 167,
"type": "git", "type": "git",
"url": "https://destiny.ostylk.de/gitea/NixDistro/Config.git" "url": "https://dev.ostylk.de/NixDistro/Config"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://destiny.ostylk.de/gitea/NixDistro/Config.git" "url": "https://dev.ostylk.de/NixDistro/Config"
}
},
"ostylk-home": {
"inputs": {
"flake-helper": "flake-helper",
"flake-utils": "flake-utils_4",
"home-stable": "home-stable",
"home-unstable": "home-unstable",
"pkg-stable": "pkg-stable",
"pkg-unstable": "pkg-unstable",
"rnix-lsp": "rnix-lsp_2"
},
"locked": {
"lastModified": 1648314458,
"narHash": "sha256-3eJDYivk8g5U4hSaD7c0WkwPcZ743Bc75vwRjTssO9I=",
"ref": "master",
"rev": "cb9d4eec8d6f27353f906d1d8f3bba90882504c9",
"revCount": 57,
"type": "git",
"url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
},
"original": {
"type": "git",
"url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
}
},
"pkg-stable": {
"locked": {
"lastModified": 1647992509,
"narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"pkg-unstable": {
"locked": {
"lastModified": 1648069223,
"narHash": "sha256-BXzQV8p/RR440EB9qY0ULYfTH0zSW1stjUCYeP4SF+E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1d08ea2bd83abef174fb43cbfb8a856b8ef2ce26",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"rnix-lsp": { "rnix-lsp": {
@ -564,27 +381,6 @@
"type": "github" "type": "github"
} }
}, },
"rnix-lsp_2": {
"inputs": {
"naersk": "naersk_2",
"nixpkgs": "nixpkgs_8",
"utils": "utils_2"
},
"locked": {
"lastModified": 1643586450,
"narHash": "sha256-BRIAc3+zavSlJPYSbov2n1W9/a4Iuh2swFPYRWjCm1g=",
"owner": "nix-community",
"repo": "rnix-lsp",
"rev": "41eb2f3366e3f351bf2563c2a7c46fd17e78dfe0",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "rnix-lsp",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"emacs": "emacs", "emacs": "emacs",
@ -594,7 +390,6 @@
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nur": "nur", "nur": "nur",
"ostylk": "ostylk", "ostylk": "ostylk",
"ostylk-home": "ostylk-home",
"stable": "stable", "stable": "stable",
"tablet-mode": "tablet-mode_2" "tablet-mode": "tablet-mode_2"
} }
@ -636,8 +431,8 @@
}, },
"tablet-mode_2": { "tablet-mode_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1645816436, "lastModified": 1645816436,
@ -667,21 +462,6 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_2": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

4
flake.nix
View File

@ -8,8 +8,7 @@
stable.url = "github:nixos/nixpkgs/nixos-21.05"; stable.url = "github:nixos/nixpkgs/nixos-21.05";
emacs.url = "github:nix-community/emacs-overlay"; emacs.url = "github:nix-community/emacs-overlay";
nur.url = "github:nix-community/nur"; nur.url = "github:nix-community/nur";
ostylk.url = "git+https://destiny.ostylk.de/gitea/NixDistro/Config.git"; ostylk.url = "git+https://dev.ostylk.de/NixDistro/Config";
ostylk-home.url = "git+https://destiny.ostylk.de/gitea/NixDistro/Home.git";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
tablet-mode.url = "git+https://dev.ostylk.de/NixDistro/tablet-mode.git"; tablet-mode.url = "git+https://dev.ostylk.de/NixDistro/tablet-mode.git";
}; };
@ -19,7 +18,6 @@
, nixpkgs , nixpkgs
, home-manager , home-manager
, flake-utils , flake-utils
, ostylk-home
, ... , ...
}@inputs: let }@inputs: let
inherit (import ./lib/flake.nix { inherit (import ./lib/flake.nix {

2
hosts/mashu.nix
View File

@ -42,7 +42,7 @@
plasma.mobile = true; plasma.mobile = true;
}; };
services = { services = {
gdm.enable = true; gnome.enable = true;
}; };
system = { system = {
i18n.enable = true; i18n.enable = true;

12
hosts/miku.nix
View File

@ -30,6 +30,7 @@
virt-manager qemu scream virt-manager qemu scream
replaysorcery # Custom package replaysorcery # Custom package
vfio-isolate # Custom Package vfio-isolate # Custom Package
discord-wrapped # Custom package
mumble mumble
piper trackma # Custom package piper trackma # Custom package
anime-dl # Custom package anime-dl # Custom package
@ -41,9 +42,6 @@
sublime-music sublime-music
anki anki
#psst #psst
# Proprietary stuff (yikes)
discord-wrapped discord-app-wrapped spotify-wrapped
]; ];
ptw = { ptw = {
@ -75,10 +73,6 @@
enable = false; enable = false;
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 = {
enable = true;
monitors = ../data/miku/monitors.xml;
};
}; };
system = { system = {
i18n.enable = true; i18n.enable = true;
@ -152,6 +146,10 @@
enable = true; enable = true;
layout = "de"; layout = "de";
libinput.enable = true; libinput.enable = true;
displayManager.gdm = {
wayland = true;
enable = true;
};
}; };
earlyoom.enable = lib.mkForce false; earlyoom.enable = lib.mkForce false;
}; };

6
hosts/nishimiya.nix
View File

@ -53,7 +53,7 @@
office.enable = true; office.enable = true;
}; };
services = { services = {
gdm.enable = true; gnome.enable = true;
kanshi = let kanshi = let
horizontal = "Samsung Electric Company C27F398 H4ZR101145"; horizontal = "Samsung Electric Company C27F398 H4ZR101145";
@ -116,6 +116,10 @@
enable = true; enable = true;
layout = "de"; layout = "de";
libinput.enable = true; libinput.enable = true;
displayManager.gdm = {
enable = true;
wayland = true;
};
}; };
}; };

8
lib/baseSystem.nix
View File

@ -102,9 +102,7 @@ in {
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel" "firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel"
"steam" "steam-original" "steam-runtime" "steam" "steam-original" "steam-runtime"
"discord" "discord-canary" "discord" "minecraft"
"minecraft"
"spotify" "spotify-unwrapped"
]; ];
services = { services = {
@ -113,7 +111,7 @@ in {
# Everyone needs sound # Everyone needs sound
pipewire = { pipewire = {
enable = true; enable = false;
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = true;
alsa.enable = true; alsa.enable = true;
@ -241,7 +239,7 @@ in {
hardware = { hardware = {
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
# This is a Pipewire household! # This is a Pipewire household!
pulseaudio.enable = false; #pulseaudio.enable = false;
opengl = { opengl = {
enable = true; enable = true;

1
modules/default.nix
View File

@ -10,7 +10,6 @@
./programs/emacs ./programs/emacs
./programs/firefox ./programs/firefox
./programs/gnome ./programs/gnome
./programs/gdm
./programs/gnome-terminal ./programs/gnome-terminal
./programs/mpv ./programs/mpv
./programs/git ./programs/git

1
modules/programs/emacs/dotemacs
View File

@ -89,7 +89,6 @@
(smartparens-global-mode t)) (smartparens-global-mode t))
(use-package undo-tree (use-package undo-tree
:config :config
(setq undo-tree-auto-save-history nil)
(global-undo-tree-mode)) (global-undo-tree-mode))
(setq-default indent-tab-mode t) (setq-default indent-tab-mode t)

22
modules/programs/gdm/default.nix
View File

@ -1,22 +0,0 @@
{ pkgs, config, lib, ... }:
let
cfg = config.ptw.services.gdm;
in {
options.ptw.services.gdm = {
enable = lib.mkEnableOption "Enable GDM as a display manager";
monitors = lib.mkOption {
description = "The file to use as a monitors.xml";
};
};
config = lib.mkIf cfg.enable {
services.xserver.displayManager.gdm = {
wayland = true;
enable = true;
# TODO: Use monitors.xml
# job
};
};
}

2
overlays/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, inputs }: { pkgs }:
{ {
simple = import ./simple.nix; simple = import ./simple.nix;

20
overlays/sandbox.nix
View File

@ -23,26 +23,6 @@ in {
categories = [ "Network" "InstantMessaging" ]; categories = [ "Network" "InstantMessaging" ];
}; };
}; };
discord-app-wrapped = wrapInSandbox {
name = "discord-app";
package = prev.discord-app;
binaryName = "discord-app";
mountInHome = [ ".local/share/discord-app" ];
additionalBlacklist = [ "/mnt" ];
chdirTo = "/home/$USER";
version = "1.0.0";
desktopFileArgs = {
name = "discord-app-wrapped";
#exec = "discord";
icon = "discord";
desktopName = "Discord-App (wrapped)";
genericName = "Instant Messenger";
categories = [ "Network" "InstantMessaging" ];
};
};
minecraft-wrapped = wrapInSandbox { minecraft-wrapped = wrapInSandbox {
name = "minecraft-launcher"; name = "minecraft-launcher";
package = prev.minecraft; package = prev.minecraft;

2
overlays/simple.nix
View File

@ -103,6 +103,4 @@ final: prev:
tor-browser-bundle-bin = prev.tor-browser-bundle-bin.override { tor-browser-bundle-bin = prev.tor-browser-bundle-bin.override {
useHardenedMalloc = false; useHardenedMalloc = false;
}; };
discord-app = prev.discord-app.override { chromium = prev.ungoogled-chromium; };
} }

46
packages/applications/networking/instant-messengers/discord-app/default.nix
View File

@ -1,46 +0,0 @@
{
stdenv
, makeDesktopItem, writeScript, fetchurl
, chromium
}:
let
script = writeScript "run-discord-app.sh" ''
${chromium}/bin/chromium \
--class="Discord-App" \
--app="https://discord.com/channels/@me" \
--user-data-dir=$HOME/.local/share/discord-app
'';
desktopItem = makeDesktopItem {
name = "discord-app";
desktopName = "Discord App";
genericName = "All-in-one cross-platform voice and text chat for gamers";
exec = "${script}";
icon = "discord";
type = "Application";
categories = [ "Network" "InstantMessaging" ];
startupWMClass = "Discord-App";
};
iconSvg = fetchurl {
url = "https://discord.com/assets/3437c10597c1526c3dbd98c737c2bcae.svg";
sha256 = "0w18j5pvqnaimnsx9flqm8n5yb7lnkc5jsvf1c9sk5a3jplq2j61";
};
in stdenv.mkDerivation {
pname = "discord-app";
version = "1.0.0";
buildInputs = [ chromium ];
phases = "installPhase";
installPhase = ''
# Install the icon
mkdir -p $out/share/pixmaps
cp ${iconSvg} $out/share/pixmaps/discord.svg
mkdir -p $out/bin
cp ${script} $out/bin/discord-app
cp -r ${desktopItem}/share/* $out/share
'';
}

4
packages/default.nix
View File

@ -61,8 +61,4 @@ in {
qtgreet = prev.libsForQt5.callPackage ./qtgreet.nix {}; qtgreet = prev.libsForQt5.callPackage ./qtgreet.nix {};
spice-gtk = prev.callPackage temp/spice-gtk/default.nix {}; spice-gtk = prev.callPackage temp/spice-gtk/default.nix {};
discord-app = prev.callPackage applications/networking/instant-messengers/discord-app {
chromium = prev.ungoogled-chromium;
};
} }