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

Compare commits

base: bad:6360968d7d59399439c9f62581dc4fcc4a887262
Branches Tags
bad:config
bad:nvim-lspconfig
..
compare: bad:4258b2d21582a8274bbc3a73171fb3b9de621b92
Branches Tags
bad:config
bad:nvim-lspconfig

4 commits
6360968d7d ... 4258b2d215

Author SHA1 Message Date
Bad
4258b2d215 Configure ssh via settings 2023-03-19 14:38:34 +01:00
Bad
04289143f0 Rename programs.mako to services.mako 2023-03-19 14:37:10 +01:00
Bad
fbb59f1345 Add dart lsp 2023-03-19 14:36:16 +01:00
Bad
15e0e96372 Update flakes 2023-03-19 14:19:17 +01:00
10 changed files with 92 additions and 43 deletions
Show stats Expand all files Collapse all files

95
flake.lock
View file

@ -2,16 +2,17 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin",
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ]
}, },
"locked": { "locked": {
"lastModified": 1673301561, "lastModified": 1677969766,
"narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,6 +37,28 @@
} }
}, },
"darwin": { "darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673295039,
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"darwin_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
@ -55,7 +78,7 @@
"type": "github" "type": "github"
} }
}, },
"darwin_2": { "darwin_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"digga", "digga",
@ -126,7 +149,7 @@
"digga": { "digga": {
"inputs": { "inputs": {
"blank": "blank", "blank": "blank",
"darwin": "darwin_2", "darwin": "darwin_3",
"deploy": [ "deploy": [
"deploy" "deploy"
], ],
@ -168,11 +191,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1674714173, "lastModified": 1679207026,
"narHash": "sha256-0JmvmzttdpE49XczoBSb/iQdVcpMe3NDXJDmUeBSGEw=", "narHash": "sha256-3BrBOSwYGlgTq69+OeHCQoFBGTzpDp9PkKjWkxpA108=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "baa5e0aa99e5381beb63f909e39d987202f78d59", "rev": "efc838bd45cfdfd21836f239605f2082d7245464",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +319,11 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1678901627,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,11 +387,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674556204, "lastModified": 1679067095,
"narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=", "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6", "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -411,11 +434,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1674731659, "lastModified": 1679232602,
"narHash": "sha256-iGnBkl6MN70cddZMWRCADLX6DLp1dnIIA66KBCtDFbU=", "narHash": "sha256-O7dj7MvfhN0G5BQxMjPEUh13iGGjLT87Wxc4U6EH20E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4fca325432efde372a2d30cc0317a66c89844f99", "rev": "feb661ff785b95dfbfe780143b66ad21814218fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -451,11 +474,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1672992692, "lastModified": 1676383589,
"narHash": "sha256-/eLQLSNIa22ARTZbk+x8i0iE8khe1eiHWkuxgTVXZ7g=", "narHash": "sha256-KCkWZXCjH+C4Kn7fUGSrEl5btk+sERHhZueSsvVbPWc=",
"owner": "guibou", "owner": "guibou",
"repo": "nixGL", "repo": "nixGL",
"rev": "643e730efb981ffaf8478f441ec9b9aeea1c89f5", "rev": "c917918ab9ebeee27b0dd657263d3f57ba6bb8ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -466,11 +489,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1674459583, "lastModified": 1679081381,
"narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -482,11 +505,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1674550793, "lastModified": 1679224149,
"narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +520,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1674459583, "lastModified": 1679081381,
"narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -615,7 +638,7 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"darwin": "darwin", "darwin": "darwin_2",
"deploy": "deploy", "deploy": "deploy",
"digga": "digga", "digga": "digga",
"fenix": "fenix", "fenix": "fenix",
@ -635,11 +658,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1674661381, "lastModified": 1679123187,
"narHash": "sha256-7A92LFbNJYi94Iio7HeDW1bT+tPTQ00zjNmsVfWLme8=", "narHash": "sha256-Jf9hN2BIHdZ2Of4A0zAyB0fhe1EFujLa9XjWRC9ZKiY=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "dd673eea33079a3bf194fad25a6aec2e824e9041", "rev": "7c05f55f0c9e9bec28464b329194fe244ca2c7a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -651,11 +674,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1674407282, "lastModified": 1679139072,
"narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", "narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", "rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -80,7 +80,7 @@
overlays = [ overlays = [
# 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.overlays.default pkgs pkgs) (_: super: let pkgs = fenix.inputs.nixpkgs.legacyPackages.${super.system}; in fenix.overlays.default pkgs pkgs)
agenix.overlay agenix.overlays.default
./pkgs/default.nix ./pkgs/default.nix
peerix.overlay peerix.overlay

2
profiles/game/default.nix
View file

@ -8,6 +8,6 @@
mumble mumble
(retroarch.override { cores = [ libretro.snes9x ]; }) (retroarch.override { cores = [ libretro.snes9x ]; })
olympus olympus
godot godot_4
]; ];
} }

8
profiles/ssh/default.nix
View file

@ -1,10 +1,12 @@
{ ... }: { { ... }: {
services.openssh = { services.openssh = {
enable = true; enable = true;
forwardX11 = true; settings = {
permitRootLogin = "no"; X11Forwarding = true;
PermitRootLogin = "no";
PasswordAuthentication = false;
};
startWhenNeeded = true; startWhenNeeded = true;
openFirewall = true; openFirewall = true;
passwordAuthentication = false;
}; };
} }

2
suites/default.nix
View file

@ -1,7 +1,7 @@
{ profiles, ... }: { profiles, ... }:
with profiles; rec { with profiles; rec {
base = [ users.root core dns ]; base = [ users.root core dns ];
workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix tailscale users.mae three_dee ]; workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix tailscale users.mae ];
desktop = workstation ++ [ amd ]; desktop = workstation ++ [ amd ];
lap = workstation ++ [ laptop bluetooth print ]; lap = workstation ++ [ laptop bluetooth print ];
} }

20
users/modules/neovim/dart.nix Normal file
View file

@ -0,0 +1,20 @@
{ lib, pkgs, config, ... }:
let
cfg = config.mae.nvim.dart;
in
with lib;
{
options.mae.nvim.dart.enable = lib.mkEnableOption "Enable dart support in neovim";
config = mkIf cfg.enable {
mae.nvim.lsp.servers.dartls = {
enable = true;
script = ''
{
cmd = { "${pkgs.latest.dart}/bin/dart", "language-server" },
}
'';
};
programs.neovim.plugins = with pkgs.vimPlugins; [ dart-vim-plugin ];
};
}

1
users/modules/neovim/default.nix
View file

@ -13,6 +13,7 @@ in
./python.nix ./python.nix
./clangd.nix ./clangd.nix
./elixir.nix ./elixir.nix
./dart.nix
]; ];
options.mae.nvim = { options.mae.nvim = {

2
users/modules/neovim/nvim-lsp.nix
View file

@ -20,6 +20,8 @@ let
in in
{ {
options.mae.nvim.lsp = { options.mae.nvim.lsp = {
enable = mkEnableOption "Enable lsp support in nvim with nvim-lspconfig and cmp-nvim"; enable = mkEnableOption "Enable lsp support in nvim with nvim-lspconfig and cmp-nvim";
servers = mkOption { servers = mkOption {
type = types.attrsOf lspLangConfigType; type = types.attrsOf lspLangConfigType;

1
users/profiles/neovim/default.nix
View file

@ -11,5 +11,6 @@
clangd.enable = true; clangd.enable = true;
python.enable = true; python.enable = true;
elixir.enable = true; elixir.enable = true;
dart.enable = true;
}; };
} }

2
users/profiles/sway/default.nix
View file

@ -102,7 +102,7 @@ in
}; };
}; };
programs.mako = { services.mako = {
enable = true; enable = true;
defaultTimeout = 2000; defaultTimeout = 2000;
}; };