bad/devos
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Compare commits

base: bad:15806203c19e9221c2ca6ee8353daede340dac9e
Branches Tags
bad:config
bad:nvim-lspconfig
..
compare: bad:f3406f1ae9ffda28dce4e9fdf6d4b95a2ec52f64
Branches Tags
bad:config
bad:nvim-lspconfig

No commits in common. "15806203c19e9221c2ca6ee8353daede340dac9e" and "f3406f1ae9ffda28dce4e9fdf6d4b95a2ec52f64" have entirely different histories.
15806203c1 ... f3406f1ae9

6 changed files with 76 additions and 44 deletions
Show stats Expand all files Collapse all files

73
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664140963, "lastModified": 1662241716,
"narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", "narHash": "sha256-urqPvSvvGUhkwzTDxUI8N1nsdMysbAfjmBNZaTYBZRU=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", "rev": "c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1665392861, "lastModified": 1663677921,
"narHash": "sha256-bCd8fYJMAb0LzabsiXl4nxECDoz483bJOCa2hjox7N0=", "narHash": "sha256-NfQnUfRrjv8DXeugdbQC5El+MMhShP42ohc8iM+UAdM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ef56fd8979b5f4e800c4716f62076e00600b1172", "rev": "088c98a584a38b5f844bb9e9cd32eb28479ca6d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +169,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1665470981, "lastModified": 1663915940,
"narHash": "sha256-ybKBuDqIq4ZDa1QQqkDVDYewUuxPGs3akEWuhEF2ltw=", "narHash": "sha256-6P/xwD2wi05gb3lliwWyhdtK9vKdt7VcZlKFTerd7Ek=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "0ba1e28f8810df02d9cd20e05b1957a782c7d9d1", "rev": "3c8bbc1d99e241efa29df54658615d7f8344c01f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,21 +359,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"latest" "latest"
],
"utils": [
"flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1665476539, "lastModified": 1656169755,
"narHash": "sha256-NDs0qfTSfG+vEvB3HN2GOOZgMBPAYBpFeIC4hrN5wjk=", "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b37a909508edb8d7fdcd04ac90761b2cfa2a5f28", "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -396,11 +394,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1665349835, "lastModified": 1663850217,
"narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -451,26 +449,27 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1665349835, "lastModified": 1663855239,
"narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", "narHash": "sha256-A2B7rlFKmBikRwz/cmayWcTAhyIOdp2whjVCDGhg9Xw=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", "rev": "bcc68429a50c4ac051920c72c60e417202c19d79",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-22.05",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1665321371, "lastModified": 1663229557,
"narHash": "sha256-0SO6MTW0bX6lxZmz1AZW/Xmk+hnTd7/hp1vF7Tp7jg0=", "narHash": "sha256-1uU4nsDLXKG0AHc/VCsNBAEPkTA/07juYhcEWRb1O1E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "236ba4df714131059945d7754c0aa3fbe9d2f74c", "rev": "a0df6cd6e199df4a78c833c273781ea92fa62cfb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,11 +480,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1665259268, "lastModified": 1663761423,
"narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=", "narHash": "sha256-bDLXl2BVq7eIQz/8CduZI1SLyhG9u/CrckHd6f7bwPE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5924154f000e6306030300592f4282949b2db6c", "rev": "d6490a0bd9dfb298fcd8382d3363b86870dc7340",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,11 +520,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664550666, "lastModified": 1663908236,
"narHash": "sha256-eXfMRd9uItEp3PsYI31FSVGPG9dVC6yF++65ZrGwW8A=", "narHash": "sha256-lcuz1GrrvaFeHnBRb3pONhEUXHz8yua5wOeLAzxFkdY=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "9763ad40d59a044e90726653d9253efaeeb053b2", "rev": "18f375e10d50a3cb4332d630cb2f640fe7d0bd67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,11 +617,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1665438197, "lastModified": 1663689031,
"narHash": "sha256-uVkoQqUHyeu1j3DucZDmp0w89WaY91eP/p2BmPFIPaY=", "narHash": "sha256-ElrhxG+zwTOolSsSYtkyFK7MLZKkDi19LyQ6kExoprk=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "5d4995191326a3710206d152a710470e196e4466", "rev": "5b49745d009634170493a214364261e36228274b",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View file

@ -4,8 +4,7 @@
nixConfig.extra-experimental-features = "nix-command flakes"; nixConfig.extra-experimental-features = "nix-command flakes";
inputs = inputs =
{ {
# nixos.url = "github:nixos/nixpkgs/nixos-22.05"; nixos.url = "github:nixos/nixpkgs/nixos-22.05";
nixos.url = "nixpkgs/nixos-unstable";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
@ -18,8 +17,7 @@
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";
digga.inputs.deploy.follows = "deploy"; digga.inputs.deploy.follows = "deploy";
home.url = "github:nix-community/home-manager"; home.url = "github:nix-community/home-manager/release-22.05";
#home.url = "github:nix-community/home-manager/release-22.05";
# home.url = "path:/home/mae/home-manager"; # home.url = "path:/home/mae/home-manager";
home.inputs.nixpkgs.follows = "latest"; home.inputs.nixpkgs.follows = "latest";
home.inputs.utils.follows = "flake-utils"; home.inputs.utils.follows = "flake-utils";
@ -82,6 +80,7 @@
# fenix.overlay breaks the cache, because it uses the system nixpkgs # fenix.overlay breaks the cache, because it uses the system nixpkgs
(_: super: let pkgs = fenix.inputs.nixpkgs.legacyPackages.${super.system}; in fenix.overlay pkgs pkgs) (_: super: let pkgs = fenix.inputs.nixpkgs.legacyPackages.${super.system}; in fenix.overlay pkgs pkgs)
agenix.overlay agenix.overlay
nvfetcher.overlay
./pkgs/default.nix ./pkgs/default.nix
peerix.overlay peerix.overlay

18
hosts/bootstrap.nix Normal file
View file

@ -0,0 +1,18 @@
{ profiles, ... }:
{
# build with: `bud build bootstrap bootstrapIso`
# reachable on the local link via ssh root@fe80::47%eno1
# where 'eno1' is replaced by your own machine's network
# interface that has the local link to the target machine
imports = [
# profiles.networking
profiles.core
profiles.users.root # make sure to configure ssh keys
profiles.users.nixos
];
boot.loader.systemd-boot.enable = true;
# will be overridden by the bootstrapIso instrumentation
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
}

5
overlays/manix.nix Normal file
View file

@ -0,0 +1,5 @@
final: prev: {
manix = prev.manix.overrideAttrs (o: rec{
inherit (prev.sources.manix) pname version src;
});
}

6
users/modules/podman/docker-compat.nix
View file

@ -5,7 +5,7 @@ let
podmanPackage = cfg.package; podmanPackage = cfg.package;
docker_host = "unix:///run/user/$UID/podman/podman.sock"; docker_host = "unix:///run/user/$UID/podman/podman.sock";
fakeDockerBinary = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" fakeDockerBinary = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}"
{ {
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
inherit (podmanPackage) meta; inherit (podmanPackage) meta;
@ -19,12 +19,12 @@ let
ln -s $f $man/share/man/man1/$basename ln -s $f $man/share/man/man1/$basename
done done
''; '';
dockerComposeCompat = pkgs.runCommand "docker-compose-podman-compat" dockerComposeCompat = pkgs.runCommandNoCC "docker-compose-podman-compat"
{ {
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
} '' } ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper '${pkgs.docker-compose}/libexec/docker/cli-plugins/docker-compose' "$out/bin/docker-compose" \ makeWrapper '${pkgs.docker-compose_2}/libexec/docker/cli-plugins/docker-compose' "$out/bin/docker-compose" \
--set-default "DOCKER_HOST" 'unix:///run/user/$UID/podman/podman.sock' \ --set-default "DOCKER_HOST" 'unix:///run/user/$UID/podman/podman.sock' \
--set-default DOCKER_BUILDKIT 0 --set-default DOCKER_BUILDKIT 0
''; '';

11
users/profiles/vscode/default.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
programs.vscode = {
enable = true;
package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [
ms-vsliveshare.vsliveshare
vscodevim.vim
];
};
}