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

Compare commits

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

No commits in common. "4258b2d21582a8274bbc3a73171fb3b9de621b92" and "6360968d7d59399439c9f62581dc4fcc4a887262" have entirely different histories.
4258b2d215 ... 6360968d7d

10 changed files with 43 additions and 92 deletions
Show stats Expand all files Collapse all files

95
flake.lock
View file

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

8
profiles/ssh/default.nix
View file

@ -1,12 +1,10 @@
{ ... }: { { ... }: {
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { forwardX11 = true;
X11Forwarding = true; permitRootLogin = "no";
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 ]; workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix tailscale users.mae three_dee ];
desktop = workstation ++ [ amd ]; desktop = workstation ++ [ amd ];
lap = workstation ++ [ laptop bluetooth print ]; lap = workstation ++ [ laptop bluetooth print ];
} }

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

@ -1,20 +0,0 @@
{ 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,7 +13,6 @@ 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,8 +20,6 @@ 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,6 +11,5 @@
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
}; };
}; };
services.mako = { programs.mako = {
enable = true; enable = true;
defaultTimeout = 2000; defaultTimeout = 2000;
}; };