added octopine
This commit is contained in:
Philipp Hochkamp
parent
dba07a05b8
commit
9bbbba6049
5 changed files with 103 additions and 76 deletions
102
flake.lock
generated
102
flake.lock
generated
|
|
@ -37,40 +37,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"coc-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1660069039,
|
||||
"narHash": "sha256-RUrjBQH8IvpPRuvizlCZl9aggGKeRtmMwyAl5AAvRzc=",
|
||||
"owner": "neoclide",
|
||||
"repo": "coc.nvim",
|
||||
"rev": "69f954eaebc0f15a0ff17b6d40e24aa1039d9334",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "neoclide",
|
||||
"ref": "release",
|
||||
"repo": "coc.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dart-vim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1653333307,
|
||||
"narHash": "sha256-NkmOlwVxObva/ka6xT54oYqIUSD2A9rZ9aMq5seOKHY=",
|
||||
"owner": "dart-lang",
|
||||
"repo": "dart-vim-plugin",
|
||||
"rev": "81e50e80329e5eac2c115f45585b1838a614d07a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "dart-lang",
|
||||
"ref": "master",
|
||||
"repo": "dart-vim-plugin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -78,11 +44,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1657835815,
|
||||
"narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
|
||||
"lastModified": 1660649317,
|
||||
"narHash": "sha256-16sWaj3cTZOQQgrmzlvBSRaBFKLrHJrfYh1k7/sSWok=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "54a24f042f93c79f5679f133faddedec61955cf2",
|
||||
"rev": "80871c71edb3da76d40bdff9cae007a2a035c074",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -98,11 +64,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1660242581,
|
||||
"narHash": "sha256-koLVNZS7qfk/eDcIRC221YqHnfI0YzochmA3IqZrbmE=",
|
||||
"lastModified": 1660882264,
|
||||
"narHash": "sha256-nVxe7sZPpexElHJnFj3TrkOpHr6w/xfthnhMUH8kahA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "ab5e238d6bc15e112beb82d898efab22426001bf",
|
||||
"rev": "3bc69e76fc1004c85a1e337656a6d4a6eb0ca260",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -134,11 +100,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1660252108,
|
||||
"narHash": "sha256-fpY8X+eJmClJyVnMQJ7bpsNgn/CxPE9+UkkJ0FRIKQ8=",
|
||||
"lastModified": 1660574517,
|
||||
"narHash": "sha256-Lp5D2pAPrM3iAc1eeR0iGwz5rM+SYOWzVxI3p17nlrU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "324fedcf9f1c475e2f522d03af029528e65969bc",
|
||||
"rev": "688e5c85b7537f308b82167c8eb4ecfb70a49861",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -162,6 +128,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mobile-nixos": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1656299939,
|
||||
"narHash": "sha256-gODt71CCv0gnMNeU4GYdSBJkxsfmBy0uNv8owQC1oPs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "mobile-nixos",
|
||||
"rev": "de9a88a70f0ae5fc0839ff94bf29e8a30af399f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"repo": "mobile-nixos",
|
||||
"rev": "de9a88a70f0ae5fc0839ff94bf29e8a30af399f8",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -185,11 +168,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1660030916,
|
||||
"narHash": "sha256-KeVTmST6vAS85uUaSYlzv6OWhveawfIGhqX1SMq+L30=",
|
||||
"lastModified": 1660407119,
|
||||
"narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "3975d5158f00accda15a11180b2c08654cfb2807",
|
||||
"rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -201,11 +184,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1660227034,
|
||||
"narHash": "sha256-bXMlG/YU0IjAod6M625XT1YbUG+/3L9ypk9llYpKeuM=",
|
||||
"lastModified": 1660639432,
|
||||
"narHash": "sha256-2WDiboOCfB0LhvnDVMXOAr8ZLDfm3WdO54CkoDPwN1A=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "964d60ff2e6bc76c0618962da52859603784fa78",
|
||||
"rev": "6c6409e965a6c883677be7b9d87a95fab6c3472e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -215,11 +198,11 @@
|
|||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1660252182,
|
||||
"narHash": "sha256-cbJ09RYPovttTgIEyhe83YZZv5rajLjFtz3bxV2Wqc0=",
|
||||
"lastModified": 1660897467,
|
||||
"narHash": "sha256-9J+xkVBi5ZIHTLPP2Wio/lxb/Er/v+TcNK1080RXvxw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "300c5c98c6e1558ec977c0f6f0b8a8af71fbd0e8",
|
||||
"rev": "f99c37f463fbfcec612ee1491a1b0c4afab5e407",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -231,11 +214,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1660162369,
|
||||
"narHash": "sha256-pZukMP4zCA1FaBg0xHxf7KdE/Nv/C5YbDID7h2L8O7A=",
|
||||
"lastModified": 1660819943,
|
||||
"narHash": "sha256-TRZV/mlW1eYuojqDC3ueYWj7jsTKXJCtyMLNYX/Ybtw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3a11db5f408095b8f08b098ec2066947f4b72ce2",
|
||||
"rev": "8ea014acc33da95ea56c902229957d8225005163",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -303,12 +286,11 @@
|
|||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"agkozak-zsh-prompt": "agkozak-zsh-prompt",
|
||||
"coc-nvim": "coc-nvim",
|
||||
"dart-vim": "dart-vim",
|
||||
"darwin": "darwin",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"home-manager": "home-manager",
|
||||
"impermanence": "impermanence",
|
||||
"mobile-nixos": "mobile-nixos",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
|
|
@ -390,11 +372,11 @@
|
|||
"zsh-completions": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1660204457,
|
||||
"narHash": "sha256-f1tm7q5Aw73K/R74T6YiecUH435g/LPjtwrDATcAhvg=",
|
||||
"lastModified": 1660413053,
|
||||
"narHash": "sha256-17Gs1HbujMufl43GEGQlOHbX5z48pRx6bkBGsgUyFng=",
|
||||
"owner": "zsh-users",
|
||||
"repo": "zsh-completions",
|
||||
"rev": "b131623ee4c46aa9a781213a3ba0e4cfd020b810",
|
||||
"rev": "f360827b882e0b651ff85ce27dc2a6287351fc22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
38
flake.nix
38
flake.nix
|
|
@ -15,18 +15,23 @@
|
|||
darwin.url = "github:lnl7/nix-darwin/master";
|
||||
darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||
utils.url = "github:numtide/flake-utils";
|
||||
|
||||
#pinephone
|
||||
mobile-nixos.url = "github:NixOS/mobile-nixos?rev=de9a88a70f0ae5fc0839ff94bf29e8a30af399f8";
|
||||
mobile-nixos.flake = false; # whyever this isn't a flake
|
||||
|
||||
## emacs
|
||||
emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||
|
||||
## vim
|
||||
#neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||
#neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||
coc-nvim.url = "github:neoclide/coc.nvim/release";
|
||||
coc-nvim.flake = false;
|
||||
#coc-nvim.url = "github:neoclide/coc.nvim/release";
|
||||
#coc-nvim.flake = false;
|
||||
nnn-vim.url = "github:mcchrish/nnn.vim";
|
||||
nnn-vim.flake = false;
|
||||
dart-vim.url = "github:dart-lang/dart-vim-plugin/master";
|
||||
dart-vim.flake = false;
|
||||
#dart-vim.url = "github:dart-lang/dart-vim-plugin/master";
|
||||
#dart-vim.flake = false;
|
||||
rnix-lsp.url = "github:nix-community/rnix-lsp";
|
||||
rnix-lsp.inputs.nixpkgs.follows = "nixpkgs";
|
||||
pandoc-latex-template.url = "github:Wandmalfarbe/pandoc-latex-template";
|
||||
|
|
@ -49,6 +54,7 @@
|
|||
, agenix
|
||||
, home-manager
|
||||
, impermanence
|
||||
, mobile-nixos
|
||||
, darwin
|
||||
, utils
|
||||
, emacs-overlay
|
||||
|
|
@ -64,12 +70,12 @@
|
|||
genPkgs = system: import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
overlays = [
|
||||
self.overlay
|
||||
# neovim-nightly-overlay.overlay
|
||||
self.overlays.default
|
||||
emacs-overlay.overlay
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
hmConfig = { hm, pkgs, inputs, config, ... }: {
|
||||
imports = (lib.my.mapModulesRec' ./hm-imports (x: x)) ++ [ "${impermanence}/home-manager.nix" ];
|
||||
|
|
@ -84,12 +90,15 @@
|
|||
nixpkgs.lib.nixosSystem
|
||||
rec {
|
||||
inherit system;
|
||||
specialArgs = { inherit lib inputs pkgs system; };
|
||||
specialArgs = { inherit lib; };
|
||||
modules = [
|
||||
agenix.nixosModules.age
|
||||
impermanence.nixosModules.impermanence
|
||||
home-manager.nixosModules.home-manager
|
||||
({ config, ... }: lib.mkMerge [{
|
||||
_module.args = { inherit inputs; };
|
||||
nixpkgs.pkgs = pkgs;
|
||||
nixpkgs.overlays = overlays;
|
||||
networking.hostName = hostName;
|
||||
system.configurationRevision = rev;
|
||||
services.getty.greetingLine =
|
||||
|
|
@ -113,12 +122,15 @@
|
|||
darwin.lib.darwinSystem
|
||||
{
|
||||
inherit system;
|
||||
specialArgs = { inherit darwin lib pkgs inputs self; };
|
||||
specialArgs = { inherit lib; };
|
||||
modules = [
|
||||
home-manager.darwinModules.home-manager
|
||||
({ config, inputs, self, ... }: {
|
||||
config = {
|
||||
#system.darwinLabel = "${config.system.darwinLabel}@${rev}";
|
||||
_module.args = { inherit lib inputs self darwin; };
|
||||
nixpkgs.pkgs = pkgs;
|
||||
nixpkgs.overlays = overlays;
|
||||
networking.hostName = hostName;
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
|
@ -136,7 +148,7 @@
|
|||
in
|
||||
{
|
||||
lib = lib.my;
|
||||
overlay = final: prev: {
|
||||
overlays.default = final: prev: {
|
||||
unstable = import nixpkgs-master {
|
||||
system = prev.system;
|
||||
config.allowUnfree = true;
|
||||
|
|
@ -150,6 +162,12 @@
|
|||
picard = nixosSystem "x86_64-linux" [ ./hosts/picard/default.nix ];
|
||||
ds9 = nixosSystem "x86_64-linux" [ ./hosts/ds9/default.nix ];
|
||||
daedalusvm = nixosSystem "aarch64-linux" [ ./hosts/daedalusvm/default.nix ];
|
||||
octopine = nixosSystem "aarch64-linux" [
|
||||
./hosts/octopine/default.nix
|
||||
(import "${mobile-nixos}/lib/configuration.nix" {
|
||||
device = "pine64-pinephone";
|
||||
})
|
||||
];
|
||||
};
|
||||
darwinConfigurations = processConfigurations {
|
||||
daedalus = darwinSystem "aarch64-darwin" [ ./hosts/daedalus/default.nix ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ require('plugin.rainbow')
|
|||
require('plugin.terminal')
|
||||
|
||||
-- plugins - coc
|
||||
vim.cmd 'source ~/.config/nvim/coc.vim' -- too lazy to convert all the shit to lua
|
||||
-- vim.cmd 'source ~/.config/nvim/coc.vim' -- too lazy to convert all the shit to lua
|
||||
-- terminal
|
||||
vim.cmd 'source ~/.config/nvim/terminal.vim' -- too lazy to convert all the shit to lua
|
||||
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@
|
|||
# name = "coc-nvim";
|
||||
# src = inputs.coc-nvim;
|
||||
# };
|
||||
dart-vim = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "dart-vim";
|
||||
src = inputs.dart-vim;
|
||||
};
|
||||
#dart-vim = pkgs.vimUtils.buildVimPlugin {
|
||||
# name = "dart-vim";
|
||||
# src = inputs.dart-vim;
|
||||
#};
|
||||
in
|
||||
map (x: { plugin = x; }) (with pkgs.vimPlugins; [
|
||||
vim-tmux-navigator
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
# vim-pandoc-syntax
|
||||
# ultisnips
|
||||
# coc-nvim
|
||||
dart-vim
|
||||
#dart-vim
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
27
hosts/octopine/default.nix
Normal file
27
hosts/octopine/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, inputs, pkgs, lib, ... }:
|
||||
{
|
||||
imports =
|
||||
[
|
||||
];
|
||||
|
||||
services.octoprint = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
services.mjpg-streamer.enable = true;
|
||||
|
||||
ragon = {
|
||||
cli.enable = true;
|
||||
user.enable = true;
|
||||
system.security.enable = false;
|
||||
|
||||
services = {
|
||||
docker.enable = true;
|
||||
ssh.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue