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

Compare commits

base: bad:2427686ffcbbb8f50930d471786a7152a3abe499
Branches Tags
bad:config
bad:nvim-lspconfig
..
compare: bad:fba781f5a9a647497c17344f1bca6af879362c15
Branches Tags
bad:config
bad:nvim-lspconfig

No commits in common. "2427686ffcbbb8f50930d471786a7152a3abe499" and "fba781f5a9a647497c17344f1bca6af879362c15" have entirely different histories.
2427686ffc ... fba781f5a9

17 changed files with 95 additions and 92 deletions
Show stats Expand all files Collapse all files

42
flake.lock
View file

@ -169,11 +169,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1656656878, "lastModified": 1656311436,
"narHash": "sha256-0rA054abuLVzv24nrk4rVWQIDl20T+570UZglPhXgzg=", "narHash": "sha256-rXZbZ61Zvn5rE0Srh5bpfNYRXEZHIigqcjkKh2+Cvk4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "e172d625f705ca4013f93d3fe061d3ecf1fc3a34", "rev": "5e2708f04efe0ed2616be471d0913e303ff3a9ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1656367977, "lastModified": 1656313134,
"narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=", "narHash": "sha256-VCEXqyq/+Ffu+TlDoIt2iepERFVVvmZ2flHNyVb0dPs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1", "rev": "be3adf9920febf26ff5221ed5c8c76a43b2d94d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1656461576, "lastModified": 1656239181,
"narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c", "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +386,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1656589841, "lastModified": 1656265786,
"narHash": "sha256-Kqd6r9aNIzjYGhMFYATdKwRbXBCGLcdqAJMLr4I8LG0=", "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dbb62c34bbb5cdf05f1aeab07638b24b0824d605", "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +402,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1656624504, "lastModified": 1656353817,
"narHash": "sha256-EuNui6P5tHk4YkfiYjcRzfc9wxpoTl2OOOgpyF6bWfs=", "narHash": "sha256-UJEzMQcft/0Ilu4LWV7UH51mr5UCo28GL06BGO+djv4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a50513f8a6c470208d7c494439775e62c3f47ce1", "rev": "78e7c2c397b0376526e83162b58de921362e3399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +417,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1656461576, "lastModified": 1656239181,
"narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c", "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1656601302, "lastModified": 1656240210,
"narHash": "sha256-8vlDMdGmccsFkDTM5O3RGRTZIGBEVIDjnXpxWGoVIQc=", "narHash": "sha256-CeP1gNUtmYHCQylROkpunvVTR8J8w/Pm6D5rjw8v4Gw=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "ce36446943a33b01de50ca27d8d17e176af13cd5", "rev": "b74e96f509baf0be70281c55f14cb18fefbc6b22",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -18,7 +18,7 @@
digga.inputs.deploy.follows = "deploy"; digga.inputs.deploy.follows = "deploy";
home.url = "github:nix-community/home-manager/master"; home.url = "github:nix-community/home-manager/master";
# 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";
@ -40,12 +40,12 @@
naersk.inputs.nixpkgs.follows = "nixos"; naersk.inputs.nixpkgs.follows = "nixos";
peerix.url = "github:cid-chan/peerix"; peerix.url = "github:cid-chan/peerix";
# peerix.url = "github:MaeIsBad/peerix"; # peerix.url = "github:MaeIsBad/peerix";
peerix.inputs.nixpkgs.follows = "nixos"; peerix.inputs.nixpkgs.follows = "nixos";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
fenix.url = "github:nix-community/fenix"; fenix.url = "github:nix-community/fenix";
# fenix.inputs.nixpkgs.follows = "nixos"; # fenix.inputs.nixpkgs.follows = "nixos";
}; };
outputs = outputs =

9
hosts/tesco.nix
View file

@ -52,18 +52,17 @@
}; };
fileSystems."/" = fileSystems."/" =
{ { device = "/dev/bcache0";
device = "/dev/bcache0";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ { device = "/dev/disk/by-label/BOOT";
device = "/dev/disk/by-label/BOOT";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[{ device = "/dev/disk/by-label/ssd-swap"; }]; [ { device = "/dev/disk/by-label/ssd-swap"; }
];
} }

5
hosts/vm.nix
View file

@ -1,5 +0,0 @@
{ suites, profiles, pkgs, ... }:
{
imports = suites.workstation;
system.stateVersion = "21.05"; # Did you read the comment?
}

5
pre-commit.sh
View file

@ -1,5 +0,0 @@
#!/usr/bin/env -S nix shell --quiet nixpkgs#bash nixpkgs#nixpkgs-fmt --ignore-environment --command bash
# Install: ln -s ../../pre-commit.sh .git/hooks/pre-commit
nixpkgs-fmt --check .

2
profiles/game/default.nix
View file

@ -7,7 +7,7 @@
minetest minetest
mumble mumble
polymc polymc
(retroarch.override { cores = [ libretro.snes9x ]; }) (retroarch.override {cores = [libretro.snes9x]; })
olympus olympus
godot godot
]; ];

4
profiles/peerix/default.nix
View file

@ -1,9 +1,9 @@
{ config, pkgs, ... }: {config, pkgs, ...}:
let let
peerix_user = "peerix"; peerix_user = "peerix";
in in
{ {
users.groups.${peerix_user} = { }; users.groups.${peerix_user} = {};
users.users.${peerix_user} = { users.users.${peerix_user} = {
group = peerix_user; group = peerix_user;
isSystemUser = true; isSystemUser = true;

2
secrets/secrets.nix
View file

@ -6,7 +6,7 @@ let
tesco_sys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqryVRMbcei0pZTOP1wgTVzn452vgsUP7MrEb0LQ17s root@tesco"; tesco_sys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqryVRMbcei0pZTOP1wgTVzn452vgsUP7MrEb0LQ17s root@tesco";
mae_tesco = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN64wtGODBn2yygv1sOXnV8qbXImbOttMlhdTKEyQCoT mae@tesco"; mae_tesco = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN64wtGODBn2yygv1sOXnV8qbXImbOttMlhdTKEyQCoT mae@tesco";
systemKeys = [ teapot_sys tesco_sys ]; systemKeys = [teapot_sys tesco_sys];
allKeys = [ mae_teapot mae_tesco ] ++ systemKeys; allKeys = [ mae_teapot mae_tesco ] ++ systemKeys;
in in
{ {

6
suites/default.nix
View file

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

7
users/mae-desk/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
home-manager.users.mae = {
imports = [ ../mae/home-manager-base.nix ];
};
users = (import ../mae/user.nix { inherit pkgs; });
}

7
users/mae-lap/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
home-manager.users.mae = {
imports = [ ../mae/home-manager-base.nix ];
};
users = (import ../mae/user.nix { inherit pkgs; });
}

37
users/mae/default.nix
View file

@ -1,37 +0,0 @@
{ pkgs, ... }:
{
users.users.mae = {
uid = 1000;
isNormalUser = true;
hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
shell = pkgs.zsh;
extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "podman" "docker" ];
};
home-manager.users.mae = { pkgs, ... }: {
imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/podman ../profiles/alacritty ../profiles/tmux ../profiles/mpv ../profiles/sway ];
home.sessionVariables = {
XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
EDITOR = "${pkgs.neovim}/bin/nvim";
MOZ_ENABLE_WAYLAND = 1;
};
home.stateVersion = "18.09";
gtk = {
enable = true;
theme = {
name = "Arc-Dark";
package = pkgs.arc-theme;
};
gtk3.extraConfig = {
gtk-application-prefer-dark-theme = true;
};
};
programs.go = {
enable = true;
goPath = ".local/go";
};
};
}

27
users/mae/home-manager-base.nix Normal file
View file

@ -0,0 +1,27 @@
{ pkgs, ... }:
{
imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/podman ../profiles/alacritty ../profiles/tmux ../profiles/mpv ../profiles/sway ];
home.sessionVariables = {
XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
EDITOR = "${pkgs.neovim}/bin/nvim";
MOZ_ENABLE_WAYLAND = 1;
};
home.stateVersion = "18.09";
gtk = {
enable = true;
theme = {
name = "Arc-Dark";
package = pkgs.arc-theme;
};
gtk3.extraConfig = {
gtk-application-prefer-dark-theme = true;
};
};
programs.go = {
enable = true;
goPath = ".local/go";
};
}

11
users/mae/user.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
users.mae = {
uid = 1000;
isNormalUser = true;
hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
shell = pkgs.zsh;
extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "podman" "docker" ];
};
}

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

@ -64,9 +64,8 @@ in
modules-right = [ "custom/riley-gender" "disk" "battery" "backlight" "pulseaudio" "clock" "tray" ]; modules-right = [ "custom/riley-gender" "disk" "battery" "backlight" "pulseaudio" "clock" "tray" ];
"custom/riley-gender" = { "custom/riley-gender" = {
interval = "360"; interval = "360";
exec = pkgs.writeShellScript "riley-gender" '' exec = pkgs.writeShellScript "hello-from-waybar" ''
set -euo pipefail set -euo pipefail
until ping -c1 google.com >/dev/null 2>&1; do :; done
gender="$(${pkgs.curl}/bin/curl 'https://rly.cx/api/gender')" gender="$(${pkgs.curl}/bin/curl 'https://rly.cx/api/gender')"
pronouns="$(${pkgs.curl}/bin/curl 'https://rly.cx/api/pronouns')" pronouns="$(${pkgs.curl}/bin/curl 'https://rly.cx/api/pronouns')"
echo -n "Riley: $gender ($pronouns)" echo -n "Riley: $gender ($pronouns)"