Compare commits
4 commits
2d515b8b6a
...
fb4b98e023
Author | SHA1 | Date | |
---|---|---|---|
fb4b98e023 | |||
2c8feae00c | |||
d5165d670e | |||
7711e69e5c |
6 changed files with 74 additions and 14 deletions
|
@ -13,6 +13,7 @@
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
|
./roles/admin.nix
|
||||||
./roles/dev.nix
|
./roles/dev.nix
|
||||||
./roles/base.nix
|
./roles/base.nix
|
||||||
./roles/desktop.nix
|
./roles/desktop.nix
|
||||||
|
|
7
dotfiles/starship.toml
Normal file
7
dotfiles/starship.toml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
add_newline = false
|
||||||
|
|
||||||
|
[username]
|
||||||
|
show_always = true
|
||||||
|
|
||||||
|
[hostname]
|
||||||
|
ssh_only = false
|
46
roles/admin.nix
Normal file
46
roles/admin.nix
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
{ pkgs, options, ...}:
|
||||||
|
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
kubectl
|
||||||
|
|
||||||
|
# podman
|
||||||
|
conmon
|
||||||
|
fuse-overlayfs
|
||||||
|
podman
|
||||||
|
podman-compose
|
||||||
|
runc
|
||||||
|
slirp4netns
|
||||||
|
];
|
||||||
|
|
||||||
|
users.users.stefan.subUidRanges = [{ startUid = 100000; count = 65536; }];
|
||||||
|
users.users.stefan.subGidRanges = [{ startGid = 100000; count = 65536; }];
|
||||||
|
|
||||||
|
environment.etc."containers/policy.json" = {
|
||||||
|
mode="0644";
|
||||||
|
text=''
|
||||||
|
{
|
||||||
|
"default": [
|
||||||
|
{
|
||||||
|
"type": "insecureAcceptAnything"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"transports":
|
||||||
|
{
|
||||||
|
"docker-daemon":
|
||||||
|
{
|
||||||
|
"": [{"type":"insecureAcceptAnything"}]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.etc."containers/registries.conf" = {
|
||||||
|
mode="0644";
|
||||||
|
text=''
|
||||||
|
[registries.search]
|
||||||
|
registries = ['docker.io', 'quay.io']
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,9 +1,8 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
let
|
||||||
|
unstable = import <nixos-unstable> {};
|
||||||
|
in {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
bash
|
bash
|
||||||
bat
|
bat
|
||||||
|
@ -11,17 +10,29 @@
|
||||||
fd
|
fd
|
||||||
fzf
|
fzf
|
||||||
git
|
git
|
||||||
|
gnupg
|
||||||
htop
|
htop
|
||||||
jq
|
jq
|
||||||
|
ncdu
|
||||||
ripgrep
|
ripgrep
|
||||||
z-lua
|
z-lua
|
||||||
|
unstable.starship
|
||||||
(import ../packages/neovim.nix)
|
(import ../packages/neovim.nix)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
etc = {
|
||||||
|
"starship.toml".source = ../dotfiles/starship.toml;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
|
promptInit = ''
|
||||||
|
. <(starship init bash)
|
||||||
|
'';
|
||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
export EDITOR=nvim
|
export EDITOR=nvim
|
||||||
|
export STARSHIP_CONFIG=/etc/starship.toml
|
||||||
|
|
||||||
if [ -z "$SSH_AUTH_SOCK" ]; then
|
if [ -z "$SSH_AUTH_SOCK" ]; then
|
||||||
eval $(ssh-agent)
|
eval $(ssh-agent)
|
||||||
|
@ -43,14 +54,6 @@
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
git_branch(){
|
|
||||||
branch=$(git branch 2> /dev/null) || exit 0
|
|
||||||
branch=$(sed -n '/^*/ s/* \(.*\)/\1/p' <<< $branch)
|
|
||||||
status=$(git status 2> /dev/null \
|
|
||||||
| grep -q "nothing to commit, working tree clean" || e cho -n '*')
|
|
||||||
echo "$branch$status "
|
|
||||||
}
|
|
||||||
|
|
||||||
. "$(fzf-share)/key-bindings.bash"
|
. "$(fzf-share)/key-bindings.bash"
|
||||||
. "$(fzf-share)/completion.bash"
|
. "$(fzf-share)/completion.bash"
|
||||||
. <(z --init bash)
|
. <(z --init bash)
|
||||||
|
|
|
@ -43,10 +43,11 @@ in {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
alacritty
|
alacritty
|
||||||
firefox
|
firefox
|
||||||
unstable.keepassxc
|
mumble
|
||||||
neofetch
|
neofetch
|
||||||
pulseaudio
|
pulseaudio
|
||||||
pulsemixer
|
pulsemixer
|
||||||
|
unstable.keepassxc
|
||||||
(
|
(
|
||||||
pkgs.writeTextFile {
|
pkgs.writeTextFile {
|
||||||
name = "startsway";
|
name = "startsway";
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
unstable = import <nixos-unstable> {};
|
unstable = import <nixos-unstable> {};
|
||||||
mozilla_overlay = import <mozilla> {};
|
mozilla = import <mozilla> {};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
@ -15,6 +15,8 @@ in {
|
||||||
python37Packages.pyls-isort
|
python37Packages.pyls-isort
|
||||||
python37Packages.pyls-mypy
|
python37Packages.pyls-mypy
|
||||||
rustup
|
rustup
|
||||||
|
sops
|
||||||
|
tig
|
||||||
unstable.gopls
|
unstable.gopls
|
||||||
unstable.rust-analyzer
|
unstable.rust-analyzer
|
||||||
];
|
];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue