Compare commits

..

5 commits

Author SHA1 Message Date
f5427d40e9 superprod: use only flatpak, to lock with android 2025-07-23 15:01:22 +02:00
e8334a04b2 packages: add whph 2025-07-23 14:54:48 +02:00
57ab783364 looking glass: update config 2025-07-23 14:54:27 +02:00
7adbc7a81a updates~ 2025-07-23 14:54:27 +02:00
ef5d5b7e02 valere: updates~ 2025-07-23 14:54:27 +02:00
16 changed files with 297 additions and 245 deletions

256
flake.lock generated
View file

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

View file

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

View file

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

View file

@ -0,0 +1,40 @@
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. # 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. # 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"; systemd.user.services.espanso.serviceConfig.ConditionUser = "|1000";

View file

@ -5,6 +5,7 @@
# vim: et:ts=2:sw=2: # vim: et:ts=2:sw=2:
{ {
pkgs, pkgs,
config,
... ...
}: }:
{ {
@ -33,10 +34,20 @@
# NixOS configuration. # NixOS configuration.
# #
# Create the SHM file we'll use for display. # Set up KVMFR as the shared memory between us and the guest.
systemd.tmpfiles.rules = [ boot.extraModulePackages = [ config.boot.kernelPackages.kvmfr ];
"f /dev/shm/looking-glass 0660 deprekages kvm -" 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 = []
'';
# Provide the looking-glass client. # Provide the looking-glass client.
environment.systemPackages = [ environment.systemPackages = [

View file

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

View file

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

View file

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

View file

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

View file

@ -7,7 +7,7 @@
asar, asar,
writeScriptBin, writeScriptBin,
bash, bash,
libgcc libgcc,
}: }:
let let
better-sqlite3-version = "11.4.0"; better-sqlite3-version = "11.4.0";
@ -38,30 +38,30 @@ let
''; '';
buildPhase = '' 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 # replace the native dependencies with linux versions
cp "$betterSqlite3/Release/better_sqlite3.node" "asar_patched/node_modules/better-sqlite3/build/Release/" cp "$betterSqlite3/Release/better_sqlite3.node" "asar_patched/node_modules/better-sqlite3/build/Release/"
# fully disabling auto updates # 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" 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 # fix tray icon and right click menu
mkdir -p asar_patched/.webpack/main mkdir -p asar_patched/.webpack/main
cp ${./notion.png} asar_patched/.webpack/main/trayIcon.png 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|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" 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 # 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" 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 # 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" 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 # re-pack the asar
asar p asar_patched app.asar --unpack "*.node" asar p asar_patched app.asar --unpack "*.node"
''; '';
installPhase = '' installPhase = ''

88
packages/whph.nix Normal file
View file

@ -0,0 +1,88 @@
{
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