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

changes

Browse Source
This commit is contained in:
PapaTutuWawa 2022-06-30 19:59:45 +02:00
parent 5df4e2c43d
commit fe60c609e6
7 changed files with 123 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flake.lock
View File

@ -24,11 +24,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1655198178, "lastModified": 1655439103,
"narHash": "sha256-S59GMG8VO2r0VkPWNWRktBxCND+jWOei1Km4cWR7XOw=", "narHash": "sha256-onKTZs6VViLnedg0AEQferHDKCZJchoLMt0murICkao=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "25ce68a5d0f177f1cc68f48376ee180dc0f9f292", "rev": "e8aa04eaa4cb8664a72191547fc2395dddd3c112",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,11 +173,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1655199284, "lastModified": 1655381586,
"narHash": "sha256-R/g2ZWplGWVOfm2TyB4kR+YcOE/uWkgjkYrl/RYgJ/U=", "narHash": "sha256-2IrSYYjxoT+iOihSiH0Elo9wzjbHjDSH+qPvI5BklCs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "87d30c164849a7471d99749aa4d2d28b81564f69", "rev": "1de492f6f8e9937c822333739c5d5b20d93bf49f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -356,8 +356,8 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", "narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=",
"path": "/nix/store/d84iknazpzwbjbj1j9zh9wnh6v6dzlfb-source", "path": "/nix/store/xx16m0bh181qgmfk6lw8h59ri2xv192v-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -415,11 +415,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1655130522, "lastModified": 1655306633,
"narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=", "narHash": "sha256-nv4FfWWV/dEelByjXJtJkoDPOHIsKfLq50RN3Hqq5Yk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "13f08d71ceff5101321e0291854495a1ec153a5e", "rev": "b1957596ff1c7aa8c55c4512b7ad1c9672502e8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,11 +550,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1655199919, "lastModified": 1655438881,
"narHash": "sha256-DOwpi0H4SVMKJ+QX/REgNESw6EHVoiQYjdHWyZLOuQs=", "narHash": "sha256-bbodx1uMbLihOn4LNidNqKLs66xGH6fkZaUz38xHaXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "c92906e4e6425ffe1be7d1a52018c1b8d5b40ca6", "rev": "3d02f72e61403bb14e97780e0b1fc160517a8907",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/miku.nix
View File

@ -81,7 +81,7 @@
}; };
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;

4
lib/baseSystem.nix
View File

@ -116,7 +116,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;
@ -244,7 +244,7 @@ in {
hardware = { hardware = {
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
# This is a Pipewire household! # This is a Pipewire household!
pulseaudio.enable = false; pulseaudio.enable = true;
opengl = { opengl = {
enable = true; enable = true;

75
modules/programs/plasma/default.nix
View File

@ -23,10 +23,71 @@ in {
runUsingSystemd = true; runUsingSystemd = true;
supportDDC = true; supportDDC = true;
mobile.enable = cfg.mobile.enable; mobile.enable = cfg.mobile.enable;
/*
kdeglobals = lib.mkIf cfg.mobile.enable {
KDE = {
StartDragDist = "10";
LookAndFeelPackage = "org.kde.plasma.phone";
};
Icons = {
Theme = "breeze";
};
General = {
ColorScheme = "breeze";
Name = "breeze";
XftHintStyle = "none";
XftSubPixel = "none";
shadeSortColumn = "true";
};
};
kwinrc = {
Plugins = {
"org.kde.phone.multitaskingEnabled" = "false";
"kwin4_effect_eyeonscreenEnabled" = "false";
"kwin4_effect_windowapertureEnabled" = "false";
blurEnabled = "false";
contrastEnabled = "false";
};
Windows = {
Placement = "Maximizing";
};
TabBox = {
TouchBorderActive = "9";
TouchBorderAlternativeActive = "9";
BorderActivate = "9";
};
"Effect-PresentWindows" = {
BorderActivateAll = "9";
};
"org.kde.kdecoration2" = {
NoPlugin = "true";
};
TouchEdges = {
Left = "None";
Right = "None";
};
Wayland = {
InputMethod = "${pkgs.maliit-keyboard}/usr/share/applications/com.github.maliit.keyboard.desktop";
};
};
*/
}; };
# See https://github.com/NixOS/nixpkgs/commit/a506f9c79700255c215dddb53455d5e2bed6c1af # See https://github.com/NixOS/nixpkgs/commit/a506f9c79700255c215dddb53455d5e2bed6c1af
displayManager.defaultSession = lib.mkIf cfg.wayland.enable "plasmawayland"; displayManager = {
defaultSession = lib.mkIf cfg.wayland.enable "plasmawayland";
#sessionPackages = lib.mkIf cfg.mobile.enable [ pkgs.libsForQt5.plasma5.plasma-mobile ];
};
}; };
xdg.portal = { xdg.portal = {
@ -35,6 +96,13 @@ in {
}; };
environment.systemPackages = let environment.systemPackages = let
/*plasmaMobilePackages = with pkgs.libsForQt5; with plasma5; with kdeApplications; with kdeFrameworks; [
plasma-mobile
plasma-nano
pkgs.maliit-framework
pkgs.maliit-keyboard
];*/
plasmaMobilePackages = [];
kdePackages = with pkgs.libsForQt5; [ kdePackages = with pkgs.libsForQt5; [
okular okular
kdeconnect-kde kdeconnect-kde
@ -42,13 +110,14 @@ in {
bismuth bismuth
gwenview gwenview
yakuake yakuake
]; ] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages;
packages = with pkgs; [ packages = with pkgs; [
kde-rounded-corners #kde-rounded-corners
index-fm index-fm
rsibreak rsibreak
kalendar kalendar
kate kate
okular
# Some Gnome software # Some Gnome software
gnome.totem gnome.totem

3
modules/users/alexander.nix
View File

@ -4,13 +4,14 @@
config = lib.mkIf (config.ptw.system.singleUser == "alexander") { config = lib.mkIf (config.ptw.system.singleUser == "alexander") {
users.users.alexander = { users.users.alexander = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "audio" "video" "kvm" "input" "libvirtd" "scanner" "lp" ]; extraGroups = [ "wheel" "audio" "video" "kvm" "input" "libvirtd" "scanner" "lp" "alexander" ];
hashedPassword = "$5$i4aZuQ/WXP.rFOc$lCzDqbrVsqBQt5954O.3bFPknD0jn27MmqzmE4DIAEC"; hashedPassword = "$5$i4aZuQ/WXP.rFOc$lCzDqbrVsqBQt5954O.3bFPknD0jn27MmqzmE4DIAEC";
shell = pkgs.zsh; shell = pkgs.zsh;
useDefaultShell = false; useDefaultShell = false;
uid = 1000; uid = 1000;
isSystemUser = false; isSystemUser = false;
}; };
users.groups.alexander = {};
# Activate gpg # Activate gpg
programs.gnupg.agent.enable = true; programs.gnupg.agent.enable = true;

4
overlays/phosh.nix
View File

@ -21,7 +21,7 @@ rec {
}); });
phosh = prev.phosh.overrideAttrs (old: rec { phosh = prev.phosh.overrideAttrs (old: rec {
version = "0.20.0"; version = "0.20.0_beta2";
src = prev.fetchFromGitLab { src = prev.fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
group = "World"; group = "World";
@ -29,7 +29,7 @@ rec {
repo = "phosh"; repo = "phosh";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
sha256 = "sha256-o/0NJZo1EPpXguN/tkUc+/9XaVTQWaLGe+2pU0B91Cg="; sha256 = "sha256-UzOv6ztxYYE4CIzCYKSRfpZzE7oSEKenVX+umkEmFRw=";
}; };
buildInputs = (map buildInputs = (map

29
overlays/simple.nix
View File

@ -97,4 +97,33 @@ final: prev:
$out/bin/lapce $out/bin/lapce
''; '';
}); });
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
];
});
});
});
} }