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

Compare commits

base: PapaTutuWawa:f72a872dffb54755f4de70fe586c70e778d4b4bf
Branches Tags
PapaTutuWawa:master
..
compare: PapaTutuWawa:b03dd28e72f22605623cea75574eb1d3c4dce691
Branches Tags
PapaTutuWawa:master

No commits in common. "f72a872dffb54755f4de70fe586c70e778d4b4bf" and "b03dd28e72f22605623cea75574eb1d3c4dce691" have entirely different histories.
f72a872dff ... b03dd28e72

12 changed files with 265 additions and 213 deletions
Show Stats Expand all files Collapse all files

147
flake.lock
View File

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1640802000, "lastModified": 1634404028,
"narHash": "sha256-ZiI94Zv/IgW64fqKrtVaQqfUCkn9STvAjgfFmvtqcQ8=", "narHash": "sha256-JyP2Y6JCCYvUcVz7CXX5pXUfTGTU4GX51Yza82BgMfk=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "c5558c88b2941bf94886dfdede6926b1ba5f5629", "rev": "53aa91b4170da35a96fab1577c9a34bc0da44e27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
}, },
"emacs": { "emacs": {
"locked": { "locked": {
"lastModified": 1641205295, "lastModified": 1638668516,
"narHash": "sha256-DG1JHIBWfLu9wLXcyRyHeQCmbWjtHNKMWSEjJQrYfAU=", "narHash": "sha256-u67dzO+HVWlimD6OSXSajvkU6/c7fGp4faC48uCln7k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "150c09f3e3029b4d2f0ceecee2bf3d5148404767", "rev": "bd45e439c084c145d67272419eaf96b978f5c2ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,11 +50,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1634851050,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,11 +68,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1641121012, "lastModified": 1638571010,
"narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=", "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6", "rev": "781d25b315def05cd7ede3765226c54216f0b1fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1638281721, "lastModified": 1634544068,
"narHash": "sha256-d3vAVFG6zov9NwjSuYntBiD+I5KjJLwX09c7uAzbONI=", "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7329ffc6e911106494183557fc249180d5422929", "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +103,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1640808801, "lastModified": 1636812815,
"narHash": "sha256-iHo8vyuYyhbk5MGfwn/7IahF8dBAwUYTZga4u0UsqPQ=", "narHash": "sha256-OG4/4cD2sGNM+ROaYhczwUJ3YCtzaIgX96rFjCs85JE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "29d781b47b0ee6014abd541c132c647d18ab098e", "rev": "00df1e57bb9c7551b45a11c70f5472d0cbfbfff7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,57 +121,41 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1639947939, "lastModified": 1629707199,
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
"owner": "nix-community", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", "rev": "df71f5e4babda41cd919a8684b72218e2e809fa9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1640686209, "lastModified": 1635881984,
"narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=", "narHash": "sha256-m6qai5HI+5/4uqSAiR1JceKQrimu/H3iOOn3BXWw3Rc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixos-hardware_2": {
"locked": {
"lastModified": 1637957946,
"narHash": "sha256-zhAql8UR2R/88VCEjvzoVpcFi3k4gkhJayNuYNZaWMY=",
"owner": "ostylk", "owner": "ostylk",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "bf27ac0017bb06c950f2f59a1213329382cb47c5", "rev": "b4238e8fb309c2d4ea1038423e9c47c5005aa0e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ostylk", "owner": "ostylk",
"ref": "surface-update", "ref": "surface-test",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1638698569, "lastModified": 1638198142,
"narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=", "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
"path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source", "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
"rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35", "rev": "8a308775674e178495767df90c419425474582a1",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -181,11 +165,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1640540585, "lastModified": 1636800699,
"narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=", "narHash": "sha256-SwbyVxXffu3G2ulJIbTf0iQfqhbGbdml4Dyv5j9BiAI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac169ec6371f0d835542db654a65e0f2feb07838", "rev": "2fa862644fc15ecb525eb8cd0a60276f1c340c7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +181,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1641210259, "lastModified": 1638698569,
"narHash": "sha256-O7oWcTw9WY/gbZPPqDpNYOAeT4bOK+1rtYC9ZaevTT0=", "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18c84ea816348e2a098390101b92d1e39a9dbd45", "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,10 +210,10 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1638698569, "lastModified": 1638198142,
"narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=", "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
"path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source", "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
"rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35", "rev": "8a308775674e178495767df90c419425474582a1",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -239,11 +223,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1640653651, "lastModified": 1636855248,
"narHash": "sha256-fByFYXYoE/6TqwKGbT7XBCOAlSsFzOXm4ZsRLoO70m8=", "narHash": "sha256-ISyGm3p9uNvSqsgguK6+Pr0IDJ3pik14wTHZXfF3e/s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61", "rev": "195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,10 +239,10 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1638698569, "lastModified": 1638198142,
"narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=", "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
"path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source", "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
"rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35", "rev": "8a308775674e178495767df90c419425474582a1",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -268,11 +252,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1640929225, "lastModified": 1638564543,
"narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=", "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9", "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -284,11 +268,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1641198127, "lastModified": 1638683309,
"narHash": "sha256-V5beyGlEIPoA5tGRHR8HKgUNOfq2Pk/pMRJsTDe5aH0=", "narHash": "sha256-KH8l/3/Ptvw4t7fzMO9hb5RmrAK7KNiFM9hqBG1YgMs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "f3540de5479a029dbf289232611800e3a83c6913", "rev": "64e93e9e68325ed12029732bac269ada92ff65f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,17 +287,17 @@
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"impermanence": "impermanence", "impermanence": "impermanence",
"nixos-hardware": "nixos-hardware_2", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"rnix-lsp": "rnix-lsp" "rnix-lsp": "rnix-lsp"
}, },
"locked": { "locked": {
"lastModified": 1641167986, "lastModified": 1636987186,
"narHash": "sha256-3rsvxh53szG4Bsi+Z9soKUeQ0mkPIIXRKLcd7ixhGH8=", "narHash": "sha256-uJ0Px5gvwtXF+HoGhMnN6Sel30XFcJUhhZfqXPFh6/A=",
"ref": "master", "ref": "master",
"rev": "f433548e1182c66e5fe403b80dc213a09c630455", "rev": "44b8e77f43d9aadf31d8d696cf514784cc6a01eb",
"revCount": 155, "revCount": 143,
"type": "git", "type": "git",
"url": "https://dev.ostylk.de/NixDistro/Config" "url": "https://dev.ostylk.de/NixDistro/Config"
}, },
@ -329,11 +313,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1640347520, "lastModified": 1636977689,
"narHash": "sha256-UkieGBW9ap0pQbumYoG60Ed+BpzMRGuLQ6Zb41u7Fkk=", "narHash": "sha256-pQmAxKBoEhC851iRsowMErz9CYiJxGpARjhPeSapH1Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "rnix-lsp", "repo": "rnix-lsp",
"rev": "d7cc2887ac9e65dd01715aac472edbf46b93ed31", "rev": "9462b0d20325a06f7e43b5a0469ec2c92e60f5fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,7 +332,6 @@
"emacs": "emacs", "emacs": "emacs",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nur": "nur", "nur": "nur",
"ostylk": "ostylk", "ostylk": "ostylk",
@ -357,11 +340,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1640929225, "lastModified": 1638564543,
"narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=", "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9", "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -4,12 +4,12 @@
inputs = { inputs = {
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
#nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs/master";
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://dev.ostylk.de/NixDistro/Config"; ostylk.url = "git+https://dev.ostylk.de/NixDistro/Config";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
}; };
outputs = { outputs = {

6
hosts/mashu.nix
View File

@ -1,10 +1,6 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, ... }:
{ {
imports = with inputs.nixos-hardware.nixosModules; [
common-cpu-intel common-pc-ssd microsoft-surface
];
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-label/root"; device = "/dev/disk/by-label/root";

17
hosts/miku.nix
View File

@ -1,10 +1,6 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, ... }:
{ {
imports = with inputs.nixos-hardware.nixosModules; [
common-cpu-amd common-gpu-amd common-pc-ssd
];
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-label/root"; device = "/dev/disk/by-label/root";
@ -32,8 +28,8 @@
trackma # Custom package trackma # Custom package
anime-dl # Custom package anime-dl # Custom package
thunderbird thunderbird
#multimc-wrapped # Custom package multimc-wrapped # Custom package
#nwg-launchers nwg-launchers
gnome-podcasts gnome-podcasts
cantata cantata
newsflash newsflash
@ -59,7 +55,7 @@
}; };
xournalpp.enable = true; xournalpp.enable = true;
zsh.enable = true; zsh.enable = true;
#plasma.enable = true; plasma.enable = true;
}; };
services = { services = {
gamemode.enable = true; gamemode.enable = true;
@ -147,14 +143,11 @@
"kvm.report_ignored_msrs=N" "kvm.report_ignored_msrs=N"
"fbcon=rotate:3" "fbcon=rotate:3"
"quiet" "quiet"
"nopti"
"nospectre_v2"
"nospec"
"clocksource=tsc" "clocksource=tsc"
"tsc=reliable" "tsc=reliable"
]; ];
extraModulePackages = [ pkgs.linuxPackages_zen.vendor-reset ]; #extraModulePackages = [ pkgs.linuxPackages_xanmod.vendor-reset ];
#extraModulePackages = [ pkgs.linuxPackages.vendor-reset ]; #extraModulePackages = [ pkgs.linuxPackages.vendor-reset ];
# NOTE: A regression appears to have happend between 5.10 and 5.12 # NOTE: A regression appears to have happend between 5.10 and 5.12

91
lib/baseSystem.nix
View File

@ -112,96 +112,6 @@ in {
jack.enable = true; jack.enable = true;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
/*
config.pipewire = {
"context.modules" = [
{
name = "libpipewire-module-rtkit";
args = {};
flags = [ "ifexists" "nofail" ];
}
{ name = "libpipewire-module-protocol-native"; }
{ name = "libpipewire-module-client-node"; }
{ name = "libpipewire-module-adapter"; }
{ name = "libpipewire-module-metadata"; }
{
name = "libpipewire-module-filter-chain";
args = {
"node.name" = "effect_output.virtual-surround-7.1-hesuvi";
"node.description" = "Virtual Surround Sink";
"media.name" = "Virtual Surround Sink";
"filter.graph" = {
nodes = [
{ type = "builtin"; label = "copy"; name = "copyFL"; }
{ type = "builtin"; label = "copy"; name = "copyFR"; }
{ type = "builtin"; label = "copy"; name = "copyFC"; }
{ type = "builtin"; label = "copy"; name = "copyRL"; }
{ type = "builtin"; label = "copy"; name = "copyRR"; }
{ type = "builtin"; label = "copy"; name = "copySL"; }
{ type = "builtin"; label = "copy"; name = "copySR"; }
{ type = "builtin"; label = "copy"; name = "copyLFE"; }
{ type = "builtin"; label = "convolver"; name = "convFL_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 0; }; }
{ type = "builtin"; label = "convolver"; name = "convFL_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 1; }; }
{ type = "builtin"; label = "convolver"; name = "convSL_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 2; }; }
{ type = "builtin"; label = "convolver"; name = "convSL_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 3; }; }
{ type = "builtin"; label = "convolver"; name = "convRL_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 4; }; }
{ type = "builtin"; label = "convolver"; name = "convRL_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 5; }; }
{ type = "builtin"; label = "convolver"; name = "convFC_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 6; }; }
{ type = "builtin"; label = "convolver"; name = "convFR_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 7; }; }
{ type = "builtin"; label = "convolver"; name = "convFR_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 8; }; }
{ type = "builtin"; label = "convolver"; name = "convSR_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 9; }; }
{ type = "builtin"; label = "convolver"; name = "convSR_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 10; }; }
{ type = "builtin"; label = "convolver"; name = "convRR_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 11; }; }
{ type = "builtin"; label = "convolver"; name = "convRR_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 12; }; }
{ type = "builtin"; label = "convolver"; name = "convFC_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 13; }; }
{ type = "builtin"; label = "convolver"; name = "convLFE_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 6; }; }
{ type = "builtin"; label = "convolver"; name = "convLFE_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 13; }; }
{ type = "builtin"; label = "mixer"; name = "mixL"; }
{ type = "builtin"; label = "mixer"; name = "mixR"; }
];
links = let
linkInput = channel: [
{ output = "copy${channel}:Out"; input = "conv${channel}_L:In"; }
{ output = "copy${channel}:Out"; input = "conv${channel}_R:In"; }
];
linkOutput = channel: n: [
{ output = "conv${channel}_L:Out"; input = "mix_L:In ${builtins.toString n}"; }
{ output = "conv${channel}_R:Out"; input = "mix_R:In ${builtins.toString n}"; }
];
in (builtins.concatMap (channel: linkInput channel) [ "FL" "SL" "RL" "FC" "FR" "SR" "RR" "LFE" ])
++ [
(linkOutput "FL" 1)
(linkOutput "SL" 2)
(linkOutput "RL" 3)
(linkOutput "FC" 4)
(linkOutput "FR" 5)
(linkOutput "SR" 6)
(linkOutput "RR" 7)
(linkOutput "LFE" 8)
];
inputs = builtins.map (channel: "copy${channel}:In") [ "FL" "SL" "RL" "FC" "FR" "SR" "RR" "LFE" ];
outputs = [ "mixL:Out" "mixR:Out" ];
};
"capture.props" = {
"media.class" = "Audio/Sink";
"audio.channels" = 8;
"audio.position" = [ "FL" "FR" "FC" "LFE" "RL" "RR" "SL" "SR" ];
};
"playback.props" = {
"node.passive" = true;
"audio.channels" = 2;
"audio.positions" = [ "FL" "FR" ];
};
};
}
];
};
*/
}; };
# On desktop: Monitor keyboards, mice, ... # On desktop: Monitor keyboards, mice, ...
@ -261,7 +171,6 @@ in {
}; };
boot = { boot = {
cleanTmpDir = true;
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;

114
modules/hardware/surface-pro6.nix
View File

@ -1,6 +1,17 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
fetchurl = pkgs.fetchurl;
commit = "a602640f4334990828e07cf78bc78217b4e7901e";
kernelVersion = "5.15";
mkPatch = name: sha256: {
name = name;
patch = fetchurl {
inherit sha256;
url = "https://raw.githubusercontent.com/linux-surface/linux-surface/${commit}/patches/${kernelVersion}/${name}.patch";
};
};
cfg = config.ptw.hardware.surface; cfg = config.ptw.hardware.surface;
in { in {
options.ptw.hardware.surface = { options.ptw.hardware.surface = {
@ -48,26 +59,101 @@ in {
}; };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_5_15;
kernelPatches = [ kernelPatches = [
(mkPatch "0001-surface3-oemb" "0id92a1g9ghvw2wf05ad3j4i294m118rvb23rywvm04wcasgav4a")
(mkPatch "0002-mwifiex" "091380bv1gmbzh9ldcnhdw64g8m5lz0akync7r0lazcm6fjcwnxa")
(mkPatch "0003-ath10k" "1hy22n8mdw743gnh82asnyjiivx9hz95a6svf6lr2pkdz5dl48ra")
(mkPatch "0004-ipts" "0c192h414wp0zgcm78q79wcavrzah33k94vb1cjzfl6y53agzjam")
(mkPatch "0005-surface-sam" "1awffwlp6wz0i0kb4xd7zy7y7syggzc04ay53nxjhn54n8djlb1r")
(mkPatch "0006-surface-sam-over-hid" "1nf9wy57hqr28f2lqk9vjvk0fkm9vs3j8nq4f8izhdqmazl8bbak")
(mkPatch "0007-surface-gpe" "0a77haazdsmv4kr76cfng829cgd4zrzvbn3pf1rl67vbl6il9wli")
(mkPatch "0008-surface-button" "1ja9n1iia3p6cjifds95cv684w8cr2kibj19k7fm8bm58achia6f")
(mkPatch "0009-surface-typecover" "0dmcsilqcqzr3rdc8lpq857pjgkj9agmns8g1nrax9h0rfh9gl3m")
#(mkPatch "0010-cameras" "1clvd09qbl3cjmxmpjvnfq4f9csqarzk13ahz3s69hq401a2a83m")
(mkPatch "0011-amd-gpio" "0552k7d9hajafryvjvlxbaxbxkqmhjmk4i3hxbpdb3czz7i9cyzj") # TODO: Maybe drop
(mkPatch "0012-misc-fixes" "16fslvys2zjp8fpysig51cchikskzpvjww9w4nk3wsz6yh1xdm0f")
{ {
name = "surface-config"; name = "surface-config";
patch = null; patch = null;
# Options from https://github.com/linux-surface/linux-surface/blob/master/configs/surface-5.13.config # Options from https://github.com/linux-surface/linux-surface/blob/master/configs/surface-5.13.config
extraConfig = '' extraConfig = ''
# #
# Other # Surface Aggregator Module
# #
# Prevent a non-fatal "kernel oops" at boot crashing udev SURFACE_AGGREGATOR m
# (https://github.com/linux-surface/linux-surface/issues/61#issuecomment-579298172) SURFACE_AGGREGATOR_ERROR_INJECTION n
PINCTRL_INTEL y SURFACE_AGGREGATOR_BUS y
PINCTRL_SUNRISEPOINT y SURFACE_AGGREGATOR_CDEV m
# Required for reading battery data SURFACE_AGGREGATOR_REGISTRY m
# (https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing)
SERIAL_DEV_BUS y SURFACE_ACPI_NOTIFY m
SERIAL_DEV_CTRL_TTYPORT y SURFACE_DTX m
MFD_INTEL_LPSS_PCI y SURFACE_PLATFORM_PROFILE m
INTEL_IDMA64 y
''; SURFACE_HID m
SURFACE_KBD m
BATTERY_SURFACE m
CHARGER_SURFACE m
#
# Surface Hotplug
#
SURFACE_HOTPLUG m
#
# IPTS touchscreen
#
# This only enables the user interface for IPTS data.
# For the touchscreen to work, you need to install iptsd.
#
MISC_IPTS m
#
# Cameras: IPU3
#
#VIDEO_IPU3_IMGU m
VIDEO_IPU3_CIO2 m
CIO2_BRIDGE y
#INTEL_SKL_INT3472 m
#
# Cameras: Sensor drivers
#
#VIDEO_OV5693 m
VIDEO_OV8865 m
#
# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
#
APDS9960 m
#
# Other Drivers
#
INPUT_SOC_BUTTON_ARRAY m
SURFACE_3_BUTTON m
SURFACE_3_POWER_OPREGION m
SURFACE_PRO3_BUTTON m
SURFACE_GPE m
SURFACE_BOOK1_DGPU_SWITCH m
#
# Other
#
# Prevent a non-fatal "kernel oops" at boot crashing udev
# (https://github.com/linux-surface/linux-surface/issues/61#issuecomment-579298172)
PINCTRL_INTEL y
PINCTRL_SUNRISEPOINT y
# Required for reading battery data
# (https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing)
SERIAL_DEV_BUS y
SERIAL_DEV_CTRL_TTYPORT y
MFD_INTEL_LPSS_PCI y
INTEL_IDMA64 y
'';
} }
]; ];
}; };

2
modules/programs/gnome/default.nix
View File

@ -39,7 +39,7 @@ in {
geoclue2.enable = false; geoclue2.enable = false;
dleyna-renderer.enable = false; dleyna-renderer.enable = false;
dleyna-server.enable = false; dleyna-server.enable = false;
gvfs.enable = true; gvfs.enable = lib.mkForce false;
telepathy.enable = false; telepathy.enable = false;
gnome = { gnome = {
chrome-gnome-shell.enable = false; chrome-gnome-shell.enable = false;

18
overlays/simple.nix
View File

@ -1,14 +1,24 @@
final: prev: final: prev:
{ let
/* # NOTE: For some reason --fs-screen-name and --screen-name are not in
mpv = prev.wrapMpv mpv { # 0.33.1. So wait and then remove this.
mpv-git = prev.mpv-unwrapped.overrideAttrs (old: {
version = "0.34.0";
src = builtins.fetchGit {
url = "https://github.com/mpv-player/mpv.git";
ref = "master";
rev = "0b56e1c00a57fdb767674462c299a5c973a9e373";
};
patches = [];
});
in {
mpv = prev.wrapMpv mpv-git {
# Prevent the need for prefixing mpv with DRI_PRIME=1 # Prevent the need for prefixing mpv with DRI_PRIME=1
extraMakeWrapperArgs = [ extraMakeWrapperArgs = [
"--set" "DRI_PRIME" "1" "--set" "DRI_PRIME" "1"
]; ];
}; };
*/
gajim = prev.gajim.overrideAttrs (old: { gajim = prev.gajim.overrideAttrs (old: {
# Enable notification sounds # Enable notification sounds

4
packages/applications/networking/instant-messengers/gajim/default.nix
View File

@ -19,14 +19,14 @@
}: }:
let let
commit = "b3449635ac737d7c87640d0cdae93f1423571b97"; commit = "2804e759eee439eb5d660368358b685a3c0b4110";
in python3.pkgs.buildPythonApplication rec { in python3.pkgs.buildPythonApplication rec {
pname = "gajim"; pname = "gajim";
version = "1.4.0"; version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "https://dev.gajim.org/gajim/gajim/-/archive/${commit}/gajim-${commit}.tar.gz"; url = "https://dev.gajim.org/gajim/gajim/-/archive/${commit}/gajim-${commit}.tar.gz";
sha256 = "sha256-9FTuZKhd0lC1r3nEQlqzBBQ5gyp3H/rpwUpN6+eDAL8="; sha256 = "sha256-G5nvLlkEU89uAQZuYlZrPa0ycR7kx67sOLmUgORhNJw=";
}; };
buildInputs = [ buildInputs = [

1
packages/default.nix
View File

@ -54,6 +54,7 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
sddm-sugar-dark = prev.callPackage ./sddm-sugar-dark {}; sddm-sugar-dark = prev.callPackage ./sddm-sugar-dark {};
iptsd = prev.callPackage ./tools/daemons/iptsd {};
surface-control = prev.callPackage ./tools/system/surface-control {}; surface-control = prev.callPackage ./tools/system/surface-control {};
trackma = prev.callPackage ./tools/video/trackma {}; trackma = prev.callPackage ./tools/video/trackma {};

42
packages/tools/daemons/iptsd/default.nix Normal file
View File

@ -0,0 +1,42 @@
{
stdenv, lib
, fetchFromGitHub
, meson, cmake, ninja, pkg-config
, inih, systemd
}:
stdenv.mkDerivation rec {
pname = "iptsd";
version = "0.4";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
sha256 = "0bh7rr37yck82g41dw2xcfkmyp1ncd27n1slb8xlknp7vs9f10qa";
};
mesonFlags = [
"-Dsample_config=false"
"-Ddebug_tool=false"
];
patches = [
./meson.patch
];
postPatch = ''
sed -e "s|@UDEVRULESDIR@|$out/lib/udev/rules.d/|" --in-place meson.build
'';
nativeBuildInputs = [ meson cmake ninja pkg-config ];
buildInputs = [ inih systemd ];
meta = with lib; {
homepage = "https://github.com/linux-surface/iptsd";
description = "Userspace daemon for Intel Precise Touch & Stylus";
license = licenses.gpl2;
maintainers = [];
platforms = platforms.linux;
};
}

32
packages/tools/daemons/iptsd/meson.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/meson.build b/meson.build
index b74a177..ca41ba3 100644
--- a/meson.build
+++ b/meson.build
@@ -104,18 +104,19 @@ configure_file(
service_manager = get_option('service_manager')
if service_manager.contains('systemd')
systemd = dependency('systemd')
- unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+ #unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
udev = dependency('udev')
- udevdir = udev.get_pkgconfig_variable('udevdir')
- rulesdir = join_paths(udevdir, 'rules.d')
+ #udevdir = udev.get_pkgconfig_variable('udevdir')
+ #udevdir = '@UDEVDIR@';
+ #rulesdir = join_paths('@UDEVDIR@', 'rules.d')
- install_data(
- join_paths(meson.current_build_dir(), 'iptsd.service'),
- install_dir: unitdir
- )
+########install_data(
+######## join_paths(meson.current_build_dir(), 'iptsd.service'),
+######## install_dir: unitdir
+########)
- install_data('etc/udev/50-ipts.rules', install_dir: rulesdir)
+ install_data('etc/udev/50-ipts.rules', install_dir: '@UDEVRULESDIR@')
endif
if service_manager.contains('openrc')