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

Merge remote-tracking branch 'origin/nixos-22-11-racoon' into infra-22.11

Browse source
This commit is contained in:
teutat3s 2022-11-28 21:53:32 +01:00
parent 9fb726b2d7 215a55e145
commit 492b8695a3
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
14 changed files with 252 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
flake.lock
View file

@ -360,19 +360,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ],
"utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1669071065,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "f7641a3ff398ccce952e19a199d775934e518c1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -418,11 +419,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1669411043, "lastModified": 1669542132,
"narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", "rev": "a115bb9bd56831941be3776c8a94005867f316a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -469,16 +470,16 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1669418739, "lastModified": 1669558522,
"narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "695b3515251873e0a7e2021add4bba643c56cde3", "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-22.05", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -504,11 +505,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1669146234, "lastModified": 1669650994,
"narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", "narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", "rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -612,11 +613,11 @@
}, },
"locked": { "locked": {
"dir": "vmtools", "dir": "vmtools",
"lastModified": 1668514320, "lastModified": 1669648111,
"narHash": "sha256-P+wzdarT2l+91VPf9hsYtKJad7WHttN5oFFlGQHJ5mQ=", "narHash": "sha256-EKh7iM4fCyZ7L6+HmGn3QkZ1HuG9zMEkziOH3K13SbY=",
"ref": "main", "ref": "main",
"rev": "8648709ed952423e82d62eb634918de1b1cfdc82", "rev": "d78c4afe040440437949ce581ae0dcdc5893553c",
"revCount": 27, "revCount": 28,
"type": "git", "type": "git",
"url": "https://git.b12f.io/pub-solar/infra?dir=vmtools" "url": "https://git.b12f.io/pub-solar/infra?dir=vmtools"
}, },
@ -641,6 +642,21 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

4
flake.nix
View file

@ -8,7 +8,7 @@
inputs = inputs =
{ {
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixos.url = "github:nixos/nixpkgs/nixos-22.05"; nixos.url = "github:nixos/nixpkgs/nixos-22.11";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
fork.url = "github:teutat3s/nixpkgs/fix/gitea-needs-gpg-in-path"; fork.url = "github:teutat3s/nixpkgs/fix/gitea-needs-gpg-in-path";
@ -21,7 +21,7 @@
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";
digga.inputs.deploy.follows = "deploy"; digga.inputs.deploy.follows = "deploy";
home.url = "github:nix-community/home-manager/release-22.05"; home.url = "github:nix-community/home-manager/release-22.11";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";

2
modules/compat/default.nix
View file

@ -2,5 +2,5 @@
# Both things below are for # Both things below are for
# https://github.com/NixOS/nixpkgs/issues/124215 # https://github.com/NixOS/nixpkgs/issues/124215
documentation.info.enable = lib.mkForce false; documentation.info.enable = lib.mkForce false;
nix.sandboxPaths = [ "/bin/sh=${pkgs.bash}/bin/sh" ]; nix.settings.extra-sandbox-paths = [ "/bin/sh=${pkgs.bash}/bin/sh" ];
} }

19
modules/core/networking.nix
View file

@ -1,8 +1,10 @@
{ config, pkgs, lib, ... }: { config
, pkgs
with lib; , lib
, ...
let cfg = config.pub-solar.core; }:
with lib; let
cfg = config.pub-solar.core;
in in
{ {
options.pub-solar.core = { options.pub-solar.core = {
@ -39,12 +41,13 @@ in
networking.firewall.enable = true; networking.firewall.enable = true;
# Customized binary caches list (with fallback to official binary cache) # Customized binary caches list (with fallback to official binary cache)
nix.binaryCaches = cfg.binaryCaches; nix.settings.substituters = cfg.binaryCaches;
nix.binaryCachePublicKeys = cfg.publicKeys; nix.settings.trusted-public-keys = cfg.publicKeys;
# These entries get added to /etc/hosts # These entries get added to /etc/hosts
networking.hosts = { networking.hosts = {
"127.0.0.1" = [ ] "127.0.0.1" =
[ ]
++ lib.optionals cfg.enableCaddy [ "caddy.local" ] ++ lib.optionals cfg.enableCaddy [ "caddy.local" ]
++ lib.optionals config.pub-solar.printing.enable [ "cups.local" ] ++ lib.optionals config.pub-solar.printing.enable [ "cups.local" ]
++ lib.optionals cfg.enableHelp [ "help.local" ]; ++ lib.optionals cfg.enableHelp [ "help.local" ];

27
modules/core/nix.nix
View file

@ -1,19 +1,24 @@
{ config, pkgs, lib, inputs, ... }: { config
, pkgs
{ , lib
, inputs
, ...
}: {
nix = { nix = {
# Use default version alias for nix package # Use default version alias for nix package
package = pkgs.nix; package = pkgs.nix;
# Improve nix store disk usage
autoOptimiseStore = true;
gc.automatic = true; gc.automatic = true;
optimise.automatic = true; optimise.automatic = true;
# Prevents impurities in builds settings = {
useSandbox = true; # Improve nix store disk usage
# give root and @wheel special privileges with nix auto-optimise-store = true;
trustedUsers = [ "root" "@wheel" ]; # Prevents impurities in builds
# This is just a representation of the nix default sandbox = true;
systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; # give root and @wheel special privileges with nix
trusted-users = [ "root" "@wheel" ];
# This is just a representation of the nix default
system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
};
# Generally useful nix option defaults # Generally useful nix option defaults
extraOptions = '' extraOptions = ''
min-free = 536870912 min-free = 536870912

2
modules/devops/default.nix
View file

@ -19,7 +19,7 @@ in
ansible-lint ansible-lint
restic restic
shellcheck shellcheck
terraform_0_15 terraform
]; ];
}; };
}; };

16
modules/docker/default.nix
View file

@ -1,6 +1,9 @@
{ lib, config, pkgs, ... }: { lib
with lib; , config
let , pkgs
, ...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.docker; cfg = config.pub-solar.docker;
in in
@ -11,9 +14,10 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
users.users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] { users.users = with pkgs;
extraGroups = [ "docker" ]; pkgs.lib.setAttrByPath [ psCfg.user.name ] {
}; extraGroups = [ "docker" ];
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
docker-compose docker-compose

138
modules/graphical/alacritty.nix
View file

@ -66,29 +66,97 @@
x = 0; x = 0;
y = 0; y = 0;
}; };
use_thin_strokes = true;
}; };
key_bindings = [ key_bindings = [
{ key = "V"; mods = "Control|Alt"; action = "Paste"; } {
{ key = "C"; mods = "Control|Alt"; action = "Copy"; } key = "V";
{ key = "Paste"; action = "Paste"; } mods = "Control|Alt";
{ key = "Copy"; action = "Copy"; } action = "Paste";
{ key = "Q"; mods = "Command"; action = "Quit"; } }
{ key = "W"; mods = "Command"; action = "Quit"; } {
{ key = "Insert"; mods = "Shift"; action = "PasteSelection"; } key = "C";
{ key = "Key0"; mods = "Control"; action = "ResetFontSize"; } mods = "Control|Alt";
{ key = "Equals"; mods = "Control"; action = "IncreaseFontSize"; } action = "Copy";
{ key = "PageUp"; mods = "Shift"; action = "ScrollPageUp"; } }
{ key = "PageDown"; mods = "Shift"; action = "ScrollPageDown"; } {
{ key = "Minus"; mods = "Control"; action = "DecreaseFontSize"; } key = "Paste";
{ key = "H"; mode = "Vi|~Search"; action = "ScrollToBottom"; } action = "Paste";
{ key = "H"; mode = "Vi|~Search"; action = "ToggleViMode"; } }
{ key = "I"; mode = "Vi|~Search"; action = "Up"; } {
{ key = "K"; mode = "Vi|~Search"; action = "Down"; } key = "Copy";
{ key = "J"; mode = "Vi|~Search"; action = "Left"; } action = "Copy";
{ key = "L"; mode = "Vi|~Search"; action = "Right"; } }
{
key = "Q";
mods = "Command";
action = "Quit";
}
{
key = "W";
mods = "Command";
action = "Quit";
}
{
key = "Insert";
mods = "Shift";
action = "PasteSelection";
}
{
key = "Key0";
mods = "Control";
action = "ResetFontSize";
}
{
key = "Equals";
mods = "Control";
action = "IncreaseFontSize";
}
{
key = "PageUp";
mods = "Shift";
action = "ScrollPageUp";
}
{
key = "PageDown";
mods = "Shift";
action = "ScrollPageDown";
}
{
key = "Minus";
mods = "Control";
action = "DecreaseFontSize";
}
{
key = "H";
mode = "Vi|~Search";
action = "ScrollToBottom";
}
{
key = "H";
mode = "Vi|~Search";
action = "ToggleViMode";
}
{
key = "I";
mode = "Vi|~Search";
action = "Up";
}
{
key = "K";
mode = "Vi|~Search";
action = "Down";
}
{
key = "J";
mode = "Vi|~Search";
action = "Left";
}
{
key = "L";
mode = "Vi|~Search";
action = "Right";
}
]; ];
# Base16 Burn 256 - alacritty color config # Base16 Burn 256 - alacritty color config
@ -164,12 +232,30 @@
}; };
indexed_colors = [ indexed_colors = [
{ index = 16; color = "0xdf5923"; } {
{ index = 17; color = "0xd70000"; } index = 16;
{ index = 18; color = "0x2d2a2e"; } color = "0xdf5923";
{ index = 19; color = "0x303030"; } }
{ index = 20; color = "0xd3d1d4"; } {
{ index = 21; color = "0x303030"; } index = 17;
color = "0xd70000";
}
{
index = 18;
color = "0x2d2a2e";
}
{
index = 19;
color = "0x303030";
}
{
index = 20;
color = "0xd3d1d4";
}
{
index = 21;
color = "0x303030";
}
]; ];
}; };
} }

99
modules/sway/default.nix
View file

@ -1,6 +1,9 @@
{ lib, config, pkgs, ... }: { lib
with lib; , config
let , pkgs
, ...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
in in
{ {
@ -29,7 +32,7 @@ in
''; '';
}) })
({ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
linuxPackages.v4l2loopback linuxPackages.v4l2loopback
]; ];
@ -49,59 +52,59 @@ in
}; };
}; };
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
gtkUsePortal = true;
}; };
services.pipewire.enable = true; services.pipewire.enable = true;
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = with pkgs; [ pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
sway home.packages = with pkgs; [
grim sway
kanshi grim
mako kanshi
slurp mako
swayidle slurp
swaylock swayidle
swaybg swaylock
xwayland swaybg
xwayland
libappindicator-gtk3 libappindicator-gtk3
wl-clipboard wl-clipboard
wf-recorder wf-recorder
brightnessctl brightnessctl
gammastep gammastep
geoclue2 geoclue2
xsettingsd xsettingsd
ydotool ydotool
sway-launcher sway-launcher
record-screen record-screen
import-gtk-settings import-gtk-settings
s s
wcwd wcwd
]; ];
programs.waybar.enable = true; programs.waybar.enable = true;
#programs.waybar.systemd.enable = true; #programs.waybar.systemd.enable = true;
systemd.user.services.mako = import ./mako.service.nix { inherit pkgs psCfg; }; systemd.user.services.mako = import ./mako.service.nix { inherit pkgs psCfg; };
systemd.user.services.sway = import ./sway.service.nix { inherit pkgs psCfg; }; systemd.user.services.sway = import ./sway.service.nix { inherit pkgs psCfg; };
systemd.user.services.swayidle = import ./swayidle.service.nix { inherit pkgs psCfg; }; systemd.user.services.swayidle = import ./swayidle.service.nix { inherit pkgs psCfg; };
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix { inherit pkgs psCfg; }; systemd.user.services.xsettingsd = import ./xsettingsd.service.nix { inherit pkgs psCfg; };
systemd.user.services.waybar = import ./waybar.service.nix { inherit pkgs psCfg; }; systemd.user.services.waybar = import ./waybar.service.nix { inherit pkgs psCfg; };
systemd.user.targets.sway-session = import ./sway-session.target.nix { inherit pkgs psCfg; }; systemd.user.targets.sway-session = import ./sway-session.target.nix { inherit pkgs psCfg; };
xdg.configFile."sway/config".text = import ./config/config.nix { inherit config pkgs; }; xdg.configFile."sway/config".text = import ./config/config.nix { inherit config pkgs; };
xdg.configFile."sway/config.d/colorscheme.conf".source = ./config/config.d/colorscheme.conf; xdg.configFile."sway/config.d/colorscheme.conf".source = ./config/config.d/colorscheme.conf;
xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf; xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf;
xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf; xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf;
xdg.configFile."sway/config.d/custom-keybindings.conf".source = ./config/config.d/custom-keybindings.conf; xdg.configFile."sway/config.d/custom-keybindings.conf".source = ./config/config.d/custom-keybindings.conf;
xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix { inherit pkgs psCfg; }; xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix { inherit pkgs psCfg; };
xdg.configFile."sway/config.d/applications.conf".source = ./config/config.d/applications.conf; xdg.configFile."sway/config.d/applications.conf".source = ./config/config.d/applications.conf;
xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf; xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf;
}; };
}) }
]); ]);
} }

1
modules/terminal-life/nvim/init.vim
View file

@ -13,6 +13,7 @@ set expandtab
set shiftwidth=2 set shiftwidth=2
set number set number
set relativenumber set relativenumber
set mouse=
set undolevels=1000 set undolevels=1000
set undoreload=10000 set undoreload=10000

3
modules/terminal-life/nvim/lsp.vim
View file

@ -73,8 +73,7 @@ lua <<EOF
end end
-- Add additional capabilities supported by nvim-cmp -- Add additional capabilities supported by nvim-cmp
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = require('cmp_nvim_lsp').default_capabilities()
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
-- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html -- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true

7
profiles/cachix/default.nix
View file

@ -1,4 +1,7 @@
{ pkgs, lib, ... }: { pkgs
, lib
, ...
}:
let let
folder = ./.; folder = ./.;
toImport = name: value: folder + ("/" + name); toImport = name: value: folder + ("/" + name);
@ -7,5 +10,5 @@ let
in in
{ {
inherit imports; inherit imports;
nix.binaryCaches = [ "https://cache.nixos.org/" ]; nix.settings.substituters = [ "https://cache.nixos.org/" ];
} }

6
profiles/cachix/nix-community.nix
View file

@ -1,9 +1,9 @@
{ {
nix = { nix.settings = {
binaryCaches = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
]; ];
binaryCachePublicKeys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
}; };

6
profiles/cachix/nrdxp.nix
View file

@ -1,9 +1,9 @@
{ {
nix = { nix.settings = {
binaryCaches = [ substituters = [
"https://nrdxp.cachix.org" "https://nrdxp.cachix.org"
]; ];
binaryCachePublicKeys = [ trusted-public-keys = [
"nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4=" "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="
]; ];
}; };