pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

b12f-to-master #16

Merged
teutat3s merged 29 commits from refs/pull/16/head into b12f 2021-09-08 22:00:04 +00:00
Conversation 0 Commits 29 Files changed 54 +34 -146
5 changed files with 34 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 99597d1b30 - Show all commits

156
flake.lock
View file

@ -35,11 +35,11 @@
"pre-commit-hooks-nix": "pre-commit-hooks-nix" "pre-commit-hooks-nix": "pre-commit-hooks-nix"
}, },
"locked": { "locked": {
"lastModified": 1620750556, "lastModified": 1626066948,
"narHash": "sha256-J+z8oduu9u1FZ8spSowrgyAmtnBUIUDImqfQCZ58heo=", "narHash": "sha256-rBo4nCPyAHb1e/9ysYGH7tW1FV0N2XNvRcJR+g8gugA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-agent", "repo": "hercules-ci-agent",
"rev": "f62ce85aed4c4a7fca9e5da2b00340bbcdc92f88", "rev": "7f3265cc42d5f364066c145939ee2812938b991c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,22 +159,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1606424373,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1620759905, "lastModified": 1620759905,
@ -191,21 +175,6 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": {
"lastModified": 1610051610,
"narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": { "locked": {
"lastModified": 1619345332, "lastModified": 1619345332,
"narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
@ -227,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1623623251, "lastModified": 1626073055,
"narHash": "sha256-Aku5PTg4zk+XaiIOvDuRLzQmybGg3StaEmAl/NZlKdU=", "narHash": "sha256-vocByfpVu6m9zvtJugDvmd6/9iT2HJuG4tmDICKd0lI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "25bf3d79531ce45fd36866205bf07a24bb3be2b9", "rev": "775cb20bd4af7781fbf336fb201df02ee3d544bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +211,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1623692755, "lastModified": 1626192309,
"narHash": "sha256-HYH9MeFye68ntgheDerkmC50PpWY5qoHAaobesQDBLw=", "narHash": "sha256-uMl42Cn1Zb3qe8Iw0Rz7x62DUEG1JPCtJNU3ZK5gEFQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a7ff3fd40e1791d22363775948619e706e1ec665", "rev": "4036bb94c78329292ef44c233bb42da40b8bd4d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +251,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1623324658, "lastModified": 1623927034,
"narHash": "sha256-TjWmZPH/xbUi7Xuj2EigB9sTOpqsiFmnv7m6+QgTDrA=", "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "4f7426c362809e472d03c369d3674317c32b6863", "rev": "e09c320446c5c2516d430803f7b19f5833781337",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,53 +264,10 @@
"type": "github" "type": "github"
} }
}, },
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
"lastModified": 1623622151,
"narHash": "sha256-IkBOtKnytI4/CxrB8TgFcUeSmf39sLDHABcwMmhbMQY=",
"owner": "neovim",
"repo": "neovim",
"rev": "2f0e5e7e67faa469f5d12a66ec084ab9c35d8c6b",
"type": "github"
},
"original": {
"dir": "contrib",
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"neovim-nightly": {
"inputs": {
"flake-compat": "flake-compat_3",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1623658603,
"narHash": "sha256-7R3BNOYXh51up/vo+o4CunTVe/MhHZ/jwGJzJBJZ+4Y=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "54eaff5f5f1080ec8d4320e5259ae404604fe014",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"type": "github"
}
},
"nix-dram": { "nix-dram": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1620663773, "lastModified": 1620663773,
@ -374,11 +300,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1623324058, "lastModified": 1626046891,
"narHash": "sha256-Jm9GUTXdjXz56gWDKy++EpFfjrBaxqXlLvTLfgEi8lo=", "narHash": "sha256-Zt8saH+hAehXskW0iFAzk+iMillYoFBxvLReYNqGT9E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "432fc2d9a67f92e05438dff5fdc2b39d33f77997", "rev": "d8f8f31af9d77a48220e4e8a301d1e79774cb7d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -389,11 +315,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1623569835, "lastModified": 1625333638,
"narHash": "sha256-Mg+FN1JkEQ91Zff0+ot/ndRgD9BB+uDBLN12AcBYkSA=", "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7305b276c90cfd3ad0a2452101a49c0b52c784c0", "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,22 +360,6 @@
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1623324058,
"narHash": "sha256-Jm9GUTXdjXz56gWDKy++EpFfjrBaxqXlLvTLfgEi8lo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "432fc2d9a67f92e05438dff5fdc2b39d33f77997",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1620340338, "lastModified": 1620340338,
"narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=", "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=",
@ -465,17 +375,16 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nur": {
"locked": { "locked": {
"lastModified": 1623692755, "lastModified": 1626188191,
"narHash": "sha256-HYH9MeFye68ntgheDerkmC50PpWY5qoHAaobesQDBLw=", "narHash": "sha256-63A/IjYpfKb/R+AiWZE6YHsaxkDnYIVSUgPw7QEQnA8=",
"owner": "NixOS", "path": "/nix/store/hjc7qr7xsbvx32092bpfsjyi6vk29fg4-source",
"repo": "nixpkgs", "rev": "5caa4740529326001714f4c49a5e9f7b2c40f737",
"rev": "a7ff3fd40e1791d22363775948619e706e1ec665", "type": "path"
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nur",
"type": "indirect" "type": "indirect"
} }
}, },
@ -486,7 +395,7 @@
] ]
}, },
"locked": { "locked": {
"narHash": "sha256-Zs7dc0dNNa0Z3//+Gckxj7SKrMqVovY0xZZ1z8xWnEg=", "narHash": "sha256-G+qmA0vMRMgEd0Wp+jMjbOe5Yz+5/Imh+wn6mTWit1o=",
"path": "./pkgs", "path": "./pkgs",
"type": "path" "type": "path"
}, },
@ -498,11 +407,11 @@
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1617783930, "lastModified": 1622650193,
"narHash": "sha256-SigoU2LWM1fMggqfM9H8XEIvjOjBVQ/wj/zrn02J28c=", "narHash": "sha256-qSzUpJDv04ajS9FXoCq6NjVF3qOt9IiGIiGh0P8amyw=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "2d169bb1b23f3b71a894a66ea81f45c788943248", "rev": "0398f0649e0a741660ac5e8216760bae5cc78579",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -520,11 +429,10 @@
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"naersk": "naersk_2", "naersk": "naersk_2",
"neovim-nightly": "neovim-nightly",
"nix-dram": "nix-dram", "nix-dram": "nix-dram",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5", "nur": "nur",
"pkgs": "pkgs" "pkgs": "pkgs"
} }
}, },

6
flake.nix
View file

@ -28,10 +28,6 @@
nix-dram.url = "github:dramforever/nix-dram"; nix-dram.url = "github:dramforever/nix-dram";
# This is a fix so that the neovim-flake dependency of neovim-nightly doesn't shit itself
nixpkgs.url = "nixpkgs";
neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
# b12f additions # b12f additions
# b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main"; # b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main";
}; };
@ -46,7 +42,6 @@
, nixos-hardware , nixos-hardware
, agenix , agenix
, nix-dram , nix-dram
, neovim-nightly
# , b12f-nix-fonts # , b12f-nix-fonts
, ... , ...
}: digga.lib.mkFlake { }: digga.lib.mkFlake {
@ -62,7 +57,6 @@
pkgs.overlay # for `srcs` pkgs.overlay # for `srcs`
agenix.overlay agenix.overlay
nix-dram.overlay nix-dram.overlay
neovim-nightly.overlay
# b12f-nix-fonts.overlay # b12f-nix-fonts.overlay
]; ];
}; };

2
modules/terminal-life/nvim/default.nix
View file

@ -52,8 +52,6 @@ in
{ {
enable = true; enable = true;
package = pkgs.neovim-nightly;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
vimdiffAlias = true; vimdiffAlias = true;

1
overlays/overrides.nix
View file

@ -9,6 +9,7 @@ channels: final: prev: {
element-desktop element-desktop
manix manix
rage rage
neovim-unwrapped
nixpkgs-fmt nixpkgs-fmt
qutebrowser qutebrowser
signal-desktop signal-desktop

13
profiles/core/default.nix
View file

@ -110,19 +110,6 @@ in
fallback = true fallback = true
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
registry.default = {
to = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-unstable";
};
from = {
type = "indirect";
id = "default";
};
};
}; };
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;