Compare commits
2 Commits
2caea9b483
...
d9cbe590c5
| Author | SHA1 | Date | |
|---|---|---|---|
|
d9cbe590c5
|
|||
|
46a9f3e99b
|
@@ -1,6 +1,5 @@
|
||||
[workstations]
|
||||
mennos-laptop-w ansible_connection=local
|
||||
mennos-cachyos-laptop ansible_connection=local
|
||||
mennos-laptop ansible_connection=local
|
||||
mennos-desktop ansible_connection=local
|
||||
|
||||
[servers]
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
- name: Include workstation tasks
|
||||
ansible.builtin.import_tasks: tasks/workstations/workstation.yml
|
||||
when: inventory_hostname in ['mennos-laptop-w', 'mennos-cachyos-laptop', 'mennos-desktop']
|
||||
when: inventory_hostname in ['mennos-laptop', 'mennos-desktop']
|
||||
|
||||
- name: Include server tasks
|
||||
ansible.builtin.import_tasks: tasks/servers/server.yml
|
||||
|
||||
@@ -34,8 +34,7 @@
|
||||
vars:
|
||||
gitconfig_mapping:
|
||||
mennos-desktop: "$DOTFILES_PATH/config/git/gitconfig.linux"
|
||||
mennos-cachyos-laptop: "$DOTFILES_PATH/config/git/gitconfig.linux"
|
||||
mennos-laptop-w: "$DOTFILES_PATH/config/git/gitconfig.wsl"
|
||||
mennos-laptop: "$DOTFILES_PATH/config/git/gitconfig.linux"
|
||||
mennos-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
|
||||
mennos-vm: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
|
||||
tags:
|
||||
|
||||
@@ -55,5 +55,7 @@
|
||||
- distrobox
|
||||
# Android Screen Mirroring
|
||||
- scrcpy
|
||||
- dolphin-nextcloud
|
||||
- nextcloud-desktop
|
||||
state: present
|
||||
become: true
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
[user]
|
||||
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr
|
||||
email = menno@vleeuwen.me
|
||||
name = Menno van Leeuwen
|
||||
|
||||
[gpg]
|
||||
format = ssh
|
||||
|
||||
[gpg "ssh"]
|
||||
program = "/mnt/c/Users/menno/AppData/Local/1Password/app/8/op-ssh-sign-wsl"
|
||||
|
||||
[commit]
|
||||
gpgsign = true
|
||||
|
||||
[color]
|
||||
ui = true
|
||||
|
||||
[push]
|
||||
autoSetupRemote = true
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
|
||||
[filter "lfs"]
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
||||
[credential "https://github.com"]
|
||||
helper =
|
||||
helper = !/home/menno/.nix-profile/bin/gh auth git-credential
|
||||
[credential "https://gist.github.com"]
|
||||
helper =
|
||||
helper = !/home/menno/.nix-profile/bin/gh auth git-credential
|
||||
|
||||
[safe]
|
||||
directory = *
|
||||
|
||||
[alias]
|
||||
pushall = "!f() { for var in $(git remote show); do echo \"pushing to $var\"; git push $var; done; }; f"
|
||||
@@ -47,7 +47,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
"mennos-cachyos-laptop" = home-manager.lib.homeManagerConfiguration {
|
||||
"mennos-laptop" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [ ./home.nix ];
|
||||
extraSpecialArgs = {
|
||||
@@ -57,49 +57,7 @@
|
||||
opnix
|
||||
;
|
||||
isServer = false;
|
||||
hostname = "mennos-cachyos-laptop";
|
||||
};
|
||||
};
|
||||
|
||||
"mennos-server" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [ ./home.nix ];
|
||||
extraSpecialArgs = {
|
||||
inherit
|
||||
pkgs
|
||||
pkgs-unstable
|
||||
opnix
|
||||
;
|
||||
isServer = true;
|
||||
hostname = "mennos-server";
|
||||
};
|
||||
};
|
||||
|
||||
"mennos-vm" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [ ./home.nix ];
|
||||
extraSpecialArgs = {
|
||||
inherit
|
||||
pkgs
|
||||
pkgs-unstable
|
||||
opnix
|
||||
;
|
||||
isServer = true;
|
||||
hostname = "mennos-vm";
|
||||
};
|
||||
};
|
||||
|
||||
"mennos-laptop-w" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [ ./home.nix ];
|
||||
extraSpecialArgs = {
|
||||
inherit
|
||||
pkgs
|
||||
pkgs-unstable
|
||||
opnix
|
||||
;
|
||||
isServer = false;
|
||||
hostname = "mennos-laptop-w";
|
||||
hostname = "mennos-laptop";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -9,109 +9,104 @@
|
||||
imports =
|
||||
if hostname == "mennos-desktop" then
|
||||
[ ./hosts/mennos-desktop.nix ]
|
||||
else if hostname == "mennos-laptop-w" then
|
||||
[ ./hosts/mennos-laptop-w.nix ]
|
||||
else if hostname == "mennos-cachyos-laptop" then
|
||||
[ ./hosts/mennos-cachyos-laptop.nix ]
|
||||
else if hostname == "mennos-server" then
|
||||
[ ./hosts/mennos-server.nix ]
|
||||
else if hostname == "mennos-vm" then
|
||||
[ ./hosts/mennos-vm.nix ]
|
||||
else if hostname == "mennos-laptop" then
|
||||
[ ./hosts/mennos-laptop.nix ]
|
||||
else
|
||||
[ ./hosts/fallback.nix ];
|
||||
|
||||
home.packages =
|
||||
with pkgs;
|
||||
[
|
||||
# General packages
|
||||
git
|
||||
onefetch
|
||||
gnupg
|
||||
gh
|
||||
nixfmt-rfc-style
|
||||
wget
|
||||
fastfetch
|
||||
_1password-cli
|
||||
home.packages =
|
||||
with pkgs;
|
||||
[
|
||||
# General packages
|
||||
git
|
||||
onefetch
|
||||
gnupg
|
||||
gh
|
||||
nixfmt-rfc-style
|
||||
nixd
|
||||
nil
|
||||
wget
|
||||
fastfetch
|
||||
_1password-cli
|
||||
|
||||
# Package management
|
||||
devbox
|
||||
# Package management
|
||||
devbox
|
||||
|
||||
# Development SDKs/Toolkits
|
||||
gcc
|
||||
pkg-config
|
||||
gnumake
|
||||
stdenv.cc
|
||||
rustc
|
||||
cargo
|
||||
cargo-edit
|
||||
cargo-watch
|
||||
cargo-audit
|
||||
cargo-expand
|
||||
cargo-tarpaulin
|
||||
act # GitHub Actions CLI
|
||||
# Development SDKs/Toolkits
|
||||
gcc
|
||||
pkg-config
|
||||
gnumake
|
||||
stdenv.cc
|
||||
rustc
|
||||
cargo
|
||||
cargo-edit
|
||||
cargo-watch
|
||||
cargo-audit
|
||||
cargo-expand
|
||||
cargo-tarpaulin
|
||||
act # GitHub Actions CLI
|
||||
|
||||
# File and directory operations
|
||||
eza # Modern ls
|
||||
bat # Modern cat
|
||||
broot # Interactive directory navigator
|
||||
du-dust # Modern du
|
||||
duf # Modern df
|
||||
zip
|
||||
unzip
|
||||
glances # Advanced system monitoring tool
|
||||
procs # Modern ps
|
||||
hyperfine # Benchmarking tool
|
||||
# File and directory operations
|
||||
eza # Modern ls
|
||||
bat # Modern cat
|
||||
broot # Interactive directory navigator
|
||||
du-dust # Modern du
|
||||
duf # Modern df
|
||||
zip
|
||||
unzip
|
||||
glances # Advanced system monitoring tool
|
||||
procs # Modern ps
|
||||
hyperfine # Benchmarking tool
|
||||
|
||||
# Search and text processing
|
||||
ripgrep # Modern grep
|
||||
sd # Modern sed
|
||||
choose # Modern cut
|
||||
jq # JSON processor
|
||||
yq # YAML processor
|
||||
xan # CSV processor (xsv is no longer maintained)
|
||||
ncdu # Disk usage analyzer
|
||||
# Search and text processing
|
||||
ripgrep # Modern grep
|
||||
sd # Modern sed
|
||||
choose # Modern cut
|
||||
jq # JSON processor
|
||||
yq # YAML processor
|
||||
xan # CSV processor (xsv is no longer maintained)
|
||||
ncdu # Disk usage analyzer
|
||||
|
||||
# System monitoring and process management
|
||||
procs # Modern ps
|
||||
hyperfine # Benchmarking tool
|
||||
bandwhich # Network utilization tool
|
||||
doggo # Modern dig
|
||||
gping # Ping with graph
|
||||
htop # Interactive process viewer
|
||||
# System monitoring and process management
|
||||
procs # Modern ps
|
||||
hyperfine # Benchmarking tool
|
||||
bandwhich # Network utilization tool
|
||||
doggo # Modern dig
|
||||
gping # Ping with graph
|
||||
htop # Interactive process viewer
|
||||
|
||||
# Development utilities
|
||||
delta # Better git diff
|
||||
difftastic # Structural diff tool
|
||||
fzf # Fuzzy finder
|
||||
tokei # Code statistics
|
||||
tealdeer # Modern tldr client
|
||||
lazygit # Terminal UI for git
|
||||
# Development utilities
|
||||
delta # Better git diff
|
||||
difftastic # Structural diff tool
|
||||
fzf # Fuzzy finder
|
||||
tokei # Code statistics
|
||||
tealdeer # Modern tldr client
|
||||
lazygit # Terminal UI for git
|
||||
|
||||
# Shell and terminal
|
||||
starship # Cross-shell prompt
|
||||
blesh # Bash ble.sh
|
||||
zellij # Modern terminal multiplexer
|
||||
screen # Terminal multiplexer
|
||||
# Shell and terminal
|
||||
starship # Cross-shell prompt
|
||||
blesh # Bash ble.sh
|
||||
zellij # Modern terminal multiplexer
|
||||
screen # Terminal multiplexer
|
||||
|
||||
# File viewers and processors
|
||||
hexyl # Modern hexdump
|
||||
chafa # Terminal image viewer
|
||||
glow # Markdown renderer
|
||||
# File viewers and processors
|
||||
hexyl # Modern hexdump
|
||||
chafa # Terminal image viewer
|
||||
glow # Markdown renderer
|
||||
|
||||
# Editors
|
||||
neovim
|
||||
## Neovim plugins
|
||||
vimPlugins.LazyVim
|
||||
# Editors
|
||||
neovim
|
||||
## Neovim plugins
|
||||
vimPlugins.LazyVim
|
||||
|
||||
nano
|
||||
micro
|
||||
nano
|
||||
micro
|
||||
|
||||
# Lolz
|
||||
fortune
|
||||
cowsay
|
||||
cmatrix
|
||||
figlet
|
||||
lolcat
|
||||
]
|
||||
++ (with pkgs-unstable; [ ]);
|
||||
# Lolz
|
||||
fortune
|
||||
cowsay
|
||||
cmatrix
|
||||
figlet
|
||||
lolcat
|
||||
];
|
||||
}
|
||||
|
||||
@@ -99,4 +99,4 @@ useDownloadLimit=0
|
||||
useUploadLimit=0
|
||||
|
||||
[Settings]
|
||||
geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\x4\xe\0\0\x2\xa4\0\0\x6\x98\0\0\0\0\0\0\x4\xe\0\0\x2\xa4\0\0\x6\x98\0\0\0\x1\0\0\0\0\x14\0\0\0\0\0\0\0\x4\xe\0\0\x2\xa4\0\0\x6\x98)
|
||||
geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\b\0\0\0\0\0\0\0\n\xa4\0\0\x2\x8a\0\0\b\0\0\0\0\0\0\0\n\xa4\0\0\x2\x8a\0\0\0\x1\0\0\0\0\x11\x64\0\0\b\0\0\0\0\0\0\0\n\xa4\0\0\x2\x8a)
|
||||
|
||||
6
setup.sh
6
setup.sh
@@ -403,10 +403,10 @@ check_compatibility() {
|
||||
check_command_availibility "dnf"
|
||||
;;
|
||||
Ubuntu)
|
||||
# Check if we are running either 22.04, 24.04 or 24.10
|
||||
if ! grep -q "Ubuntu 22.04" /etc/os-release && ! grep -q "Ubuntu 24.04" /etc/os-release && ! grep -q "Ubuntu 24.10" /etc/os-release; then
|
||||
# Check if we are running either 22.04, 24.04, 24.10 or 25.04
|
||||
if ! grep -q "Ubuntu 22.04" /etc/os-release && ! grep -q "Ubuntu 24.04" /etc/os-release && ! grep -q "Ubuntu 24.10" /etc/os-release && ! grep -q "Ubuntu 25.04" /etc/os-release; then
|
||||
log_warning "Unsupported Ubuntu version detected. Setup may not work as expected."
|
||||
log_warning "Supported versions are: Ubuntu 22.04, 24.04, 24.10"
|
||||
log_warning "Supported versions are: Ubuntu 22.04, 24.04, 24.10, 25.04"
|
||||
fi
|
||||
log_success "Detected Ubuntu. Proceeding with setup..."
|
||||
check_command_availibility "apt"
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
"window.confirmSaveUntitledWorkspace": false,
|
||||
"git.openRepositoryInParentFolders": "never",
|
||||
"debug.toolBarLocation": "commandCenter",
|
||||
"workbench.colorTheme": "One Dark Pro Darker",
|
||||
"workbench.colorTheme": "Catppuccin Macchiato",
|
||||
"ansible.lightspeed.enabled": false,
|
||||
"ansible.lightspeed.suggestions.enabled": false,
|
||||
"docker.extension.enableComposeLanguageServer": false,
|
||||
@@ -85,7 +85,6 @@
|
||||
"git show"
|
||||
],
|
||||
"roo-cline.deniedCommands": [],
|
||||
"dart.flutterSdkPath": "/home/menno/.flutter/flutter",
|
||||
"kilo-code.allowedCommands": [
|
||||
"npm test",
|
||||
"npm install",
|
||||
@@ -96,5 +95,5 @@
|
||||
],
|
||||
"kilo-code.deniedCommands": [],
|
||||
"github.copilot.nextEditSuggestions.enabled": true,
|
||||
"workbench.iconTheme": "material-icon-theme"
|
||||
"workbench.iconTheme": "vscode-icons"
|
||||
}
|
||||
Reference in New Issue
Block a user