Compare commits

..

No commits in common. "f5427d40e93e53148729cddd44d3d7b7465caddf" and "302a8ec1b355f6faacd7b65262a1308c24967a7b" have entirely different histories.

16 changed files with 245 additions and 297 deletions

256
flake.lock generated
View file

@ -33,11 +33,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1752217044,
"narHash": "sha256-5TomR72rn4q+5poQcN6EnanxeXKqJSqWVAoDAFN0lUc=",
"lastModified": 1751403276,
"narHash": "sha256-V0EPQNsQko1a8OqIWc2lLviLnMpR1m08Ej00z5RVTfs=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "24fad0622fc9404c69e83bab7738359c5be4988e",
"rev": "896ad88fa57ad5dbcd267c0ac51f1b71ccfcb4dd",
"type": "github"
},
"original": {
@ -114,12 +114,18 @@
}
},
"crane": {
"inputs": {
"nixpkgs": [
"attic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1751562746,
"narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=",
"lastModified": 1722960479,
"narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=",
"owner": "ipetkov",
"repo": "crane",
"rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd",
"rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4",
"type": "github"
},
"original": {
@ -209,11 +215,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@ -238,6 +244,21 @@
"type": "github"
}
},
"flake-compat_3": {
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@ -246,11 +267,11 @@
]
},
"locked": {
"lastModified": 1751413152,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
@ -267,11 +288,11 @@
]
},
"locked": {
"lastModified": 1751413152,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"lastModified": 1743550720,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github"
},
"original": {
@ -350,6 +371,54 @@
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
"stylix",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1747372754,
"narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"stylix",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gnome-shell": {
"flake": false,
"locked": {
@ -395,11 +464,11 @@
]
},
"locked": {
"lastModified": 1752338520,
"narHash": "sha256-O1p5BwTwAqZ6sDrCxCxlZFaP/Jx4t1W8+ms9USyEcPQ=",
"lastModified": 1751760902,
"narHash": "sha256-qBGNn7T/zOgUDQTo/RM/D2oxMkB2x36j3ajvpVanEVs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ae62fd8ad8347e6bb5b615057f39f33d595a1c47",
"rev": "8b0180dde1d6f4cf632e046309e8f963924dfbd0",
"type": "github"
},
"original": {
@ -409,6 +478,27 @@
"type": "github"
}
},
"home-manager_3": {
"inputs": {
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1751146119,
"narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"lix": {
"inputs": {
"flake-compat": "flake-compat_2",
@ -419,11 +509,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1752289320,
"narHash": "sha256-egjQR8l9UiElIiaL+SsTsFpK9jSVXvX/DaqoXjHeVAg=",
"lastModified": 1751631393,
"narHash": "sha256-4CVRbeYExqIDpFH+QMZb5IeUGkP6kA/zHSuExYoZygk=",
"ref": "refs/heads/main",
"rev": "ae00b1298353a43a10bbecea8220471731db10ec",
"revCount": 18148,
"rev": "362bfd827f522b57062e4ebcb465bb51941632a4",
"revCount": 18119,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@ -476,11 +566,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1752341624,
"narHash": "sha256-TL45QOCt1+RSrRzVca3KeMjhZgkCaI585AjKUTCj3Jc=",
"lastModified": 1751736567,
"narHash": "sha256-/wvCffuHn2eOw6qYyLFm+oButg9Z1dU/BhkHhoRd5z4=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "b658155b3c10d32c62fad3bde0097b87b47d2d08",
"rev": "f3b4c3cbb65b690c66ad5ca78f1e88620d4d6cc5",
"type": "github"
},
"original": {
@ -569,11 +659,11 @@
]
},
"locked": {
"lastModified": 1737420293,
"narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
"lastModified": 1729742964,
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
"type": "github"
},
"original": {
@ -605,11 +695,11 @@
},
"nix-hardware": {
"locked": {
"lastModified": 1752048960,
"narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
"lastModified": 1751432711,
"narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
"rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
"type": "github"
},
"original": {
@ -692,11 +782,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1752048960,
"narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
"lastModified": 1751432711,
"narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
"rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
"type": "github"
},
"original": {
@ -770,27 +860,27 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1751741127,
"narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
"lastModified": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "29e290002bfff26af1db6f64d070698019460302",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1752162966,
"narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=",
"lastModified": 1751582995,
"narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a",
"rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693",
"type": "github"
},
"original": {
@ -865,11 +955,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1751984180,
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
"lastModified": 1751637120,
"narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
"rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
"type": "github"
},
"original": {
@ -881,11 +971,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1751984180,
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
"lastModified": 1751637120,
"narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
"rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
"type": "github"
},
"original": {
@ -912,10 +1002,10 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1751637120,
"narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
"path": "/nix/store/cd7fkv2r1nflz758r8bsnqfvkq7f72wj-source",
"rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
"lastModified": 1751011381,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
"path": "/nix/store/igmrb3hj6wr27ll3nlgjfaawf5jsjvji-source",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
"type": "path"
},
"original": {
@ -986,14 +1076,15 @@
"nixpkgs": [
"stylix",
"nixpkgs"
]
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1751906969,
"narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
"lastModified": 1748730660,
"narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
"owner": "nix-community",
"repo": "NUR",
"rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
"rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
"type": "github"
},
"original": {
@ -1082,8 +1173,11 @@
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": [
"nixpkgs"
],
@ -1096,11 +1190,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1752250117,
"narHash": "sha256-zCPV1a8w9hRn5ukOQwaAggA3X5cMmVsZVBYo8wLfLuU=",
"lastModified": 1751769163,
"narHash": "sha256-5/fDueotC2qqa5r+1UbOO1p6g1FUhVVb5cR5TwweF4c=",
"owner": "danth",
"repo": "stylix",
"rev": "0da583a359fd911d5cbfd2c789424b888b777a4b",
"rev": "50ed5ddd1072a6b10e6368cc338d759ffa02df9b",
"type": "github"
},
"original": {
@ -1242,11 +1336,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1750770351,
"narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
"lastModified": 1748180480,
"narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
"rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
"type": "github"
},
"original": {
@ -1258,11 +1352,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1751159871,
"narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
"lastModified": 1748740859,
"narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
"rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
"type": "github"
},
"original": {
@ -1274,11 +1368,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1751158968,
"narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
"lastModified": 1725758778,
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
"type": "github"
},
"original": {
@ -1287,6 +1381,28 @@
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"stylix",
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"waveforms": {
"inputs": {
"nixpkgs": "nixpkgs_9"
@ -1325,11 +1441,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1752338000,
"narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=",
"lastModified": 1751228685,
"narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "ba78881a68182ce338041846164cbfed0d70935c",
"rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b",
"type": "github"
},
"original": {

View file

@ -278,16 +278,15 @@
};
# Valere (powerful laptop).
nixosConfigurations.valere = nixpkgs.lib.nixosSystem rec {
nixosConfigurations.kanbaru = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
specialArgs = mkSpecialArgs system;
modules = linuxOfflineGuiModules [
./nixos/hosts/valere
./nixos/hosts/kanbaru.nix
./nixos/configs/steam.nix
./nixos/configs/virt-host.nix
./nixos/configs/virtualbox.nix
./nixos/configs/power-saving.nix
./nixos/configs/looking-glass.nix
];
};

View file

@ -1,7 +0,0 @@
@echo off
set CERTIFICATE="%~dp0IddSampleDriver.cer"
certutil -addstore -f root %CERTIFICATE%
certutil -addstore -f TrustedPublisher %CERTIFICATE%
pause

View file

@ -1,40 +0,0 @@
1
#lines beginning with "#" are ignored (comment)
#the first line must be a positive integer (small number (<5) is recommended)), NOT comment
#(currently) the location of this file must be "C:\IddSampleDriver\option.txt" (hard-coded)
#numbers should be separated by comma
#spaces before number are allowed
640, 480, 60
800, 600, 60
1024, 768, 60
1152, 864, 60
1280, 600, 60
1280, 720, 60
1280, 768, 60
1280, 800, 60
1280, 960, 60
1280, 1024, 60
1360, 768, 60
1366, 768, 60
1400, 1050, 60
1440, 900, 60
1600, 900, 60
1680, 1050, 60
1600, 1024, 60
1920, 1080, 60
1920, 1200, 60
1920, 1440, 60
2560, 1440, 60
2560, 1600, 60
2880, 1620, 60
2880, 1800, 60
3008, 1692, 60
3200, 1800, 60
3200, 2400, 60
3840, 2160, 60
3840, 2400, 60
4096, 2304, 60
4096, 2560, 60
5120, 2880, 60
6016, 3384, 60
7680, 4320, 60

View file

@ -36,7 +36,7 @@
];
# Enable espanso, when not on wayland.
# services.espanso.enable = true;
services.espanso.enable = true;
# Espanso will try to run in any session; so we'll tell it not to run for _system_ users.
systemd.user.services.espanso.serviceConfig.ConditionUser = "|1000";

View file

@ -5,7 +5,6 @@
# vim: et:ts=2:sw=2:
{
pkgs,
config,
...
}:
{
@ -34,20 +33,10 @@
# NixOS configuration.
#
# Set up KVMFR as the shared memory between us and the guest.
boot.extraModulePackages = [ config.boot.kernelPackages.kvmfr ];
boot.extraModprobeConfig = ''
options kvmfr static_size_mb=128
'';
boot.kernelModules = [ "kvmfr" ];
services.udev.extraRules = ''
SUBSYSTEM=="kvmfr", OWNER="deprekated", GROUP="kvm", MODE="0660"
'';
virtualisation.libvirtd.qemu.verbatimConfig = ''
namespaces = []
cgroup_controllers = []
'';
# Create the SHM file we'll use for display.
systemd.tmpfiles.rules = [
"f /dev/shm/looking-glass 0660 deprekages kvm -"
];
# Provide the looking-glass client.
environment.systemPackages = [

View file

@ -16,9 +16,4 @@
virt-manager
spice-gtk
];
boot.kernelModules = [
"kvm-amd"
"kvm-intel"
];
}

View file

@ -47,50 +47,50 @@
};
# Override stylix font sizes.
stylix.fonts.sizes.desktop = lib.mkForce 16;
stylix.fonts.sizes.desktop = lib.mkForce 18;
#
# Intel+NVIDIA / prime setup.
#
# Provide a configuration that uses the full GPU power of the system.
system.nixos.tags = [ "Intel" ];
system.nixos.tags = [ "AMD" ];
# Disable the NVIDIA GPU unless we explicitly request it.
#hardware.nvidiaOptimus.disable = true;
boot.blacklistedKernelModules = [ "nouveau" ];
hardware.nvidiaOptimus.disable = true;
specialisation.optimus.configuration = {
system.nixos.tags = [ "NVIDIA" ];
services.xserver.videoDrivers = [ "nvidia" ];
# TEMPORARILY DISABLED DUE TO KERNEL WONK
#specialisation.optimus.configuration = {
# system.nixos.tags = [ "NVIDIA" ];
# services.xserver.videoDrivers = [ "nvidia" ];
# Set up the NVIDIA half of the GPU setup.
# These are used only in the "enabled" configuration.
hardware.nvidia = {
modesetting.enable = true;
# # Set up the NVIDIA half of the GPU setup.
# # These are used only in the "enabled" configuration.
# hardware.nvidia = {
# modesetting.enable = true;
# Prefer the open NVIDIA driver.
open = true;
# # Prefer the open NVIDIA driver.
# open = true;
# Enable the nvidia-settings command.
nvidiaSettings = true;
# # Enable the nvidia-settings command.
# nvidiaSettings = true;
# Offloading setup: use GPU when asked for by command, and not otherwise.
prime = {
sync.enable = true;
# # Offloading setup: use GPU when asked for by command, and not otherwise.
# prime = {
# sync.enable = true;
# Specify how to find our GPUs.
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
# # Specify how to find our GPUs.
# intelBusId = "PCI:0:2:0";
# nvidiaBusId = "PCI:1:0:0";
# };
};
# };
# Include the NVIDIA X11 driver.
boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
# # Include the NVIDIA X11 driver.
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
# Don't disable optimus on this config.
hardware.nvidiaOptimus.disable = lib.mkForce false;
};
# # Don't disable optimus on this config.
# hardware.nvidiaOptimus.disable = lib.mkForce false;
#};
# Provide memtest86, since that's nice.
boot.loader.systemd-boot.memtest86.enable = true;
@ -98,6 +98,7 @@
#
# Hardware config.
#
# Use the latest kernel, and our patches, until the Dell+Alienware stuff makes it into
# more mainline kernels. We'll include ccache so we can iterate sanely.
boot.kernelPackages = pkgs.linuxPackages_latest;
@ -124,32 +125,17 @@
"sd_mod"
];
boot.initrd.kernelModules = [ ];
# Support virtualization, thunderbolt, and poking the APCI directly. >.>
boot.kernelModules = [
"thunderbolt"
"acpi_call"
];
boot.extraModulePackages = [ config.boot.kernelPackages.acpi_call ];
# Support thunderbolt.
services.hardware.bolt.enable = true;
# Support bluetooth.
hardware.bluetooth = {
enable = true;
powerOnBoot = false;
settings = {
General = {
# Support A2DP.
Enable = "Source,Sink,Media,Socket";
# Enable experimental featurees, like reading device battery levels.
Experimental = true;
};
};
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/bb880b80-992f-4e56-bb80-c5c4df0ddd72";
fsType = "ext4";

View file

@ -27,7 +27,6 @@ with pkgs;
gnused
gnugrep
just
qrencode
# Backup things.
keepassxc

View file

@ -45,7 +45,6 @@ flake-utils.lib.eachDefaultSystem (
hrvst-cli = callPackage ./hrvst-cli { };
notion-app = callPackage ./notion-app { inherit _7zz; };
gfn-electron = callPackage ./geforce-now { };
whph = callPackage ./whph.nix { };
# utilities
ykush = callPackage ./ykush.nix { };

View file

@ -7,7 +7,7 @@
asar,
writeScriptBin,
bash,
libgcc,
libgcc
}:
let
better-sqlite3-version = "11.4.0";
@ -38,30 +38,30 @@ let
'';
buildPhase = ''
ls -lah **/*
ls -lah **/*
asar e "Notion/Notion.app/Contents/Resources/app.asar" asar_patched
asar e "Notion/Notion.app/Contents/Resources/app.asar" asar_patched
# replace the native dependencies with linux versions
cp "$betterSqlite3/Release/better_sqlite3.node" "asar_patched/node_modules/better-sqlite3/build/Release/"
# replace the native dependencies with linux versions
cp "$betterSqlite3/Release/better_sqlite3.node" "asar_patched/node_modules/better-sqlite3/build/Release/"
# fully disabling auto updates
sed -i 's/if("darwin"===process.platform){const e=s.systemPreferences?.getUserDefault(E,"boolean"),t=_.Store.getState().app.preferences?.isAutoUpdaterDisabled;return Boolean(e||t)}return!1/return!0/g' "asar_patched/.webpack/main/index.js"
# fully disabling auto updates
sed -i 's/if("darwin"===process.platform){const e=s.systemPreferences?.getUserDefault(E,"boolean"),t=_.Store.getState().app.preferences?.isAutoUpdaterDisabled;return Boolean(e||t)}return!1/return!0/g' "asar_patched/.webpack/main/index.js"
# fix tray icon and right click menu
mkdir -p asar_patched/.webpack/main
cp ${./notion.png} asar_patched/.webpack/main/trayIcon.png
sed -i 's|this.tray.on("click",(()=>{this.onClick()}))|this.tray.setContextMenu(this.trayMenu),this.tray.on("click",(()=>{this.onClick()}))|g' "asar_patched/.webpack/main/index.js"
sed -i 's|getIcon(){[^}]*}|getIcon(){return s.default.join(__dirname, "trayIcon.png");}|g' "asar_patched/.webpack/main/index.js"
# fix tray icon and right click menu
mkdir -p asar_patched/.webpack/main
cp ${./notion.png} asar_patched/.webpack/main/trayIcon.png
sed -i 's|this.tray.on("click",(()=>{this.onClick()}))|this.tray.setContextMenu(this.trayMenu),this.tray.on("click",(()=>{this.onClick()}))|g' "asar_patched/.webpack/main/index.js"
sed -i 's|getIcon(){[^}]*}|getIcon(){return s.default.join(__dirname, "trayIcon.png");}|g' "asar_patched/.webpack/main/index.js"
# avoid running duplicated instances, fixes url opening
sed -i 's|o.app.on("open-url",w.handleOpenUrl)):"win32"===process.platform|o.app.on("open-url",w.handleOpenUrl)):"linux"===process.platform|g' "asar_patched/.webpack/main/index.js"
# avoid running duplicated instances, fixes url opening
sed -i 's|o.app.on("open-url",w.handleOpenUrl)):"win32"===process.platform|o.app.on("open-url",w.handleOpenUrl)):"linux"===process.platform|g' "asar_patched/.webpack/main/index.js"
# fake the useragent as windows to fix the spellchecker languages selector and other issues
sed -i 's|e.setUserAgent(`''${e.getUserAgent()} WantsServiceWorker`),|e.setUserAgent(`''${e.getUserAgent().replace("Linux", "Windows")} WantsServiceWorker`),|g' "asar_patched/.webpack/main/index.js"
# fake the useragent as windows to fix the spellchecker languages selector and other issues
sed -i 's|e.setUserAgent(`''${e.getUserAgent()} WantsServiceWorker`),|e.setUserAgent(`''${e.getUserAgent().replace("Linux", "Windows")} WantsServiceWorker`),|g' "asar_patched/.webpack/main/index.js"
# re-pack the asar
asar p asar_patched app.asar --unpack "*.node"
# re-pack the asar
asar p asar_patched app.asar --unpack "*.node"
'';
installPhase = ''

View file

@ -1,88 +0,0 @@
{
lib,
stdenv,
fetchzip,
autoPatchelfHook,
xorg,
gtk3,
zlib,
pango,
cairo,
harfbuzz,
at-spi2-atk,
gdk-pixbuf,
glib,
gst_all_1,
libayatana-appindicator,
}:
let
this = stdenv.mkDerivation {
pname = "whph";
version = "0.10.1";
src = fetchzip {
url = "https://github.com/ahmet-cetinkaya/whph/releases/download/v${this.version}/whph-v${this.version}-linux.tar.gz";
hash = "sha256-RnxeqZBS7U65Dz0gc/uMDMnWU3tDN/Jx3Czs1gn0rJk=";
stripRoot = false;
};
nativeBuildInputs = [
autoPatchelfHook
];
buildInputs = [
xorg.libSM
xorg.libICE
xorg.libX11
xorg.libXext
gtk3
zlib
pango
cairo
harfbuzz
at-spi2-atk
gdk-pixbuf
glib
gst_all_1.gst-plugins-base
libayatana-appindicator
];
desktopFile = ''
[Desktop Entry]
Version=1.0
Type=Application
Name=WHPH
GenericName=Work Hard Play Hard; Task Manager
Comment=manager for tasks, habits, and screen use in one
Exec=${placeholder "out"}/bin/whph %U
Icon=${placeholder "out"}/opt/${this.pname}/share/icons/hicolor/512x512/apps/whph.png
Categories=Office;ProjectManagement;
MimeType=x-scheme-handler/notion;
StartupNotify=false
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/opt/${this.pname}
cp -r $src/* $out/opt/${this.pname}/
addAutoPatchelfSearchPath ${this.src}/lib/
# Launch wrapper.
echo "#!/bin/sh" >> $out/bin/whph
echo "$out/opt/${this.pname}/whph \$@" >> $out/bin/whph
chmod +x $out/bin/whph
# Application menu entry.
mkdir -p $out/share/applications
echo "$desktopFile" > $out/share/applications/whph.desktop
runHook postInstall
'';
};
in
this