Compare commits
No commits in common. "main" and "boot" have entirely different histories.
9 changed files with 15 additions and 249 deletions
|
|
@ -1,13 +0,0 @@
|
|||
import fs from "fs/promises"
|
||||
|
||||
const original = await fs.readFile("./dconf.settings", {encoding: "utf-8"})
|
||||
|
||||
let cleanedLines = []
|
||||
|
||||
original.split("\n").forEach((line) => {
|
||||
if(!line.startsWith("app-picker-layout")) {
|
||||
cleanedLines.push(line)
|
||||
}
|
||||
})
|
||||
|
||||
await fs.writeFile("./dconf.settings", cleanedLines.join("\n"), "utf-8")
|
||||
|
|
@ -25,13 +25,16 @@
|
|||
devices = [ "nodev" ];
|
||||
efiInstallAsRemovable = false;
|
||||
extraEntries = ''
|
||||
# Arch Linux EFI
|
||||
menuentry "Arch Linux" {
|
||||
chainloader (hd1,gpt1)/EFI/arch/grubx64.efi
|
||||
}
|
||||
# Windows Boot Manager
|
||||
menuentry "Windows" {
|
||||
chainloader /EFI/Microsoft/Boot/bootmgfw.efi
|
||||
}
|
||||
'';
|
||||
gfxmodeEfi = "1920x1080x32";
|
||||
default = 1;
|
||||
};
|
||||
|
||||
efi = {
|
||||
|
|
@ -101,13 +104,8 @@
|
|||
simple-scan
|
||||
gnome-music
|
||||
geary
|
||||
gnome-console
|
||||
];
|
||||
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb.layout = "fr";
|
||||
services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||
|
|
@ -122,13 +120,8 @@
|
|||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users.users.heroz = {
|
||||
shell = pkgs.nushell;
|
||||
isNormalUser = true;
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"libvirtd"
|
||||
"docker"
|
||||
]; # Enable ‘sudo’ for the user.
|
||||
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||
packages = with pkgs; [
|
||||
gnomeExtensions.blur-my-shell
|
||||
gnomeExtensions.appindicator
|
||||
|
|
@ -136,25 +129,9 @@
|
|||
gnomeExtensions.clipboard-indicator
|
||||
gnomeExtensions.forge
|
||||
gnomeExtensions.media-controls
|
||||
gnomeExtensions.auto-move-windows
|
||||
gnome-tweaks
|
||||
nodejs_24
|
||||
pnpm
|
||||
];
|
||||
};
|
||||
|
||||
virtualisation.libvirtd.enable = true;
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
programs.virt-manager.enable = true;
|
||||
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# List packages installed in system profile.
|
||||
# You can use https://search.nixos.org/ to find more packages (and options).
|
||||
# environment.systemPackages = with pkgs; [
|
||||
|
|
@ -180,7 +157,6 @@
|
|||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
networking.firewall.trustedInterfaces = [ "virbr0" ];
|
||||
|
||||
# Copy the NixOS configuration file and link it from the resulting system
|
||||
# (/run/current-system/configuration.nix). This is useful in case you
|
||||
|
|
|
|||
13
dconf.nix
13
dconf.nix
|
|
@ -37,7 +37,7 @@ with lib.gvariant;
|
|||
};
|
||||
|
||||
"org/gnome/desktop/wm/preferences" = {
|
||||
num-workspaces = 3;
|
||||
num-workspaces = 2;
|
||||
};
|
||||
|
||||
"org/gnome/mutter" = {
|
||||
|
|
@ -53,7 +53,6 @@ with lib.gvariant;
|
|||
"blur-my-shell@aunetx"
|
||||
"appindicatorsupport@rgcjonas.gmail.com"
|
||||
"mediacontrols@cliffniff.github.com"
|
||||
"auto-move-windows@gnome-shell-extensions.gcampax.github.com"
|
||||
];
|
||||
disabled-extensions = [ ];
|
||||
favorite-apps = [
|
||||
|
|
@ -61,9 +60,6 @@ with lib.gvariant;
|
|||
"org.gnome.Console.desktop"
|
||||
"org.gnome.Nautilus.desktop"
|
||||
"code.desktop"
|
||||
"idea.desktop"
|
||||
"vesktop.desktop"
|
||||
"io.bassi.Amberol.desktop"
|
||||
];
|
||||
last-selected-power-profile = "performance";
|
||||
};
|
||||
|
|
@ -86,13 +82,6 @@ with lib.gvariant;
|
|||
natural-scroll = false;
|
||||
speed = -0.28205128205128205;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/auto-move-windows" = {
|
||||
application-list = [
|
||||
"io.bassi.Amberol.desktop:3"
|
||||
"vesktop.desktop:3"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
8
dconf.sh
8
dconf.sh
|
|
@ -1,8 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
|
||||
#! nix-shell -i bash --pure
|
||||
#! nix-shell -p bash dconf dconf2nix nodejs_24
|
||||
|
||||
dconf dump / > dconf.settings
|
||||
node ./cleanUpDconf.js
|
||||
cat dconf.settings | dconf2nix -i dconf.settings -o dconf.gen.nix
|
||||
83
env.nu
83
env.nu
|
|
@ -1,83 +0,0 @@
|
|||
# Code generated by zoxide. DO NOT EDIT.
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# Hook configuration for zoxide.
|
||||
#
|
||||
|
||||
# Initialize hook to add new entries to the database.
|
||||
export-env {
|
||||
$env.config = (
|
||||
$env.config?
|
||||
| default {}
|
||||
| upsert hooks { default {} }
|
||||
| upsert hooks.env_change { default {} }
|
||||
| upsert hooks.env_change.PWD { default [] }
|
||||
)
|
||||
let __zoxide_hooked = (
|
||||
$env.config.hooks.env_change.PWD | any { try { get __zoxide_hook } catch { false } }
|
||||
)
|
||||
if not $__zoxide_hooked {
|
||||
$env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD | append {
|
||||
__zoxide_hook: true,
|
||||
code: {|_, dir| zoxide add -- $dir}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# When using zoxide with --no-cmd, alias these internal functions as desired.
|
||||
#
|
||||
|
||||
# Jump to a directory using only keywords.
|
||||
def --env --wrapped __zoxide_z [...rest: string] {
|
||||
let path = match $rest {
|
||||
[] => {'~'},
|
||||
[ '-' ] => {'-'},
|
||||
[ $arg ] if ($arg | path expand | path type) == 'dir' => {$arg}
|
||||
_ => {
|
||||
zoxide query --exclude $env.PWD -- ...$rest | str trim -r -c "\n"
|
||||
}
|
||||
}
|
||||
cd $path
|
||||
}
|
||||
|
||||
# Jump to a directory using interactive search.
|
||||
def --env --wrapped __zoxide_zi [...rest:string] {
|
||||
cd $'(zoxide query --interactive -- ...$rest | str trim -r -c "\n")'
|
||||
}
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# Commands for zoxide. Disable these using --no-cmd.
|
||||
#
|
||||
|
||||
alias z = __zoxide_z
|
||||
alias zi = __zoxide_zi
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# Add this to your env file (find it by running `$nu.env-path` in Nushell):
|
||||
#
|
||||
# zoxide init nushell | save -f ~/.zoxide.nu
|
||||
#
|
||||
# Now, add this to the end of your config file (find it by running
|
||||
# `$nu.config-path` in Nushell):
|
||||
#
|
||||
# source ~/.zoxide.nu
|
||||
#
|
||||
# Note: zoxide only supports Nushell v0.89.0+.
|
||||
|
||||
|
||||
$env.config.buffer_editor = "micro"
|
||||
$env.config.show_banner = false
|
||||
|
||||
alias lzd = lazydocker
|
||||
alias comp = docker compose
|
||||
alias cat = bat
|
||||
alias nenter = nix-shell ./shell.nix
|
||||
alias fulldust = sudo dust / -X /storage -X /windows
|
||||
|
||||
$env.PNPM_HOME = "~/.local/share/pnpm" | path expand
|
||||
$env.PATH = ($env.PATH | append $env.PNPM_HOME)
|
||||
|
|
@ -14,8 +14,6 @@
|
|||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_18;
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
|
|
@ -41,18 +39,6 @@
|
|||
];
|
||||
};
|
||||
|
||||
fileSystems."/windows" = {
|
||||
device = "/dev/disk/by-uuid/3A86237286232DB7";
|
||||
fsType = "ntfs-3g";
|
||||
options = [ "rw" "uid=1000"];
|
||||
};
|
||||
|
||||
fileSystems."/storage" = {
|
||||
device = "/dev/disk/by-uuid/9EC66CCBC66CA56D";
|
||||
fsType = "ntfs-3g";
|
||||
options = [ "rw" "uid=1000"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
|
|
|||
65
home.nix
65
home.nix
|
|
@ -4,55 +4,30 @@
|
|||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
nix-alien-pkgs = import (
|
||||
builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master"
|
||||
) { };
|
||||
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz";
|
||||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
<home-manager/nixos>
|
||||
(import "${home-manager}/nixos")
|
||||
./dconf.nix
|
||||
];
|
||||
|
||||
home-manager.users.heroz =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; with nix-alien-pkgs; [
|
||||
home.packages = with pkgs; [
|
||||
brave
|
||||
nixfmt-rfc-style
|
||||
nixd
|
||||
amberol
|
||||
jetbrains.idea
|
||||
prismlauncher
|
||||
affine
|
||||
bat
|
||||
micro
|
||||
tldr
|
||||
dust
|
||||
zoxide
|
||||
iperf
|
||||
lazydocker
|
||||
nix-alien
|
||||
file
|
||||
unzip
|
||||
nil
|
||||
];
|
||||
|
||||
# Fix duplicate brave entry in gnome apps
|
||||
xdg.desktopEntries = {
|
||||
"com.brave.Browser" = {
|
||||
name = "Brave";
|
||||
noDisplay = true;
|
||||
};
|
||||
"org.prismlauncher.PrismLauncher" = {
|
||||
name = "Prism Launcher";
|
||||
exec = "prismlauncher -d /storage/Jeux/PrismLauncher-8.4 %U";
|
||||
comment = "Discover, manage, and play Minecraft instances";
|
||||
type = "Application";
|
||||
terminal = false;
|
||||
startupNotify = true;
|
||||
icon = "org.prismlauncher.PrismLauncher";
|
||||
};
|
||||
xdg.desktopEntries."com.brave.Browser" = {
|
||||
name = "Brave";
|
||||
noDisplay = true;
|
||||
};
|
||||
|
||||
programs.vscode = {
|
||||
|
|
@ -62,15 +37,6 @@ in
|
|||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
matchBlocks = {
|
||||
"a8" = {
|
||||
user = "heroz";
|
||||
};
|
||||
# ubuntu vm
|
||||
"192.168.122.85" = {
|
||||
user = "heroz";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.vesktop = {
|
||||
|
|
@ -85,19 +51,6 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "Adwaita Dark";
|
||||
shell-integration-features = "ssh-terminfo";
|
||||
};
|
||||
};
|
||||
|
||||
programs.nushell = {
|
||||
enable = true;
|
||||
extraConfig = builtins.readFile ./env.nu;
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
home.stateVersion = "25.05";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
<network>
|
||||
<name>virbr0</name>
|
||||
<forward mode='bridge'/>
|
||||
<bridge name='virbr0'/>
|
||||
</network>
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# Bridge networking
|
||||
|
||||
Create a XML file called virbr0.xml with the definition of the bridge interface
|
||||
```xml
|
||||
<network>
|
||||
<name>virbr0</name>
|
||||
<forward mode='bridge'/>
|
||||
<bridge name='virbr0'/>
|
||||
</network>
|
||||
```
|
||||
|
||||
Add and enable bridge interface
|
||||
```sh
|
||||
virsh net-define virbr0.xml
|
||||
virsh net-start virbr0
|
||||
ip link add virbr0 type bridge
|
||||
ip address ad dev virbr0 10.25.0.1/24
|
||||
ip link set dev virbr0 up
|
||||
```
|
||||
|
||||
Add a new network device to the vm :
|
||||
```xml
|
||||
<interface type='bridge'>
|
||||
<mac address='52:54:00:12:34:56'/>
|
||||
<source bridge='virbr0'/>
|
||||
<model type='virtio'/>
|
||||
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
||||
</interface>
|
||||
```
|
||||
Loading…
Add table
Add a link
Reference in a new issue