jolheiser
/
dotnix
mirror of https://git.jolheiser.com/dotnix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: jolheiser:b6b22cba13ed4bc4388c98f084e40fdbfa83e4b5
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity
..
compare: jolheiser:15fb1fe71d60a17b9f8c6e7aad20c8d29017bb0b
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity

No commits in common. "b6b22cba13ed4bc4388c98f084e40fdbfa83e4b5" and "15fb1fe71d60a17b9f8c6e7aad20c8d29017bb0b" have entirely different histories.
b6b22cba13 ... 15fb1fe71d

3 changed files with 66 additions and 17 deletions
Show Stats Expand all files Collapse all files

75
flake.lock
View File

@ -106,6 +106,22 @@
"url": "https://git.jolheiser.com/cfg.git" "url": "https://git.jolheiser.com/cfg.git"
} }
}, },
"flake-compat": {
"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-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -378,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722537572, "lastModified": 1721704399,
"narHash": "sha256-GaZfoJzTLZE+kGqvjqiEbMZbtlnPdrOOTKv0t07g+x4=", "narHash": "sha256-mozJib1QQtUihBFYqTJ8pEc4mT0b2U5FbYH4NBtH4wc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e3791ad55c372543bb3df09def5de9df05d0ffdb", "rev": "b17e4e22003ea311ddb58ef4e75c7205c7cd309d",
"revCount": 20, "revCount": 19,
"type": "git", "type": "git",
"url": "https://git.jolheiser.com/helix.drv.git" "url": "https://git.jolheiser.com/helix.drv.git"
}, },
@ -398,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722936497, "lastModified": 1719438532,
"narHash": "sha256-UBst8PkhY0kqTgdKiR8MtTBt4c1XmjJoOV11efjsC/o=", "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a6c743980e23f4cef6c2a377f9ffab506568413a", "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +449,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1722332872, "lastModified": 1719413427,
"narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "narHash": "sha256-WS087+fEO804gWvwqEfclbLFw6xdrrtZZULSyQafMdg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "14c333162ba53c02853add87a0000cbd7aa230c2", "rev": "901bc809b5d3e73a609a167385df23311d81b39c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +465,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722813957, "lastModified": 1719254875,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -480,11 +496,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1722959180, "lastModified": 1701441860,
"narHash": "sha256-t8gWve5gzFJ7rkRyS7wCVrAshUtiIGxebSFzsacawvs=", "narHash": "sha256-1jbuWl7DCk/+1l8ffYf8c01J6R5FryZSVqWobSfPQ5I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "bca4a289a944eb9aba71e500080945fb464a2c8b", "rev": "f6744687a0393402ec5faada9e53a02901fe069f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -541,7 +557,8 @@
"tmpl": "tmpl", "tmpl": "tmpl",
"tsnet-serve": "tsnet-serve", "tsnet-serve": "tsnet-serve",
"ugit": "ugit", "ugit": "ugit",
"website": "website" "website": "website",
"wsl": "wsl"
} }
}, },
"systems": { "systems": {
@ -824,6 +841,30 @@
"url": "https://git.jolheiser.com/jolheiser.com.git" "url": "https://git.jolheiser.com/jolheiser.com.git"
} }
}, },
"wsl": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1703521177,
"narHash": "sha256-V95s2ypDpdaFGbeG3pvazEE7qdjwZknoauv89DJQvz0=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "ec53b11f0c78572a2b0b5263ae1c46293daaf55f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NixOS-WSL",
"type": "github"
}
},
"xc": { "xc": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",

7
flake.nix
View File

@ -112,6 +112,12 @@
url = "git+https://git.jolheiser.com/tsnet-serve-nix.git"; url = "git+https://git.jolheiser.com/tsnet-serve-nix.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# WSL
wsl = {
url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
}; };
outputs = outputs =
@ -120,6 +126,7 @@
home-manager, home-manager,
nixos-hardware, nixos-hardware,
agenix, agenix,
wsl,
... ...
}@inputs: }@inputs:
let let

1
machines/common/gui/default.nix
View File

@ -2,6 +2,7 @@
{ {
imports = [ ../nogui ]; imports = [ ../nogui ];
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security = { security = {
rtkit.enable = true; rtkit.enable = true;