michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' of https://git.thomasfmly.org/michael/nix-dots

Browse Source
This commit is contained in:
Michael Thomas 2024-06-17 09:40:55 -04:00
commit 6fd64b0a68
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
flake.lock generated
View File

@ -91,11 +91,11 @@
]
},
"locked": {
"lastModified": 1718345812,
"narHash": "sha256-FJhA+YFsOFrAYe6EaiTEfomNf7jeURaPiG5/+a3DRSc=",
"lastModified": 1718440858,
"narHash": "sha256-iMVwdob8F6P6Ib+pnhMZqyvYI10ZxmvA885jjnEaO54=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ff988d78f2f55641efacdf9a585d2937f7e32a9b",
"rev": "58b905ea87674592aa84c37873e6c07bc3807aba",
"type": "github"
},
"original": {
@ -395,11 +395,11 @@
]
},
"locked": {
"lastModified": 1717527182,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"lastModified": 1718530513,
"narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
"owner": "rycee",
"repo": "home-manager",
"rev": "845a5c4c073f74105022533907703441e0464bc3",
"rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
"type": "github"
},
"original": {
@ -470,11 +470,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1718395253,
"narHash": "sha256-kbXUz5Pg0ph9HD9wRO0w+kyCyX9n1YuED0WZGIH8GH4=",
"lastModified": 1718564210,
"narHash": "sha256-3+uzDpcA2zhcc3wEPwlhE4jE9p1sOkFg7DQw0Hw7Suc=",
"ref": "refs/heads/main",
"rev": "cb63398f079b4b4324c04e2e41ba17983d66487c",
"revCount": 4829,
"rev": "d5ef10abf429355246abcda65fe4c15d886fad7c",
"revCount": 4850,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -660,11 +660,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1718328588,
"narHash": "sha256-dTuHdsZkPJg2YS7S/04d5gLpLqCmKEGuJkRO0yHklgo=",
"lastModified": 1718501434,
"narHash": "sha256-bvsRY6N9bWJg31cPeWrTBahJ2ZbZJ1ncTqXl+fit4Q4=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "ae25cb00075c72a2a91497814a11a00f567f5f75",
"rev": "8e091c59f250bcc1f6e73350fcacc59b36769ade",
"type": "github"
},
"original": {
@ -682,11 +682,11 @@
]
},
"locked": {
"lastModified": 1717976391,
"narHash": "sha256-STKlWaiiFKDybexvQCg5U1+DSLRaxT93NwVaiBSEvTI=",
"lastModified": 1718470009,
"narHash": "sha256-VBeDG3we0bkbFWMyZy+wjUkmeDN58pGFzw1dQCTeDV8=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "e3f215e518d52f6f2e68cf713cefe773284e1aa6",
"rev": "e0a970cbb8c3af05c80ef48a336ad91efd9b2bf6",
"type": "github"
},
"original": {
@ -802,11 +802,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1718376125,
"narHash": "sha256-NIJZxmY2CWsqJK/9BQCRSHfcCY9K6thjq/1XtJobxmU=",
"lastModified": 1718560097,
"narHash": "sha256-JI17CzgQbbzeB2H0n3G9N/HtTAMFSq2IFbRPnlJNTt8=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "7a2a25af02be25987aa43cd681312f4b5ba12317",
"rev": "6ac0d2869d8d5a71547a504900f9199871d62506",
"type": "github"
},
"original": {
@ -817,11 +817,11 @@
},
"nur": {
"locked": {
"lastModified": 1718397909,
"narHash": "sha256-nQd/7GPc4OC0OY+uw0m2BbfXWj41jRoRotsUBarbN04=",
"lastModified": 1718559875,
"narHash": "sha256-7jH1WTZnrK1HI1Q/Gn7O0BnNWhXZ7qJWBmGeJldA1No=",
"owner": "nix-community",
"repo": "NUR",
"rev": "24123cf5fea48b71954e81b0f4fe5db127109979",
"rev": "92d4e146d9db87b515fc9d0e4f5f1ffd0a0b47cd",
"type": "github"
},
"original": {
@ -877,11 +877,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1718331519,
"narHash": "sha256-6Ru37wS8uec626nHVIh6hSpCYB7eNc3RPFa2U//bhw4=",
"lastModified": 1718504420,
"narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "419e7fae2731f41dd9b3e34dfe8802be68558b92",
"rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9",
"type": "github"
},
"original": {

22
flake.nix
View File

@ -92,20 +92,22 @@
};
nixosConfigurations = let
homeModule =
baseHomeModule
// {
home-manager.users.michael = import ./user/environments/nixos/home.nix;
};
fullNixOSModules =
defaultModules
++ [
baseHomeModule
{
home-manager.users.michael = import ./user/environments/nixos/home.nix;
}
];
in {
kitchen = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux;
modules =
defaultModules
fullNixOSModules
++ [
./modules/common.nix
./modules/containers.nix
homeModule
./machines/kitchen/configuration.nix
];
@ -115,12 +117,11 @@
thinkcentre = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux;
modules =
defaultModules
fullNixOSModules
++ [
./modules/common.nix
./modules/hyprland.nix
./modules/containers.nix
homeModule
./machines/thinkcentre/configuration.nix
agenix.nixosModules.default
@ -136,13 +137,12 @@
terra = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux;
modules =
defaultModules
fullNixOSModules
++ [
./modules/common.nix
./modules/hyprland.nix
./modules/containers.nix
./modules/applications/steam
homeModule
./machines/terra/configuration.nix
agenix.nixosModules.default

4
machines/thinkcentre/configuration.nix
View File

@ -55,9 +55,9 @@
};
# Configure keymap in X11
services.xserver = {
services.xserver.xkb = {
layout = "us";
xkbVariant = "";
variant = "";
};
services.openssh = {