forked from pub-solar/os
Merge branch 'main' into teutat3s-bash
This commit is contained in:
commit
778ef916ca
GPG key ID:
4FA1D3FA524F22C1
2
.git-blame-ignore-revs
Normal file
2
.git-blame-ignore-revs
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
# Formatted code using treefmt and alejandra
|
||||
73bf158392a427d188b7aad36244b94506f57a15
|
||||
|
|
@ -29,8 +29,9 @@ in {
|
|||
};
|
||||
};
|
||||
config = {
|
||||
# disable NetworkManager-wait-online by default
|
||||
# disable NetworkManager and systemd-networkd -wait-online by default
|
||||
systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
|
||||
systemd.services.systemd-networkd-wait-online.enable = lib.mkDefault false;
|
||||
|
||||
networking.networkmanager = {
|
||||
# Enable networkmanager. REMEMBER to add yourself to group in order to use nm related stuff.
|
||||
|
|
|
|||
|
|
@ -58,10 +58,13 @@ in {
|
|||
systemd.tmpfiles.rules = [
|
||||
"f /dev/shm/looking-glass 0660 ${psCfg.user.name} kvm"
|
||||
];
|
||||
#networking.bridges.virbr1.interfaces = [ ];
|
||||
#networking.bridges.virbr1.interfaces = [];
|
||||
#networking.interfaces.virbr1 = {
|
||||
# ipv4.addresses = [
|
||||
# { address = "192.168.123.1"; prefixLength = 24; }
|
||||
# {
|
||||
# address = "192.168.123.1";
|
||||
# prefixLength = 24;
|
||||
# }
|
||||
# ];
|
||||
#};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}: {
|
||||
F-Sy-H = {
|
||||
pname = "F-Sy-H";
|
||||
version = "81315330ff4eb4bc13b03fe6ec5bbb6fee0f27ac";
|
||||
version = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
|
||||
src = fetchFromGitHub {
|
||||
owner = "z-shell";
|
||||
repo = "F-Sy-H";
|
||||
rev = "81315330ff4eb4bc13b03fe6ec5bbb6fee0f27ac";
|
||||
rev = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-2b/O/1SIhKgqHYjwy7yPCEb3EMXgkIvOk+FC4PbuQ8c=";
|
||||
sha256 = "sha256-zhaXjrNL0amxexbZm4Kr5Y/feq1+2zW0O6eo9iZhmi0=";
|
||||
};
|
||||
};
|
||||
instant-nvim-nvfetcher = {
|
||||
|
|
@ -39,35 +39,35 @@
|
|||
};
|
||||
ohmyzsh = {
|
||||
pname = "ohmyzsh";
|
||||
version = "c35ca17258dd870f1724eeb92e9077177d2e3bed";
|
||||
version = "39525e5ec36052a83fadd47f377a26d33df851bd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
rev = "c35ca17258dd870f1724eeb92e9077177d2e3bed";
|
||||
rev = "39525e5ec36052a83fadd47f377a26d33df851bd";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-EA880CWKBxvMj6chH2pzoUKaJKEO+ACEnFcfh3Agjm8=";
|
||||
sha256 = "sha256-EU+GbjntLPzGzbWnTJ6vlOqelPead99HMONTbPrnX1w=";
|
||||
};
|
||||
};
|
||||
powerlevel10k = {
|
||||
pname = "powerlevel10k";
|
||||
version = "cf83ab21e440ffa276a13ab5fd63b6372b674b5e";
|
||||
version = "e7b2bb2372c5c7060d35c0b7a710f3f01bd4593b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "powerlevel10k";
|
||||
rev = "cf83ab21e440ffa276a13ab5fd63b6372b674b5e";
|
||||
rev = "e7b2bb2372c5c7060d35c0b7a710f3f01bd4593b";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-BBSyF+TFtfD7lDE+m7uEYOp/bct+/P8g3Q2SJPpx5nI=";
|
||||
sha256 = "sha256-zClUsh4U4XE8RD42kWdsXE0LrCDm9JL8NAWvj/n9kP4=";
|
||||
};
|
||||
};
|
||||
rnix-lsp-nvfetcher = {
|
||||
pname = "rnix-lsp-nvfetcher";
|
||||
version = "7339d80b7bf415ea42d790e073fbd69d21d09db4";
|
||||
version = "95d40673fe43642e2e1144341e86d0036abd95d9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "rnix-lsp";
|
||||
rev = "7339d80b7bf415ea42d790e073fbd69d21d09db4";
|
||||
rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-SKe5jEBHjjinb5R/fnJElwammKfof6zICc30E/we43Q=";
|
||||
sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
|
||||
};
|
||||
};
|
||||
vim-apprentice-nvfetcher = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
self:
|
||||
with self; ''
|
||||
#!/usr/bin/env bash
|
||||
# terminal application launcher for sway, using fzf
|
||||
# original command:
|
||||
# Based on: https://github.com/swaywm/sway/issues/1367
|
||||
# bindsym $altkey+space exec termite --name=launcher -e \
|
||||
|
|
|
|||
|
|
@ -1,32 +1,47 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
user = config.pub-solar.user;
|
||||
xdg = config.home-manager.users."${user.name}".xdg;
|
||||
in
|
||||
''[user]
|
||||
${if user.email != null then "email = ${user.email}" else ""}
|
||||
${if user.fullName != null then "name = ${user.fullName}" else ""}
|
||||
${if user.gpgKeyId != null then "signingkey = ${user.gpgKeyId}" else ""}
|
||||
[core]
|
||||
editor = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim
|
||||
excludesFile = /home/${config.pub-solar.user.name}/.config/git/global_gitignore
|
||||
[alias]
|
||||
pol = pull
|
||||
ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number
|
||||
# define command which will be used when "nvim"is set as a merge tool
|
||||
[mergetool]
|
||||
prompt = false
|
||||
[merge]
|
||||
tool = nvim
|
||||
[mergetool "nvim"]
|
||||
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
||||
in '' [user]
|
||||
${
|
||||
if user.email != null
|
||||
then "email = ${user.email}"
|
||||
else ""
|
||||
}
|
||||
${
|
||||
if user.fullName != null
|
||||
then "name = ${user.fullName}"
|
||||
else ""
|
||||
}
|
||||
${
|
||||
if user.gpgKeyId != null
|
||||
then "signingkey = ${user.gpgKeyId}"
|
||||
else ""
|
||||
}
|
||||
[core]
|
||||
editor = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim
|
||||
excludesFile = /home/${config.pub-solar.user.name}/.config/git/global_gitignore
|
||||
[alias]
|
||||
pol = pull
|
||||
ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number
|
||||
# define command which will be used when "nvim"is set as a merge tool
|
||||
|
||||
[commit]
|
||||
gpgsign = true
|
||||
template = ${xdg.configHome}/git/gitmessage
|
||||
[tag]
|
||||
gpgsign = true
|
||||
[init]
|
||||
defaultBranch = main
|
||||
[pull]
|
||||
rebase = false''
|
||||
[mergetool]
|
||||
prompt = false
|
||||
[merge]
|
||||
tool = nvim
|
||||
[mergetool "nvim"]
|
||||
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
||||
|
||||
[commit]
|
||||
gpgsign = true
|
||||
template = ${xdg.configHome}/git/gitmessage
|
||||
[tag]
|
||||
gpgsign = true
|
||||
[init]
|
||||
defaultBranch = main
|
||||
[pull]
|
||||
rebase = false''
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
user = config.pub-solar.user;
|
||||
xdg = config.home-manager.users."${user.name}".xdg;
|
||||
in
|
||||
''
|
||||
# Title: Summary, imperative, start upper case, don't end with a period
|
||||
# No more than 50 chars. #### 50 chars is here: #
|
||||
#
|
||||
|
||||
|
||||
# ^ Remember ending with an extra blank line
|
||||
# Body: Explain *what* and *why* (not *how*). Include issue number.
|
||||
# Wrap at 72 chars. ################################## which is here: #
|
||||
#
|
||||
|
||||
|
||||
# ^ Remember ending with an extra blank line
|
||||
# At the end: Include Co-authored-by for all contributors.
|
||||
#
|
||||
# Co-authored-by: Example Name <email@example.com>
|
||||
in ''
|
||||
# Title: Summary, imperative, start upper case, don't end with a period
|
||||
# No more than 50 chars. #### 50 chars is here: #
|
||||
#
|
||||
|
||||
|
||||
# ^ Remember ending with an extra blank line
|
||||
# Body: Explain *what* and *why* (not *how*). Include issue number.
|
||||
# Wrap at 72 chars. ################################## which is here: #
|
||||
#
|
||||
|
||||
|
||||
# ^ Remember ending with an extra blank line
|
||||
# At the end: Include Co-authored-by for all contributors.
|
||||
#
|
||||
# Co-authored-by: Example Name <email@example.com>
|
||||
''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
in
|
||||
''tags''
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
in ''tags''
|
||||
|
|
|
|||
|
|
@ -39,15 +39,17 @@ in {
|
|||
# override for our own welcome
|
||||
devshell.name = pkgs.lib.mkForce "PubSolarOS";
|
||||
|
||||
devshell.startup.aliases.text = ''
|
||||
alias nvfetcher="nvfetcher --config $PRJ_ROOT/sources.toml --build-dir PRJ_ROOT/pkgs/_sources"
|
||||
'';
|
||||
|
||||
commands = with pkgs;
|
||||
[
|
||||
(devos nix)
|
||||
(devos agenix)
|
||||
(devos nvfetcher)
|
||||
{
|
||||
category = "devos";
|
||||
name = pkgs.nvfetcher.pname;
|
||||
help = pkgs.nvfetcher.meta.description;
|
||||
command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher}/bin/nvfetcher -c ./sources.toml $@";
|
||||
}
|
||||
|
||||
(linter alejandra)
|
||||
(linter editorconfig-checker)
|
||||
(linter nodePackages.prettier)
|
||||
|
|
|
|||
Loading…
Reference in a new issue