Compare commits
No commits in common. "dda27a3be5e3fe7e51537973d86b984efbc6992e" and "a236fcb45e0b71d0fa4610acec084197cc058cf8" have entirely different histories.
dda27a3be5
...
a236fcb45e
11 changed files with 148 additions and 474 deletions
250
flake.lock
generated
250
flake.lock
generated
|
|
@ -33,11 +33,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730906442,
|
||||
"narHash": "sha256-tBuyb8jWBSHHgcIrOfiyQJZGY1IviMzH2V74t7gWfgI=",
|
||||
"lastModified": 1730257295,
|
||||
"narHash": "sha256-OQl+aAsKiyygvpzck1u0sZf/R4T9zM903CgNDFmmzA8=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "attic",
|
||||
"rev": "d0b66cf897e4d55f03d341562c9821dc4e566e54",
|
||||
"rev": "48c8b395bfbc6b76c7eae74df6c74351255a095c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -162,11 +162,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731032247,
|
||||
"narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=",
|
||||
"lastModified": 1730600078,
|
||||
"narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632",
|
||||
"rev": "4652874d014b82cb746173ffc64f6a70044daa7e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -212,22 +212,6 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
|
|
@ -375,6 +359,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flakey-profile": {
|
||||
"locked": {
|
||||
"lastModified": 1712898590,
|
||||
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
|
||||
"owner": "lf-",
|
||||
"repo": "flakey-profile",
|
||||
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lf-",
|
||||
"repo": "flakey-profile",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -436,11 +435,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730837930,
|
||||
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
|
||||
"lastModified": 1730633670,
|
||||
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
|
||||
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -472,19 +471,13 @@
|
|||
}
|
||||
},
|
||||
"lix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nix2container": "nix2container",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-regression": "nixpkgs-regression",
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731087338,
|
||||
"narHash": "sha256-9J8+Pyb/WtzZ+AU5XJLvpVSILN742z37C4CrbnYXkuo=",
|
||||
"lastModified": 1730610940,
|
||||
"narHash": "sha256-ZsTpii4kZcioRF3bu3/pS374R9GYQVyrMpBNr2ZUnVg=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "116895acb1fb5b09e8c1b867f345f6c8ca09647a",
|
||||
"revCount": 16456,
|
||||
"rev": "b1a0e3c0029c2dd5fb7c8dd2db4f9e0b309c9f54",
|
||||
"revCount": 16445,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
|
@ -493,10 +486,37 @@
|
|||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
}
|
||||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": [
|
||||
"lix"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727752861,
|
||||
"narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
|
||||
"revCount": 116,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/nixos-module"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/nixos-module"
|
||||
}
|
||||
},
|
||||
"nil": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -518,17 +538,17 @@
|
|||
"flake-parts": "flake-parts_2",
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731077178,
|
||||
"narHash": "sha256-ayB01Zz1qkV4IBqB597TIeYYsU2MBIzLDO13UmHdGWo=",
|
||||
"lastModified": 1730666848,
|
||||
"narHash": "sha256-2KV8r72ieAmsFeU6wzJhV7q24WIIO70u5LdRBgJGYgE=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "57d86eb5cc2c22dba5d97e3622ada05488c7d0a0",
|
||||
"rev": "22dfd130c044944b83017e646cca82d9ab2ad2a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -557,11 +577,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731072306,
|
||||
"narHash": "sha256-jBbeNVgirzpj7lD5bYQSGJJMirU4Uw0lRPaPCHSst7Y=",
|
||||
"lastModified": 1730664018,
|
||||
"narHash": "sha256-FBKtV07NQzb1l0UuxmKtW9wYTFWV9txjhrPMrZByTZ4=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "c0829087da6c38e693e47a8b961f7d4aaa15a91e",
|
||||
"rev": "4c2f49d566579ee9a7f7528bde03c24ebaefd6fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -658,22 +678,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix2container": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1724996935,
|
||||
"narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
|
||||
"owner": "nlewo",
|
||||
"repo": "nix2container",
|
||||
"rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nlewo",
|
||||
"repo": "nix2container",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1703013332,
|
||||
|
|
@ -734,22 +738,6 @@
|
|||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-regression": {
|
||||
"locked": {
|
||||
"lastModified": 1643052045,
|
||||
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1724316499,
|
||||
|
|
@ -768,11 +756,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1730883749,
|
||||
"narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
|
||||
"lastModified": 1730327045,
|
||||
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
|
||||
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -798,22 +786,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1727184566,
|
||||
"narHash": "sha256-mgdK8BcFsLSNhe780+cHbEUbZ3OruLa1T/xgQlL4Aj4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "48c3030083c46042584531bc9d931020f1975677",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1726481836,
|
||||
"narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=",
|
||||
|
|
@ -829,13 +801,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1730785428,
|
||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||
"lastModified": 1730531603,
|
||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1730531603,
|
||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -846,22 +834,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1730785428,
|
||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1725634671,
|
||||
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
|
||||
|
|
@ -876,12 +848,12 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1730531603,
|
||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||
"path": "/nix/store/zq2axpgzd5kykk1v446rkffj3bxa2m2h-source",
|
||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"path": "/nix/store/riqkpszjqk02bi1wppfg8ip5xvh102qd-source",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -946,7 +918,7 @@
|
|||
"openxc7": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725961608,
|
||||
|
|
@ -962,22 +934,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726745158,
|
||||
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
|
|
@ -987,11 +943,12 @@
|
|||
"flake-utils": "flake-utils_2",
|
||||
"home-manager": "home-manager_2",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"nil": "nil",
|
||||
"niri": "niri",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nix-on-droid": "nix-on-droid",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"openxc7": "openxc7",
|
||||
"stylix": "stylix",
|
||||
"waveforms": "waveforms"
|
||||
|
|
@ -1040,7 +997,7 @@
|
|||
"base16-fish": "base16-fish",
|
||||
"base16-helix": "base16-helix",
|
||||
"base16-vim": "base16-vim",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": "home-manager_3",
|
||||
|
|
@ -1053,11 +1010,11 @@
|
|||
"tinted-tmux": "tinted-tmux"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731090365,
|
||||
"narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=",
|
||||
"lastModified": 1729963473,
|
||||
"narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68",
|
||||
"rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1159,17 +1116,16 @@
|
|||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726913040,
|
||||
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
|
||||
"lastModified": 1696725948,
|
||||
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-foot",
|
||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-foot",
|
||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -1208,7 +1164,7 @@
|
|||
},
|
||||
"waveforms": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728376004,
|
||||
|
|
|
|||
31
flake.nix
31
flake.nix
|
|
@ -14,7 +14,16 @@
|
|||
flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
# Not nix -- lix!
|
||||
lix.url = "git+https://git@git.lix.systems/lix-project/lix";
|
||||
lix = {
|
||||
url = "git+https://git@git.lix.systems/lix-project/lix";
|
||||
flake = false;
|
||||
};
|
||||
lix-module = {
|
||||
url = "git+https://git@git.lix.systems/lix-project/nixos-module";
|
||||
inputs.lix.follows = "lix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
};
|
||||
|
||||
# Home-manager.
|
||||
home-manager = {
|
||||
|
|
@ -75,7 +84,7 @@
|
|||
darwin,
|
||||
agenix,
|
||||
nil,
|
||||
lix,
|
||||
lix-module,
|
||||
niri,
|
||||
stylix,
|
||||
waveforms,
|
||||
|
|
@ -124,7 +133,6 @@
|
|||
glowing-bear-desktop = callPackage ./packages/glowing-bear-desktop.nix { };
|
||||
hrvst-cli = callPackage ./packages/hrvst-cli { };
|
||||
notion-app = callPackage ./packages/notion-app { inherit _7zz; };
|
||||
gfn-electron = callPackage ./packages/geforce-now { };
|
||||
|
||||
# utilities
|
||||
ykush = callPackage ./packages/ykush.nix { };
|
||||
|
|
@ -205,7 +213,6 @@
|
|||
./nixos/packages
|
||||
|
||||
./nixos/configs/stylix
|
||||
./nixos/configs/lix.nix
|
||||
./nixos/configs/nix.nix
|
||||
./nixos/configs/dotfiles
|
||||
./nixos/configs/calendar.nix
|
||||
|
|
@ -215,6 +222,7 @@
|
|||
|
||||
./nixos/services/tailscale.nix
|
||||
|
||||
lix-module.nixosModules.default
|
||||
home-manager.nixosModules.home-manager
|
||||
];
|
||||
|
||||
|
|
@ -304,7 +312,6 @@
|
|||
openxc7 = openxc7.outputs.packages.${system};
|
||||
attic = attic.outputs.packages.${system};
|
||||
esp-dev = esp-dev.outputs.packages.${system};
|
||||
lix = lix.outputs.packages.${system};
|
||||
|
||||
# Helper to convert hm modules into NixOS or nix-on-droid modules.
|
||||
callHm = module: (specialArgs: (import module) specialArgs);
|
||||
|
|
@ -368,20 +375,6 @@
|
|||
|
||||
modules = linuxOfflineGuiModules [
|
||||
./nixos/hosts/valere.nix
|
||||
./nixos/configs/steam.nix
|
||||
./nixos/configs/vmware.nix
|
||||
./nixos/configs/power-saving.nix
|
||||
];
|
||||
};
|
||||
|
||||
# Kanbaru (not-quite-as-powerful-as-Valere laptop).
|
||||
nixosConfigurations.kanbaru = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = mkSpecialArgs system;
|
||||
|
||||
modules = linuxOfflineGuiModules [
|
||||
./nixos/hosts/kanbaru.nix
|
||||
./nixos/configs/steam.nix
|
||||
./nixos/configs/vmware.nix
|
||||
./nixos/configs/power-saving.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{ lix, ... }:
|
||||
{
|
||||
# Use lix, and not nix.
|
||||
nix.package = lix.nix;
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
#
|
||||
# Provide steam; for gameyputers.
|
||||
#
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
|
||||
# Start our steam with appropriate environment vars set.
|
||||
package = pkgs.steam.override {
|
||||
extraEnv = {
|
||||
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
|
||||
};
|
||||
};
|
||||
|
||||
# Allow Steam to provide services for other LAN units.
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
remotePlay.openFirewall = true;
|
||||
|
||||
# Use extest to better support input on wayland.
|
||||
extest.enable = true;
|
||||
|
||||
# Also allow running steam not-from-niri.
|
||||
gamescopeSession.enable = true;
|
||||
|
||||
# Make more features available to steam.
|
||||
extraPackages = with pkgs; [
|
||||
gamescope
|
||||
];
|
||||
|
||||
};
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# vim: et:ts=2:sw=2:
|
||||
#
|
||||
{ pkgs, deprekages, lib, ... }:
|
||||
{ pkgs, deprekages, ... }:
|
||||
|
||||
{
|
||||
# Ensures the system state isn't changed breakingly (e.g. by updating
|
||||
|
|
|
|||
|
|
@ -1,173 +0,0 @@
|
|||
#
|
||||
# Per-system configuration for Kanbaru (Suruga).
|
||||
#
|
||||
# vim: et:ts=2:sw=2:
|
||||
#
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
deprekages,
|
||||
modulesPath,
|
||||
fetchFromGitHub,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# Networking.
|
||||
networking.hostName = "kanbaru";
|
||||
networking.networkmanager.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
|
||||
# This is a local machine, rather than our typical network-accesed ones.
|
||||
# Run an ssh-agent locally.
|
||||
programs.ssh.startAgent = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.nvitop
|
||||
];
|
||||
|
||||
#
|
||||
# Niri configuration for our monitors.
|
||||
#
|
||||
home-manager.users.deprekated.programs.niri.settings = {
|
||||
outputs."eDP-1".scale = 1.5;
|
||||
};
|
||||
|
||||
# Override stylix font sizes.
|
||||
stylix.fonts.sizes.desktop = lib.mkForce 18;
|
||||
|
||||
#
|
||||
# Intel+NVIDIA / prime setup.
|
||||
#
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
# Set up the NVIDIA half of the GPU setup.
|
||||
system.nixos.tags = [
|
||||
"NVIDIA"
|
||||
"AMDGPU"
|
||||
];
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
|
||||
# Prefer the open NVIDIA driver.
|
||||
open = true;
|
||||
|
||||
# Enable the nvidia-settings command.
|
||||
nvidiaSettings = true;
|
||||
|
||||
# Offloading setup: use GPU when asked for by command, and not otherwise.
|
||||
prime = {
|
||||
sync.enable = true;
|
||||
|
||||
# Specify how to find our GPUs.
|
||||
amdgpuBusId = "PCI:4:0:0";
|
||||
nvidiaBusId = "PCI:1:0:0";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
# Provide a way to disable the NVIDIA GPU entirely,
|
||||
# for points when traveling where we don't want to burn power.
|
||||
specialisation.lowpower.configuration = {
|
||||
system.nixos.tags = lib.mkForce [ "AMDGPU" ];
|
||||
|
||||
# Disable the NVIDIA GPU.
|
||||
hardware.nvidiaOptimus.disable = true;
|
||||
|
||||
# These don't actually do anything, but they make introspecting
|
||||
# the configuration a bit nicer.
|
||||
hardware.nvidia.modesetting.enable = lib.mkForce false;
|
||||
hardware.nvidia.prime.sync.enable = lib.mkForce false;
|
||||
};
|
||||
|
||||
# Set up the asus-on-linux services for this machine.
|
||||
services.asusd = {
|
||||
enable = true;
|
||||
enableUserService = true;
|
||||
};
|
||||
|
||||
# Enable fingerprint reader...
|
||||
services.fprintd = {
|
||||
enable = false;
|
||||
|
||||
# ... and use a weird Goodix-ized fork of libfprintd.
|
||||
package = pkgs.fprintd.override {
|
||||
libfprint = pkgs.libfprint.overrideAttrs (prev: {
|
||||
|
||||
# Add in the additional dependencies for the Goodix fork...
|
||||
buildInputs =
|
||||
prev.buildInputs
|
||||
++ (with pkgs; [
|
||||
cmake
|
||||
openssl
|
||||
]);
|
||||
|
||||
# ... and retarget the package to the fork.
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "infinytum";
|
||||
repo = "libfprint";
|
||||
rev = "5e14af7f136265383ca27756455f00954eef5db1";
|
||||
hash = "sha256-MFhPsTF0oLUMJ9BIRZnSHj9VRwtHJxvWv0WT5zz7vDY=";
|
||||
};
|
||||
|
||||
# Manually null out the installCheckPhase.
|
||||
installCheckPhase = "";
|
||||
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
#
|
||||
# Hardware config.
|
||||
#
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"vmd"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"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 ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/bb880b80-992f-4e56-bb80-c5c4df0ddd72";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/5B37-C691";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/50f20263-9632-439d-b57d-b9ee8f13d62b"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
@ -6,7 +6,6 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
deprekages,
|
||||
modulesPath,
|
||||
...
|
||||
|
|
@ -31,9 +30,8 @@
|
|||
# Note on valere in particular this requires our overlay.
|
||||
environment.systemPackages = [
|
||||
deprekages.humanfx
|
||||
|
||||
# NVIDIA tools.
|
||||
pkgs.nvitop
|
||||
deprekages.dell.fan
|
||||
deprekages.dell.bios-fan-control
|
||||
];
|
||||
|
||||
#
|
||||
|
|
@ -46,48 +44,10 @@
|
|||
# Override stylix font sizes.
|
||||
stylix.fonts.sizes.desktop = lib.mkForce 18;
|
||||
|
||||
#
|
||||
# Intel+NVIDIA / prime setup.
|
||||
#
|
||||
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
|
||||
# Set up the NVIDIA half of the GPU setup.
|
||||
system.nixos.tags = ["NVIDIA" "Intel"];
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
|
||||
# Prefer the open NVIDIA driver.
|
||||
open = true;
|
||||
|
||||
# Enable the nvidia-settings command.
|
||||
nvidiaSettings = 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";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
# Provide a way to disable the NVIDIA GPU entirely,
|
||||
# for points when traveling where we don't want to burn power.
|
||||
specialisation.lowpower.configuration = {
|
||||
system.nixos.tags = lib.mkForce ["Intel"];
|
||||
|
||||
# Disable the NVIDIA GPU.
|
||||
hardware.nvidiaOptimus.disable = true;
|
||||
|
||||
# These don't actually do anything, but they make introspecting
|
||||
# the configuration a bit nicer.
|
||||
hardware.nvidia.modesetting.enable = lib.mkForce false;
|
||||
hardware.nvidia.prime.sync.enable = lib.mkForce false;
|
||||
};
|
||||
|
||||
# Save power!
|
||||
services.udev.extraRules = ''
|
||||
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", ATTR{power/control}="auto"
|
||||
'';
|
||||
|
||||
#
|
||||
# Hardware config.
|
||||
|
|
@ -104,8 +64,15 @@
|
|||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
|
||||
# Disallow nouveau so the NVIDIA device is available for VFIO.
|
||||
boot.blacklistedKernelModules = [ "nouveau" ];
|
||||
boot.extraModprobeConfig = ''
|
||||
options nouveau modeset=0
|
||||
'';
|
||||
|
||||
# Support virtualization, thunderbolt, and poking the APCI directly. >.>
|
||||
boot.kernelModules = [
|
||||
"kvm-intel"
|
||||
"thunderbolt"
|
||||
"acpi_call"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ with pkgs;
|
|||
niv
|
||||
|
||||
# Utils.
|
||||
_1password-cli
|
||||
_1password
|
||||
age
|
||||
agenix.agenix
|
||||
atool
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
#
|
||||
# GeForce now.
|
||||
#
|
||||
# vim: et:ts=2:sw=2:
|
||||
{
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
}:
|
||||
let
|
||||
pname = "gfn-electron";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hmlendea/gfn-electron/releases/download/v2.1.2/geforcenow-electron_2.1.2_linux.AppImage";
|
||||
hash = "sha256-0hsFGwPPbMuoman1b1CgsakJbHvhUyEPbxX18hlFOoM=";
|
||||
};
|
||||
|
||||
appImageContent = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
runScript = "appimage-exec.sh -w ${appImageContent} -- --ozone-platform-hint=auto --spoof-chromeos";
|
||||
}
|
||||
|
|
@ -205,19 +205,26 @@ config = {
|
|||
--
|
||||
-- Font Size Tweaks
|
||||
--
|
||||
font_overrides = {
|
||||
miko = 16,
|
||||
hinata = 16,
|
||||
valere = 13,
|
||||
utol = 13,
|
||||
trailblazer = 12,
|
||||
kanbaru = 12,
|
||||
}
|
||||
|
||||
if font_overrides[hostname] ~= nil then
|
||||
config.font_size = font_overrides[hostname]
|
||||
if (hostname == "miko") or (hostname == "hinata") then
|
||||
config["font_size"] = 16
|
||||
end
|
||||
|
||||
if (hostname == "valere") or (hostname == "utol") then
|
||||
config["font_size"] = 13
|
||||
end
|
||||
|
||||
if (hostname == "trailblazer") then
|
||||
config["font_size"] = 12
|
||||
end
|
||||
|
||||
if hostname == "tohru" then
|
||||
config["font_size"] = 17
|
||||
end
|
||||
|
||||
if hostname == "veth" then
|
||||
config["font_size"] = 32
|
||||
end
|
||||
|
||||
--
|
||||
-- Increase tab bar spacing.
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
#
|
||||
# Dotfile specifics for this machine.
|
||||
#
|
||||
|
||||
# Path
|
||||
# Note: lower in the list = higher priority
|
||||
PATH_ADDS = [
|
||||
"/run/current-system/sw/bin"
|
||||
"/run/wrappers/bin"
|
||||
]
|
||||
|
||||
# SSH key management.
|
||||
try_source("includes/add-ssh-keys")
|
||||
|
||||
# NixOS compatibility.
|
||||
try_source("includes/nixos")
|
||||
Loading…
Add table
Reference in a new issue