Run nix fmt
This commit is contained in:
parent
df9449315d
commit
c22aee3927
233
flake.nix
233
flake.nix
|
|
@ -1,113 +1,130 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nur.url = "github:nix-community/NUR";
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
vicinae.url = "github:vicinaehq/vicinae";
|
||||
worktimer = {
|
||||
type = "git";
|
||||
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
||||
ref = "cli";
|
||||
};
|
||||
astal = {
|
||||
url = "github:aylur/astal";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
ags = {
|
||||
url = "github:aylur/ags";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.astal.follows = "astal";
|
||||
};
|
||||
nixos-06cb-009a-fingerprint-sensor = {
|
||||
url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor?ref=24.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nur.url = "github:nix-community/NUR";
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
vicinae.url = "github:vicinaehq/vicinae";
|
||||
worktimer = {
|
||||
type = "git";
|
||||
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
||||
ref = "cli";
|
||||
};
|
||||
astal = {
|
||||
url = "github:aylur/astal";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, nur, nixos-06cb-009a-fingerprint-sensor, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
commonModules = host: user: [
|
||||
./hosts/${host}/hardware-configuration.nix
|
||||
{ nixpkgs.overlays = [
|
||||
nur.overlays.default
|
||||
(self: super: { utillinux = super.util-linux; })
|
||||
]; }
|
||||
{
|
||||
networking.hostName = host;
|
||||
time.timeZone = "Asia/Bangkok";
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://vicinae.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
|
||||
];
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
trusted-users = [ "root" user ];
|
||||
auto-optimise-store = true;
|
||||
};
|
||||
users.users.${user} = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAa3tMzSCRuprEACrBsKI0F/o73o6J9L1qR3TaZn/N8 user@Kell"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByLwLAdJbmoDV5sx4hg5NbzKbOh1GmWEhDOUJ1GQBhK user@Riva"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxMq4kubz4wWr4S8xU3GRkPcn6XRS3y7IP+qylN5QAp user@Aloria"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOAhFTJI49o+eS1kHs5XRrpCLLuhAE+JUCffusudyR88 user@Arendia"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHtzTFdvLEvXpv69qAWLTipl4hgsKgRrRrWJRecsFthG user@Arch"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxtJRtlAphl8euicVUR/6C7o+tyhpYmcbMBLHnldEIX server@mallorea"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILazQU/Y9I5PkMZoG/Lzc6mDR7s+aRHzqJoFUhYSse4P PocoF1"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOetfiPyIQ8hbU4t87E0ZrgLqFW9YW09+MNNiusXwW0C user@Asturia"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoUYcVMsDw6tmjfdOuQkwaXx8fohKJs/6/5HoLzTP6x Tablet"
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users.${user} = { imports = [ ./home/${host}.nix ]; };
|
||||
backupFileExtension = "bak";
|
||||
};
|
||||
}
|
||||
./hosts/${host}
|
||||
];
|
||||
mkSystem = host: cfg:
|
||||
let
|
||||
system = cfg.system or "x86_64-linux";
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]) ++ [
|
||||
{ nixpkgs.hostPlatform = system; }
|
||||
];
|
||||
specialArgs = inputs;
|
||||
};
|
||||
systems = {
|
||||
Riva = { user = "user"; };
|
||||
Kell = { user = "user"; };
|
||||
Aloria = { user = "user"; };
|
||||
Arendia = { user = "user"; modules = [
|
||||
nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
|
||||
];};
|
||||
Asturia = { user = "user"; };
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems;
|
||||
ags = {
|
||||
url = "github:aylur/ags";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.astal.follows = "astal";
|
||||
};
|
||||
nixos-06cb-009a-fingerprint-sensor = {
|
||||
url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor?ref=24.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nur,
|
||||
nixos-06cb-009a-fingerprint-sensor,
|
||||
...
|
||||
} @ inputs: let
|
||||
supportedSystems = ["x86_64-linux" "aarch64-linux"];
|
||||
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
||||
system = builtins.currentSystem;
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
commonModules = host: user: [
|
||||
./hosts/${host}/hardware-configuration.nix
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
nur.overlays.default
|
||||
(self: super: {utillinux = super.util-linux;})
|
||||
];
|
||||
}
|
||||
{
|
||||
networking.hostName = host;
|
||||
time.timeZone = "Asia/Bangkok";
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://vicinae.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
|
||||
];
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
trusted-users = ["root" user];
|
||||
auto-optimise-store = true;
|
||||
};
|
||||
users.users.${user} = {
|
||||
isNormalUser = true;
|
||||
extraGroups = ["wheel"]; # Enable ‘sudo’ for the user.
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAa3tMzSCRuprEACrBsKI0F/o73o6J9L1qR3TaZn/N8 user@Kell"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByLwLAdJbmoDV5sx4hg5NbzKbOh1GmWEhDOUJ1GQBhK user@Riva"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxMq4kubz4wWr4S8xU3GRkPcn6XRS3y7IP+qylN5QAp user@Aloria"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOAhFTJI49o+eS1kHs5XRrpCLLuhAE+JUCffusudyR88 user@Arendia"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHtzTFdvLEvXpv69qAWLTipl4hgsKgRrRrWJRecsFthG user@Arch"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxtJRtlAphl8euicVUR/6C7o+tyhpYmcbMBLHnldEIX server@mallorea"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILazQU/Y9I5PkMZoG/Lzc6mDR7s+aRHzqJoFUhYSse4P PocoF1"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOetfiPyIQ8hbU4t87E0ZrgLqFW9YW09+MNNiusXwW0C user@Asturia"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoUYcVMsDw6tmjfdOuQkwaXx8fohKJs/6/5HoLzTP6x Tablet"
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager = {
|
||||
extraSpecialArgs = {inherit inputs;};
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users.${user} = {imports = [./home/${host}.nix];};
|
||||
backupFileExtension = "bak";
|
||||
};
|
||||
}
|
||||
./hosts/${host}
|
||||
];
|
||||
mkSystem = host: cfg: let
|
||||
system = cfg.system or "x86_64-linux";
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
modules =
|
||||
(commonModules host cfg.user)
|
||||
++ (cfg.modules or [])
|
||||
++ [
|
||||
{nixpkgs.hostPlatform = system;}
|
||||
];
|
||||
specialArgs = inputs;
|
||||
};
|
||||
systems = {
|
||||
Riva = {user = "user";};
|
||||
Kell = {user = "user";};
|
||||
Aloria = {user = "user";};
|
||||
Arendia = {
|
||||
user = "user";
|
||||
modules = [
|
||||
nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
|
||||
];
|
||||
};
|
||||
Asturia = {user = "user";};
|
||||
};
|
||||
in {
|
||||
nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems;
|
||||
formatter = forAllSystems (
|
||||
system:
|
||||
nixpkgs.legacyPackages.${system}.alejandra
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
101
home/Aloria.nix
101
home/Aloria.nix
|
|
@ -1,55 +1,58 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
];
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/Storage/TrackBox"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(import ./utils/desktop.nix { inherit inputs config pkgs; })
|
||||
(import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
];
|
||||
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
jetbrains.pycharm
|
||||
rclone
|
||||
opencode
|
||||
# zed-editor
|
||||
google-cloud-sdk
|
||||
distrobox
|
||||
gnome-disk-utility
|
||||
moonlight-qt
|
||||
vscode
|
||||
texliveFull
|
||||
gnome-power-manager
|
||||
discord
|
||||
smile
|
||||
podman-compose
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/Storage/TrackBox"
|
||||
];
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"eDP-1,2880x1800@120.00Hz,480x0,1.2,vrr,1"
|
||||
"HDMI-A-1,3840x2160@60.00Hz,0x-2160,1"
|
||||
"DP-3,1920x1080,3840x-540,1"
|
||||
"DP-1,1920x1080,3840x-540,1"
|
||||
];
|
||||
bind = [
|
||||
", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
|
||||
./hyprland/files/rofi-power-menu.sh
|
||||
}"
|
||||
];
|
||||
general.gaps_out = 1;
|
||||
};
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
|
||||
|
||||
programs.alacritty.settings.font.size = 13;
|
||||
programs.kitty.font.size = 13;
|
||||
home.packages = with pkgs; [
|
||||
jetbrains.pycharm
|
||||
rclone
|
||||
opencode
|
||||
# zed-editor
|
||||
google-cloud-sdk
|
||||
distrobox
|
||||
gnome-disk-utility
|
||||
moonlight-qt
|
||||
vscode
|
||||
texliveFull
|
||||
gnome-power-manager
|
||||
discord
|
||||
smile
|
||||
podman-compose
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"eDP-1,2880x1800@120.00Hz,480x0,1.2,vrr,1"
|
||||
"HDMI-A-1,3840x2160@60.00Hz,0x-2160,1"
|
||||
"DP-3,1920x1080,3840x-540,1"
|
||||
"DP-1,1920x1080,3840x-540,1"
|
||||
];
|
||||
bind = [
|
||||
", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
|
||||
./hyprland/files/rofi-power-menu.sh
|
||||
}"
|
||||
];
|
||||
general.gaps_out = 1;
|
||||
};
|
||||
|
||||
programs.alacritty.settings.font.size = 13;
|
||||
programs.kitty.font.size = 13;
|
||||
}
|
||||
|
|
|
|||
103
home/Arendia.nix
103
home/Arendia.nix
|
|
@ -1,58 +1,61 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
];
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/Storage/TrackBox/"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(import ./utils/desktop.nix { inherit inputs config pkgs; })
|
||||
(import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
];
|
||||
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Arendia/id_ed25519";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
distrobox
|
||||
gnome-disk-utility
|
||||
moonlight-qt
|
||||
vscode
|
||||
texliveFull
|
||||
gnome-power-manager
|
||||
# jetbrains.pycharm-professional
|
||||
discord
|
||||
smile
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/Storage/TrackBox/"
|
||||
];
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||
];
|
||||
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
|
||||
"eDP-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Arendia/id_ed25519";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
distrobox
|
||||
gnome-disk-utility
|
||||
moonlight-qt
|
||||
vscode
|
||||
texliveFull
|
||||
gnome-power-manager
|
||||
# jetbrains.pycharm-professional
|
||||
discord
|
||||
smile
|
||||
];
|
||||
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
|
||||
"eDP-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"eDP-1,2560x1440@60.01,0x0,1"
|
||||
"HDMI-A-1,1920x1080@60,0x-1080,1"
|
||||
];
|
||||
bind = [
|
||||
", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
|
||||
./hyprland/files/rofi-power-menu.sh
|
||||
}"
|
||||
];
|
||||
general.gaps_out = 1;
|
||||
};
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"eDP-1,2560x1440@60.01,0x0,1"
|
||||
"HDMI-A-1,1920x1080@60,0x-1080,1"
|
||||
];
|
||||
bind = [
|
||||
", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
|
||||
./hyprland/files/rofi-power-menu.sh
|
||||
}"
|
||||
];
|
||||
general.gaps_out = 1;
|
||||
};
|
||||
|
||||
programs.alacritty.settings.font.size = 13;
|
||||
programs.kitty.font.size = 15;
|
||||
programs.foot.settings.main.font = pkgs.lib.mkForce "DejaVu Sans Mono:size=15";
|
||||
programs.alacritty.settings.font.size = 13;
|
||||
programs.kitty.font.size = 15;
|
||||
programs.foot.settings.main.font = pkgs.lib.mkForce "DejaVu Sans Mono:size=15";
|
||||
}
|
||||
|
|
|
|||
53
home/Arm.nix
53
home/Arm.nix
|
|
@ -1,30 +1,33 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
in
|
||||
{
|
||||
home.username = "ubuntu";
|
||||
home.homeDirectory = "/home/ubuntu";
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings.use-xdg-base-directories = true;
|
||||
};
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
in {
|
||||
home.username = "ubuntu";
|
||||
home.homeDirectory = "/home/ubuntu";
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings.use-xdg-base-directories = true;
|
||||
};
|
||||
|
||||
xdg.enable = true;
|
||||
xdg.enable = true;
|
||||
|
||||
imports = [
|
||||
(import ./utils/common.nix { inherit inputs config pkgs; })
|
||||
./ssh
|
||||
];
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/ubuntu/.secrets/SSH/Arm/id_ed25519";
|
||||
imports = [
|
||||
(import ./utils/common.nix {inherit inputs config pkgs;})
|
||||
./ssh
|
||||
];
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/ubuntu/.secrets/SSH/Arm/id_ed25519";
|
||||
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/ubuntu/$(id -u)";
|
||||
};
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/ubuntu/$(id -u)";
|
||||
};
|
||||
|
||||
programs.zsh.initContent = pkgs.lib.mkAfter ''
|
||||
LOCAL_SEARCH_DIRS=(~/.dotfiles/)
|
||||
REMOTE_SEARCH_DIRS=()
|
||||
'';
|
||||
programs.zsh.initContent = pkgs.lib.mkAfter ''
|
||||
LOCAL_SEARCH_DIRS=(~/.dotfiles/)
|
||||
REMOTE_SEARCH_DIRS=()
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +1,40 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(import ./utils/desktop.nix { inherit inputs config pkgs; })
|
||||
];
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||
];
|
||||
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Asturia/id_ed25519";
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Asturia/id_ed25519";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
distrobox
|
||||
wl-clipboard
|
||||
jq
|
||||
evince
|
||||
home.packages = with pkgs; [
|
||||
distrobox
|
||||
wl-clipboard
|
||||
jq
|
||||
evince
|
||||
];
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
"$mainMod" = pkgs.lib.mkForce "ALT_L";
|
||||
"$altMod" = pkgs.lib.mkForce "SUPER";
|
||||
monitor = [
|
||||
"Virtual-1,1920x1080@60,0x0,1"
|
||||
"DP-1,1920x1080@60,0x0,1"
|
||||
"HDMI-A-1,1920x1080@60,0x0,1"
|
||||
];
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
"$mainMod" = pkgs.lib.mkForce "ALT_L";
|
||||
"$altMod" = pkgs.lib.mkForce "SUPER";
|
||||
monitor = [
|
||||
"Virtual-1,1920x1080@60,0x0,1"
|
||||
"DP-1,1920x1080@60,0x0,1"
|
||||
"HDMI-A-1,1920x1080@60,0x0,1"
|
||||
];
|
||||
general.gaps_out = 1;
|
||||
general.gaps_out = 1;
|
||||
};
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"Virtual-1,${./hyprland/files/wallpaper.png}"
|
||||
"DP-1,${./hyprland/files/wallpaper.png}"
|
||||
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"Virtual-1,${./hyprland/files/wallpaper.png}"
|
||||
"DP-1,${./hyprland/files/wallpaper.png}"
|
||||
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
};
|
||||
programs.alacritty.settings.font.size = 12;
|
||||
programs.kitty.font.size = 12;
|
||||
};
|
||||
programs.alacritty.settings.font.size = 12;
|
||||
programs.kitty.font.size = 12;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
{
|
||||
home.username = "user";
|
||||
home.homeDirectory = "/home/user";
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.username = "user";
|
||||
home.homeDirectory = "/home/user";
|
||||
|
||||
imports = [
|
||||
(import ./utils/common.nix { inherit inputs config pkgs; })
|
||||
];
|
||||
imports = [
|
||||
(import ./utils/common.nix {inherit inputs config pkgs;})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
103
home/Kell.nix
103
home/Kell.nix
|
|
@ -1,57 +1,60 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
|
||||
];
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(import ./utils/desktop.nix { inherit inputs config pkgs; })
|
||||
(import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
|
||||
];
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Kell/id_ed25519";
|
||||
|
||||
dconf.settings = {
|
||||
"org/virt-manager/virt-manager/connections" = {
|
||||
autoconnect = ["qemu:///system"];
|
||||
uris = ["qemu:///system"];
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
distrobox
|
||||
gnome-disk-utility
|
||||
moonlight-qt
|
||||
vscode
|
||||
jetbrains.rider
|
||||
discord
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
||||
];
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||
];
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Kell/id_ed25519";
|
||||
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"DP-1,${./hyprland/files/wallpaper.png}"
|
||||
"DP-2,${./hyprland/files/wallpaper.png}"
|
||||
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
dconf.settings = {
|
||||
"org/virt-manager/virt-manager/connections" = {
|
||||
autoconnect = ["qemu:///system"];
|
||||
uris = ["qemu:///system"];
|
||||
};
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"DP-2,preferred,0x550,1"
|
||||
"DP-1,preferred,1920x0,1"
|
||||
"HDMI-A-1,preferred,5760x550,1"
|
||||
];
|
||||
input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";
|
||||
# input.kb_options = "compose:rctrl, caps:super";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
distrobox
|
||||
gnome-disk-utility
|
||||
moonlight-qt
|
||||
vscode
|
||||
jetbrains.rider
|
||||
discord
|
||||
];
|
||||
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"DP-1,${./hyprland/files/wallpaper.png}"
|
||||
"DP-2,${./hyprland/files/wallpaper.png}"
|
||||
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
};
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"DP-2,preferred,0x550,1"
|
||||
"DP-1,preferred,1920x0,1"
|
||||
"HDMI-A-1,preferred,5760x550,1"
|
||||
];
|
||||
input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";
|
||||
# input.kb_options = "compose:rctrl, caps:super";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,97 +1,101 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
username = "server";
|
||||
home_dir = "/home/${username}";
|
||||
scripts = {
|
||||
disk_check = import ./utils/disk_check.nix { inherit pkgs; };
|
||||
# vdirsyncer = {
|
||||
# when = "*:0/15";
|
||||
# script = toString (pkgs.writeShellScript "script" '' ${pkgs.vdirsyncer}/bin/vdirsyncer sync imec/pair '');
|
||||
# };
|
||||
fzgo = {
|
||||
when = "*:0/5";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
${pkgs.zsh}/bin/zsh -c "source ${./zsh/files/fzgo.zsh} && fzgo_update_cache"
|
||||
'');
|
||||
};
|
||||
mbsync = {
|
||||
when = "*-*-* 00:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
BASEDIR=/home/server/Containers/mbsync
|
||||
# python3 $BASEDIR/config/oauth2/mutt_oauth2.py $BASEDIR/data/oauth2/credentials.json
|
||||
docker exec --user "1000:1000" mbsync-container /home/user/.config/mbsync/run.sh -a
|
||||
${pkgs.notmuch}/bin/notmuch new
|
||||
'');
|
||||
};
|
||||
# sync_vault = {
|
||||
# when = "*-*-* 02:00:00";
|
||||
# script = toString (pkgs.writeShellScript "script" ''
|
||||
# source $HOME/.secrets/Backup/env.sh
|
||||
# for _ in {1..2}; do
|
||||
# OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted 2>&1);
|
||||
# if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then
|
||||
# echo "Key successfully loaded, starting syncoid"
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas/Workspace 10.4.0.1:Vault/Thomas/Encrypted/Storage/Workspace
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas 10.4.0.1:Vault/Thomas/Encrypted/Storage/T
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Emily 10.4.0.1:Vault/Thomas/Encrypted/Storage/N
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Yolande 10.4.0.1:Vault/Thomas/Encrypted/Storage/Y
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Containers 10.4.0.1:Vault/Thomas/Encrypted/Containers
|
||||
# ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted
|
||||
# ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R
|
||||
# exit 0
|
||||
# fi
|
||||
# done
|
||||
#
|
||||
# echo "Found output instead: $OUTPUT"
|
||||
# echo "Failed to load key: $OUTPUT" | sendmail
|
||||
# exit 1
|
||||
# '');
|
||||
# };
|
||||
backup = {
|
||||
when = "*-*-* 04:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
${./scripts/files/backup.sh}
|
||||
${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/R6iJcWqGp0
|
||||
'');
|
||||
};
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
username = "server";
|
||||
home_dir = "/home/${username}";
|
||||
scripts = {
|
||||
disk_check = import ./utils/disk_check.nix {inherit pkgs;};
|
||||
# vdirsyncer = {
|
||||
# when = "*:0/15";
|
||||
# script = toString (pkgs.writeShellScript "script" '' ${pkgs.vdirsyncer}/bin/vdirsyncer sync imec/pair '');
|
||||
# };
|
||||
fzgo = {
|
||||
when = "*:0/5";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
${pkgs.zsh}/bin/zsh -c "source ${./zsh/files/fzgo.zsh} && fzgo_update_cache"
|
||||
'');
|
||||
};
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/Workspace"
|
||||
"${home_dir}/.dotfiles"
|
||||
];
|
||||
dirs = [
|
||||
"/home/user/Workspace"
|
||||
"${home_dir}/.dotfiles"
|
||||
"${home_dir}/Containers"
|
||||
"${home_dir}/Storage/Thomas"
|
||||
"${home_dir}/Storage/Shared"
|
||||
];
|
||||
mbsync = {
|
||||
when = "*-*-* 00:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
BASEDIR=/home/server/Containers/mbsync
|
||||
# python3 $BASEDIR/config/oauth2/mutt_oauth2.py $BASEDIR/data/oauth2/credentials.json
|
||||
docker exec --user "1000:1000" mbsync-container /home/user/.config/mbsync/run.sh -a
|
||||
${pkgs.notmuch}/bin/notmuch new
|
||||
'');
|
||||
};
|
||||
in {
|
||||
home.username = username;
|
||||
home.homeDirectory = home_dir;
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings = {
|
||||
trusted-users = [ username ];
|
||||
use-xdg-base-directories = true;
|
||||
};
|
||||
# sync_vault = {
|
||||
# when = "*-*-* 02:00:00";
|
||||
# script = toString (pkgs.writeShellScript "script" ''
|
||||
# source $HOME/.secrets/Backup/env.sh
|
||||
# for _ in {1..2}; do
|
||||
# OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted 2>&1);
|
||||
# if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then
|
||||
# echo "Key successfully loaded, starting syncoid"
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas/Workspace 10.4.0.1:Vault/Thomas/Encrypted/Storage/Workspace
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas 10.4.0.1:Vault/Thomas/Encrypted/Storage/T
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Emily 10.4.0.1:Vault/Thomas/Encrypted/Storage/N
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Yolande 10.4.0.1:Vault/Thomas/Encrypted/Storage/Y
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Containers 10.4.0.1:Vault/Thomas/Encrypted/Containers
|
||||
# ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted
|
||||
# ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R
|
||||
# exit 0
|
||||
# fi
|
||||
# done
|
||||
#
|
||||
# echo "Found output instead: $OUTPUT"
|
||||
# echo "Failed to load key: $OUTPUT" | sendmail
|
||||
# exit 1
|
||||
# '');
|
||||
# };
|
||||
backup = {
|
||||
when = "*-*-* 04:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
${./scripts/files/backup.sh}
|
||||
${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/R6iJcWqGp0
|
||||
'');
|
||||
};
|
||||
|
||||
xdg.enable = true;
|
||||
|
||||
imports = [
|
||||
(import ./utils/common.nix { inherit inputs config pkgs; })
|
||||
(import ./utils/services.nix { inherit pkgs scripts; })
|
||||
(import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
|
||||
./ssh
|
||||
};
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/Workspace"
|
||||
"${home_dir}/.dotfiles"
|
||||
];
|
||||
programs.ssh.matchBlocks."*".identityFile = "${home_dir}/.secrets/SSH/Mallorea/id_ed25519";
|
||||
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/user/$(id -u)";
|
||||
dirs = [
|
||||
"/home/user/Workspace"
|
||||
"${home_dir}/.dotfiles"
|
||||
"${home_dir}/Containers"
|
||||
"${home_dir}/Storage/Thomas"
|
||||
"${home_dir}/Storage/Shared"
|
||||
];
|
||||
};
|
||||
in {
|
||||
home.username = username;
|
||||
home.homeDirectory = home_dir;
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings = {
|
||||
trusted-users = [username];
|
||||
use-xdg-base-directories = true;
|
||||
};
|
||||
};
|
||||
|
||||
xdg.enable = true;
|
||||
|
||||
imports = [
|
||||
(import ./utils/common.nix {inherit inputs config pkgs;})
|
||||
(import ./utils/services.nix {inherit pkgs scripts;})
|
||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||
./ssh
|
||||
];
|
||||
programs.ssh.matchBlocks."*".identityFile = "${home_dir}/.secrets/SSH/Mallorea/id_ed25519";
|
||||
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/user/$(id -u)";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
59
home/Pi.nix
59
home/Pi.nix
|
|
@ -1,33 +1,36 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
in
|
||||
{
|
||||
home.username = "user";
|
||||
home.homeDirectory = "/home/user";
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings.use-xdg-base-directories = true;
|
||||
};
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
in {
|
||||
home.username = "user";
|
||||
home.homeDirectory = "/home/user";
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings.use-xdg-base-directories = true;
|
||||
};
|
||||
|
||||
xdg.enable = true;
|
||||
xdg.enable = true;
|
||||
|
||||
imports = [
|
||||
(import ./utils/common.nix { inherit inputs config pkgs; })
|
||||
./ssh
|
||||
];
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Pi/id_ed25519";
|
||||
imports = [
|
||||
(import ./utils/common.nix {inherit inputs config pkgs;})
|
||||
./ssh
|
||||
];
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Pi/id_ed25519";
|
||||
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/user/$(id -u)";
|
||||
};
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/user/$(id -u)";
|
||||
};
|
||||
|
||||
programs.zsh.initContent = pkgs.lib.mkAfter ''
|
||||
LOCAL_SEARCH_DIRS=(~/.dotfiles/)
|
||||
REMOTE_SEARCH_DIRS=()
|
||||
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
|
||||
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
|
||||
fi
|
||||
'';
|
||||
programs.zsh.initContent = pkgs.lib.mkAfter ''
|
||||
LOCAL_SEARCH_DIRS=(~/.dotfiles/)
|
||||
REMOTE_SEARCH_DIRS=()
|
||||
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
|
||||
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
|
||||
fi
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,43 +1,46 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
|
||||
];
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
|
||||
(import ./utils/desktop.nix { inherit inputs config pkgs; })
|
||||
./ssh
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
|
||||
];
|
||||
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Riva/id_ed25519";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
distrobox
|
||||
jq
|
||||
rclone
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
||||
];
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"Virtual-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
};
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"Virtual-1,2560x1440,0x0,1"
|
||||
];
|
||||
input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||
./ssh
|
||||
];
|
||||
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Riva/id_ed25519";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
distrobox
|
||||
jq
|
||||
rclone
|
||||
];
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"Virtual-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
};
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"Virtual-1,2560x1440,0x0,1"
|
||||
];
|
||||
input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +1,43 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.username = "user";
|
||||
home.homeDirectory = "/home/user";
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings = {
|
||||
trusted-users = [ "user" ];
|
||||
use-xdg-base-directories = true;
|
||||
};
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.username = "user";
|
||||
home.homeDirectory = "/home/user";
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings = {
|
||||
trusted-users = ["user"];
|
||||
use-xdg-base-directories = true;
|
||||
};
|
||||
};
|
||||
|
||||
xdg.enable = true;
|
||||
imports = [
|
||||
(import ./utils/common.nix { inherit inputs config pkgs; })
|
||||
./alacritty
|
||||
./ssh
|
||||
];
|
||||
xdg.enable = true;
|
||||
imports = [
|
||||
(import ./utils/common.nix {inherit inputs config pkgs;})
|
||||
./alacritty
|
||||
./ssh
|
||||
];
|
||||
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Tolnedra/id_ed25519";
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Tolnedra/id_ed25519";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
jq
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
jq
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/user/$(id -u)";
|
||||
};
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/user/$(id -u)";
|
||||
};
|
||||
|
||||
programs.zsh.initContent = pkgs.lib.mkAfter ''
|
||||
LOCAL_SEARCH_DIRS=(~/.dotfiles/)
|
||||
REMOTE_SEARCH_DIRS=()
|
||||
'';
|
||||
programs.zsh.initContent = pkgs.lib.mkAfter ''
|
||||
LOCAL_SEARCH_DIRS=(~/.dotfiles/)
|
||||
REMOTE_SEARCH_DIRS=()
|
||||
'';
|
||||
|
||||
programs.alacritty.settings.window.opacity = 0.8;
|
||||
programs.alacritty.settings.window.opacity = 0.8;
|
||||
}
|
||||
|
|
|
|||
110
home/Vault.nix
110
home/Vault.nix
|
|
@ -1,9 +1,13 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
scripts = {
|
||||
disk_check = {
|
||||
when = "*-*-* *:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
scripts = {
|
||||
disk_check = {
|
||||
when = "*-*-* *:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
REPORT_EMAIL=email@thomasave.be
|
||||
ZPOOL_STATUS=$(zpool status -x)
|
||||
if [ "$ZPOOL_STATUS" = "all pools are healthy" ] || [ "$ZPOOL_STATUS" = "no pools available" ]
|
||||
|
|
@ -16,63 +20,65 @@ let
|
|||
printf 1 > /var/db/zpool.status
|
||||
fi
|
||||
fi
|
||||
'');
|
||||
};
|
||||
restic_etienne = {
|
||||
when = "*-*-* 01:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
'');
|
||||
};
|
||||
restic_etienne = {
|
||||
when = "*-*-* 01:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
/Backup/Restic/Etienne/run.sh
|
||||
${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/zGPrOi0NsJ
|
||||
'');
|
||||
};
|
||||
restic_magda_and_etienne = {
|
||||
when = "*-*-* 03:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
'');
|
||||
};
|
||||
restic_magda_and_etienne = {
|
||||
when = "*-*-* 03:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
/Backup/Restic/Magda\ and\ Etienne/run.sh
|
||||
${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/yvBuDgduDd
|
||||
'');
|
||||
};
|
||||
restic_backblaze = {
|
||||
when = "*-*-* 02:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
'');
|
||||
};
|
||||
restic_backblaze = {
|
||||
when = "*-*-* 02:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
/Backup/Restic/BackBlaze/run.sh
|
||||
${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/LVruVYTwTn
|
||||
'');
|
||||
};
|
||||
mail_sync = {
|
||||
when = "*-*-* 04:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
'');
|
||||
};
|
||||
mail_sync = {
|
||||
when = "*-*-* 04:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
cd /home/server/Containers/Mails && docker compose up sync-etienne sync-magda
|
||||
${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/eEIPVGyrAx
|
||||
'');
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
home.username = "server";
|
||||
home.homeDirectory = "/home/server";
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings.use-xdg-base-directories = true;
|
||||
'');
|
||||
};
|
||||
};
|
||||
in {
|
||||
home.username = "server";
|
||||
home.homeDirectory = "/home/server";
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings.use-xdg-base-directories = true;
|
||||
};
|
||||
|
||||
xdg.enable = true;
|
||||
imports = [
|
||||
(import ./utils/common.nix { inherit inputs config pkgs; })
|
||||
(import ./utils/services.nix { inherit pkgs; scripts = scripts; })
|
||||
./ssh
|
||||
];
|
||||
xdg.enable = true;
|
||||
imports = [
|
||||
(import ./utils/common.nix {inherit inputs config pkgs;})
|
||||
(import ./utils/services.nix {
|
||||
inherit pkgs;
|
||||
scripts = scripts;
|
||||
})
|
||||
./ssh
|
||||
];
|
||||
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Vault/id_ed25519";
|
||||
programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Vault/id_ed25519";
|
||||
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/user/$(id -u)";
|
||||
};
|
||||
home.sessionVariables = {
|
||||
NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
|
||||
LANG = "en_US.UTF-8";
|
||||
XDG_RUNTIME_DIR = "/run/user/$(id -u)";
|
||||
};
|
||||
|
||||
programs.zsh.initContent = pkgs.lib.mkAfter ''
|
||||
LOCAL_SEARCH_DIRS=(~/.dotfiles/ ~/Storage/Thomas/ ~/Storage/Etienne/ ~/Storage/Magda\ and\ Etienne/ ~/Containers/)
|
||||
REMOTE_SEARCH_DIRS=()
|
||||
'';
|
||||
programs.zsh.initContent = pkgs.lib.mkAfter ''
|
||||
LOCAL_SEARCH_DIRS=(~/.dotfiles/ ~/Storage/Thomas/ ~/Storage/Etienne/ ~/Storage/Magda\ and\ Etienne/ ~/Containers/)
|
||||
REMOTE_SEARCH_DIRS=()
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,29 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
# add the home manager module
|
||||
imports = [ inputs.ags.homeManagerModules.default ];
|
||||
programs.ags = {
|
||||
enable = true;
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# add the home manager module
|
||||
imports = [inputs.ags.homeManagerModules.default];
|
||||
programs.ags = {
|
||||
enable = true;
|
||||
|
||||
configDir = ./files;
|
||||
configDir = ./files;
|
||||
|
||||
extraPackages = with inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
pkgs.gtksourceview
|
||||
pkgs.accountsservice
|
||||
pkgs.libadwaita
|
||||
extraPackages = with inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
pkgs.gtksourceview
|
||||
pkgs.accountsservice
|
||||
pkgs.libadwaita
|
||||
|
||||
battery
|
||||
hyprland
|
||||
tray
|
||||
powerprofiles
|
||||
wireplumber
|
||||
mpris
|
||||
network
|
||||
apps
|
||||
notifd
|
||||
];
|
||||
};
|
||||
battery
|
||||
hyprland
|
||||
tray
|
||||
powerprofiles
|
||||
wireplumber
|
||||
mpris
|
||||
network
|
||||
apps
|
||||
notifd
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,55 +1,55 @@
|
|||
{
|
||||
description = "AGS Config";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||
description = "AGS Config";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||
|
||||
ags = {
|
||||
url = "github:aylur/ags";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
ags = {
|
||||
url = "github:aylur/ags";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
ags,
|
||||
}: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
extraPackages = with ags.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
pkgs.gtksourceview
|
||||
pkgs.accountsservice
|
||||
|
||||
battery
|
||||
hyprland
|
||||
tray
|
||||
powerprofiles
|
||||
wireplumber
|
||||
mpris
|
||||
network
|
||||
apps
|
||||
notifd
|
||||
];
|
||||
in {
|
||||
packages.${system} = {
|
||||
default = ags.lib.bundle {
|
||||
inherit pkgs;
|
||||
src = ./files;
|
||||
name = "ags-bar";
|
||||
entry = "app.ts";
|
||||
extraPackages = extraPackages;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
ags,
|
||||
}: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
extraPackages = with ags.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
pkgs.gtksourceview
|
||||
pkgs.accountsservice
|
||||
|
||||
battery
|
||||
hyprland
|
||||
tray
|
||||
powerprofiles
|
||||
wireplumber
|
||||
mpris
|
||||
network
|
||||
apps
|
||||
notifd
|
||||
];
|
||||
in {
|
||||
packages.${system} = {
|
||||
default = ags.lib.bundle {
|
||||
inherit pkgs;
|
||||
src = ./files;
|
||||
name = "ags-bar";
|
||||
entry = "app.ts";
|
||||
extraPackages = extraPackages;
|
||||
};
|
||||
};
|
||||
|
||||
devShells.${system} = {
|
||||
default = pkgs.mkShell {
|
||||
buildInputs = [
|
||||
# ags.packages.${system}.agsFull
|
||||
(ags.packages.${system}.default.override {
|
||||
extraPackages = extraPackages;
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
devShells.${system} = {
|
||||
default = pkgs.mkShell {
|
||||
buildInputs = [
|
||||
# ags.packages.${system}.agsFull
|
||||
(ags.packages.${system}.default.override {
|
||||
extraPackages = extraPackages;
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,115 +1,113 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
scrolling.history = 10000;
|
||||
window = {
|
||||
dynamic_padding = true;
|
||||
dynamic_title = true;
|
||||
opacity = 0.3;
|
||||
};
|
||||
env = {
|
||||
TERM = "xterm-256color";
|
||||
};
|
||||
colors = {
|
||||
bright = {
|
||||
black = "#555556";
|
||||
blue = "#00afff";
|
||||
cyan = "#50cdfe";
|
||||
green = "#b0e05e";
|
||||
magenta = "#af87ff";
|
||||
red = "#f5669c";
|
||||
white = "#ffffff";
|
||||
yellow = "#fef26c";
|
||||
};
|
||||
normal = {
|
||||
black = "#121213";
|
||||
blue = "#0f7fcf";
|
||||
cyan = "#42a7cf";
|
||||
green = "#97e123";
|
||||
magenta = "#8700ff";
|
||||
red = "#fa2573";
|
||||
white = "#bbbbbb";
|
||||
yellow = "#dfd460";
|
||||
};
|
||||
primary = {
|
||||
background = "#000011";
|
||||
foreground = "#F8F8F2";
|
||||
};
|
||||
};
|
||||
font = {
|
||||
size = pkgs.lib.mkDefault 13;
|
||||
normal.family = "DejaVu Sans Mono";
|
||||
};
|
||||
keyboard.bindings = [
|
||||
{
|
||||
action = "ToggleFullscreen";
|
||||
key = "F11";
|
||||
}
|
||||
{
|
||||
action = "ToggleViMode";
|
||||
key = "Escape";
|
||||
mode = "Vi";
|
||||
}
|
||||
{
|
||||
action = "ScrollHalfPageUp";
|
||||
key = "E";
|
||||
mode = "Vi";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
key = "F";
|
||||
mods = "Control|Shift";
|
||||
action = "ReceiveChar";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[72;6u";
|
||||
key = "H";
|
||||
mods = "Control|Shift";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[74;6u";
|
||||
key = "J";
|
||||
mods = "Control|Shift";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[75;6u";
|
||||
key = "K";
|
||||
mods = "Control|Shift";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[76;6u";
|
||||
key = "L";
|
||||
mods = "Control|Shift";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[105;5u";
|
||||
key = "I";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[46;5u";
|
||||
key = "Period";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[44;5u";
|
||||
key = "Comma";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[59;5u";
|
||||
key = "Semicolon";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[13;2u";
|
||||
key = "Return";
|
||||
mods = "Shift";
|
||||
}
|
||||
];
|
||||
{pkgs, ...}: {
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
scrolling.history = 10000;
|
||||
window = {
|
||||
dynamic_padding = true;
|
||||
dynamic_title = true;
|
||||
opacity = 0.3;
|
||||
};
|
||||
env = {
|
||||
TERM = "xterm-256color";
|
||||
};
|
||||
colors = {
|
||||
bright = {
|
||||
black = "#555556";
|
||||
blue = "#00afff";
|
||||
cyan = "#50cdfe";
|
||||
green = "#b0e05e";
|
||||
magenta = "#af87ff";
|
||||
red = "#f5669c";
|
||||
white = "#ffffff";
|
||||
yellow = "#fef26c";
|
||||
};
|
||||
normal = {
|
||||
black = "#121213";
|
||||
blue = "#0f7fcf";
|
||||
cyan = "#42a7cf";
|
||||
green = "#97e123";
|
||||
magenta = "#8700ff";
|
||||
red = "#fa2573";
|
||||
white = "#bbbbbb";
|
||||
yellow = "#dfd460";
|
||||
};
|
||||
primary = {
|
||||
background = "#000011";
|
||||
foreground = "#F8F8F2";
|
||||
};
|
||||
};
|
||||
font = {
|
||||
size = pkgs.lib.mkDefault 13;
|
||||
normal.family = "DejaVu Sans Mono";
|
||||
};
|
||||
keyboard.bindings = [
|
||||
{
|
||||
action = "ToggleFullscreen";
|
||||
key = "F11";
|
||||
}
|
||||
{
|
||||
action = "ToggleViMode";
|
||||
key = "Escape";
|
||||
mode = "Vi";
|
||||
}
|
||||
{
|
||||
action = "ScrollHalfPageUp";
|
||||
key = "E";
|
||||
mode = "Vi";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
key = "F";
|
||||
mods = "Control|Shift";
|
||||
action = "ReceiveChar";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[72;6u";
|
||||
key = "H";
|
||||
mods = "Control|Shift";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[74;6u";
|
||||
key = "J";
|
||||
mods = "Control|Shift";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[75;6u";
|
||||
key = "K";
|
||||
mods = "Control|Shift";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[76;6u";
|
||||
key = "L";
|
||||
mods = "Control|Shift";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[105;5u";
|
||||
key = "I";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[46;5u";
|
||||
key = "Period";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[44;5u";
|
||||
key = "Comma";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[59;5u";
|
||||
key = "Semicolon";
|
||||
mods = "Control";
|
||||
}
|
||||
{
|
||||
chars = "\\u001B[13;2u";
|
||||
key = "Return";
|
||||
mods = "Shift";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,77 +1,80 @@
|
|||
{ config, inputs, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
enableZshIntegration = false;
|
||||
settings = {
|
||||
add_newline = false;
|
||||
format = "$nix_shell$username$hostname[](bg:#0F7FCF fg:prev_bg)$directory$git_branch$git_status[](fg:prev_bg) ";
|
||||
right_format = "";
|
||||
username = {
|
||||
show_always = true;
|
||||
style_user = "bg:#121213";
|
||||
style_root = "bg:#EA2C38";
|
||||
format = "[ $user]($style)";
|
||||
disabled = false;
|
||||
};
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
enableZshIntegration = false;
|
||||
settings = {
|
||||
add_newline = false;
|
||||
format = "$nix_shell$username$hostname[](bg:#0F7FCF fg:prev_bg)$directory$git_branch$git_status[](fg:prev_bg) ";
|
||||
right_format = "";
|
||||
username = {
|
||||
show_always = true;
|
||||
style_user = "bg:#121213";
|
||||
style_root = "bg:#EA2C38";
|
||||
format = "[ $user]($style)";
|
||||
disabled = false;
|
||||
};
|
||||
|
||||
hostname = {
|
||||
disabled = false;
|
||||
ssh_only = false;
|
||||
format = "[@$hostname ]($style)";
|
||||
style = "bg:#121213";
|
||||
};
|
||||
hostname = {
|
||||
disabled = false;
|
||||
ssh_only = false;
|
||||
format = "[@$hostname ]($style)";
|
||||
style = "bg:#121213";
|
||||
};
|
||||
|
||||
directory = {
|
||||
style = "bg:#0F7FCF fg:#080808";
|
||||
format = "[ $path ]($style)";
|
||||
truncation_length = 3;
|
||||
truncation_symbol = ".../";
|
||||
};
|
||||
directory = {
|
||||
style = "bg:#0F7FCF fg:#080808";
|
||||
format = "[ $path ]($style)";
|
||||
truncation_length = 3;
|
||||
truncation_symbol = ".../";
|
||||
};
|
||||
|
||||
git_branch = {
|
||||
symbol = "";
|
||||
style = "bg:#DFD460 fg:#080808";
|
||||
format = "[](fg:prev_bg bg:#DFD460)[ $symbol $branch ]($style)";
|
||||
};
|
||||
git_branch = {
|
||||
symbol = "";
|
||||
style = "bg:#DFD460 fg:#080808";
|
||||
format = "[](fg:prev_bg bg:#DFD460)[ $symbol $branch ]($style)";
|
||||
};
|
||||
|
||||
git_status = {
|
||||
style = "bg:#DFD460 fg:#080808";
|
||||
format = "[$all_status$ahead_behind ]($style)";
|
||||
};
|
||||
git_status = {
|
||||
style = "bg:#DFD460 fg:#080808";
|
||||
format = "[$all_status$ahead_behind ]($style)";
|
||||
};
|
||||
|
||||
nix_shell = {
|
||||
symbol = "";
|
||||
style = "bg:#0F7FCF fg:#080808";
|
||||
format = "[ $symbol ]($style)[](fg:#0F7FCF bg:#121213)";
|
||||
disabled = false;
|
||||
};
|
||||
};
|
||||
nix_shell = {
|
||||
symbol = "";
|
||||
style = "bg:#0F7FCF fg:#080808";
|
||||
format = "[ $symbol ]($style)[](fg:#0F7FCF bg:#121213)";
|
||||
disabled = false;
|
||||
};
|
||||
};
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
historySize = 10000000;
|
||||
historyFile = "${config.xdg.dataHome}/bash/history";
|
||||
initExtra = pkgs.lib.mkAfter ''
|
||||
bind 'set show-all-if-ambiguous on'
|
||||
bind 'set completion-ignore-case on'
|
||||
bind 'TAB:menu-complete'
|
||||
bind '"\e[A": history-search-backward'
|
||||
bind '"\e[B": history-search-forward'
|
||||
'';
|
||||
shellAliases = {
|
||||
ll = "ls -lhat";
|
||||
ls = "ls --color=auto";
|
||||
lf = ''cd "$(${pkgs.lf}/bin/lf -print-last-dir)"'';
|
||||
wget = ''wget --hsts-file = "$XDG_DATA_HOME/wget-hsts"'';
|
||||
python = "python3";
|
||||
vim = "nvim";
|
||||
v = ''nvim -c ':lua require("oil").open()' && cd "$(cat /tmp/oil_dir 2> /dev/null || pwd)"'';
|
||||
rg = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";
|
||||
reset = "tput reset";
|
||||
};
|
||||
};
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
historySize = 10000000;
|
||||
historyFile = "${config.xdg.dataHome}/bash/history";
|
||||
initExtra = pkgs.lib.mkAfter ''
|
||||
bind 'set show-all-if-ambiguous on'
|
||||
bind 'set completion-ignore-case on'
|
||||
bind 'TAB:menu-complete'
|
||||
bind '"\e[A": history-search-backward'
|
||||
bind '"\e[B": history-search-forward'
|
||||
'';
|
||||
shellAliases = {
|
||||
ll = "ls -lhat";
|
||||
ls = "ls --color=auto";
|
||||
lf = ''cd "$(${pkgs.lf}/bin/lf -print-last-dir)"'';
|
||||
wget = ''wget --hsts-file = "$XDG_DATA_HOME/wget-hsts"'';
|
||||
python = "python3";
|
||||
vim = "nvim";
|
||||
v = ''nvim -c ':lua require("oil").open()' && cd "$(cat /tmp/oil_dir 2> /dev/null || pwd)"'';
|
||||
rg = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";
|
||||
reset = "tput reset";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,252 +1,242 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.file = {
|
||||
".mailcap".text =
|
||||
"text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";
|
||||
};
|
||||
home.packages = with pkgs; [ mailcap ];
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.file = {
|
||||
".mailcap".text = "text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";
|
||||
};
|
||||
home.packages = with pkgs; [mailcap];
|
||||
|
||||
programs.notmuch = {
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
database = { path = "/home/server/Storage/Thomas/Mail"; };
|
||||
user = {
|
||||
name = "Thomas Avé";
|
||||
primary_email = "email@thomasave.be";
|
||||
other_email = "Thomas.Ave@uantwerpen.be;Thomas.Ave@imec.be;";
|
||||
};
|
||||
maildir = { synchronize_flags = "true"; };
|
||||
};
|
||||
programs.notmuch = {
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
database = {path = "/home/server/Storage/Thomas/Mail";};
|
||||
user = {
|
||||
name = "Thomas Avé";
|
||||
primary_email = "email@thomasave.be";
|
||||
other_email = "Thomas.Ave@uantwerpen.be;Thomas.Ave@imec.be;";
|
||||
};
|
||||
maildir = {synchronize_flags = "true";};
|
||||
};
|
||||
programs.aerc = {
|
||||
enable = true;
|
||||
extraBinds = {
|
||||
global = {
|
||||
"<C-p>" = ":menu -adc 'fzy -l 30' :cf -a<Enter>";
|
||||
"<tab>" = ":next-tab<Enter>";
|
||||
"?" = ":help keys<Enter>";
|
||||
"<F5>" = ":check-mail<Enter>";
|
||||
};
|
||||
messages = {
|
||||
"q" = ":q<Enter>";
|
||||
"<Backspace>" = ":q<Enter>";
|
||||
"j" = ":next<Enter>";
|
||||
"k" = ":prev<Enter>";
|
||||
"<Up>" = ":prev<Enter>";
|
||||
"g" = ":select 0<Enter>";
|
||||
"G" = ":select -1<Enter>";
|
||||
"J" = ":next-folder<Enter>";
|
||||
"K" = ":prev-folder<Enter>";
|
||||
"v" = ":mark -t<Enter>";
|
||||
"V" = ":mark -v<Enter>";
|
||||
"<Space>" = ":read -t<Enter>";
|
||||
"T" = ":toggle-threads<Enter>";
|
||||
"<Enter>" = ":view<Enter>";
|
||||
"d" = ":prompt 'Really delete this message?' 'delete-message'<Enter>";
|
||||
"D" = ":delete<Enter>";
|
||||
"a" = ":archive flat<Enter>";
|
||||
"A" = ":unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>";
|
||||
"f" = ":flag -t<Enter>";
|
||||
"m" = ":compose<Enter>";
|
||||
"rr" = ":reply -a<Enter>";
|
||||
"rq" = ":reply -aq<Enter>";
|
||||
"Rr" = ":reply<Enter>";
|
||||
"Rq" = ":reply -q<Enter>";
|
||||
"c" = ":cf<space>";
|
||||
"$" = ":term<space>";
|
||||
"!" = ":term<space>";
|
||||
"|" = ":pipe<space>";
|
||||
"/" = ":search -a<space>";
|
||||
"\\" = ":filter -a <space>";
|
||||
"n" = ":next-result<Enter>";
|
||||
"N" = ":prev-result<Enter>";
|
||||
"<Esc>" = ":clear<Enter>";
|
||||
"s" = ":split<Enter>";
|
||||
"S" = ":vsplit<Enter>";
|
||||
"pl" = ":patch list<Enter>";
|
||||
"pa" = ":patch apply <Tab>";
|
||||
"pd" = ":patch drop <Tab>";
|
||||
"pb" = ":patch rebase<Enter>";
|
||||
"pt" = ":patch term<Enter>";
|
||||
"ps" = ":patch switch <Tab>";
|
||||
};
|
||||
view = {
|
||||
"/" = ":toggle-key-passthrough<Enter>/";
|
||||
"q" = ":close<Enter>";
|
||||
"O" = ":open<Enter>";
|
||||
"o" = ":open<Enter>";
|
||||
"S" = ":save<space>";
|
||||
"|" = ":pipe<space>";
|
||||
"D" = ":delete<Enter>";
|
||||
"A" = ":archive flat<Enter>";
|
||||
"<C-l>" = ":open-link <space>";
|
||||
"f" = ":flag -t<Enter>";
|
||||
"rr" = ":reply -a<Enter>";
|
||||
"rq" = ":reply -aq<Enter>";
|
||||
"Rr" = ":reply<Enter>";
|
||||
"Rq" = ":reply -q<Enter>";
|
||||
"H" = ":toggle-headers<Enter>";
|
||||
"<C-k>" = ":prev-part<Enter>";
|
||||
"<C-Up>" = ":prev-part<Enter>";
|
||||
"<C-j>" = ":next-part<Enter>";
|
||||
"<C-Down>" = ":next-part<Enter>";
|
||||
"J" = ":next<Enter>";
|
||||
"<C-Right>" = ":next<Enter>";
|
||||
"K" = ":prev<Enter>";
|
||||
"<C-Left>" = ":prev<Enter>";
|
||||
};
|
||||
"view::passthrough" = {
|
||||
"$noinherit" = "true";
|
||||
"$ex" = "<C-x>";
|
||||
"<Esc>" = ":toggle-key-passthrough<Enter>";
|
||||
};
|
||||
compose = {
|
||||
"$noinherit" = "true";
|
||||
"$ex" = "<C-x>";
|
||||
"$complete" = "<C-o>";
|
||||
"<C-k>" = ":prev-field<Enter>";
|
||||
"<C-Up>" = ":prev-field<Enter>";
|
||||
"<C-j>" = ":next-field<Enter>";
|
||||
"<C-Down>" = ":next-field<Enter>";
|
||||
"<A-p>" = ":switch-account -p<Enter>";
|
||||
"<C-Left>" = ":switch-account -p<Enter>";
|
||||
"<A-n>" = ":switch-account -n<Enter>";
|
||||
"<C-Right>" = ":switch-account -n<Enter>";
|
||||
"<tab>" = ":next-field<Enter>";
|
||||
"<backtab>" = ":prev-field<Enter>";
|
||||
"<C-p>" = ":prev-tab<Enter>";
|
||||
"<C-PgUp>" = ":prev-tab<Enter>";
|
||||
"<C-n>" = ":next-tab<Enter>";
|
||||
"<C-PgDn>" = ":next-tab<Enter>";
|
||||
};
|
||||
"compose::editor" = {
|
||||
"$noinherit" = "true";
|
||||
"$ex" = "<C-x>";
|
||||
"<C-k>" = ":prev-field<Enter>";
|
||||
"<C-Up>" = ":prev-field<Enter>";
|
||||
"<C-j>" = ":next-field<Enter>";
|
||||
"<C-Down>" = ":next-field<Enter>";
|
||||
"<C-p>" = ":prev-tab<Enter>";
|
||||
"<C-PgUp>" = ":prev-tab<Enter>";
|
||||
"<C-n>" = ":next-tab<Enter>";
|
||||
"<C-PgDn>" = ":next-tab<Enter>";
|
||||
};
|
||||
"compose::review" = {
|
||||
"y" = ":send<Enter>";
|
||||
"n" = ":abort<Enter>";
|
||||
"v" = ":preview<Enter>";
|
||||
"p" = ":postpone<Enter>";
|
||||
"q" = ":choose -o d discard abort -o p postpone postpone<Enter>";
|
||||
"e" = ":edit<Enter>";
|
||||
"a" = ":attach<space>";
|
||||
"d" = ":detach<space>";
|
||||
};
|
||||
terminal = {
|
||||
"$noinherit" = "true";
|
||||
"$ex" = "<C-x>";
|
||||
"<C-p>" = ":prev-tab<Enter>";
|
||||
"<C-n>" = ":next-tab<Enter>";
|
||||
"<C-PgUp>" = ":prev-tab<Enter>";
|
||||
"<C-PgDn>" = ":next-tab<Enter>";
|
||||
};
|
||||
};
|
||||
templates = {
|
||||
quoted_reply = ''
|
||||
{{(index .OriginalFrom 0).Name}}, {{dateFormat (.OriginalDate | toLocal) "Jan 02, 2006 at 15:04"}}:
|
||||
{{ if eq .OriginalMIMEType "text/html" -}}
|
||||
{{- exec `${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html` .OriginalText | quote -}}
|
||||
{{- else -}}
|
||||
{{- .OriginalText | quote -}}
|
||||
{{- end}}
|
||||
'';
|
||||
};
|
||||
extraConfig = {
|
||||
general = {
|
||||
term = "xterm-256color";
|
||||
unsafe-accounts-conf = true;
|
||||
};
|
||||
ui = {
|
||||
border-char-vertical = "│";
|
||||
border-char-horizontal = "─";
|
||||
styleset-name = "catppuccin-mocha";
|
||||
timestamp-format = "2006-01-02 15:04";
|
||||
sidebar-width = 30;
|
||||
mouse-enabled = true;
|
||||
dirlist-right = "{{if .Unread}}{{humanReadable .Unread}}{{end}}";
|
||||
dirlist-tree = true;
|
||||
};
|
||||
viewer = {
|
||||
pager =
|
||||
"${pkgs.neovim}/bin/nvim -u ${config.xdg.configHome}/nvim/aerc.lua";
|
||||
};
|
||||
compose = { address-book-cmd = ''notmuch address "%s"''; };
|
||||
multipart-converters = {
|
||||
"text/html" =
|
||||
"${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html";
|
||||
};
|
||||
filters = {
|
||||
"text/plain" = "cat";
|
||||
"text/calendar" = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
||||
"message/delivery-status" = "cat";
|
||||
"message/rfc822" = "cat";
|
||||
"text/html" = "${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html";
|
||||
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
||||
};
|
||||
};
|
||||
extraAccounts = {
|
||||
Zoho = {
|
||||
outgoing = "smtps://email%40thomasave.be@smtp.zoho.com";
|
||||
outgoing-cred-cmd = "cat ~/.secrets/Aerc/Zoho.key";
|
||||
source =
|
||||
"maildir:///home/server/Storage/Thomas/Mail/email@thomasave.be/";
|
||||
check-mail-cmd =
|
||||
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||
check-mail-timeout = "60s";
|
||||
default = "Inbox";
|
||||
from = ''"Thomas Avé" <email@thomasave.be>'';
|
||||
cache-headers = true;
|
||||
};
|
||||
UAntwerpen = {
|
||||
outgoing =
|
||||
"ssh server@192.168.1.2 /home/server/Containers/mbsync/send.sh";
|
||||
source =
|
||||
"maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@uantwerpen.be";
|
||||
check-mail-cmd =
|
||||
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||
check-mail-timeout = "60s";
|
||||
default = "Inbox";
|
||||
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
|
||||
cache-headers = true;
|
||||
};
|
||||
IMEC = {
|
||||
outgoing = "smtp+insecure://ave57%40imec.be@smtp.thomasave.be:1025";
|
||||
outgoing-cred-cmd = "cat ~/.secrets/Aerc/IMEC.key";
|
||||
source =
|
||||
"maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@imec.be/";
|
||||
check-mail-cmd =
|
||||
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||
check-mail-timeout = "60s";
|
||||
default = "Inbox";
|
||||
from = ''"Thomas Avé" <Thomas.Ave@imec.be>'';
|
||||
cache-headers = true;
|
||||
};
|
||||
NotMuch = {
|
||||
source = "notmuch:///home/server/Storage/Thomas/Mail/";
|
||||
check-mail-cmd =
|
||||
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||
check-mail-timeout = "60s";
|
||||
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
|
||||
query-map = "${config.xdg.configHome}/aerc/map.conf";
|
||||
default = "INBOX";
|
||||
cache-headers = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.aerc = {
|
||||
enable = true;
|
||||
extraBinds = {
|
||||
global = {
|
||||
"<C-p>" = ":menu -adc 'fzy -l 30' :cf -a<Enter>";
|
||||
"<tab>" = ":next-tab<Enter>";
|
||||
"?" = ":help keys<Enter>";
|
||||
"<F5>" = ":check-mail<Enter>";
|
||||
};
|
||||
messages = {
|
||||
"q" = ":q<Enter>";
|
||||
"<Backspace>" = ":q<Enter>";
|
||||
"j" = ":next<Enter>";
|
||||
"k" = ":prev<Enter>";
|
||||
"<Up>" = ":prev<Enter>";
|
||||
"g" = ":select 0<Enter>";
|
||||
"G" = ":select -1<Enter>";
|
||||
"J" = ":next-folder<Enter>";
|
||||
"K" = ":prev-folder<Enter>";
|
||||
"v" = ":mark -t<Enter>";
|
||||
"V" = ":mark -v<Enter>";
|
||||
"<Space>" = ":read -t<Enter>";
|
||||
"T" = ":toggle-threads<Enter>";
|
||||
"<Enter>" = ":view<Enter>";
|
||||
"d" = ":prompt 'Really delete this message?' 'delete-message'<Enter>";
|
||||
"D" = ":delete<Enter>";
|
||||
"a" = ":archive flat<Enter>";
|
||||
"A" = ":unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>";
|
||||
"f" = ":flag -t<Enter>";
|
||||
"m" = ":compose<Enter>";
|
||||
"rr" = ":reply -a<Enter>";
|
||||
"rq" = ":reply -aq<Enter>";
|
||||
"Rr" = ":reply<Enter>";
|
||||
"Rq" = ":reply -q<Enter>";
|
||||
"c" = ":cf<space>";
|
||||
"$" = ":term<space>";
|
||||
"!" = ":term<space>";
|
||||
"|" = ":pipe<space>";
|
||||
"/" = ":search -a<space>";
|
||||
"\\" = ":filter -a <space>";
|
||||
"n" = ":next-result<Enter>";
|
||||
"N" = ":prev-result<Enter>";
|
||||
"<Esc>" = ":clear<Enter>";
|
||||
"s" = ":split<Enter>";
|
||||
"S" = ":vsplit<Enter>";
|
||||
"pl" = ":patch list<Enter>";
|
||||
"pa" = ":patch apply <Tab>";
|
||||
"pd" = ":patch drop <Tab>";
|
||||
"pb" = ":patch rebase<Enter>";
|
||||
"pt" = ":patch term<Enter>";
|
||||
"ps" = ":patch switch <Tab>";
|
||||
};
|
||||
view = {
|
||||
"/" = ":toggle-key-passthrough<Enter>/";
|
||||
"q" = ":close<Enter>";
|
||||
"O" = ":open<Enter>";
|
||||
"o" = ":open<Enter>";
|
||||
"S" = ":save<space>";
|
||||
"|" = ":pipe<space>";
|
||||
"D" = ":delete<Enter>";
|
||||
"A" = ":archive flat<Enter>";
|
||||
"<C-l>" = ":open-link <space>";
|
||||
"f" = ":flag -t<Enter>";
|
||||
"rr" = ":reply -a<Enter>";
|
||||
"rq" = ":reply -aq<Enter>";
|
||||
"Rr" = ":reply<Enter>";
|
||||
"Rq" = ":reply -q<Enter>";
|
||||
"H" = ":toggle-headers<Enter>";
|
||||
"<C-k>" = ":prev-part<Enter>";
|
||||
"<C-Up>" = ":prev-part<Enter>";
|
||||
"<C-j>" = ":next-part<Enter>";
|
||||
"<C-Down>" = ":next-part<Enter>";
|
||||
"J" = ":next<Enter>";
|
||||
"<C-Right>" = ":next<Enter>";
|
||||
"K" = ":prev<Enter>";
|
||||
"<C-Left>" = ":prev<Enter>";
|
||||
};
|
||||
"view::passthrough" = {
|
||||
"$noinherit" = "true";
|
||||
"$ex" = "<C-x>";
|
||||
"<Esc>" = ":toggle-key-passthrough<Enter>";
|
||||
};
|
||||
compose = {
|
||||
"$noinherit" = "true";
|
||||
"$ex" = "<C-x>";
|
||||
"$complete" = "<C-o>";
|
||||
"<C-k>" = ":prev-field<Enter>";
|
||||
"<C-Up>" = ":prev-field<Enter>";
|
||||
"<C-j>" = ":next-field<Enter>";
|
||||
"<C-Down>" = ":next-field<Enter>";
|
||||
"<A-p>" = ":switch-account -p<Enter>";
|
||||
"<C-Left>" = ":switch-account -p<Enter>";
|
||||
"<A-n>" = ":switch-account -n<Enter>";
|
||||
"<C-Right>" = ":switch-account -n<Enter>";
|
||||
"<tab>" = ":next-field<Enter>";
|
||||
"<backtab>" = ":prev-field<Enter>";
|
||||
"<C-p>" = ":prev-tab<Enter>";
|
||||
"<C-PgUp>" = ":prev-tab<Enter>";
|
||||
"<C-n>" = ":next-tab<Enter>";
|
||||
"<C-PgDn>" = ":next-tab<Enter>";
|
||||
};
|
||||
"compose::editor" = {
|
||||
"$noinherit" = "true";
|
||||
"$ex" = "<C-x>";
|
||||
"<C-k>" = ":prev-field<Enter>";
|
||||
"<C-Up>" = ":prev-field<Enter>";
|
||||
"<C-j>" = ":next-field<Enter>";
|
||||
"<C-Down>" = ":next-field<Enter>";
|
||||
"<C-p>" = ":prev-tab<Enter>";
|
||||
"<C-PgUp>" = ":prev-tab<Enter>";
|
||||
"<C-n>" = ":next-tab<Enter>";
|
||||
"<C-PgDn>" = ":next-tab<Enter>";
|
||||
};
|
||||
"compose::review" = {
|
||||
"y" = ":send<Enter>";
|
||||
"n" = ":abort<Enter>";
|
||||
"v" = ":preview<Enter>";
|
||||
"p" = ":postpone<Enter>";
|
||||
"q" = ":choose -o d discard abort -o p postpone postpone<Enter>";
|
||||
"e" = ":edit<Enter>";
|
||||
"a" = ":attach<space>";
|
||||
"d" = ":detach<space>";
|
||||
};
|
||||
terminal = {
|
||||
"$noinherit" = "true";
|
||||
"$ex" = "<C-x>";
|
||||
"<C-p>" = ":prev-tab<Enter>";
|
||||
"<C-n>" = ":next-tab<Enter>";
|
||||
"<C-PgUp>" = ":prev-tab<Enter>";
|
||||
"<C-PgDn>" = ":next-tab<Enter>";
|
||||
};
|
||||
};
|
||||
templates = {
|
||||
quoted_reply = ''
|
||||
{{(index .OriginalFrom 0).Name}}, {{dateFormat (.OriginalDate | toLocal) "Jan 02, 2006 at 15:04"}}:
|
||||
{{ if eq .OriginalMIMEType "text/html" -}}
|
||||
{{- exec `${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html` .OriginalText | quote -}}
|
||||
{{- else -}}
|
||||
{{- .OriginalText | quote -}}
|
||||
{{- end}}
|
||||
'';
|
||||
};
|
||||
extraConfig = {
|
||||
general = {
|
||||
term = "xterm-256color";
|
||||
unsafe-accounts-conf = true;
|
||||
};
|
||||
ui = {
|
||||
border-char-vertical = "│";
|
||||
border-char-horizontal = "─";
|
||||
styleset-name = "catppuccin-mocha";
|
||||
timestamp-format = "2006-01-02 15:04";
|
||||
sidebar-width = 30;
|
||||
mouse-enabled = true;
|
||||
dirlist-right = "{{if .Unread}}{{humanReadable .Unread}}{{end}}";
|
||||
dirlist-tree = true;
|
||||
};
|
||||
viewer = {
|
||||
pager = "${pkgs.neovim}/bin/nvim -u ${config.xdg.configHome}/nvim/aerc.lua";
|
||||
};
|
||||
compose = {address-book-cmd = ''notmuch address "%s"'';};
|
||||
multipart-converters = {
|
||||
"text/html" = "${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html";
|
||||
};
|
||||
filters = {
|
||||
"text/plain" = "cat";
|
||||
"text/calendar" = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
||||
"message/delivery-status" = "cat";
|
||||
"message/rfc822" = "cat";
|
||||
"text/html" = "${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html";
|
||||
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
||||
};
|
||||
};
|
||||
extraAccounts = {
|
||||
Zoho = {
|
||||
outgoing = "smtps://email%40thomasave.be@smtp.zoho.com";
|
||||
outgoing-cred-cmd = "cat ~/.secrets/Aerc/Zoho.key";
|
||||
source = "maildir:///home/server/Storage/Thomas/Mail/email@thomasave.be/";
|
||||
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||
check-mail-timeout = "60s";
|
||||
default = "Inbox";
|
||||
from = ''"Thomas Avé" <email@thomasave.be>'';
|
||||
cache-headers = true;
|
||||
};
|
||||
UAntwerpen = {
|
||||
outgoing = "ssh server@192.168.1.2 /home/server/Containers/mbsync/send.sh";
|
||||
source = "maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@uantwerpen.be";
|
||||
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||
check-mail-timeout = "60s";
|
||||
default = "Inbox";
|
||||
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
|
||||
cache-headers = true;
|
||||
};
|
||||
IMEC = {
|
||||
outgoing = "smtp+insecure://ave57%40imec.be@smtp.thomasave.be:1025";
|
||||
outgoing-cred-cmd = "cat ~/.secrets/Aerc/IMEC.key";
|
||||
source = "maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@imec.be/";
|
||||
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||
check-mail-timeout = "60s";
|
||||
default = "Inbox";
|
||||
from = ''"Thomas Avé" <Thomas.Ave@imec.be>'';
|
||||
cache-headers = true;
|
||||
};
|
||||
NotMuch = {
|
||||
source = "notmuch:///home/server/Storage/Thomas/Mail/";
|
||||
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||
check-mail-timeout = "60s";
|
||||
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
|
||||
query-map = "${config.xdg.configHome}/aerc/map.conf";
|
||||
default = "INBOX";
|
||||
cache-headers = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.file."${config.xdg.configHome}/aerc/map.conf".text =
|
||||
"Inbox=tag:inbox and not tag:archived and not tag:deleted";
|
||||
home.file."${config.xdg.configHome}/aerc/stylesets/catppuccin-mocha".text = ''
|
||||
home.file."${config.xdg.configHome}/aerc/map.conf".text = "Inbox=tag:inbox and not tag:archived and not tag:deleted";
|
||||
home.file."${config.xdg.configHome}/aerc/stylesets/catppuccin-mocha".text = ''
|
||||
*.default=true
|
||||
*.normal=true
|
||||
|
||||
|
|
@ -305,5 +295,5 @@
|
|||
diff_del.fg=#f38ba8
|
||||
quote_*.fg=#6c7086
|
||||
quote_1.fg=#9399b2
|
||||
'';
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,102 +1,99 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
lock-false = {
|
||||
Value = false;
|
||||
Status = "locked";
|
||||
};
|
||||
in
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
|
||||
pkcs11Modules = [
|
||||
pkgs.eid-mw
|
||||
];
|
||||
extraPolicies = {
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab"
|
||||
EnableTrackingProtection = {
|
||||
Value = true;
|
||||
Locked = true;
|
||||
Cryptomining = true;
|
||||
Fingerprinting = true;
|
||||
};
|
||||
ExtensionSettings = {
|
||||
"{3e4d2037-d300-4e95-859d-3cba866f46d3}" = {
|
||||
install_url =
|
||||
"https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = {
|
||||
install_url = "file://${./files/signed.xpi}";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
};
|
||||
Preferences = {
|
||||
"browser.disableResetPrompt" = true;
|
||||
"browser.download.panel.shown" = true;
|
||||
"browser.shell.checkDefaultBrowser" = false;
|
||||
"browser.tabs.inTitlebar" = 0;
|
||||
"browser.shell.defaultBrowserCheckCount" = 1;
|
||||
"browser.startup.homepage" = "https://start.duckduckgo.com";
|
||||
"browser.compactmode.show" = true;
|
||||
"browser.uidensity" = 1;
|
||||
"extensions.update.enabled" = false;
|
||||
"extensions.pocket.enabled" = lock-false;
|
||||
"extensions.autoDisableScopes" = 0;
|
||||
"browser.contentblocking.category" = {
|
||||
Value = "strict";
|
||||
Status = "locked";
|
||||
};
|
||||
"privacy.trackingprotection.enabled" = true;
|
||||
};
|
||||
};
|
||||
{pkgs, ...}: let
|
||||
lock-false = {
|
||||
Value = false;
|
||||
Status = "locked";
|
||||
};
|
||||
in {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
|
||||
pkcs11Modules = [
|
||||
pkgs.eid-mw
|
||||
];
|
||||
extraPolicies = {
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab"
|
||||
EnableTrackingProtection = {
|
||||
Value = true;
|
||||
Locked = true;
|
||||
Cryptomining = true;
|
||||
Fingerprinting = true;
|
||||
};
|
||||
profiles = {
|
||||
default = {
|
||||
id = 0;
|
||||
name = "default";
|
||||
isDefault = true;
|
||||
search = {
|
||||
force = true;
|
||||
default = "ddg";
|
||||
order = [ "ddg" "google" ];
|
||||
};
|
||||
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
ublock-origin
|
||||
bitwarden
|
||||
privacy-badger
|
||||
beyond-20
|
||||
display-_anchors
|
||||
facebook-container
|
||||
multi-account-containers
|
||||
istilldontcareaboutcookies
|
||||
return-youtube-dislikes
|
||||
sponsorblock
|
||||
unpaywall
|
||||
vimium
|
||||
google-container
|
||||
duckduckgo-privacy-essentials
|
||||
];
|
||||
};
|
||||
ExtensionSettings = {
|
||||
"{3e4d2037-d300-4e95-859d-3cba866f46d3}" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
"{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = {
|
||||
install_url = "file://${./files/signed.xpi}";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
};
|
||||
Preferences = {
|
||||
"browser.disableResetPrompt" = true;
|
||||
"browser.download.panel.shown" = true;
|
||||
"browser.shell.checkDefaultBrowser" = false;
|
||||
"browser.tabs.inTitlebar" = 0;
|
||||
"browser.shell.defaultBrowserCheckCount" = 1;
|
||||
"browser.startup.homepage" = "https://start.duckduckgo.com";
|
||||
"browser.compactmode.show" = true;
|
||||
"browser.uidensity" = 1;
|
||||
"extensions.update.enabled" = false;
|
||||
"extensions.pocket.enabled" = lock-false;
|
||||
"extensions.autoDisableScopes" = 0;
|
||||
"browser.contentblocking.category" = {
|
||||
Value = "strict";
|
||||
Status = "locked";
|
||||
};
|
||||
"privacy.trackingprotection.enabled" = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
profiles = {
|
||||
default = {
|
||||
id = 0;
|
||||
name = "default";
|
||||
isDefault = true;
|
||||
search = {
|
||||
force = true;
|
||||
default = "ddg";
|
||||
order = ["ddg" "google"];
|
||||
};
|
||||
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
ublock-origin
|
||||
bitwarden
|
||||
privacy-badger
|
||||
beyond-20
|
||||
display-_anchors
|
||||
facebook-container
|
||||
multi-account-containers
|
||||
istilldontcareaboutcookies
|
||||
return-youtube-dislikes
|
||||
sponsorblock
|
||||
unpaywall
|
||||
vimium
|
||||
google-container
|
||||
duckduckgo-privacy-essentials
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# xdg.mimeApps.defaultApplications = {
|
||||
# "application/json" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-htm" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-html" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-shtml" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-xhtml" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-xht" = [ "firefox.desktop" ];
|
||||
# "application/xhtml+xml" = [ "firefox.desktop" ];
|
||||
# "text/html" = [ "firefox.desktop" ];
|
||||
# "text/xml" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/about" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/ftp" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/http" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/unknown" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/https" = [ "firefox.desktop" ];
|
||||
# };
|
||||
# xdg.mimeApps.defaultApplications = {
|
||||
# "application/json" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-htm" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-html" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-shtml" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-xhtml" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-xht" = [ "firefox.desktop" ];
|
||||
# "application/xhtml+xml" = [ "firefox.desktop" ];
|
||||
# "text/html" = [ "firefox.desktop" ];
|
||||
# "text/xml" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/about" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/ftp" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/http" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/unknown" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/https" = [ "firefox.desktop" ];
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,38 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
server.enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
font = "DejaVu Sans Mono:size=13";
|
||||
term = "xterm-256color";
|
||||
line-height = "18";
|
||||
};
|
||||
tweak = {
|
||||
sixel = "yes";
|
||||
};
|
||||
scrollback.lines = 100000;
|
||||
colors = {
|
||||
background = "000010";
|
||||
foreground = "F8F8F2";
|
||||
regular0 = "121212";
|
||||
regular1 = "fa2573";
|
||||
regular2 = "97e123";
|
||||
regular3 = "dfd460";
|
||||
regular4 = "0f7fcf";
|
||||
regular5 = "8700ff";
|
||||
regular6 = "42a7cf";
|
||||
regular7 = "bbbbbb";
|
||||
bright0 = "555556";
|
||||
bright1 = "f5669c";
|
||||
bright2 = "b0e05e";
|
||||
bright3 = "fef26c";
|
||||
bright4 = "00afff";
|
||||
bright5 = "af87ff";
|
||||
bright6 = "50cdfe";
|
||||
bright7 = "ffffff";
|
||||
alpha = "0.3";
|
||||
};
|
||||
};
|
||||
{...}: {
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
server.enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
font = "DejaVu Sans Mono:size=13";
|
||||
term = "xterm-256color";
|
||||
line-height = "18";
|
||||
};
|
||||
tweak = {
|
||||
sixel = "yes";
|
||||
};
|
||||
scrollback.lines = 100000;
|
||||
colors-dark = {
|
||||
background = "000010";
|
||||
foreground = "F8F8F2";
|
||||
regular0 = "121212";
|
||||
regular1 = "fa2573";
|
||||
regular2 = "97e123";
|
||||
regular3 = "dfd460";
|
||||
regular4 = "0f7fcf";
|
||||
regular5 = "8700ff";
|
||||
regular6 = "42a7cf";
|
||||
regular7 = "bbbbbb";
|
||||
bright0 = "555556";
|
||||
bright1 = "f5669c";
|
||||
bright2 = "b0e05e";
|
||||
bright3 = "fef26c";
|
||||
bright4 = "00afff";
|
||||
bright5 = "af87ff";
|
||||
bright6 = "50cdfe";
|
||||
bright7 = "ffffff";
|
||||
alpha = "0.3";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,45 +1,43 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.ghostty= {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
installVimSyntax = true;
|
||||
themes = {
|
||||
personal = {
|
||||
background-opacity = 0.3;
|
||||
foreground = "#F8F8F2";
|
||||
background = "#000010";
|
||||
selection-foreground = "#121212";
|
||||
selection-background = "#b4d5ff";
|
||||
cursor-color = "#bbbbbb";
|
||||
palette = [
|
||||
"0=#121212"
|
||||
"8=#545454"
|
||||
"1=#fa2573"
|
||||
"9=#f5669c"
|
||||
"2=#97e123"
|
||||
"10=#b0e05e"
|
||||
"3=#dfd460"
|
||||
"11=#fef26c"
|
||||
"4=#0f7fcf"
|
||||
"12=#00afff"
|
||||
"5=#8700ff"
|
||||
"13=#af87ff"
|
||||
"6=#42a7cf"
|
||||
"14=#50cdfe"
|
||||
"7=#bbbbbb"
|
||||
"15=#ffffff"
|
||||
];
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
resize-overlay = "never";
|
||||
theme = "personal";
|
||||
font-size = 13;
|
||||
font-family = "JetBrains Mono";
|
||||
window-decoration = false;
|
||||
# adjust-cell-height = "10%";
|
||||
|
||||
};
|
||||
{...}: {
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
installVimSyntax = true;
|
||||
themes = {
|
||||
personal = {
|
||||
background-opacity = 0.3;
|
||||
foreground = "#F8F8F2";
|
||||
background = "#000010";
|
||||
selection-foreground = "#121212";
|
||||
selection-background = "#b4d5ff";
|
||||
cursor-color = "#bbbbbb";
|
||||
palette = [
|
||||
"0=#121212"
|
||||
"8=#545454"
|
||||
"1=#fa2573"
|
||||
"9=#f5669c"
|
||||
"2=#97e123"
|
||||
"10=#b0e05e"
|
||||
"3=#dfd460"
|
||||
"11=#fef26c"
|
||||
"4=#0f7fcf"
|
||||
"12=#00afff"
|
||||
"5=#8700ff"
|
||||
"13=#af87ff"
|
||||
"6=#42a7cf"
|
||||
"14=#50cdfe"
|
||||
"7=#bbbbbb"
|
||||
"15=#ffffff"
|
||||
];
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
resize-overlay = "never";
|
||||
theme = "personal";
|
||||
font-size = 13;
|
||||
font-family = "JetBrains Mono";
|
||||
window-decoration = false;
|
||||
# adjust-cell-height = "10%";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,43 +1,41 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
lfs.enable = true;
|
||||
settings = {
|
||||
alias = {
|
||||
s = "status";
|
||||
a = "add";
|
||||
};
|
||||
user = {
|
||||
name = "Thomas Avé";
|
||||
email = "email@thomasave.be";
|
||||
};
|
||||
credentials.helper = "store";
|
||||
pull.rebase = false;
|
||||
push.autoSetupRemove = true;
|
||||
branch.autoSetupMerge = true;
|
||||
init.defaultBranch = "master";
|
||||
diff.noprefix = true;
|
||||
color.ui = "auto";
|
||||
core = {
|
||||
excludesfile = "~/.gitignore";
|
||||
editor = "${pkgs.neovim}/bin/nvim";
|
||||
};
|
||||
rerere.enabled = true;
|
||||
};
|
||||
ignores = [
|
||||
"*.direnv/"
|
||||
".dmypy.json"
|
||||
];
|
||||
{pkgs, ...}: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
lfs.enable = true;
|
||||
settings = {
|
||||
alias = {
|
||||
s = "status";
|
||||
a = "add";
|
||||
};
|
||||
user = {
|
||||
name = "Thomas Avé";
|
||||
email = "email@thomasave.be";
|
||||
};
|
||||
credentials.helper = "store";
|
||||
pull.rebase = false;
|
||||
push.autoSetupRemove = true;
|
||||
branch.autoSetupMerge = true;
|
||||
init.defaultBranch = "master";
|
||||
diff.noprefix = true;
|
||||
color.ui = "auto";
|
||||
core = {
|
||||
excludesfile = "~/.gitignore";
|
||||
editor = "${pkgs.neovim}/bin/nvim";
|
||||
};
|
||||
rerere.enabled = true;
|
||||
};
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
os = {
|
||||
editPreset = "nvim";
|
||||
autoStageResolvedConflicts = false;
|
||||
};
|
||||
};
|
||||
ignores = [
|
||||
"*.direnv/"
|
||||
".dmypy.json"
|
||||
];
|
||||
};
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
os = {
|
||||
editPreset = "nvim";
|
||||
autoStageResolvedConflicts = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,59 +1,58 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = [
|
||||
(pkgs.appimageTools.wrapType2 {
|
||||
pname = "Helium";
|
||||
version = "0.4.7.1";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/imputnet/helium-linux/releases/download/0.8.5.1/helium-0.8.5.1-x86_64.AppImage";
|
||||
sha256 = "sha256-jFSLLDsHB/NiJqFmn8S+JpdM8iCy3Zgyq+8l4RkBecM=";
|
||||
};
|
||||
})
|
||||
];
|
||||
xdg.desktopEntries = {
|
||||
helium = {
|
||||
name = "Helium";
|
||||
genericName = "Web Browser";
|
||||
comment = "Access the Internet";
|
||||
exec = "Helium --enable-features=TouchpadOverscrollHistoryNavigation %U";
|
||||
startupNotify = true;
|
||||
terminal = false;
|
||||
icon = "chromium";
|
||||
type = "Application";
|
||||
categories = [ "Network" "WebBrowser" ];
|
||||
mimeType = [
|
||||
"x-scheme-handler/webcal"
|
||||
"application/pdf"
|
||||
"application/rdf+xml"
|
||||
"application/rss+xml"
|
||||
"application/xhtml+xml"
|
||||
"application/xhtml_xml"
|
||||
"application/xml"
|
||||
"image/gif"
|
||||
"image/jpeg"
|
||||
"image/png"
|
||||
"image/webp"
|
||||
"text/html"
|
||||
"text/xml"
|
||||
"x-scheme-handler/http"
|
||||
"x-scheme-handler/https"
|
||||
];
|
||||
};
|
||||
};
|
||||
xdg.mimeApps.defaultApplications = {
|
||||
"application/json" = [ "helium.desktop" ];
|
||||
"application/x-extension-htm" = [ "helium.desktop" ];
|
||||
"application/x-extension-html" = [ "helium.desktop" ];
|
||||
"application/x-extension-shtml" = [ "helium.desktop" ];
|
||||
"application/x-extension-xhtml" = [ "helium.desktop" ];
|
||||
"application/x-extension-xht" = [ "helium.desktop" ];
|
||||
"application/xhtml+xml" = [ "helium.desktop" ];
|
||||
"text/html" = [ "helium.desktop" ];
|
||||
"text/xml" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/about" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/ftp" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/http" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/unknown" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/https" = [ "helium.desktop" ];
|
||||
{pkgs, ...}: {
|
||||
home.packages = [
|
||||
(pkgs.appimageTools.wrapType2 {
|
||||
pname = "Helium";
|
||||
version = "0.4.7.1";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/imputnet/helium-linux/releases/download/0.8.5.1/helium-0.8.5.1-x86_64.AppImage";
|
||||
sha256 = "sha256-jFSLLDsHB/NiJqFmn8S+JpdM8iCy3Zgyq+8l4RkBecM=";
|
||||
};
|
||||
})
|
||||
];
|
||||
xdg.desktopEntries = {
|
||||
helium = {
|
||||
name = "Helium";
|
||||
genericName = "Web Browser";
|
||||
comment = "Access the Internet";
|
||||
exec = "Helium --enable-features=TouchpadOverscrollHistoryNavigation %U";
|
||||
startupNotify = true;
|
||||
terminal = false;
|
||||
icon = "chromium";
|
||||
type = "Application";
|
||||
categories = ["Network" "WebBrowser"];
|
||||
mimeType = [
|
||||
"x-scheme-handler/webcal"
|
||||
"application/pdf"
|
||||
"application/rdf+xml"
|
||||
"application/rss+xml"
|
||||
"application/xhtml+xml"
|
||||
"application/xhtml_xml"
|
||||
"application/xml"
|
||||
"image/gif"
|
||||
"image/jpeg"
|
||||
"image/png"
|
||||
"image/webp"
|
||||
"text/html"
|
||||
"text/xml"
|
||||
"x-scheme-handler/http"
|
||||
"x-scheme-handler/https"
|
||||
];
|
||||
};
|
||||
};
|
||||
xdg.mimeApps.defaultApplications = {
|
||||
"application/json" = ["helium.desktop"];
|
||||
"application/x-extension-htm" = ["helium.desktop"];
|
||||
"application/x-extension-html" = ["helium.desktop"];
|
||||
"application/x-extension-shtml" = ["helium.desktop"];
|
||||
"application/x-extension-xhtml" = ["helium.desktop"];
|
||||
"application/x-extension-xht" = ["helium.desktop"];
|
||||
"application/xhtml+xml" = ["helium.desktop"];
|
||||
"text/html" = ["helium.desktop"];
|
||||
"text/xml" = ["helium.desktop"];
|
||||
"x-scheme-handler/about" = ["helium.desktop"];
|
||||
"x-scheme-handler/ftp" = ["helium.desktop"];
|
||||
"x-scheme-handler/http" = ["helium.desktop"];
|
||||
"x-scheme-handler/unknown" = ["helium.desktop"];
|
||||
"x-scheme-handler/https" = ["helium.desktop"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,297 +1,297 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||
nautilus = "${pkgs.nautilus}/bin/nautilus";
|
||||
gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
||||
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
||||
terminal-name = "foot";
|
||||
terminal = "${pkgs.foot}/bin/footclient";
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
{pkgs, ...}: let
|
||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||
nautilus = "${pkgs.nautilus}/bin/nautilus";
|
||||
gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
||||
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
||||
terminal-name = "foot";
|
||||
terminal = "${pkgs.foot}/bin/footclient";
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
|
||||
# Disable split-monitor-workspaces
|
||||
workspace_command_prefix = "";
|
||||
hyprland_plugins = [];
|
||||
# Disable split-monitor-workspaces
|
||||
workspace_command_prefix = "";
|
||||
hyprland_plugins = [];
|
||||
|
||||
launch_terminal = pkgs.writeShellScriptBin "launch_terminal" ''
|
||||
function find_leaf_pid(){
|
||||
local PID
|
||||
local RET
|
||||
local NAME
|
||||
PID=$1
|
||||
for CHILD_PID in $(pgrep -P "$PID"); do
|
||||
RET=$(find_leaf_pid "$CHILD_PID")
|
||||
if [ "$RET" != "" ]; then
|
||||
PID="$RET"
|
||||
fi
|
||||
done
|
||||
NAME=$(ps -p "$PID" -o comm=)
|
||||
if [ "$NAME" == "zsh" ]; then
|
||||
echo "$PID"
|
||||
elif [ "$NAME" == "ssh" ]; then
|
||||
echo "$PID"
|
||||
launch_terminal = pkgs.writeShellScriptBin "launch_terminal" ''
|
||||
function find_leaf_pid(){
|
||||
local PID
|
||||
local RET
|
||||
local NAME
|
||||
PID=$1
|
||||
for CHILD_PID in $(pgrep -P "$PID"); do
|
||||
RET=$(find_leaf_pid "$CHILD_PID")
|
||||
if [ "$RET" != "" ]; then
|
||||
PID="$RET"
|
||||
fi
|
||||
}
|
||||
done
|
||||
NAME=$(ps -p "$PID" -o comm=)
|
||||
if [ "$NAME" == "zsh" ]; then
|
||||
echo "$PID"
|
||||
elif [ "$NAME" == "ssh" ]; then
|
||||
echo "$PID"
|
||||
fi
|
||||
}
|
||||
|
||||
LEAF_PID=$(find_leaf_pid "$1")
|
||||
if [ "$(ps -p "$LEAF_PID" -o comm=)" == "ssh" ]; then
|
||||
SSH_COMMAND=$(ps -p "$LEAF_PID" -o args --no-headers)
|
||||
if [[ "$SSH_COMMAND" == *"waypipe"* ]]; then
|
||||
CLIENT=$(echo "$SSH_COMMAND" | awk '{ print $5 }')
|
||||
PREVIOUS_SESSION_ID=$(grep -z "SSH_SESSION_ID" "/proc/$LEAF_PID/environ" | xargs -0 -n 1 | grep -oP "[0-9]*")
|
||||
SSH_SESSION_ID=$RANDOM
|
||||
${terminal} -e zsh -c "SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t \"$CLIENT\" env SSH_SESSION_ID=\"$SSH_SESSION_ID\" PREVIOUS_SESSION_ID=\"$PREVIOUS_SESSION_ID\" \"zsh --login\""
|
||||
else
|
||||
${terminal} -e zsh -c "ssh -t \"$(echo "$SSH_COMMAND" | awk '{ print $2 }')\""
|
||||
fi
|
||||
LEAF_PID=$(find_leaf_pid "$1")
|
||||
if [ "$(ps -p "$LEAF_PID" -o comm=)" == "ssh" ]; then
|
||||
SSH_COMMAND=$(ps -p "$LEAF_PID" -o args --no-headers)
|
||||
if [[ "$SSH_COMMAND" == *"waypipe"* ]]; then
|
||||
CLIENT=$(echo "$SSH_COMMAND" | awk '{ print $5 }')
|
||||
PREVIOUS_SESSION_ID=$(grep -z "SSH_SESSION_ID" "/proc/$LEAF_PID/environ" | xargs -0 -n 1 | grep -oP "[0-9]*")
|
||||
SSH_SESSION_ID=$RANDOM
|
||||
${terminal} -e zsh -c "SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t \"$CLIENT\" env SSH_SESSION_ID=\"$SSH_SESSION_ID\" PREVIOUS_SESSION_ID=\"$PREVIOUS_SESSION_ID\" \"zsh --login\""
|
||||
else
|
||||
${terminal} -e zsh -c "ssh -t \"$(echo "$SSH_COMMAND" | awk '{ print $2 }')\""
|
||||
fi
|
||||
|
||||
else # Not an ssh session
|
||||
if [ "$(ps -p "$1" -o comm=)" == "${terminal-name}" ]; then
|
||||
CWD=$(readlink -e /proc/"$LEAF_PID"/cwd)
|
||||
if [ "$CWD" != "" ]; then
|
||||
${terminal} --working-directory "$CWD"
|
||||
else
|
||||
${terminal}
|
||||
fi
|
||||
else # Not an ssh session
|
||||
if [ "$(ps -p "$1" -o comm=)" == "${terminal-name}" ]; then
|
||||
CWD=$(readlink -e /proc/"$LEAF_PID"/cwd)
|
||||
if [ "$CWD" != "" ]; then
|
||||
${terminal} --working-directory "$CWD"
|
||||
else
|
||||
${terminal}
|
||||
fi
|
||||
else
|
||||
${terminal}
|
||||
fi
|
||||
'';
|
||||
fi
|
||||
'';
|
||||
in {
|
||||
home.packages = [
|
||||
pkgs.wl-clipboard
|
||||
pkgs.jq
|
||||
];
|
||||
services.hyprpaper = {
|
||||
enable = true;
|
||||
settings = {
|
||||
ipc = "on";
|
||||
splash = false;
|
||||
wallpaper = {
|
||||
path = "${./files/wallpaper.png}";
|
||||
monitor = "";
|
||||
};
|
||||
};
|
||||
home.packages = [
|
||||
pkgs.wl-clipboard
|
||||
pkgs.jq
|
||||
];
|
||||
services.hyprpaper = {
|
||||
enable = true;
|
||||
settings = {
|
||||
ipc = "on";
|
||||
splash = false;
|
||||
wallpaper = {
|
||||
path = "${./files/wallpaper.png}";
|
||||
monitor = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
settings = {
|
||||
input-field = [
|
||||
{
|
||||
size = "200, 50";
|
||||
position = "0, -80";
|
||||
monitor = "";
|
||||
dots_center = true;
|
||||
fade_on_empty = true;
|
||||
font_color = "rgb(202, 211, 245)";
|
||||
inner_color = "rgb(91, 96, 120)";
|
||||
outer_color = "rgb(24, 25, 38)";
|
||||
outline_thickness = 3;
|
||||
placeholder_text = "<span foreground=\"##cad3f5\">Password...</span>";
|
||||
shadow_passes = 2;
|
||||
}
|
||||
];
|
||||
general = {
|
||||
no_fade_in = false;
|
||||
};
|
||||
background = [
|
||||
{
|
||||
path = "screenshot";
|
||||
blur_passes = 3;
|
||||
blur_size = 8;
|
||||
}
|
||||
];
|
||||
};
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
settings = {
|
||||
input-field = [
|
||||
{
|
||||
size = "200, 50";
|
||||
position = "0, -80";
|
||||
monitor = "";
|
||||
dots_center = true;
|
||||
fade_on_empty = true;
|
||||
font_color = "rgb(202, 211, 245)";
|
||||
inner_color = "rgb(91, 96, 120)";
|
||||
outer_color = "rgb(24, 25, 38)";
|
||||
outline_thickness = 3;
|
||||
placeholder_text = "<span foreground=\"##cad3f5\">Password...</span>";
|
||||
shadow_passes = 2;
|
||||
}
|
||||
];
|
||||
general = {
|
||||
no_fade_in = false;
|
||||
};
|
||||
background = [
|
||||
{
|
||||
path = "screenshot";
|
||||
blur_passes = 3;
|
||||
blur_size = 8;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
systemd.enable = false;
|
||||
xwayland.enable = true;
|
||||
plugins = [ ] ++ hyprland_plugins;
|
||||
settings = {
|
||||
"$mainMod" = pkgs.lib.mkDefault "SUPER_L";
|
||||
"$altMod" = pkgs.lib.mkDefault "ALT_L";
|
||||
exec-once = [
|
||||
"uwsm app -- hyprpaper"
|
||||
"uwsm app -- foot --server"
|
||||
"uwsm app -- hyprctl dispatch exec ags run"
|
||||
"uwsm app -- ${pkgs.mate.mate-polkit}/bin/polkit-mate"
|
||||
];
|
||||
env = [
|
||||
"WLR_NO_HARDWARE_CURSORS,1"
|
||||
"TERMINAL,${terminal}"
|
||||
"WLR_RENDERER_ALLOW_SOFTWARE,1"
|
||||
];
|
||||
debug = { disable_logs = false; };
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
systemd.enable = false;
|
||||
xwayland.enable = true;
|
||||
plugins = [] ++ hyprland_plugins;
|
||||
settings = {
|
||||
"$mainMod" = pkgs.lib.mkDefault "SUPER_L";
|
||||
"$altMod" = pkgs.lib.mkDefault "ALT_L";
|
||||
exec-once = [
|
||||
"uwsm app -- hyprpaper"
|
||||
"uwsm app -- foot --server"
|
||||
"uwsm app -- hyprctl dispatch exec ags run"
|
||||
"uwsm app -- ${pkgs.mate.mate-polkit}/bin/polkit-mate"
|
||||
];
|
||||
env = [
|
||||
"WLR_NO_HARDWARE_CURSORS,1"
|
||||
"TERMINAL,${terminal}"
|
||||
"WLR_RENDERER_ALLOW_SOFTWARE,1"
|
||||
];
|
||||
debug = {disable_logs = false;};
|
||||
|
||||
# UPDATED: New Window Rule Syntax (0.53.0)
|
||||
windowrule = [
|
||||
"float on, match:title ^(rofi)(.*)$"
|
||||
"center on, match:title ^(rofi)(.*)$"
|
||||
"border_size 0, match:title ^(rofi)(.*)$" # 'noborder' is replaced by border_size 0
|
||||
# UPDATED: New Window Rule Syntax (0.53.0)
|
||||
windowrule = [
|
||||
"float on, match:title ^(rofi)(.*)$"
|
||||
"center on, match:title ^(rofi)(.*)$"
|
||||
"border_size 0, match:title ^(rofi)(.*)$" # 'noborder' is replaced by border_size 0
|
||||
|
||||
# Combined matches (replaces old multi-rule logic)
|
||||
"stay_focused on, match:title ^()$, match:class ^(steam)$"
|
||||
"min_size 1 1, match:title ^()$, match:class ^(steam)$"
|
||||
"stay_focused on, match:title ^()$, match:class ^(steam)$"
|
||||
# Combined matches (replaces old multi-rule logic)
|
||||
"stay_focused on, match:title ^()$, match:class ^(steam)$"
|
||||
"min_size 1 1, match:title ^()$, match:class ^(steam)$"
|
||||
"stay_focused on, match:title ^()$, match:class ^(steam)$"
|
||||
|
||||
"workspace 8, match:class thunderbird"
|
||||
"workspace 9, match:class spotify"
|
||||
"workspace 10, match:class Slack"
|
||||
"workspace 8, match:class thunderbird"
|
||||
"workspace 9, match:class spotify"
|
||||
"workspace 10, match:class Slack"
|
||||
|
||||
# Windowrulev2-style logic updated to new prop syntax
|
||||
"border_size 0, match:float 0, match:workspace w[tv1]"
|
||||
"rounding 0, match:float 0, match:workspace w[tv1]"
|
||||
"border_size 0, match:float 0, match:workspace f[1]"
|
||||
"rounding 0, match:float 0, match:workspace f[1]"
|
||||
];
|
||||
# Windowrulev2-style logic updated to new prop syntax
|
||||
"border_size 0, match:float 0, match:workspace w[tv1]"
|
||||
"rounding 0, match:float 0, match:workspace w[tv1]"
|
||||
"border_size 0, match:float 0, match:workspace f[1]"
|
||||
"rounding 0, match:float 0, match:workspace f[1]"
|
||||
];
|
||||
|
||||
# UPDATED: New Layer Rule Syntax (0.53.0)
|
||||
# Syntax: effect value, match:namespace regex
|
||||
layerrule = [
|
||||
"no_anim on, match:namespace ags_bar_0"
|
||||
"no_anim on, match:namespace selection"
|
||||
"blur on, match:namespace vicinae"
|
||||
"ignore_alpha 0, match:namespace vicinae"
|
||||
"no_anim on, match:namespace vicinae"
|
||||
];
|
||||
# UPDATED: New Layer Rule Syntax (0.53.0)
|
||||
# Syntax: effect value, match:namespace regex
|
||||
layerrule = [
|
||||
"no_anim on, match:namespace ags_bar_0"
|
||||
"no_anim on, match:namespace selection"
|
||||
"blur on, match:namespace vicinae"
|
||||
"ignore_alpha 0, match:namespace vicinae"
|
||||
"no_anim on, match:namespace vicinae"
|
||||
];
|
||||
|
||||
general = {
|
||||
gaps_in = 1;
|
||||
gaps_out = pkgs.lib.mkDefault 5;
|
||||
border_size = 2;
|
||||
"col.active_border" = "rgba(002f5fee)";
|
||||
"col.inactive_border" = "rgba(ffffff00)";
|
||||
layout = "dwindle";
|
||||
};
|
||||
input = {
|
||||
kb_layout = "us";
|
||||
follow_mouse = 1;
|
||||
kb_options = pkgs.lib.mkDefault "compose:rctrl, caps:ctrl_modifier";
|
||||
numlock_by_default = true;
|
||||
};
|
||||
binds = { scroll_event_delay = 1; };
|
||||
xwayland = { force_zero_scaling = true; };
|
||||
misc = {
|
||||
disable_hyprland_logo = 1;
|
||||
# Removed 'enable_anr_dialog' (deprecated/removed in recent versions)
|
||||
};
|
||||
decoration = {
|
||||
rounding = 1;
|
||||
blur = { enabled = false; };
|
||||
};
|
||||
animations = {
|
||||
enabled = "yes";
|
||||
bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
|
||||
animation = [
|
||||
"windows, 1, 2, myBezier"
|
||||
"windowsOut, 1, 2, default, popin 80%"
|
||||
"border, 1, 2, default"
|
||||
"borderangle, 1, 2, default"
|
||||
"fade, 1, 2, default"
|
||||
"workspaces, 1, 1, default"
|
||||
];
|
||||
};
|
||||
dwindle = {
|
||||
preserve_split = "yes";
|
||||
force_split = 2;
|
||||
};
|
||||
general = {
|
||||
gaps_in = 1;
|
||||
gaps_out = pkgs.lib.mkDefault 5;
|
||||
border_size = 2;
|
||||
"col.active_border" = "rgba(002f5fee)";
|
||||
"col.inactive_border" = "rgba(ffffff00)";
|
||||
layout = "dwindle";
|
||||
};
|
||||
input = {
|
||||
kb_layout = "us";
|
||||
follow_mouse = 1;
|
||||
kb_options = pkgs.lib.mkDefault "compose:rctrl, caps:ctrl_modifier";
|
||||
numlock_by_default = true;
|
||||
};
|
||||
binds = {scroll_event_delay = 1;};
|
||||
xwayland = {force_zero_scaling = true;};
|
||||
misc = {
|
||||
disable_hyprland_logo = 1;
|
||||
# Removed 'enable_anr_dialog' (deprecated/removed in recent versions)
|
||||
};
|
||||
decoration = {
|
||||
rounding = 1;
|
||||
blur = {enabled = false;};
|
||||
};
|
||||
animations = {
|
||||
enabled = "yes";
|
||||
bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
|
||||
animation = [
|
||||
"windows, 1, 2, myBezier"
|
||||
"windowsOut, 1, 2, default, popin 80%"
|
||||
"border, 1, 2, default"
|
||||
"borderangle, 1, 2, default"
|
||||
"fade, 1, 2, default"
|
||||
"workspaces, 1, 1, default"
|
||||
];
|
||||
};
|
||||
dwindle = {
|
||||
preserve_split = "yes";
|
||||
force_split = 2;
|
||||
};
|
||||
|
||||
gesture = [
|
||||
"3, horizontal, workspace"
|
||||
];
|
||||
gestures = {
|
||||
workspace_swipe_invert = false;
|
||||
};
|
||||
device = [
|
||||
{
|
||||
name = "tpps/2-ibm-trackpoint";
|
||||
sensitivity = "+0.5";
|
||||
}
|
||||
{
|
||||
name = "synaptics-tm3276-022";
|
||||
sensitivity = "+0.5";
|
||||
}
|
||||
];
|
||||
workspace = [
|
||||
"w[tv1], gapsout:0, gapsin:0"
|
||||
"f[1], gapsout:0, gapsin:0"
|
||||
];
|
||||
bindr = [
|
||||
"$mainMod, $mainMod, exec, vicinae toggle"
|
||||
];
|
||||
bindm = [
|
||||
"$mainMod, mouse:272, movewindow"
|
||||
"$mainMod, mouse:273, resizewindow"
|
||||
];
|
||||
binde = [
|
||||
"$mainMod $altMod, L, resizeactive, 20 0"
|
||||
"$mainMod $altMod, H, resizeactive, -20 0"
|
||||
"$mainMod $altMod, K, resizeactive, 0 -20"
|
||||
"$mainMod $altMod, J, resizeactive, 0 20"
|
||||
];
|
||||
bind = [
|
||||
"$mainMod, return, exec, ${launch_terminal}/bin/launch_terminal $(hyprctl activewindow -j | ${jq} .pid)"
|
||||
"$mainMod SHIFT, return, exec, ${terminal}"
|
||||
"$mainMod, Q, killactive,"
|
||||
"$mainMod, A, exec, ${nautilus}"
|
||||
"$mainMod, S, exec, LC_TIME=\"en_GB.UTF-8\" ${gnome-calendar}"
|
||||
"$mainMod, B, exec, Helium"
|
||||
"$mainMod, M, fullscreen, 1"
|
||||
"$mainMod, F11, fullscreen"
|
||||
"$mainMod, F, togglefloating,"
|
||||
"$mainMod, SPACE, layoutmsg, togglesplit"
|
||||
"CONTROL_L ALT_L, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
||||
"$mainMod, C, exec, vicinae vicinae://extensions/vicinae/clipboard/history"
|
||||
"$mainMod, N, exec, vicinae vicinae://extensions/vicinae/wm/switch-windows"
|
||||
"$mainMod, Escape, exec, vicinae open -q \"Power Management \""
|
||||
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%"
|
||||
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-"
|
||||
",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0"
|
||||
",XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%-"
|
||||
",XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
|
||||
# ",mouse:273, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0"
|
||||
# ",mouse:272, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-"
|
||||
",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
",XF86AudioNext, exec, ${playerctl} next"
|
||||
",XF86AudioPrev, exec, ${playerctl} previous"
|
||||
"$mainMod,XF86AudioMute, exec, ${playerctl} play-pause"
|
||||
"$mainMod,XF86AudioRaiseVolume, exec, ${playerctl} next"
|
||||
"$mainMod,XF86AudioLowerVolume, exec, ${playerctl} previous"
|
||||
'', Print, exec, ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp -d)" - | wl-copy''
|
||||
'', Pause, exec, systemctl suspend''
|
||||
'', XF86Calculator, exec, systemctl suspend''
|
||||
gesture = [
|
||||
"3, horizontal, workspace"
|
||||
];
|
||||
gestures = {
|
||||
workspace_swipe_invert = false;
|
||||
};
|
||||
device = [
|
||||
{
|
||||
name = "tpps/2-ibm-trackpoint";
|
||||
sensitivity = "+0.5";
|
||||
}
|
||||
{
|
||||
name = "synaptics-tm3276-022";
|
||||
sensitivity = "+0.5";
|
||||
}
|
||||
];
|
||||
workspace = [
|
||||
"w[tv1], gapsout:0, gapsin:0"
|
||||
"f[1], gapsout:0, gapsin:0"
|
||||
];
|
||||
bindr = [
|
||||
"$mainMod, $mainMod, exec, vicinae toggle"
|
||||
];
|
||||
bindm = [
|
||||
"$mainMod, mouse:272, movewindow"
|
||||
"$mainMod, mouse:273, resizewindow"
|
||||
];
|
||||
binde = [
|
||||
"$mainMod $altMod, L, resizeactive, 20 0"
|
||||
"$mainMod $altMod, H, resizeactive, -20 0"
|
||||
"$mainMod $altMod, K, resizeactive, 0 -20"
|
||||
"$mainMod $altMod, J, resizeactive, 0 20"
|
||||
];
|
||||
bind =
|
||||
[
|
||||
"$mainMod, return, exec, ${launch_terminal}/bin/launch_terminal $(hyprctl activewindow -j | ${jq} .pid)"
|
||||
"$mainMod SHIFT, return, exec, ${terminal}"
|
||||
"$mainMod, Q, killactive,"
|
||||
"$mainMod, A, exec, ${nautilus}"
|
||||
"$mainMod, S, exec, LC_TIME=\"en_GB.UTF-8\" ${gnome-calendar}"
|
||||
"$mainMod, B, exec, Helium"
|
||||
"$mainMod, M, fullscreen, 1"
|
||||
"$mainMod, F11, fullscreen"
|
||||
"$mainMod, F, togglefloating,"
|
||||
"$mainMod, SPACE, layoutmsg, togglesplit"
|
||||
"CONTROL_L ALT_L, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
||||
"$mainMod, C, exec, vicinae vicinae://extensions/vicinae/clipboard/history"
|
||||
"$mainMod, N, exec, vicinae vicinae://extensions/vicinae/wm/switch-windows"
|
||||
"$mainMod, Escape, exec, vicinae open -q \"Power Management \""
|
||||
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%"
|
||||
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-"
|
||||
",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0"
|
||||
",XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%-"
|
||||
",XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
|
||||
# ",mouse:273, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0"
|
||||
# ",mouse:272, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-"
|
||||
",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
",XF86AudioNext, exec, ${playerctl} next"
|
||||
",XF86AudioPrev, exec, ${playerctl} previous"
|
||||
"$mainMod,XF86AudioMute, exec, ${playerctl} play-pause"
|
||||
"$mainMod,XF86AudioRaiseVolume, exec, ${playerctl} next"
|
||||
"$mainMod,XF86AudioLowerVolume, exec, ${playerctl} previous"
|
||||
'', Print, exec, ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp -d)" - | wl-copy''
|
||||
'', Pause, exec, systemctl suspend''
|
||||
'', XF86Calculator, exec, systemctl suspend''
|
||||
|
||||
"$mainMod, H, exec, ${./files/vim-hypr-nav.sh} l"
|
||||
"$mainMod, L, exec, ${./files/vim-hypr-nav.sh} r"
|
||||
"$mainMod, K, exec, ${./files/vim-hypr-nav.sh} u"
|
||||
"$mainMod, J, exec, ${./files/vim-hypr-nav.sh} d"
|
||||
"$mainMod CONTROL_L, H, swapwindow, l"
|
||||
"$mainMod CONTROL_L, L, swapwindow, r"
|
||||
"$mainMod CONTROL_L, K, swapwindow, u"
|
||||
"$mainMod CONTROL_L, J, swapwindow, d"
|
||||
"$mainMod SHIFT, H, movewindow, l"
|
||||
"$mainMod SHIFT, L, movewindow, r"
|
||||
"$mainMod SHIFT, K, movewindow, u"
|
||||
"$mainMod SHIFT, J, movewindow, d"
|
||||
"$mainMod SHIFT, T, ${workspace_command_prefix}movetoworkspace, empty"
|
||||
"$mainMod, T, ${workspace_command_prefix}workspace, empty"
|
||||
"$mainMod, TAB, ${workspace_command_prefix}workspace, m+1"
|
||||
"$mainMod SHIFT, TAB, ${workspace_command_prefix}workspace, m-1"
|
||||
"$mainMod, Caps_Lock, ${workspace_command_prefix}workspace, m+1"
|
||||
"$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1"
|
||||
] ++ (
|
||||
# workspaces
|
||||
builtins.concatLists (builtins.genList (x:
|
||||
let
|
||||
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
||||
in
|
||||
[
|
||||
"$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}"
|
||||
"$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}"
|
||||
]) 10));
|
||||
};
|
||||
"$mainMod, H, exec, ${./files/vim-hypr-nav.sh} l"
|
||||
"$mainMod, L, exec, ${./files/vim-hypr-nav.sh} r"
|
||||
"$mainMod, K, exec, ${./files/vim-hypr-nav.sh} u"
|
||||
"$mainMod, J, exec, ${./files/vim-hypr-nav.sh} d"
|
||||
"$mainMod CONTROL_L, H, swapwindow, l"
|
||||
"$mainMod CONTROL_L, L, swapwindow, r"
|
||||
"$mainMod CONTROL_L, K, swapwindow, u"
|
||||
"$mainMod CONTROL_L, J, swapwindow, d"
|
||||
"$mainMod SHIFT, H, movewindow, l"
|
||||
"$mainMod SHIFT, L, movewindow, r"
|
||||
"$mainMod SHIFT, K, movewindow, u"
|
||||
"$mainMod SHIFT, J, movewindow, d"
|
||||
"$mainMod SHIFT, T, ${workspace_command_prefix}movetoworkspace, empty"
|
||||
"$mainMod, T, ${workspace_command_prefix}workspace, empty"
|
||||
"$mainMod, TAB, ${workspace_command_prefix}workspace, m+1"
|
||||
"$mainMod SHIFT, TAB, ${workspace_command_prefix}workspace, m-1"
|
||||
"$mainMod, Caps_Lock, ${workspace_command_prefix}workspace, m+1"
|
||||
"$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1"
|
||||
]
|
||||
++ (
|
||||
# workspaces
|
||||
builtins.concatLists (builtins.genList (x: let
|
||||
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
||||
in [
|
||||
"$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}"
|
||||
"$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}"
|
||||
]) 10)
|
||||
);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +1,58 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
shellIntegration.enableZshIntegration = true;
|
||||
font = {
|
||||
name = "'ZedMono Nerd Font' style='Extended Light' features=+ss05";
|
||||
size = lib.mkDefault 13;
|
||||
};
|
||||
keybindings = {
|
||||
"kitty_mod+h" = "kitty_scrollback_nvim";
|
||||
"kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
|
||||
"kitty_mod+enter" = "nop";
|
||||
"kitty_mod+equal" = "change_font_size current +1.0";
|
||||
"kitty_mod+minus" = "change_font_size current -1.0";
|
||||
"ctrl+shift+c" = "copy_to_clipboard";
|
||||
"ctrl+shift+v" = "paste_from_clipboard";
|
||||
};
|
||||
settings = {
|
||||
kitty_mod= "ctrl+alt";
|
||||
cursor_shape = "block";
|
||||
cursor_beam_thickness = 1;
|
||||
scrollback_lines = 100000;
|
||||
scrollback_fill_enlarged_window = "yes";
|
||||
enable_audio_bell = "no";
|
||||
confirm_os_window_close = 0;
|
||||
modify_font = "cell_height 115%";
|
||||
allow_remote_control = "socket-only";
|
||||
listen_on = "unix:/tmp/kitty";
|
||||
shell_integration = "enabled";
|
||||
action_alias = "kitty_scrollback_nvim kitten /home/user/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py";
|
||||
mouse_map = "ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output";
|
||||
|
||||
# Theme
|
||||
background = "#000010";
|
||||
foreground = "#F8F8F2";
|
||||
cursor = "#bbbbbb";
|
||||
selection_background = "#b4d5ff";
|
||||
color0 = "#121212";
|
||||
color8 = "#545454";
|
||||
color1 = "#fa2573";
|
||||
color9 = "#f5669c";
|
||||
color2 = "#97e123";
|
||||
color10 = "#b0e05e";
|
||||
color3 = "#dfd460";
|
||||
color11 = "#fef26c";
|
||||
color4 = "#0f7fcf";
|
||||
color12 = "#00afff";
|
||||
color5 = "#8700ff";
|
||||
color13 = "#af87ff";
|
||||
color6 = "#42a7cf";
|
||||
color14 = "#50cdfe";
|
||||
color7 = "#bbbbbb";
|
||||
color15 = "#ffffff";
|
||||
selection_foreground = "#121212";
|
||||
background_opacity = "0.3";
|
||||
};
|
||||
{lib, ...}: {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
shellIntegration.enableZshIntegration = true;
|
||||
font = {
|
||||
name = "'ZedMono Nerd Font' style='Extended Light' features=+ss05";
|
||||
size = lib.mkDefault 13;
|
||||
};
|
||||
keybindings = {
|
||||
"kitty_mod+h" = "kitty_scrollback_nvim";
|
||||
"kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
|
||||
"kitty_mod+enter" = "nop";
|
||||
"kitty_mod+equal" = "change_font_size current +1.0";
|
||||
"kitty_mod+minus" = "change_font_size current -1.0";
|
||||
"ctrl+shift+c" = "copy_to_clipboard";
|
||||
"ctrl+shift+v" = "paste_from_clipboard";
|
||||
};
|
||||
settings = {
|
||||
kitty_mod = "ctrl+alt";
|
||||
cursor_shape = "block";
|
||||
cursor_beam_thickness = 1;
|
||||
scrollback_lines = 100000;
|
||||
scrollback_fill_enlarged_window = "yes";
|
||||
enable_audio_bell = "no";
|
||||
confirm_os_window_close = 0;
|
||||
modify_font = "cell_height 115%";
|
||||
allow_remote_control = "socket-only";
|
||||
listen_on = "unix:/tmp/kitty";
|
||||
shell_integration = "enabled";
|
||||
action_alias = "kitty_scrollback_nvim kitten /home/user/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py";
|
||||
mouse_map = "ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output";
|
||||
|
||||
# Theme
|
||||
background = "#000010";
|
||||
foreground = "#F8F8F2";
|
||||
cursor = "#bbbbbb";
|
||||
selection_background = "#b4d5ff";
|
||||
color0 = "#121212";
|
||||
color8 = "#545454";
|
||||
color1 = "#fa2573";
|
||||
color9 = "#f5669c";
|
||||
color2 = "#97e123";
|
||||
color10 = "#b0e05e";
|
||||
color3 = "#dfd460";
|
||||
color11 = "#fef26c";
|
||||
color4 = "#0f7fcf";
|
||||
color12 = "#00afff";
|
||||
color5 = "#8700ff";
|
||||
color13 = "#af87ff";
|
||||
color6 = "#42a7cf";
|
||||
color14 = "#50cdfe";
|
||||
color7 = "#bbbbbb";
|
||||
color15 = "#ffffff";
|
||||
selection_foreground = "#121212";
|
||||
background_opacity = "0.3";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,22 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.file."${config.xdg.configHome}/lf" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
programs.lf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
icons = true;
|
||||
autoquit = true;
|
||||
mouse = true;
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
cursorpreviewfmt = "";
|
||||
previewer = toString (pkgs.writeShellScript "script" ''
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.file."${config.xdg.configHome}/lf" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
programs.lf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
icons = true;
|
||||
autoquit = true;
|
||||
mouse = true;
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
cursorpreviewfmt = "";
|
||||
previewer = toString (pkgs.writeShellScript "script" ''
|
||||
case "''$1" in
|
||||
*.tar*) tar tf "''$1";;
|
||||
*.zip) unzip -l "''$1";;
|
||||
|
|
@ -23,25 +25,25 @@
|
|||
*.pdf) ${pkgs.poppler-utils}/bin/pdftotext "''$1" -;;
|
||||
*) ${pkgs.highlight}/bin/highlight -O ansi "''$1";;
|
||||
esac
|
||||
'');
|
||||
};
|
||||
keybindings = {
|
||||
"<backspace2>" = "quit";
|
||||
"<c-e>" = "half-up";
|
||||
"." = "set hidden!";
|
||||
"o" = ''$nvim -c "lua require(\"oil\").open(\"$PWD\")"'';
|
||||
"-" = ''$nvim -c "lua require(\"oil\").open(\"$PWD\")"'';
|
||||
"<enter>" = "open";
|
||||
"<c-t>" = ":jump <enter>";
|
||||
};
|
||||
commands = {
|
||||
jump = ''
|
||||
'');
|
||||
};
|
||||
keybindings = {
|
||||
"<backspace2>" = "quit";
|
||||
"<c-e>" = "half-up";
|
||||
"." = "set hidden!";
|
||||
"o" = ''$nvim -c "lua require(\"oil\").open(\"$PWD\")"'';
|
||||
"-" = ''$nvim -c "lua require(\"oil\").open(\"$PWD\")"'';
|
||||
"<enter>" = "open";
|
||||
"<c-t>" = ":jump <enter>";
|
||||
};
|
||||
commands = {
|
||||
jump = ''
|
||||
''${{
|
||||
res=$(zsh -c "source ${../zsh/files/functions.zsh} && find_global d")
|
||||
lf -remote "send $id cd \"$res\""
|
||||
}}
|
||||
'';
|
||||
};
|
||||
cmdKeybindings = { q = "quit"; };
|
||||
'';
|
||||
};
|
||||
cmdKeybindings = {q = "quit";};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.file."${config.xdg.configHome}/mpv" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
programs.mpv = { enable = true; };
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.file."${config.xdg.configHome}/mpv" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
programs.mpv = {enable = true;};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,52 +1,54 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
# codeium
|
||||
nixd
|
||||
clang-tools
|
||||
llvmPackages.libcxxClang
|
||||
go
|
||||
nodejs
|
||||
luarocks
|
||||
jre
|
||||
python313Packages.pip
|
||||
python313Packages.debugpy
|
||||
unzip
|
||||
dotnet-sdk_8
|
||||
cargo
|
||||
neovim-unwrapped
|
||||
tree-sitter
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
# codeium
|
||||
nixd
|
||||
clang-tools
|
||||
llvmPackages.libcxxClang
|
||||
go
|
||||
nodejs
|
||||
luarocks
|
||||
jre
|
||||
python313Packages.pip
|
||||
python313Packages.debugpy
|
||||
unzip
|
||||
dotnet-sdk_8
|
||||
cargo
|
||||
neovim-unwrapped
|
||||
tree-sitter
|
||||
|
||||
# LSPs
|
||||
texlab
|
||||
ltex-ls
|
||||
basedpyright
|
||||
# mypy
|
||||
cmake-language-server
|
||||
vscode-langservers-extracted
|
||||
yaml-language-server
|
||||
bash-language-server
|
||||
docker-compose-language-service
|
||||
dockerfile-language-server
|
||||
lua-language-server
|
||||
rust-analyzer
|
||||
gopls
|
||||
# deno
|
||||
typescript-language-server
|
||||
jdt-language-server
|
||||
emmet-ls
|
||||
ruff
|
||||
csharp-ls
|
||||
tinymist
|
||||
];
|
||||
# LSPs
|
||||
texlab
|
||||
ltex-ls
|
||||
basedpyright
|
||||
# mypy
|
||||
cmake-language-server
|
||||
vscode-langservers-extracted
|
||||
yaml-language-server
|
||||
bash-language-server
|
||||
docker-compose-language-service
|
||||
dockerfile-language-server
|
||||
lua-language-server
|
||||
rust-analyzer
|
||||
gopls
|
||||
# deno
|
||||
typescript-language-server
|
||||
jdt-language-server
|
||||
emmet-ls
|
||||
ruff
|
||||
csharp-ls
|
||||
tinymist
|
||||
];
|
||||
|
||||
home.file."${config.xdg.configHome}/nvim" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
home.file."${config.xdg.configHome}/nvim" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".clang-tidy".text = ''
|
||||
home.file.".clang-tidy".text = ''
|
||||
Checks: "*,
|
||||
-abseil-*,
|
||||
-altera-*,
|
||||
|
|
@ -78,8 +80,8 @@
|
|||
WarningsAsErrors: '''
|
||||
HeaderFilterRegex: '''
|
||||
FormatStyle: none
|
||||
'';
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
'';
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,128 +1,130 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [ papirus-icon-theme ];
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [papirus-icon-theme];
|
||||
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi;
|
||||
font = "SF Pro Rounded 13";
|
||||
extraConfig = {
|
||||
show-icons = true;
|
||||
icon-theme = "Papirus";
|
||||
kb-cancel = "Super_L+XF86Launch5,Escape";
|
||||
combi-hide-mode-prefix = true;
|
||||
};
|
||||
theme =
|
||||
let inherit (config.lib.formats.rasi) mkLiteral;
|
||||
in {
|
||||
"*" = {
|
||||
background = mkLiteral "#0f111a";
|
||||
foreground = mkLiteral "#f1f1f1";
|
||||
selected = mkLiteral "#0033a1";
|
||||
selected-text = mkLiteral "#ffffff";
|
||||
};
|
||||
|
||||
"window" = {
|
||||
transparency = "real";
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
width = mkLiteral "800px";
|
||||
border-radius = mkLiteral "5px";
|
||||
};
|
||||
|
||||
"textbox-prompt-colon" = {
|
||||
expand = mkLiteral "false";
|
||||
background-color = mkLiteral "@background";
|
||||
padding = mkLiteral "4px 0px 0px 6px";
|
||||
};
|
||||
|
||||
"inputbar" = {
|
||||
children = mkLiteral "[ textbox-prompt-colon, entry ]";
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
expand = mkLiteral "false";
|
||||
border = mkLiteral "0px 0px 0px 0px";
|
||||
border-radius = mkLiteral "0px";
|
||||
border-color = mkLiteral "@selected";
|
||||
margin = mkLiteral "0px 0px 0px 0px";
|
||||
padding = mkLiteral "0px 0px 4px 0px";
|
||||
position = mkLiteral "center";
|
||||
};
|
||||
|
||||
"entry" = {
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
placeholder-color = mkLiteral "@foreground";
|
||||
expand = mkLiteral "true";
|
||||
horizontal-align = mkLiteral "0";
|
||||
blink = mkLiteral "true";
|
||||
padding = mkLiteral "4px 0px 0px 4px";
|
||||
font = "SF Pro Rounded 25";
|
||||
};
|
||||
|
||||
"case-indicator" = {
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
spacing = mkLiteral "0";
|
||||
};
|
||||
|
||||
"listview" = {
|
||||
background-color = mkLiteral "@background";
|
||||
columns = mkLiteral "1";
|
||||
spacing = mkLiteral "5px";
|
||||
cycle = mkLiteral "true";
|
||||
dynamic = mkLiteral "true";
|
||||
layout = mkLiteral "vertical";
|
||||
fixed-height = "true";
|
||||
lines = mkLiteral "5";
|
||||
};
|
||||
|
||||
"mainbox" = {
|
||||
background-color = mkLiteral "@background";
|
||||
children = mkLiteral "[ inputbar, message, listview ]";
|
||||
spacing = mkLiteral "20px";
|
||||
padding = mkLiteral "20px 15px 15px 15px";
|
||||
};
|
||||
|
||||
"message" = {
|
||||
children = mkLiteral "[ textbox ]";
|
||||
border-radius = mkLiteral "5px";
|
||||
};
|
||||
|
||||
"textbox" = {
|
||||
background-color = mkLiteral "@selected";
|
||||
text-color = mkLiteral "@foreground";
|
||||
padding = mkLiteral "20px 6px 20px 80px";
|
||||
};
|
||||
|
||||
"element" = {
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
orientation = mkLiteral "horizontal";
|
||||
border-radius = mkLiteral "4px";
|
||||
padding = mkLiteral "2px 2px 2px 2px";
|
||||
};
|
||||
|
||||
"element-text, element-icon" = {
|
||||
background-color = mkLiteral "inherit";
|
||||
text-color = mkLiteral "inherit";
|
||||
};
|
||||
|
||||
"element-icon" = {
|
||||
size = mkLiteral "40px";
|
||||
padding = mkLiteral "10px 10px 10px 10px";
|
||||
};
|
||||
|
||||
"element-text" = { padding = mkLiteral "20px 0px 0px 10px"; };
|
||||
|
||||
"element selected" = {
|
||||
background-color = mkLiteral "@selected";
|
||||
text-color = mkLiteral "@selected-text";
|
||||
border = mkLiteral "0px";
|
||||
border-radius = mkLiteral "3px";
|
||||
border-color = mkLiteral "@selected";
|
||||
};
|
||||
};
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi;
|
||||
font = "SF Pro Rounded 13";
|
||||
extraConfig = {
|
||||
show-icons = true;
|
||||
icon-theme = "Papirus";
|
||||
kb-cancel = "Super_L+XF86Launch5,Escape";
|
||||
combi-hide-mode-prefix = true;
|
||||
};
|
||||
theme = let
|
||||
inherit (config.lib.formats.rasi) mkLiteral;
|
||||
in {
|
||||
"*" = {
|
||||
background = mkLiteral "#0f111a";
|
||||
foreground = mkLiteral "#f1f1f1";
|
||||
selected = mkLiteral "#0033a1";
|
||||
selected-text = mkLiteral "#ffffff";
|
||||
};
|
||||
|
||||
"window" = {
|
||||
transparency = "real";
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
width = mkLiteral "800px";
|
||||
border-radius = mkLiteral "5px";
|
||||
};
|
||||
|
||||
"textbox-prompt-colon" = {
|
||||
expand = mkLiteral "false";
|
||||
background-color = mkLiteral "@background";
|
||||
padding = mkLiteral "4px 0px 0px 6px";
|
||||
};
|
||||
|
||||
"inputbar" = {
|
||||
children = mkLiteral "[ textbox-prompt-colon, entry ]";
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
expand = mkLiteral "false";
|
||||
border = mkLiteral "0px 0px 0px 0px";
|
||||
border-radius = mkLiteral "0px";
|
||||
border-color = mkLiteral "@selected";
|
||||
margin = mkLiteral "0px 0px 0px 0px";
|
||||
padding = mkLiteral "0px 0px 4px 0px";
|
||||
position = mkLiteral "center";
|
||||
};
|
||||
|
||||
"entry" = {
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
placeholder-color = mkLiteral "@foreground";
|
||||
expand = mkLiteral "true";
|
||||
horizontal-align = mkLiteral "0";
|
||||
blink = mkLiteral "true";
|
||||
padding = mkLiteral "4px 0px 0px 4px";
|
||||
font = "SF Pro Rounded 25";
|
||||
};
|
||||
|
||||
"case-indicator" = {
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
spacing = mkLiteral "0";
|
||||
};
|
||||
|
||||
"listview" = {
|
||||
background-color = mkLiteral "@background";
|
||||
columns = mkLiteral "1";
|
||||
spacing = mkLiteral "5px";
|
||||
cycle = mkLiteral "true";
|
||||
dynamic = mkLiteral "true";
|
||||
layout = mkLiteral "vertical";
|
||||
fixed-height = "true";
|
||||
lines = mkLiteral "5";
|
||||
};
|
||||
|
||||
"mainbox" = {
|
||||
background-color = mkLiteral "@background";
|
||||
children = mkLiteral "[ inputbar, message, listview ]";
|
||||
spacing = mkLiteral "20px";
|
||||
padding = mkLiteral "20px 15px 15px 15px";
|
||||
};
|
||||
|
||||
"message" = {
|
||||
children = mkLiteral "[ textbox ]";
|
||||
border-radius = mkLiteral "5px";
|
||||
};
|
||||
|
||||
"textbox" = {
|
||||
background-color = mkLiteral "@selected";
|
||||
text-color = mkLiteral "@foreground";
|
||||
padding = mkLiteral "20px 6px 20px 80px";
|
||||
};
|
||||
|
||||
"element" = {
|
||||
background-color = mkLiteral "@background";
|
||||
text-color = mkLiteral "@foreground";
|
||||
orientation = mkLiteral "horizontal";
|
||||
border-radius = mkLiteral "4px";
|
||||
padding = mkLiteral "2px 2px 2px 2px";
|
||||
};
|
||||
|
||||
"element-text, element-icon" = {
|
||||
background-color = mkLiteral "inherit";
|
||||
text-color = mkLiteral "inherit";
|
||||
};
|
||||
|
||||
"element-icon" = {
|
||||
size = mkLiteral "40px";
|
||||
padding = mkLiteral "10px 10px 10px 10px";
|
||||
};
|
||||
|
||||
"element-text" = {padding = mkLiteral "20px 0px 0px 10px";};
|
||||
|
||||
"element selected" = {
|
||||
background-color = mkLiteral "@selected";
|
||||
text-color = mkLiteral "@selected-text";
|
||||
border = mkLiteral "0px";
|
||||
border-radius = mkLiteral "3px";
|
||||
border-color = mkLiteral "@selected";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,90 +1,93 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
matchBlocks = {
|
||||
"*" = {
|
||||
host = "*";
|
||||
};
|
||||
mallorea = {
|
||||
host = "mallorea";
|
||||
hostname = "server.thomasave.be";
|
||||
port = 22;
|
||||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Mallorea = {
|
||||
host = "Mallorea";
|
||||
hostname = "server.thomasave.be";
|
||||
port = 22;
|
||||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Kell = {
|
||||
host = "Kell";
|
||||
hostname = "kell.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
kell = {
|
||||
host = "kell";
|
||||
hostname = "kell.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Riva = {
|
||||
host = "Riva";
|
||||
hostname = "riva.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
riva = {
|
||||
host = "riva";
|
||||
hostname = "riva.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Arch = {
|
||||
host = "Arch";
|
||||
hostname = "arch.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
arch = {
|
||||
host = "arch";
|
||||
hostname = "arch.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Vault = {
|
||||
host = "Vault";
|
||||
hostname = "etienne.thomasave.be";
|
||||
port = 22;
|
||||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
vault = {
|
||||
host = "vault";
|
||||
hostname = "etienne.thomasave.be";
|
||||
port = 22;
|
||||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
gcp = {
|
||||
host = "gcp";
|
||||
hostname = "34.126.140.76";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
};
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
matchBlocks = {
|
||||
"*" = {
|
||||
host = "*";
|
||||
};
|
||||
mallorea = {
|
||||
host = "mallorea";
|
||||
hostname = "server.thomasave.be";
|
||||
port = 22;
|
||||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Mallorea = {
|
||||
host = "Mallorea";
|
||||
hostname = "server.thomasave.be";
|
||||
port = 22;
|
||||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Kell = {
|
||||
host = "Kell";
|
||||
hostname = "kell.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
kell = {
|
||||
host = "kell";
|
||||
hostname = "kell.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Riva = {
|
||||
host = "Riva";
|
||||
hostname = "riva.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
riva = {
|
||||
host = "riva";
|
||||
hostname = "riva.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Arch = {
|
||||
host = "Arch";
|
||||
hostname = "arch.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
arch = {
|
||||
host = "arch";
|
||||
hostname = "arch.thomasave.be";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
Vault = {
|
||||
host = "Vault";
|
||||
hostname = "etienne.thomasave.be";
|
||||
port = 22;
|
||||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
vault = {
|
||||
host = "vault";
|
||||
hostname = "etienne.thomasave.be";
|
||||
port = 22;
|
||||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
gcp = {
|
||||
host = "gcp";
|
||||
hostname = "34.126.140.76";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,63 +1,62 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs.tmux = {
|
||||
shell = "${pkgs.zsh}/bin/zsh";
|
||||
terminal = "screen-256color";
|
||||
enable = true;
|
||||
clock24 = true;
|
||||
shortcut = "a";
|
||||
escapeTime = 0;
|
||||
newSession = true;
|
||||
mouse = true;
|
||||
keyMode = "vi";
|
||||
plugins = [
|
||||
pkgs.tmuxPlugins.vim-tmux-navigator
|
||||
pkgs.tmuxPlugins.better-mouse-mode
|
||||
pkgs.tmuxPlugins.yank
|
||||
{
|
||||
plugin = pkgs.tmuxPlugins.catppuccin;
|
||||
extraConfig = ''
|
||||
set -ogq @catppuccin_flavor "mocha"
|
||||
set -ogq @catppuccin_window_status_style "rounded"
|
||||
set -ogq @catppuccin_pane_border_style "fg=#181825"
|
||||
set -ogq @catppuccin_pane_active_border_style "fg=#023269"
|
||||
set -ogq @catppuccin_menu_selected_style "fg=#{@thm_gray},bg=#0F7FCF"
|
||||
set -g @catppuccin_window_current_number_color "#0F7FCF"
|
||||
set -g @catppuccin_window_current_text_color "#1F2430"
|
||||
set -g @catppuccin_window_text_color "#1F2430"
|
||||
set -g @catppuccin_window_number_color "#707072"
|
||||
set -ogq status-right "#{E:@catppuccin_status_directory}"
|
||||
|
||||
# Make the status line pretty and add some modules
|
||||
set -g status-right-length 100
|
||||
set -g status-left-length 100
|
||||
set -g status-left ""
|
||||
set -g status-right "#{E:@catppuccin_status_application}"
|
||||
set -ag status-right "#{E:@catppuccin_status_session}"
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
{pkgs, ...}: {
|
||||
programs.tmux = {
|
||||
shell = "${pkgs.zsh}/bin/zsh";
|
||||
terminal = "screen-256color";
|
||||
enable = true;
|
||||
clock24 = true;
|
||||
shortcut = "a";
|
||||
escapeTime = 0;
|
||||
newSession = true;
|
||||
mouse = true;
|
||||
keyMode = "vi";
|
||||
plugins = [
|
||||
pkgs.tmuxPlugins.vim-tmux-navigator
|
||||
pkgs.tmuxPlugins.better-mouse-mode
|
||||
pkgs.tmuxPlugins.yank
|
||||
{
|
||||
plugin = pkgs.tmuxPlugins.catppuccin;
|
||||
extraConfig = ''
|
||||
set -ag terminal-overrides ",screen-256color:Tc"
|
||||
set-window-option -g mode-keys vi
|
||||
bind-key -T copy-mode-vi 'v' send -X begin-selection
|
||||
bind-key -T copy-mode-vi 'y' send -X copy-selection
|
||||
set -ogq @catppuccin_flavor "mocha"
|
||||
set -ogq @catppuccin_window_status_style "rounded"
|
||||
set -ogq @catppuccin_pane_border_style "fg=#181825"
|
||||
set -ogq @catppuccin_pane_active_border_style "fg=#023269"
|
||||
set -ogq @catppuccin_menu_selected_style "fg=#{@thm_gray},bg=#0F7FCF"
|
||||
set -g @catppuccin_window_current_number_color "#0F7FCF"
|
||||
set -g @catppuccin_window_current_text_color "#1F2430"
|
||||
set -g @catppuccin_window_text_color "#1F2430"
|
||||
set -g @catppuccin_window_number_color "#707072"
|
||||
set -ogq status-right "#{E:@catppuccin_status_directory}"
|
||||
|
||||
bind | split-window -h -c "#{pane_current_path}"
|
||||
bind - split-window -v -c "#{pane_current_path}"
|
||||
bind c new-window -c "#{pane_current_path}"
|
||||
unbind '"'
|
||||
unbind %
|
||||
|
||||
# Renumber windows starting from 1
|
||||
set -g base-index 1
|
||||
setw -g pane-base-index 1
|
||||
set-option -g renumber-windows on
|
||||
|
||||
# Transparent bar
|
||||
set -g status-bg default
|
||||
set -g status-style "bg=default"
|
||||
# Make the status line pretty and add some modules
|
||||
set -g status-right-length 100
|
||||
set -g status-left-length 100
|
||||
set -g status-left ""
|
||||
set -g status-right "#{E:@catppuccin_status_application}"
|
||||
set -ag status-right "#{E:@catppuccin_status_session}"
|
||||
'';
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
extraConfig = ''
|
||||
set -ag terminal-overrides ",screen-256color:Tc"
|
||||
set-window-option -g mode-keys vi
|
||||
bind-key -T copy-mode-vi 'v' send -X begin-selection
|
||||
bind-key -T copy-mode-vi 'y' send -X copy-selection
|
||||
|
||||
bind | split-window -h -c "#{pane_current_path}"
|
||||
bind - split-window -v -c "#{pane_current_path}"
|
||||
bind c new-window -c "#{pane_current_path}"
|
||||
unbind '"'
|
||||
unbind %
|
||||
|
||||
# Renumber windows starting from 1
|
||||
set -g base-index 1
|
||||
setw -g pane-base-index 1
|
||||
set-option -g renumber-windows on
|
||||
|
||||
# Transparent bar
|
||||
set -g status-bg default
|
||||
set -g status-style "bg=default"
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,52 +1,54 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(import ../zsh { inherit inputs config pkgs; })
|
||||
(import ../bash { inherit inputs config pkgs; })
|
||||
../git
|
||||
../nvim
|
||||
../email
|
||||
../lf
|
||||
../tmux
|
||||
../yazi
|
||||
../zellij
|
||||
];
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(import ../zsh {inherit inputs config pkgs;})
|
||||
(import ../bash {inherit inputs config pkgs;})
|
||||
../git
|
||||
../nvim
|
||||
../email
|
||||
../lf
|
||||
../tmux
|
||||
../yazi
|
||||
../zellij
|
||||
];
|
||||
|
||||
home.stateVersion = "24.11";
|
||||
targets.genericLinux.enable = true;
|
||||
programs.home-manager.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
htop
|
||||
ghostscript
|
||||
waypipe
|
||||
inputs.worktimer.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
usbutils
|
||||
gocryptfs
|
||||
sshfs
|
||||
ncdu
|
||||
];
|
||||
home.sessionVariables = {
|
||||
XDG_CONFIG_HOME = "${config.xdg.configHome}";
|
||||
XDG_CACHE_HOME = "${config.xdg.cacheHome}";
|
||||
XDG_DATA_HOME = "${config.xdg.dataHome}";
|
||||
XDG_STATE_HOME = "${config.xdg.stateHome}";
|
||||
home.stateVersion = "24.11";
|
||||
targets.genericLinux.enable = true;
|
||||
programs.home-manager.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
htop
|
||||
ghostscript
|
||||
waypipe
|
||||
inputs.worktimer.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
usbutils
|
||||
gocryptfs
|
||||
sshfs
|
||||
ncdu
|
||||
];
|
||||
home.sessionVariables = {
|
||||
XDG_CONFIG_HOME = "${config.xdg.configHome}";
|
||||
XDG_CACHE_HOME = "${config.xdg.cacheHome}";
|
||||
XDG_DATA_HOME = "${config.xdg.dataHome}";
|
||||
XDG_STATE_HOME = "${config.xdg.stateHome}";
|
||||
|
||||
CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv";
|
||||
DOCKER_CONFIG = "${config.xdg.configHome}/docker";
|
||||
LESSHISTFILE = "${config.xdg.cacheHome}/less/history";
|
||||
PARALLEL_HOME = "${config.xdg.configHome}/parallel";
|
||||
PYTHONSTARTUP = "${config.xdg.configHome}/python/pythonrc";
|
||||
SQLITE_HISTORY = "${config.xdg.cacheHome}/sqlite_history";
|
||||
WINEPREFIX = "${config.xdg.dataHome}/wine";
|
||||
# XDG_CURRENT_DESKTOP = "GNOME";
|
||||
OPENCV_LOG_LEVEL = "ERROR";
|
||||
COLORTERM = "truecolor";
|
||||
};
|
||||
|
||||
home.file.".latexmkrc".text = ''
|
||||
$pdf_mode = 1;
|
||||
$pdf_previewer = 'evince %O %S';
|
||||
'';
|
||||
CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv";
|
||||
DOCKER_CONFIG = "${config.xdg.configHome}/docker";
|
||||
LESSHISTFILE = "${config.xdg.cacheHome}/less/history";
|
||||
PARALLEL_HOME = "${config.xdg.configHome}/parallel";
|
||||
PYTHONSTARTUP = "${config.xdg.configHome}/python/pythonrc";
|
||||
SQLITE_HISTORY = "${config.xdg.cacheHome}/sqlite_history";
|
||||
WINEPREFIX = "${config.xdg.dataHome}/wine";
|
||||
# XDG_CURRENT_DESKTOP = "GNOME";
|
||||
OPENCV_LOG_LEVEL = "ERROR";
|
||||
COLORTERM = "truecolor";
|
||||
};
|
||||
|
||||
home.file.".latexmkrc".text = ''
|
||||
$pdf_mode = 1;
|
||||
$pdf_previewer = 'evince %O %S';
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,109 +1,113 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
(import ./common.nix { inherit inputs config pkgs; })
|
||||
(import ./python.nix { inherit inputs config pkgs; })
|
||||
(import ../hyprland { inherit inputs pkgs; })
|
||||
(import ../ags { inherit inputs pkgs; })
|
||||
../rofi
|
||||
../vicinae
|
||||
../alacritty
|
||||
../foot
|
||||
../kitty
|
||||
../firefox
|
||||
../helium
|
||||
../ssh
|
||||
../mpv
|
||||
];
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(import ./common.nix {inherit inputs config pkgs;})
|
||||
(import ./python.nix {inherit inputs config pkgs;})
|
||||
(import ../hyprland {inherit inputs pkgs;})
|
||||
(import ../ags {inherit inputs pkgs;})
|
||||
../rofi
|
||||
../vicinae
|
||||
../alacritty
|
||||
../foot
|
||||
../kitty
|
||||
../firefox
|
||||
../helium
|
||||
../ssh
|
||||
../mpv
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
spotify
|
||||
slack
|
||||
eid-mw
|
||||
onlyoffice-desktopeditors
|
||||
libreoffice
|
||||
telegram-desktop
|
||||
signal-desktop
|
||||
iwgtk
|
||||
element-desktop
|
||||
evince
|
||||
loupe
|
||||
gimp3
|
||||
obs-studio
|
||||
inkscape
|
||||
gnome-calendar
|
||||
file-roller
|
||||
zip
|
||||
heroic
|
||||
cmake
|
||||
nmap
|
||||
arp-scan
|
||||
virt-manager
|
||||
wol
|
||||
dig
|
||||
file
|
||||
zip
|
||||
yubioath-flutter
|
||||
obsidian
|
||||
nautilus
|
||||
appimage-run
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
spotify
|
||||
slack
|
||||
eid-mw
|
||||
onlyoffice-desktopeditors
|
||||
libreoffice
|
||||
telegram-desktop
|
||||
signal-desktop
|
||||
iwgtk
|
||||
element-desktop
|
||||
evince
|
||||
loupe
|
||||
gimp3
|
||||
obs-studio
|
||||
inkscape
|
||||
gnome-calendar
|
||||
file-roller
|
||||
zip
|
||||
heroic
|
||||
cmake
|
||||
nmap
|
||||
arp-scan
|
||||
virt-manager
|
||||
wol
|
||||
dig
|
||||
file
|
||||
zip
|
||||
yubioath-flutter
|
||||
obsidian
|
||||
nautilus
|
||||
appimage-run
|
||||
];
|
||||
|
||||
services.kdeconnect = {
|
||||
enable = true;
|
||||
package = pkgs.kdePackages.kdeconnect-kde;
|
||||
indicator = true;
|
||||
services.kdeconnect = {
|
||||
enable = true;
|
||||
package = pkgs.kdePackages.kdeconnect-kde;
|
||||
indicator = true;
|
||||
};
|
||||
|
||||
programs.thunderbird = {
|
||||
enable = true;
|
||||
profiles.default.isDefault = true;
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
package = pkgs.gnome-themes-extra;
|
||||
name = "Adwaita-dark";
|
||||
};
|
||||
|
||||
programs.thunderbird = {
|
||||
enable = true;
|
||||
profiles.default.isDefault = true;
|
||||
iconTheme = {
|
||||
name = "Papirus";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
package = pkgs.gnome-themes-extra;
|
||||
name = "Adwaita-dark";
|
||||
};
|
||||
iconTheme = {
|
||||
name = "Papirus";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
home.pointerCursor = {
|
||||
gtk.enable = true;
|
||||
name = "Adwaita";
|
||||
size = 28;
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
};
|
||||
|
||||
services.mpris-proxy.enable = true; # Bluetooth media control
|
||||
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/mid" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/tonsite" = "org.telegram.desktop.desktop";
|
||||
"message/rfc822" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"application/pdf" = "org.gnome.Evince.desktop";
|
||||
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
||||
"video/*" = "mpv.desktop";
|
||||
"audio/*" = "mpv.desktop";
|
||||
"image/jpeg" = "org.gnome.Loupe.desktop";
|
||||
"image/png" = "org.gnome.Loupe.desktop";
|
||||
};
|
||||
|
||||
home.pointerCursor = {
|
||||
gtk.enable = true;
|
||||
name = "Adwaita";
|
||||
size = 28;
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
associations.added = {
|
||||
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
||||
"x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/mid" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/tonsite" = "org.telegram.desktop.desktop";
|
||||
"image/jpeg" = "org.gnome.Loupe.desktop";
|
||||
"image/png" = "org.gnome.Loupe.desktop";
|
||||
};
|
||||
};
|
||||
|
||||
services.mpris-proxy.enable = true; # Bluetooth media control
|
||||
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/mid" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/tonsite" = "org.telegram.desktop.desktop";
|
||||
"message/rfc822" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"application/pdf" = "org.gnome.Evince.desktop";
|
||||
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
||||
"video/*" = "mpv.desktop";
|
||||
"audio/*" = "mpv.desktop";
|
||||
"image/jpeg" = "org.gnome.Loupe.desktop";
|
||||
"image/png" = "org.gnome.Loupe.desktop";
|
||||
};
|
||||
associations.added = {
|
||||
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
||||
"x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/mid" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/tonsite" = "org.telegram.desktop.desktop";
|
||||
"image/jpeg" = "org.gnome.Loupe.desktop";
|
||||
"image/png" = "org.gnome.Loupe.desktop";
|
||||
};
|
||||
};
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
fonts.fontconfig.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ pkgs }:
|
||||
{
|
||||
when = "*-*-* *:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
{pkgs}: {
|
||||
when = "*-*-* *:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
REPORT_EMAIL=email@thomasave.be
|
||||
ZPOOL_STATUS=$(zpool status -x)
|
||||
if [ "$ZPOOL_STATUS" = "all pools are healthy" ] || [ "$ZPOOL_STATUS" = "no pools available" ]
|
||||
|
|
@ -14,5 +13,5 @@
|
|||
printf 1 > /var/db/zpool.status
|
||||
fi
|
||||
fi
|
||||
'');
|
||||
'');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
{ config, pkgs, fzgo_paths }:
|
||||
let
|
||||
mkLink = source_path: file_type: {
|
||||
"${source_path}-${file_type}" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink source_path;
|
||||
target = ".config/fzgo/entries/${file_type}/${pkgs.lib.strings.replaceStrings [ "/" ] [ "|" ] source_path}";
|
||||
};
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
fzgo_paths,
|
||||
}: let
|
||||
mkLink = source_path: file_type: {
|
||||
"${source_path}-${file_type}" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink source_path;
|
||||
target = ".config/fzgo/entries/${file_type}/${pkgs.lib.strings.replaceStrings ["/"] ["|"] source_path}";
|
||||
};
|
||||
links = (map (source_path: mkLink source_path "f") fzgo_paths.files) ++ (map (source_path: mkLink source_path "d") fzgo_paths.dirs);
|
||||
};
|
||||
links = (map (source_path: mkLink source_path "f") fzgo_paths.files) ++ (map (source_path: mkLink source_path "d") fzgo_paths.dirs);
|
||||
in {
|
||||
home.file = pkgs.lib.mkMerge links;
|
||||
home.file = pkgs.lib.mkMerge links;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +1,42 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
pythonldlibpath = pkgs.lib.makeLibraryPath (with pkgs; [
|
||||
libGL
|
||||
glib
|
||||
zlib
|
||||
zstd
|
||||
stdenv.cc.cc
|
||||
stdenv.cc.cc.lib
|
||||
curl
|
||||
openssl
|
||||
attr
|
||||
libssh
|
||||
bzip2
|
||||
libxml2
|
||||
acl
|
||||
libsodium
|
||||
util-linux
|
||||
xz
|
||||
systemd
|
||||
]);
|
||||
# Darwin requires a different library path prefix
|
||||
wrapPrefix = if (!pkgs.stdenv.isDarwin) then "LD_LIBRARY_PATH" else "DYLD_LIBRARY_PATH";
|
||||
# pythonOverlay = (pkgs.python313.withPackages (ps: [
|
||||
# (ps.torch.override { rocmSupport = true; })
|
||||
# ]));
|
||||
{pkgs, ...}: let
|
||||
pythonldlibpath = pkgs.lib.makeLibraryPath (with pkgs; [
|
||||
libGL
|
||||
glib
|
||||
zlib
|
||||
zstd
|
||||
stdenv.cc.cc
|
||||
stdenv.cc.cc.lib
|
||||
curl
|
||||
openssl
|
||||
attr
|
||||
libssh
|
||||
bzip2
|
||||
libxml2
|
||||
acl
|
||||
libsodium
|
||||
util-linux
|
||||
xz
|
||||
systemd
|
||||
]);
|
||||
# Darwin requires a different library path prefix
|
||||
wrapPrefix =
|
||||
if (!pkgs.stdenv.isDarwin)
|
||||
then "LD_LIBRARY_PATH"
|
||||
else "DYLD_LIBRARY_PATH";
|
||||
# pythonOverlay = (pkgs.python313.withPackages (ps: [
|
||||
# (ps.torch.override { rocmSupport = true; })
|
||||
# ]));
|
||||
|
||||
patchedpython = (pkgs.symlinkJoin {
|
||||
name = "python";
|
||||
paths = [ pkgs.python313 ];
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
patchedpython = pkgs.symlinkJoin {
|
||||
name = "python";
|
||||
paths = [pkgs.python313];
|
||||
buildInputs = [pkgs.makeWrapper];
|
||||
postBuild = ''
|
||||
wrapProgram "$out/bin/python3.13" --prefix ${wrapPrefix} : "${pythonldlibpath}"
|
||||
'';
|
||||
});
|
||||
'';
|
||||
};
|
||||
in {
|
||||
home.packages = [
|
||||
patchedpython
|
||||
];
|
||||
home.packages = [
|
||||
patchedpython
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,82 +1,85 @@
|
|||
{ pkgs, scripts }:
|
||||
let
|
||||
notify_script = (pkgs.writers.writePython3Bin "telegram-notify.py"
|
||||
{
|
||||
libraries = [ pkgs.python3Packages.python-telegram-bot ];
|
||||
} ''
|
||||
import telegram
|
||||
import asyncio
|
||||
import sys
|
||||
import socket
|
||||
import json
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
|
||||
async def run():
|
||||
text = subprocess.check_output(
|
||||
[
|
||||
"journalctl",
|
||||
"--user",
|
||||
"-u",
|
||||
sys.argv[1],
|
||||
"--since",
|
||||
"-1h",
|
||||
"--no-pager"
|
||||
]
|
||||
).decode("utf-8")
|
||||
|
||||
with open("/home/server/.secrets/Telegram/token.json") as f:
|
||||
credentials = json.load(f)
|
||||
token = credentials["token"]
|
||||
chat_id = credentials["chat_id"]
|
||||
|
||||
with open("/home/server/mail.log", "a") as f:
|
||||
f.write(text)
|
||||
f.write("\n===========================================\n")
|
||||
|
||||
bot = telegram.Bot(token=token)
|
||||
hostname = socket.gethostname()
|
||||
await bot.send_message(
|
||||
chat_id,
|
||||
f"{hostname} encountered an error in the service: {sys.argv[1]}"
|
||||
)
|
||||
|
||||
with tempfile.NamedTemporaryFile(suffix=".txt") as tmp_file:
|
||||
tmp_file.write(text.encode("utf-8"))
|
||||
tmp_file.seek(0)
|
||||
await bot.send_document(chat_id, document=tmp_file)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
loop = asyncio.get_event_loop()
|
||||
loop.run_until_complete(asyncio.wait([loop.create_task(run())]))
|
||||
loop.close()
|
||||
'');
|
||||
|
||||
mkTimer = name: cfg: {
|
||||
Install.WantedBy = [ "timers.target" ];
|
||||
Timer = {
|
||||
Persistent = true;
|
||||
OnCalendar = cfg.when;
|
||||
Unit = "${name}.service";
|
||||
};
|
||||
};
|
||||
mkService = name: cfg: {
|
||||
Unit.Description = name;
|
||||
Unit.OnFailure = "status_notify@${name}.service";
|
||||
# Install = { WantedBy = [ "default.target" ]; };
|
||||
Service = { ExecStart = cfg.script; };
|
||||
};
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
scripts,
|
||||
}: let
|
||||
notify_script =
|
||||
pkgs.writers.writePython3Bin "telegram-notify.py"
|
||||
{
|
||||
systemd.user.services = pkgs.lib.mapAttrs mkService scripts
|
||||
// (pkgs.lib.mapAttrs mkService {
|
||||
"status_notify@" = {
|
||||
script = "${notify_script}/bin/telegram-notify.py %i";
|
||||
};
|
||||
});
|
||||
systemd.user.timers = pkgs.lib.mapAttrs mkTimer scripts;
|
||||
# Don't forget to enable these timers! Or reboot, after which it should also be activated automatically
|
||||
# systemctl --user enable --now <script>.timer
|
||||
libraries = [pkgs.python3Packages.python-telegram-bot];
|
||||
} ''
|
||||
import telegram
|
||||
import asyncio
|
||||
import sys
|
||||
import socket
|
||||
import json
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
|
||||
async def run():
|
||||
text = subprocess.check_output(
|
||||
[
|
||||
"journalctl",
|
||||
"--user",
|
||||
"-u",
|
||||
sys.argv[1],
|
||||
"--since",
|
||||
"-1h",
|
||||
"--no-pager"
|
||||
]
|
||||
).decode("utf-8")
|
||||
|
||||
with open("/home/server/.secrets/Telegram/token.json") as f:
|
||||
credentials = json.load(f)
|
||||
token = credentials["token"]
|
||||
chat_id = credentials["chat_id"]
|
||||
|
||||
with open("/home/server/mail.log", "a") as f:
|
||||
f.write(text)
|
||||
f.write("\n===========================================\n")
|
||||
|
||||
bot = telegram.Bot(token=token)
|
||||
hostname = socket.gethostname()
|
||||
await bot.send_message(
|
||||
chat_id,
|
||||
f"{hostname} encountered an error in the service: {sys.argv[1]}"
|
||||
)
|
||||
|
||||
with tempfile.NamedTemporaryFile(suffix=".txt") as tmp_file:
|
||||
tmp_file.write(text.encode("utf-8"))
|
||||
tmp_file.seek(0)
|
||||
await bot.send_document(chat_id, document=tmp_file)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
loop = asyncio.get_event_loop()
|
||||
loop.run_until_complete(asyncio.wait([loop.create_task(run())]))
|
||||
loop.close()
|
||||
'';
|
||||
|
||||
mkTimer = name: cfg: {
|
||||
Install.WantedBy = ["timers.target"];
|
||||
Timer = {
|
||||
Persistent = true;
|
||||
OnCalendar = cfg.when;
|
||||
Unit = "${name}.service";
|
||||
};
|
||||
};
|
||||
mkService = name: cfg: {
|
||||
Unit.Description = name;
|
||||
Unit.OnFailure = "status_notify@${name}.service";
|
||||
# Install = { WantedBy = [ "default.target" ]; };
|
||||
Service = {ExecStart = cfg.script;};
|
||||
};
|
||||
in {
|
||||
systemd.user.services =
|
||||
pkgs.lib.mapAttrs mkService scripts
|
||||
// (pkgs.lib.mapAttrs mkService {
|
||||
"status_notify@" = {
|
||||
script = "${notify_script}/bin/telegram-notify.py %i";
|
||||
};
|
||||
});
|
||||
systemd.user.timers = pkgs.lib.mapAttrs mkTimer scripts;
|
||||
# Don't forget to enable these timers! Or reboot, after which it should also be activated automatically
|
||||
# systemctl --user enable --now <script>.timer
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ inputs, ... }: # Add inputs here
|
||||
{inputs, ...}:
|
||||
# Add inputs here
|
||||
{
|
||||
# Import the module definition here
|
||||
imports = [ inputs.vicinae.homeManagerModules.default ];
|
||||
# Import the module definition here
|
||||
imports = [inputs.vicinae.homeManagerModules.default];
|
||||
|
||||
services.vicinae = {
|
||||
enable = true;
|
||||
systemd = {
|
||||
enable = true;
|
||||
autoStart = true;
|
||||
environment = {
|
||||
QT_SCALE_FACTOR="1.5";
|
||||
};
|
||||
};
|
||||
services.vicinae = {
|
||||
enable = true;
|
||||
systemd = {
|
||||
enable = true;
|
||||
autoStart = true;
|
||||
environment = {
|
||||
QT_SCALE_FACTOR = "1.5";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
{
|
||||
imports = [inputs.walker.homeManagerModules.walker];
|
||||
programs.walker = {
|
||||
enable = true;
|
||||
runAsService = true;
|
||||
};
|
||||
home.file."${config.xdg.configHome}/walker" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [inputs.walker.homeManagerModules.walker];
|
||||
programs.walker = {
|
||||
enable = true;
|
||||
runAsService = true;
|
||||
};
|
||||
home.file."${config.xdg.configHome}/walker" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,91 +1,93 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
height = pkgs.lib.mkDefault 35;
|
||||
spacing = 4;
|
||||
# output = "DP-2"; # Fill in with host-specific config!
|
||||
modules-left = [ "wlr/taskbar" ];
|
||||
modules-center = [ "hyprland/workspaces" ];
|
||||
modules-right = [
|
||||
"tray"
|
||||
"wireplumber"
|
||||
"battery"
|
||||
"cpu#cpu2"
|
||||
"cpu"
|
||||
"memory"
|
||||
"custom/temperature"
|
||||
"clock"
|
||||
"clock#clock2"
|
||||
];
|
||||
"wlr/taskbar" = {
|
||||
on-click = "activate";
|
||||
on-click-right = "close";
|
||||
format = "{icon} {title:.20}";
|
||||
all-outputs = true;
|
||||
};
|
||||
"wireplumber" = {
|
||||
format = "{icon} {volume}%";
|
||||
format-muted = "";
|
||||
on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
format-icons = [ "" "" "" ];
|
||||
};
|
||||
"hyprland/workspaces" = {
|
||||
disable-scroll = true;
|
||||
all-outputs = true;
|
||||
warp-on-scroll = false;
|
||||
format = "{name}";
|
||||
};
|
||||
"hyprland/window" = { max-length = 50; };
|
||||
tray = { spacing = 10; };
|
||||
"clock#clock2" = {
|
||||
timezone = "Asia/Bangkok";
|
||||
format = "{:%H:%M:%S}";
|
||||
interval = 1;
|
||||
};
|
||||
clock = {
|
||||
timezone = "Asia/Bangkok";
|
||||
format = "{:%Y-%m-%d}";
|
||||
interval = 3600;
|
||||
};
|
||||
cpu = {
|
||||
format = "{max_frequency}GHz";
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
};
|
||||
"cpu#cpu2" = {
|
||||
format = "CPU {usage}%";
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
};
|
||||
memory = {
|
||||
interval = 5;
|
||||
format = "{used:0.2f}G";
|
||||
};
|
||||
"custom/temperature" = {
|
||||
interval = 5;
|
||||
exec = pkgs.lib.mkDefault "echo TODO";
|
||||
};
|
||||
battery = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon}";
|
||||
tooltip-format = "{capacity}% ({time})";
|
||||
format-icons = [ " " " " " " " " " " ];
|
||||
format-charging = "{capacity}% ";
|
||||
format-full = "{capacity}% ";
|
||||
format-alt = "{capacity}% {time} [{power:.2} W]";
|
||||
};
|
||||
};
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
height = pkgs.lib.mkDefault 35;
|
||||
spacing = 4;
|
||||
# output = "DP-2"; # Fill in with host-specific config!
|
||||
modules-left = ["wlr/taskbar"];
|
||||
modules-center = ["hyprland/workspaces"];
|
||||
modules-right = [
|
||||
"tray"
|
||||
"wireplumber"
|
||||
"battery"
|
||||
"cpu#cpu2"
|
||||
"cpu"
|
||||
"memory"
|
||||
"custom/temperature"
|
||||
"clock"
|
||||
"clock#clock2"
|
||||
];
|
||||
"wlr/taskbar" = {
|
||||
on-click = "activate";
|
||||
on-click-right = "close";
|
||||
format = "{icon} {title:.20}";
|
||||
all-outputs = true;
|
||||
};
|
||||
style = ''
|
||||
"wireplumber" = {
|
||||
format = "{icon} {volume}%";
|
||||
format-muted = "";
|
||||
on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
format-icons = ["" "" ""];
|
||||
};
|
||||
"hyprland/workspaces" = {
|
||||
disable-scroll = true;
|
||||
all-outputs = true;
|
||||
warp-on-scroll = false;
|
||||
format = "{name}";
|
||||
};
|
||||
"hyprland/window" = {max-length = 50;};
|
||||
tray = {spacing = 10;};
|
||||
"clock#clock2" = {
|
||||
timezone = "Asia/Bangkok";
|
||||
format = "{:%H:%M:%S}";
|
||||
interval = 1;
|
||||
};
|
||||
clock = {
|
||||
timezone = "Asia/Bangkok";
|
||||
format = "{:%Y-%m-%d}";
|
||||
interval = 3600;
|
||||
};
|
||||
cpu = {
|
||||
format = "{max_frequency}GHz";
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
};
|
||||
"cpu#cpu2" = {
|
||||
format = "CPU {usage}%";
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
};
|
||||
memory = {
|
||||
interval = 5;
|
||||
format = "{used:0.2f}G";
|
||||
};
|
||||
"custom/temperature" = {
|
||||
interval = 5;
|
||||
exec = pkgs.lib.mkDefault "echo TODO";
|
||||
};
|
||||
battery = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon}";
|
||||
tooltip-format = "{capacity}% ({time})";
|
||||
format-icons = [" " " " " " " " " "];
|
||||
format-charging = "{capacity}% ";
|
||||
format-full = "{capacity}% ";
|
||||
format-alt = "{capacity}% {time} [{power:.2} W]";
|
||||
};
|
||||
};
|
||||
};
|
||||
style = ''
|
||||
* {
|
||||
/* `otf-font-awesome` is required to be installed for icons */
|
||||
font-size: 14px;
|
||||
|
|
@ -227,6 +229,6 @@
|
|||
-gtk-icon-effect: highlight;
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
'';
|
||||
};
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{...}:
|
||||
|
||||
{
|
||||
{...}: {
|
||||
programs.yazi = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
|
|
@ -13,16 +11,56 @@
|
|||
|
||||
keymap = {
|
||||
mgr.normal = [
|
||||
{ on = [ "j" ]; run = "down"; desc = "Move cursor down"; }
|
||||
{ on = [ "k" ]; run = "up"; desc = "Move cursor up"; }
|
||||
{ on = [ "h" ]; run = "back"; desc = "Go back to parent directory"; }
|
||||
{ on = [ "l" ]; run = "forward"; desc = "Enter directory / open file"; }
|
||||
{ on = [ "q" ]; run = "quit"; desc = "Quit yazi"; }
|
||||
{ on = [ " " ]; run = "select"; desc = "Select the current file"; }
|
||||
{ on = [ "v" ]; run = "visual_mode"; desc = "Enter visual mode"; }
|
||||
{ on = [ "y" ]; run = "yank"; desc = "Yank selection"; }
|
||||
{ on = [ "p" ]; run = "paste"; desc = "Paste files"; }
|
||||
{ on = [ "d" ]; run = "remove --permanently"; desc = "Delete permanently"; }
|
||||
{
|
||||
on = ["j"];
|
||||
run = "down";
|
||||
desc = "Move cursor down";
|
||||
}
|
||||
{
|
||||
on = ["k"];
|
||||
run = "up";
|
||||
desc = "Move cursor up";
|
||||
}
|
||||
{
|
||||
on = ["h"];
|
||||
run = "back";
|
||||
desc = "Go back to parent directory";
|
||||
}
|
||||
{
|
||||
on = ["l"];
|
||||
run = "forward";
|
||||
desc = "Enter directory / open file";
|
||||
}
|
||||
{
|
||||
on = ["q"];
|
||||
run = "quit";
|
||||
desc = "Quit yazi";
|
||||
}
|
||||
{
|
||||
on = [" "];
|
||||
run = "select";
|
||||
desc = "Select the current file";
|
||||
}
|
||||
{
|
||||
on = ["v"];
|
||||
run = "visual_mode";
|
||||
desc = "Enter visual mode";
|
||||
}
|
||||
{
|
||||
on = ["y"];
|
||||
run = "yank";
|
||||
desc = "Yank selection";
|
||||
}
|
||||
{
|
||||
on = ["p"];
|
||||
run = "paste";
|
||||
desc = "Paste files";
|
||||
}
|
||||
{
|
||||
on = ["d"];
|
||||
run = "remove --permanently";
|
||||
desc = "Delete permanently";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
programs.zellij = {
|
||||
enable = true;
|
||||
};
|
||||
home.file."${config.xdg.configHome}/zellij" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
{config, ...}: {
|
||||
programs.zellij = {
|
||||
enable = true;
|
||||
};
|
||||
home.file."${config.xdg.configHome}/zellij" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,114 +1,117 @@
|
|||
{ config, inputs, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = [
|
||||
pkgs.fzy
|
||||
pkgs.lf
|
||||
pkgs.curl
|
||||
pkgs.fd
|
||||
pkgs.zsh-powerlevel10k
|
||||
pkgs.zsh-autocomplete
|
||||
pkgs.zsh-vi-mode
|
||||
pkgs.ripgrep
|
||||
pkgs.rsync
|
||||
pkgs.moreutils
|
||||
inputs.fzgo.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
];
|
||||
home.sessionVariables = {
|
||||
BROWSER = "Helium";
|
||||
PDF_VIEWER = "evince";
|
||||
GPULAB_CERT = "${config.xdg.configHome}/../.secrets/GPULab/certificate.pem";
|
||||
GPULAB_DEV = "False";
|
||||
GCC_COLORS = "error = '01;31:warning = '01;35:note = '01;36:caret = '01;32:locus = '01:quote = '01'";
|
||||
ARCHFLAGS = "-arch x86_64";
|
||||
TERM = "screen-256color";
|
||||
PYTHONDONTWRITEBYTECODE = "1";
|
||||
GOPATH = "${config.xdg.dataHome}/go";
|
||||
DIRENV_LOG_FORMAT = "";
|
||||
OPENER = "${pkgs.handlr-regex}/bin/handlr open";
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = [
|
||||
pkgs.fzy
|
||||
pkgs.lf
|
||||
pkgs.curl
|
||||
pkgs.fd
|
||||
pkgs.zsh-powerlevel10k
|
||||
pkgs.zsh-autocomplete
|
||||
pkgs.zsh-vi-mode
|
||||
pkgs.ripgrep
|
||||
pkgs.rsync
|
||||
pkgs.moreutils
|
||||
inputs.fzgo.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
];
|
||||
home.sessionVariables = {
|
||||
BROWSER = "Helium";
|
||||
PDF_VIEWER = "evince";
|
||||
GPULAB_CERT = "${config.xdg.configHome}/../.secrets/GPULab/certificate.pem";
|
||||
GPULAB_DEV = "False";
|
||||
GCC_COLORS = "error = '01;31:warning = '01;35:note = '01;36:caret = '01;32:locus = '01:quote = '01'";
|
||||
ARCHFLAGS = "-arch x86_64";
|
||||
TERM = "screen-256color";
|
||||
PYTHONDONTWRITEBYTECODE = "1";
|
||||
GOPATH = "${config.xdg.dataHome}/go";
|
||||
DIRENV_LOG_FORMAT = "";
|
||||
OPENER = "${pkgs.handlr-regex}/bin/handlr open";
|
||||
};
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
config = {
|
||||
global = {
|
||||
hiden_env_diff = true;
|
||||
warn_timeout = 0;
|
||||
};
|
||||
};
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
config = {
|
||||
global = {
|
||||
hiden_env_diff = true;
|
||||
warn_timeout = 0;
|
||||
};
|
||||
};
|
||||
};
|
||||
home.file."${config.xdg.configHome}/direnv/direnvrc".text = ''
|
||||
: "''${XDG_CACHE_HOME:="''${HOME}/.cache"}"
|
||||
declare -A direnv_layout_dirs
|
||||
direnv_layout_dir() {
|
||||
local hash path
|
||||
echo "''${direnv_layout_dirs[$PWD]:=$(
|
||||
hash="$(sha1sum - <<< "$PWD" | head -c40)"
|
||||
path="''${PWD//[^a-zA-Z0-9]/-}"
|
||||
echo "''${XDG_CACHE_HOME}/direnv/layouts/''${hash}''${path}"
|
||||
)}"
|
||||
};
|
||||
home.file."${config.xdg.configHome}/direnv/direnvrc".text = ''
|
||||
: "''${XDG_CACHE_HOME:="''${HOME}/.cache"}"
|
||||
declare -A direnv_layout_dirs
|
||||
direnv_layout_dir() {
|
||||
local hash path
|
||||
echo "''${direnv_layout_dirs[$PWD]:=$(
|
||||
hash="$(sha1sum - <<< "$PWD" | head -c40)"
|
||||
path="''${PWD//[^a-zA-Z0-9]/-}"
|
||||
echo "''${XDG_CACHE_HOME}/direnv/layouts/''${hash}''${path}"
|
||||
)}"
|
||||
}
|
||||
'';
|
||||
programs.fzf = {enable = true;};
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
syntaxHighlighting.enable = false;
|
||||
autosuggestion.enable = true;
|
||||
initContent = pkgs.lib.mkBefore ''
|
||||
ZVM_VI_INSERT_ESCAPE_BINDKEY=jj
|
||||
export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH
|
||||
source ${./files/waypipe.zsh}
|
||||
source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
|
||||
source ${./files/p10k.zsh}
|
||||
source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
|
||||
source ${./files/functions.zsh}
|
||||
source ${./files/fzgo.zsh}
|
||||
function zvm_after_init() {
|
||||
source ${./files/term.zsh}
|
||||
source ${./files/completion.zsh}
|
||||
if [ -n "\$\{commands[fzf-share]\}" ]; then
|
||||
source "$(fzf-share)/key-bindings.zsh"
|
||||
source "$(fzf-share)/completion.zsh"
|
||||
fi
|
||||
source ${./files/keys.zsh}
|
||||
eval "$(direnv hook zsh)"
|
||||
export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH
|
||||
}
|
||||
function o() {
|
||||
${pkgs.handlr-regex}/bin/handlr open $@ < /dev/null &> /dev/null & disown
|
||||
}
|
||||
precmd() {
|
||||
print -Pn "\e]133;A\e\\"
|
||||
}
|
||||
'';
|
||||
programs.fzf = { enable = true; };
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
syntaxHighlighting.enable = false;
|
||||
autosuggestion.enable = true;
|
||||
initContent = pkgs.lib.mkBefore ''
|
||||
ZVM_VI_INSERT_ESCAPE_BINDKEY=jj
|
||||
export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH
|
||||
source ${./files/waypipe.zsh}
|
||||
source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
|
||||
source ${./files/p10k.zsh}
|
||||
source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
|
||||
source ${./files/functions.zsh}
|
||||
source ${./files/fzgo.zsh}
|
||||
function zvm_after_init() {
|
||||
source ${./files/term.zsh}
|
||||
source ${./files/completion.zsh}
|
||||
if [ -n "\$\{commands[fzf-share]\}" ]; then
|
||||
source "$(fzf-share)/key-bindings.zsh"
|
||||
source "$(fzf-share)/completion.zsh"
|
||||
fi
|
||||
source ${./files/keys.zsh}
|
||||
eval "$(direnv hook zsh)"
|
||||
export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH
|
||||
}
|
||||
function o() {
|
||||
${pkgs.handlr-regex}/bin/handlr open $@ < /dev/null &> /dev/null & disown
|
||||
}
|
||||
precmd() {
|
||||
print -Pn "\e]133;A\e\\"
|
||||
}
|
||||
'';
|
||||
|
||||
shellAliases = {
|
||||
mallorea = "run_waypipe mallorea";
|
||||
vault = "run_waypipe vault";
|
||||
riva = "run_waypipe riva";
|
||||
kell = "run_waypipe kell";
|
||||
aloria = "run_waypipe aloria";
|
||||
arch = "run_waypipe arch";
|
||||
shellAliases = {
|
||||
mallorea = "run_waypipe mallorea";
|
||||
vault = "run_waypipe vault";
|
||||
riva = "run_waypipe riva";
|
||||
kell = "run_waypipe kell";
|
||||
aloria = "run_waypipe aloria";
|
||||
arch = "run_waypipe arch";
|
||||
|
||||
ll = "ls -lhat";
|
||||
ls = "ls --color=auto";
|
||||
lf = ''cd "$(${pkgs.lf}/bin/lf -print-last-dir)"'';
|
||||
ll = "ls -lhat";
|
||||
ls = "ls --color=auto";
|
||||
lf = ''cd "$(${pkgs.lf}/bin/lf -print-last-dir)"'';
|
||||
|
||||
compress = "tar --use-compress-program = lbzip2 -cvf";
|
||||
wget = ''wget --hsts-file = "$XDG_DATA_HOME/wget-hsts"'';
|
||||
python = "python3";
|
||||
vim = "nvim";
|
||||
v = ''echo $(pwd) > /tmp/oil_dir && nvim -c ':lua require("oil").open()' && cd "$(cat /tmp/oil_dir 2> /dev/null || pwd)"'';
|
||||
cpr = "rsync --archive -hh --partial --info = stats1,progress2 --modify-window = 1";
|
||||
mvr = "rsync --archive -hh --partial --info = stats1,progress2 --modify-window = 1 --remove-source-files";
|
||||
rg = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";
|
||||
ag = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";
|
||||
reset = "tput reset";
|
||||
};
|
||||
history.size = 10000000;
|
||||
history.save = 10000000;
|
||||
history.path = "${config.xdg.dataHome}/zsh/history";
|
||||
autocd = true;
|
||||
compress = "tar --use-compress-program = lbzip2 -cvf";
|
||||
wget = ''wget --hsts-file = "$XDG_DATA_HOME/wget-hsts"'';
|
||||
python = "python3";
|
||||
vim = "nvim";
|
||||
v = ''echo $(pwd) > /tmp/oil_dir && nvim -c ':lua require("oil").open()' && cd "$(cat /tmp/oil_dir 2> /dev/null || pwd)"'';
|
||||
cpr = "rsync --archive -hh --partial --info = stats1,progress2 --modify-window = 1";
|
||||
mvr = "rsync --archive -hh --partial --info = stats1,progress2 --modify-window = 1 --remove-source-files";
|
||||
rg = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";
|
||||
ag = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";
|
||||
reset = "tput reset";
|
||||
};
|
||||
history.size = 10000000;
|
||||
history.save = 10000000;
|
||||
history.path = "${config.xdg.dataHome}/zsh/history";
|
||||
autocd = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,157 +1,183 @@
|
|||
{ pkgs, lib, inputs, config, ... }:
|
||||
let
|
||||
serverIP = "10.0.0.1";
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
serverIP = "10.0.0.1";
|
||||
in {
|
||||
imports = [
|
||||
(import ../Common/default.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/nfs.nix { inherit pkgs serverIP; })
|
||||
(import ../Common/zfs.nix {inherit inputs pkgs config; })
|
||||
imports = [
|
||||
(import ../Common/default.nix {inherit inputs pkgs config;})
|
||||
(import ../Common/desktop.nix {inherit inputs pkgs config;})
|
||||
(import ../Common/nfs.nix {inherit pkgs serverIP;})
|
||||
(import ../Common/zfs.nix {inherit inputs pkgs config;})
|
||||
];
|
||||
|
||||
hardware.graphics.extraPackages = [
|
||||
pkgs.intel-compute-runtime
|
||||
pkgs.intel-media-driver
|
||||
];
|
||||
|
||||
zramSwap.enable = true;
|
||||
services.upower.enable = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
services.throttled.enable = true;
|
||||
services.thinkfan.enable = true;
|
||||
services.thinkfan.settings = {
|
||||
sensors = [
|
||||
# Search for 'coretemp' anywhere in /sys/class/hwmon
|
||||
{
|
||||
hwmon = "/sys/class/hwmon";
|
||||
name = "coretemp";
|
||||
indices = [1];
|
||||
}
|
||||
|
||||
# Search for 'acpitz'
|
||||
{
|
||||
hwmon = "/sys/class/hwmon";
|
||||
name = "acpitz";
|
||||
indices = [1];
|
||||
}
|
||||
|
||||
# Search for 'nvme'
|
||||
{
|
||||
hwmon = "/sys/class/hwmon";
|
||||
name = "nvme";
|
||||
indices = [1];
|
||||
}
|
||||
];
|
||||
|
||||
hardware.graphics.extraPackages = [
|
||||
pkgs.intel-compute-runtime
|
||||
pkgs.intel-media-driver
|
||||
fans = [
|
||||
{tpacpi = "/proc/acpi/ibm/fan";}
|
||||
];
|
||||
|
||||
zramSwap.enable = true;
|
||||
services.upower.enable = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
services.throttled.enable = true;
|
||||
services.thinkfan.enable = true;
|
||||
services.thinkfan.settings = {
|
||||
sensors = [
|
||||
# Search for 'coretemp' anywhere in /sys/class/hwmon
|
||||
{ hwmon = "/sys/class/hwmon"; name = "coretemp"; indices = [ 1 ]; }
|
||||
|
||||
# Search for 'acpitz'
|
||||
{ hwmon = "/sys/class/hwmon"; name = "acpitz"; indices = [ 1 ]; }
|
||||
|
||||
# Search for 'nvme'
|
||||
{ hwmon = "/sys/class/hwmon"; name = "nvme"; indices = [ 1 ]; }
|
||||
];
|
||||
|
||||
fans = [
|
||||
{ tpacpi = "/proc/acpi/ibm/fan"; }
|
||||
];
|
||||
|
||||
levels = [
|
||||
[ 0 0 45 ]
|
||||
[ 1 42 55 ]
|
||||
[ 2 50 60 ]
|
||||
[ 3 56 68 ]
|
||||
[ 5 64 78 ]
|
||||
[ 7 76 95 ]
|
||||
];
|
||||
};
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
|
||||
networking.hostId = "4e859062";
|
||||
networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
|
||||
networking.enableIPv6 = false;
|
||||
networking.wireless.iwd.enable = true;
|
||||
networking.wireless.iwd.settings = {
|
||||
IPv6 = {
|
||||
Enabled = false;
|
||||
};
|
||||
Settings = {
|
||||
AutoConnect = true;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.fprintd = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig.Type = "simple";
|
||||
};
|
||||
services.fprintd = {
|
||||
enable = true;
|
||||
# tod = {
|
||||
# enable = true;
|
||||
# };
|
||||
};
|
||||
security.pam.services.sudo.fprintAuth = true;
|
||||
|
||||
# virtualisation
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
users.users.user.extraGroups = [ "libvirtd" ];
|
||||
|
||||
services.tlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge
|
||||
STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
|
||||
};
|
||||
};
|
||||
|
||||
systemd.network.enable = true;
|
||||
networking.useNetworkd = true;
|
||||
systemd.network.config.networkConfig = {
|
||||
ManageForeignRoutingPolicyRules = false;
|
||||
ManageForeignRoutes = false;
|
||||
SpeedMeter = true;
|
||||
};
|
||||
systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
Tunnel = {
|
||||
address = [ "10.0.0.5/24" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
|
||||
listenPort = 51820;
|
||||
autostart = false;
|
||||
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
|
||||
dns = ["10.0.0.1"];
|
||||
peers = [{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
||||
endpoint = "external.thomasave.be:13231";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
OPNsense = {
|
||||
address = [ "10.0.0.5/24" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
|
||||
listenPort = 51820;
|
||||
autostart = true;
|
||||
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
|
||||
dns = ["10.0.0.1"];
|
||||
peers = [{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = [ "10.0.0.1/8" "192.168.1.2/32" ];
|
||||
endpoint = "external.thomasave.be:13231";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
GCP = {
|
||||
address = [ "10.5.0.5/24" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/GCP.key";
|
||||
listenPort = 51820;
|
||||
autostart = false;
|
||||
postUp = "resolvectl dns GCP 1.1.1.1;resolvectl dns wlan0 1.1.1.1;";
|
||||
peers = [{
|
||||
publicKey = "NEBNE4Czf2MkZF2X5aVhmofENH1uXjDpvXjIMJvfMFA=";
|
||||
allowedIPs = [ "0.0.0.0/0" ];
|
||||
endpoint = "35.201.231.151:443";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
};
|
||||
systemd.services."wg-quick-OPNsense" = {
|
||||
serviceConfig = { Restart = "on-failure"; RestartSec = "2s"; };
|
||||
unitConfig.StartLimitIntervalSec = 0;
|
||||
};
|
||||
services.usbmuxd.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
ifuse
|
||||
libimobiledevice
|
||||
scrcpy
|
||||
v4l-utils
|
||||
levels = [
|
||||
[0 0 45]
|
||||
[1 42 55]
|
||||
[2 50 60]
|
||||
[3 56 68]
|
||||
[5 64 78]
|
||||
[7 76 95]
|
||||
];
|
||||
};
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
|
||||
networking.hostId = "4e859062";
|
||||
networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
|
||||
networking.enableIPv6 = false;
|
||||
networking.wireless.iwd.enable = true;
|
||||
networking.wireless.iwd.settings = {
|
||||
IPv6 = {
|
||||
Enabled = false;
|
||||
};
|
||||
Settings = {
|
||||
AutoConnect = true;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.fprintd = {
|
||||
wantedBy = ["multi-user.target"];
|
||||
serviceConfig.Type = "simple";
|
||||
};
|
||||
services.fprintd = {
|
||||
enable = true;
|
||||
# tod = {
|
||||
# enable = true;
|
||||
# };
|
||||
};
|
||||
security.pam.services.sudo.fprintAuth = true;
|
||||
|
||||
# virtualisation
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
users.users.user.extraGroups = ["libvirtd"];
|
||||
|
||||
services.tlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge
|
||||
STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
|
||||
};
|
||||
};
|
||||
|
||||
systemd.network.enable = true;
|
||||
networking.useNetworkd = true;
|
||||
systemd.network.config.networkConfig = {
|
||||
ManageForeignRoutingPolicyRules = false;
|
||||
ManageForeignRoutes = false;
|
||||
SpeedMeter = true;
|
||||
};
|
||||
systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
Tunnel = {
|
||||
address = ["10.0.0.5/24"];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
|
||||
listenPort = 51820;
|
||||
autostart = false;
|
||||
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
|
||||
dns = ["10.0.0.1"];
|
||||
peers = [
|
||||
{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = ["0.0.0.0/0" "::/0"];
|
||||
endpoint = "external.thomasave.be:13231";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
OPNsense = {
|
||||
address = ["10.0.0.5/24"];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
|
||||
listenPort = 51820;
|
||||
autostart = true;
|
||||
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
|
||||
dns = ["10.0.0.1"];
|
||||
peers = [
|
||||
{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = ["10.0.0.1/8" "192.168.1.2/32"];
|
||||
endpoint = "external.thomasave.be:13231";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
GCP = {
|
||||
address = ["10.5.0.5/24"];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/GCP.key";
|
||||
listenPort = 51820;
|
||||
autostart = false;
|
||||
postUp = "resolvectl dns GCP 1.1.1.1;resolvectl dns wlan0 1.1.1.1;";
|
||||
peers = [
|
||||
{
|
||||
publicKey = "NEBNE4Czf2MkZF2X5aVhmofENH1uXjDpvXjIMJvfMFA=";
|
||||
allowedIPs = ["0.0.0.0/0"];
|
||||
endpoint = "35.201.231.151:443";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
systemd.services."wg-quick-OPNsense" = {
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = "2s";
|
||||
};
|
||||
unitConfig.StartLimitIntervalSec = 0;
|
||||
};
|
||||
services.usbmuxd.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
ifuse
|
||||
libimobiledevice
|
||||
scrcpy
|
||||
v4l-utils
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,71 +1,75 @@
|
|||
# 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, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback tp_smapi ];
|
||||
boot.extraModprobeConfig = ''
|
||||
options thinkpad_acpi fan_control=1
|
||||
options v4l2loopback exclusive_caps=1 card_label="Android Virtual Camera"
|
||||
'';
|
||||
boot.kernelParams = [ "ipv6.disable=1" ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel" "v4l2loopback"];
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback tp_smapi];
|
||||
boot.extraModprobeConfig = ''
|
||||
options thinkpad_acpi fan_control=1
|
||||
options v4l2loopback exclusive_caps=1 card_label="Android Virtual Camera"
|
||||
'';
|
||||
boot.kernelParams = ["ipv6.disable=1"];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "rpool/root";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "rpool/root";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "rpool/home";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/home" = {
|
||||
device = "rpool/home";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/5C58-A909";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/5C58-A909";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.trackpoint.enable = lib.mkDefault true;
|
||||
hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable;
|
||||
hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint";
|
||||
hardware.ipu6.enable = true;
|
||||
hardware.ipu6.platform = "ipu6ep";
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
zfs = pkgs.zfs_unstable;
|
||||
};
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest.extend ( self: super: {
|
||||
# ipu6-drivers = super.ipu6-drivers.overrideAttrs (
|
||||
# final: previous: rec {
|
||||
# src = builtins.fetchGit {
|
||||
# url = "https://github.com/intel/ipu6-drivers.git";
|
||||
# ref = "master";
|
||||
# rev = "4bb5b4d8128fbf7f4730cd364a8f7fc13a0ef65b";
|
||||
# };
|
||||
# patches = [
|
||||
# "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch"
|
||||
# ] ;
|
||||
# }
|
||||
# );
|
||||
# } );
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.trackpoint.enable = lib.mkDefault true;
|
||||
hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable;
|
||||
hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint";
|
||||
hardware.ipu6.enable = true;
|
||||
hardware.ipu6.platform = "ipu6ep";
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
zfs = pkgs.zfs_unstable;
|
||||
};
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest.extend ( self: super: {
|
||||
# ipu6-drivers = super.ipu6-drivers.overrideAttrs (
|
||||
# final: previous: rec {
|
||||
# src = builtins.fetchGit {
|
||||
# url = "https://github.com/intel/ipu6-drivers.git";
|
||||
# ref = "master";
|
||||
# rev = "4bb5b4d8128fbf7f4730cd364a8f7fc13a0ef65b";
|
||||
# };
|
||||
# patches = [
|
||||
# "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch"
|
||||
# ] ;
|
||||
# }
|
||||
# );
|
||||
# } );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,124 +1,137 @@
|
|||
{ pkgs, lib, inputs, config, nixos-06cb-009a-fingerprint-sensor, ... }:
|
||||
let
|
||||
serverIP = "10.0.0.1";
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
config,
|
||||
nixos-06cb-009a-fingerprint-sensor,
|
||||
...
|
||||
}: let
|
||||
serverIP = "10.0.0.1";
|
||||
in {
|
||||
imports = [
|
||||
(import ../Common/default.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/nfs.nix { inherit pkgs serverIP; })
|
||||
(import ../Common/zfs.nix {inherit inputs pkgs config; })
|
||||
];
|
||||
imports = [
|
||||
(import ../Common/default.nix {inherit inputs pkgs config;})
|
||||
(import ../Common/desktop.nix {inherit inputs pkgs config;})
|
||||
(import ../Common/nfs.nix {inherit pkgs serverIP;})
|
||||
(import ../Common/zfs.nix {inherit inputs pkgs config;})
|
||||
];
|
||||
|
||||
hardware.graphics.extraPackages = [
|
||||
pkgs.intel-compute-runtime
|
||||
pkgs.intel-media-driver
|
||||
];
|
||||
hardware.graphics.extraPackages = [
|
||||
pkgs.intel-compute-runtime
|
||||
pkgs.intel-media-driver
|
||||
];
|
||||
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = ["mitigations=off"];
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = ["mitigations=off"];
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
|
||||
zramSwap.enable = true;
|
||||
services.upower.enable = true;
|
||||
services.thermald.enable = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
services.throttled = {
|
||||
enable = true;
|
||||
};
|
||||
zramSwap.enable = true;
|
||||
services.upower.enable = true;
|
||||
services.thermald.enable = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
services.throttled = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
networking.hostId = "b6c5c9af";
|
||||
networking.interfaces.wlan0.useDHCP = lib.mkDefault false;
|
||||
networking.wireless.iwd.enable = true;
|
||||
networking.wireless.iwd.settings = {
|
||||
IPv6 = {
|
||||
Enabled = true;
|
||||
};
|
||||
Settings = {
|
||||
AutoConnect = true;
|
||||
Country = "ES";
|
||||
};
|
||||
General = {
|
||||
EnableNetworkConfiguration = true;
|
||||
};
|
||||
networking.hostId = "b6c5c9af";
|
||||
networking.interfaces.wlan0.useDHCP = lib.mkDefault false;
|
||||
networking.wireless.iwd.enable = true;
|
||||
networking.wireless.iwd.settings = {
|
||||
IPv6 = {
|
||||
Enabled = true;
|
||||
};
|
||||
# services."06cb-009a-fingerprint-sensor" = {
|
||||
# enable = true;
|
||||
# backend = "python-validity";
|
||||
# };
|
||||
# services."06cb-009a-fingerprint-sensor" = {
|
||||
# enable = true;
|
||||
# backend = "libfprint-tod";
|
||||
# calib-data-file = ./files/calib-data-2.bin;
|
||||
# };
|
||||
Settings = {
|
||||
AutoConnect = true;
|
||||
Country = "ES";
|
||||
};
|
||||
General = {
|
||||
EnableNetworkConfiguration = true;
|
||||
};
|
||||
};
|
||||
# services."06cb-009a-fingerprint-sensor" = {
|
||||
# enable = true;
|
||||
# backend = "python-validity";
|
||||
# };
|
||||
# services."06cb-009a-fingerprint-sensor" = {
|
||||
# enable = true;
|
||||
# backend = "libfprint-tod";
|
||||
# calib-data-file = ./files/calib-data-2.bin;
|
||||
# };
|
||||
|
||||
# virtualisation
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
users.users.user.extraGroups = [ "libvirtd" ];
|
||||
# virtualisation
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
users.users.user.extraGroups = ["libvirtd"];
|
||||
|
||||
services.tlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge
|
||||
STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
|
||||
START_CHARGE_THRESH_BAT1 = 40; # 40 and bellow it starts to charge
|
||||
STOP_CHARGE_THRESH_BAT1 = 80; # 80 and above it stops charging
|
||||
};
|
||||
services.tlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge
|
||||
STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
|
||||
START_CHARGE_THRESH_BAT1 = 40; # 40 and bellow it starts to charge
|
||||
STOP_CHARGE_THRESH_BAT1 = 80; # 80 and above it stops charging
|
||||
};
|
||||
};
|
||||
|
||||
systemd.network.enable = true;
|
||||
networking.useNetworkd = true;
|
||||
systemd.network.config.networkConfig = {
|
||||
ManageForeignRoutingPolicyRules = false;
|
||||
ManageForeignRoutes = false;
|
||||
SpeedMeter = true;
|
||||
systemd.network.enable = true;
|
||||
networking.useNetworkd = true;
|
||||
systemd.network.config.networkConfig = {
|
||||
ManageForeignRoutingPolicyRules = false;
|
||||
ManageForeignRoutes = false;
|
||||
SpeedMeter = true;
|
||||
};
|
||||
systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
|
||||
networking.wg-quick.interfaces = {
|
||||
Tunnel = {
|
||||
address = ["10.0.0.7/24" "2a02:a03f:83ad:2101::7/128"];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Arendia.key";
|
||||
listenPort = 51820;
|
||||
autostart = false;
|
||||
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
|
||||
dns = ["10.0.0.1"];
|
||||
peers = [
|
||||
{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = ["0.0.0.0/0" "::/0"];
|
||||
endpoint = "ipv4.thomasave.be:13231";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
|
||||
networking.wg-quick.interfaces = {
|
||||
Tunnel = {
|
||||
address = [ "10.0.0.7/24" "2a02:a03f:83ad:2101::7/128" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Arendia.key";
|
||||
listenPort = 51820;
|
||||
autostart = false;
|
||||
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
|
||||
dns = ["10.0.0.1"];
|
||||
peers = [{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
||||
endpoint = "ipv4.thomasave.be:13231";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
OPNsense = {
|
||||
address = [ "10.0.0.7/24" "2a02:a03f:83ad:2101::7/128" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Arendia.key";
|
||||
listenPort = 51820;
|
||||
autostart = true;
|
||||
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
|
||||
dns = ["10.0.0.1"];
|
||||
peers = [{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = [ "10.0.0.1/8" "192.168.1.2/32" ];
|
||||
endpoint = "ipv4.thomasave.be:13231";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
OPNsense = {
|
||||
address = ["10.0.0.7/24" "2a02:a03f:83ad:2101::7/128"];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Arendia.key";
|
||||
listenPort = 51820;
|
||||
autostart = true;
|
||||
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
|
||||
dns = ["10.0.0.1"];
|
||||
peers = [
|
||||
{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = ["10.0.0.1/8" "192.168.1.2/32"];
|
||||
endpoint = "ipv4.thomasave.be:13231";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
systemd.services."wg-quick-OPNsense" = {
|
||||
serviceConfig = { Restart = "on-failure"; RestartSec = "2s"; };
|
||||
unitConfig.StartLimitIntervalSec = 0;
|
||||
};
|
||||
systemd.services."wg-quick-OPNsense" = {
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = "2s";
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
gcc
|
||||
];
|
||||
fonts.fontDir.enable = true;
|
||||
services.flatpak.enable = true;
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
|
||||
unitConfig.StartLimitIntervalSec = 0;
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
gcc
|
||||
];
|
||||
fonts.fontDir.enable = true;
|
||||
services.flatpak.enable = true;
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +1,40 @@
|
|||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "rpool/root";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "rpool/root";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "rpool/home";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/home" = {
|
||||
device = "rpool/home";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/12CE-A600";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/12CE-A600";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||
swapDevices = [];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
services.hardware.bolt.enable = true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
services.hardware.bolt.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,36 @@
|
|||
{
|
||||
description = "Home Manager configuration of Arm VPS";
|
||||
description = "Home Manager configuration of Arm VPS";
|
||||
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
||||
let
|
||||
system = "aarch64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."ubuntu" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "aarch64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."ubuntu" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [ ../../home/Arm.nix ];
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [../../home/Arm.nix];
|
||||
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,42 +1,49 @@
|
|||
{ lib, inputs, config, pkgs, ... }:
|
||||
let
|
||||
serverIP = "192.168.1.2";
|
||||
{
|
||||
lib,
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
serverIP = "192.168.1.2";
|
||||
in {
|
||||
imports = [
|
||||
(import ../Common/default.nix { inherit inputs pkgs; })
|
||||
(import ../Common/nvidia.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/nfs.nix { inherit pkgs serverIP; })
|
||||
];
|
||||
imports = [
|
||||
(import ../Common/default.nix {inherit inputs pkgs;})
|
||||
(import ../Common/nvidia.nix {inherit inputs pkgs config;})
|
||||
(import ../Common/desktop.nix {inherit inputs pkgs config;})
|
||||
(import ../Common/nfs.nix {inherit pkgs serverIP;})
|
||||
];
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = [ "10.0.0.8/24" " 2a02:a03f:83ad:2101::8/128" ];
|
||||
dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Asturia.key";
|
||||
listenPort = 51820;
|
||||
peers = [{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = [ "10.0.0.1/8" ];
|
||||
endpoint = "192.168.1.1:13231";
|
||||
}];
|
||||
};
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = ["10.0.0.8/24" " 2a02:a03f:83ad:2101::8/128"];
|
||||
dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Asturia.key";
|
||||
listenPort = 51820;
|
||||
peers = [
|
||||
{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = ["10.0.0.1/8"];
|
||||
endpoint = "192.168.1.1:13231";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# Programs & Services
|
||||
programs.gnupg.agent.enable = true;
|
||||
services.sunshine = {
|
||||
enable = true;
|
||||
autoStart = true;
|
||||
capSysAdmin = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
fileSystems."/mnt/host" = {
|
||||
device = "host";
|
||||
fsType = "virtiofs";
|
||||
};
|
||||
# Programs & Services
|
||||
programs.gnupg.agent.enable = true;
|
||||
services.sunshine = {
|
||||
enable = true;
|
||||
autoStart = true;
|
||||
capSysAdmin = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
fileSystems."/mnt/host" = {
|
||||
device = "host";
|
||||
fsType = "virtiofs";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +1,34 @@
|
|||
# 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, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/721d0462-9488-435e-9690-f13f11557edc";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/721d0462-9488-435e-9690-f13f11557edc";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/CE52-0414";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/CE52-0414";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,142 +1,141 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland:
|
||||
{pkgs, ...}: {
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland:
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
security.polkit.enable = true;
|
||||
security.rtkit.enable = true;
|
||||
programs.zsh.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [
|
||||
# Toolchain / C++ runtime
|
||||
stdenv.cc.cc # libc, libgcc, libstdc++
|
||||
stdenv.cc.cc.lib # sometimes needed explicitly
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
security.polkit.enable = true;
|
||||
security.rtkit.enable = true;
|
||||
programs.zsh.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [
|
||||
# Toolchain / C++ runtime
|
||||
stdenv.cc.cc # libc, libgcc, libstdc++
|
||||
stdenv.cc.cc.lib # sometimes needed explicitly
|
||||
|
||||
# Compression / archive
|
||||
zlib
|
||||
zstd
|
||||
xz
|
||||
bzip2
|
||||
# Compression / archive
|
||||
zlib
|
||||
zstd
|
||||
xz
|
||||
bzip2
|
||||
|
||||
# Crypto / TLS / networking
|
||||
openssl
|
||||
curl
|
||||
libssh
|
||||
# Crypto / TLS / networking
|
||||
openssl
|
||||
curl
|
||||
libssh
|
||||
|
||||
# Core system libs
|
||||
attr
|
||||
acl
|
||||
util-linux
|
||||
libsodium
|
||||
systemd # libudev, libsystemd
|
||||
libxml2
|
||||
expat
|
||||
# Core system libs
|
||||
attr
|
||||
acl
|
||||
util-linux
|
||||
libsodium
|
||||
systemd # libudev, libsystemd
|
||||
libxml2
|
||||
expat
|
||||
|
||||
# Graphics / X11 / desktop
|
||||
libx11
|
||||
libxext
|
||||
libxfixes
|
||||
libxdamage
|
||||
libxcomposite
|
||||
libxrandr
|
||||
libxcb
|
||||
libdrm
|
||||
mesa
|
||||
libxkbcommon
|
||||
# Graphics / X11 / desktop
|
||||
libx11
|
||||
libxext
|
||||
libxfixes
|
||||
libxdamage
|
||||
libxcomposite
|
||||
libxrandr
|
||||
libxcb
|
||||
libdrm
|
||||
mesa
|
||||
libxkbcommon
|
||||
|
||||
# Audio / desktop integration
|
||||
alsa-lib
|
||||
dbus
|
||||
cups
|
||||
# Audio / desktop integration
|
||||
alsa-lib
|
||||
dbus
|
||||
cups
|
||||
|
||||
# GLib / GTK stack (lots of GUI apps, Electron, etc.)
|
||||
glib
|
||||
gdk-pixbuf
|
||||
pango
|
||||
cairo
|
||||
atk
|
||||
gtk3
|
||||
# GLib / GTK stack (lots of GUI apps, Electron, etc.)
|
||||
glib
|
||||
gdk-pixbuf
|
||||
pango
|
||||
cairo
|
||||
atk
|
||||
gtk3
|
||||
|
||||
# NSS/NSPR (Firefox, Electron, many apps)
|
||||
nspr
|
||||
nss
|
||||
];
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.systemd-boot.memtest86.enable = true;
|
||||
boot.loader.systemd-boot.netbootxyz.enable = true;
|
||||
boot.loader.timeout = 1;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
systemd.settings.Manager.DefaultTimeoutStopSec = "10s";
|
||||
systemd.settings.Manager.DefaultTimeoutStartSec = "10s";
|
||||
systemd.settings.Manager.DefaultTimeoutAbortSec = "10s";
|
||||
systemd.settings.Manager.DefaultDeviceTimeoutSec = "10s";
|
||||
systemd.services.systemd-user-sessions.enable = false;
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
|
||||
powerManagement.enable = true;
|
||||
services.thermald.enable = true;
|
||||
services.pcscd.enable = true;
|
||||
services.fwupd.enable = true;
|
||||
services.gvfs.enable = true;
|
||||
services.fstrim.enable = true;
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
PermitRootLogin = "no";
|
||||
PasswordAuthentication = false;
|
||||
};
|
||||
};
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-color-emoji
|
||||
iosevka
|
||||
roboto
|
||||
font-awesome
|
||||
jetbrains-mono
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.ubuntu
|
||||
nerd-fonts.zed-mono
|
||||
# NSS/NSPR (Firefox, Electron, many apps)
|
||||
nspr
|
||||
nss
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
android-tools
|
||||
virtiofsd
|
||||
wget
|
||||
curl
|
||||
git
|
||||
lm_sensors
|
||||
wireguard-tools
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.systemd-boot.memtest86.enable = true;
|
||||
boot.loader.systemd-boot.netbootxyz.enable = true;
|
||||
boot.loader.timeout = 1;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
systemd.settings.Manager.DefaultTimeoutStopSec = "10s";
|
||||
systemd.settings.Manager.DefaultTimeoutStartSec = "10s";
|
||||
systemd.settings.Manager.DefaultTimeoutAbortSec = "10s";
|
||||
systemd.settings.Manager.DefaultDeviceTimeoutSec = "10s";
|
||||
systemd.services.systemd-user-sessions.enable = false;
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
|
||||
# Podman
|
||||
dive
|
||||
podman-tui
|
||||
docker-compose
|
||||
];
|
||||
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "daily";
|
||||
options = "--delete-older-than 2d";
|
||||
powerManagement.enable = true;
|
||||
services.thermald.enable = true;
|
||||
services.pcscd.enable = true;
|
||||
services.fwupd.enable = true;
|
||||
services.gvfs.enable = true;
|
||||
services.fstrim.enable = true;
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
PermitRootLogin = "no";
|
||||
PasswordAuthentication = false;
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation.containers.enable = true;
|
||||
virtualisation = {
|
||||
podman = {
|
||||
enable = true;
|
||||
dockerCompat = true;
|
||||
defaultNetwork.settings.dns_enabled = true;
|
||||
};
|
||||
};
|
||||
fonts.packages = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-color-emoji
|
||||
iosevka
|
||||
roboto
|
||||
font-awesome
|
||||
jetbrains-mono
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.ubuntu
|
||||
nerd-fonts.zed-mono
|
||||
];
|
||||
|
||||
services.resolved = {
|
||||
enable = pkgs.lib.mkDefault true;
|
||||
settings.Resolve.FallbackDNS = [ "1.1.1.1" "1.0.0.1" ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
android-tools
|
||||
virtiofsd
|
||||
wget
|
||||
curl
|
||||
git
|
||||
lm_sensors
|
||||
wireguard-tools
|
||||
|
||||
# Podman
|
||||
dive
|
||||
podman-tui
|
||||
docker-compose
|
||||
];
|
||||
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "daily";
|
||||
options = "--delete-older-than 2d";
|
||||
};
|
||||
|
||||
virtualisation.containers.enable = true;
|
||||
virtualisation = {
|
||||
podman = {
|
||||
enable = true;
|
||||
dockerCompat = true;
|
||||
defaultNetwork.settings.dns_enabled = true;
|
||||
};
|
||||
networking.nameservers = pkgs.lib.mkDefault ["1.1.1.1" "1.0.0.1"];
|
||||
};
|
||||
|
||||
services.resolved = {
|
||||
enable = pkgs.lib.mkDefault true;
|
||||
settings.Resolve.FallbackDNS = ["1.1.1.1" "1.0.0.1"];
|
||||
};
|
||||
networking.nameservers = pkgs.lib.mkDefault ["1.1.1.1" "1.0.0.1"];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,65 +1,68 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||
programs.appimage.enable = true;
|
||||
programs.appimage.binfmt = true;
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.udev.packages = [pkgs.yubikey-personalization];
|
||||
programs.appimage.enable = true;
|
||||
programs.appimage.binfmt = true;
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
vulkan-loader
|
||||
vulkan-validation-layers
|
||||
vulkan-extension-layer
|
||||
];
|
||||
};
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
};
|
||||
services.greetd = {
|
||||
enable = pkgs.lib.mkDefault true;
|
||||
settings = rec {
|
||||
initial_session = {
|
||||
command = "uwsm start hyprland-uwsm.desktop";
|
||||
user = "user";
|
||||
};
|
||||
default_session = initial_session;
|
||||
};
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
vulkan-loader
|
||||
vulkan-validation-layers
|
||||
vulkan-extension-layer
|
||||
];
|
||||
};
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
};
|
||||
services.greetd = {
|
||||
enable = pkgs.lib.mkDefault true;
|
||||
settings = rec {
|
||||
initial_session = {
|
||||
command = "uwsm start hyprland-uwsm.desktop";
|
||||
user = "user";
|
||||
};
|
||||
default_session = initial_session;
|
||||
};
|
||||
};
|
||||
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_TIME = "en_GB.UTF-8";
|
||||
};
|
||||
environment.variables = {
|
||||
LC_TIME = "en_GB.UTF-8";
|
||||
};
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_TIME = "en_GB.UTF-8";
|
||||
};
|
||||
environment.variables = {
|
||||
LC_TIME = "en_GB.UTF-8";
|
||||
};
|
||||
|
||||
# Calendar
|
||||
# Add the server using gnome-online-accounts:
|
||||
# nix-shell -p gnome-control-center --run "gnome-control-center"
|
||||
# Just add the main webdav server and gnome-calendar will automatically pick up all available calendars.
|
||||
programs.dconf.enable = true;
|
||||
services.gnome.evolution-data-server.enable = true;
|
||||
services.gnome.gnome-online-accounts.enable = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
services.gnome.sushi.enable = true;
|
||||
# Calendar
|
||||
# Add the server using gnome-online-accounts:
|
||||
# nix-shell -p gnome-control-center --run "gnome-control-center"
|
||||
# Just add the main webdav server and gnome-calendar will automatically pick up all available calendars.
|
||||
programs.dconf.enable = true;
|
||||
services.gnome.evolution-data-server.enable = true;
|
||||
services.gnome.gnome-online-accounts.enable = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
services.gnome.sushi.enable = true;
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
settings = {
|
||||
General = {
|
||||
Experimental = true;
|
||||
};
|
||||
};
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
settings = {
|
||||
General = {
|
||||
Experimental = true;
|
||||
};
|
||||
};
|
||||
services.blueman.enable = true;
|
||||
};
|
||||
services.blueman.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,64 +1,70 @@
|
|||
{pkgs, serverIP, ...}:
|
||||
|
||||
let
|
||||
sharePath = "/home/server";
|
||||
mountPath = "/home/server";
|
||||
common_options = [
|
||||
"noauto"
|
||||
"_netdev"
|
||||
"soft"
|
||||
"bg"
|
||||
"intr"
|
||||
# "x-systemd.automount"
|
||||
"x-systemd.idle-timeout=600"
|
||||
"x-systemd.device-timeout=2s"
|
||||
"x-systemd.mount-timeout=2s"
|
||||
"timeo=5"
|
||||
"x-gvfs-hide"
|
||||
"x-systemd.after=network-online.target"
|
||||
"x-systemd.requires=network-online.target"
|
||||
];
|
||||
bind_options = [
|
||||
"bind"
|
||||
"x-systemd.after=${builtins.replaceStrings ["/"] ["-"] mountPath}.mount"
|
||||
] ++ common_options;
|
||||
{
|
||||
pkgs,
|
||||
serverIP,
|
||||
...
|
||||
}: let
|
||||
sharePath = "/home/server";
|
||||
mountPath = "/home/server";
|
||||
common_options = [
|
||||
"noauto"
|
||||
"_netdev"
|
||||
"soft"
|
||||
"bg"
|
||||
"intr"
|
||||
# "x-systemd.automount"
|
||||
"x-systemd.idle-timeout=600"
|
||||
"x-systemd.device-timeout=2s"
|
||||
"x-systemd.mount-timeout=2s"
|
||||
"timeo=5"
|
||||
"x-gvfs-hide"
|
||||
"x-systemd.after=network-online.target"
|
||||
"x-systemd.requires=network-online.target"
|
||||
];
|
||||
bind_options =
|
||||
[
|
||||
"bind"
|
||||
"x-systemd.after=${builtins.replaceStrings ["/"] ["-"] mountPath}.mount"
|
||||
]
|
||||
++ common_options;
|
||||
in {
|
||||
services.rpcbind.enable = true;
|
||||
boot.supportedFilesystems = [ "nfs" ];
|
||||
fileSystems.${mountPath} = {
|
||||
device = "${serverIP}:${sharePath}";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.after=wg-quick-Tunnel.service"
|
||||
"x-systemd.after=wg-quick-OPNsense.service"
|
||||
] ++ common_options;
|
||||
};
|
||||
services.rpcbind.enable = true;
|
||||
boot.supportedFilesystems = ["nfs"];
|
||||
fileSystems.${mountPath} = {
|
||||
device = "${serverIP}:${sharePath}";
|
||||
fsType = "nfs";
|
||||
options =
|
||||
[
|
||||
"x-systemd.after=wg-quick-Tunnel.service"
|
||||
"x-systemd.after=wg-quick-OPNsense.service"
|
||||
]
|
||||
++ common_options;
|
||||
};
|
||||
|
||||
systemd.services."${builtins.replaceStrings ["/"] ["-"] mountPath}-unmount" = {
|
||||
description = "Unmount NFS share before shutdown";
|
||||
wantedBy = [ "shutdown.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "/bin/true";
|
||||
ExecStop = "${pkgs.util-linux}/bin/umount -f -l ${mountPath}";
|
||||
TimeoutStopSec = "10s";
|
||||
};
|
||||
};
|
||||
fileSystems."/home/user/Workspace" = {
|
||||
device = "/home/server/Workspace";
|
||||
options = bind_options;
|
||||
};
|
||||
fileSystems."/home/user/Documents" = {
|
||||
device = "/home/server/Storage/Thomas/Documents";
|
||||
options = bind_options;
|
||||
};
|
||||
fileSystems."/home/user/Pictures" = {
|
||||
device = "/home/server/Storage/Thomas/Pictures";
|
||||
options = bind_options;
|
||||
};
|
||||
fileSystems."/home/user/Videos" = {
|
||||
device = "/home/server/Storage/Thomas/Videos";
|
||||
options = bind_options;
|
||||
systemd.services."${builtins.replaceStrings ["/"] ["-"] mountPath}-unmount" = {
|
||||
description = "Unmount NFS share before shutdown";
|
||||
wantedBy = ["shutdown.target"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "/bin/true";
|
||||
ExecStop = "${pkgs.util-linux}/bin/umount -f -l ${mountPath}";
|
||||
TimeoutStopSec = "10s";
|
||||
};
|
||||
};
|
||||
fileSystems."/home/user/Workspace" = {
|
||||
device = "/home/server/Workspace";
|
||||
options = bind_options;
|
||||
};
|
||||
fileSystems."/home/user/Documents" = {
|
||||
device = "/home/server/Storage/Thomas/Documents";
|
||||
options = bind_options;
|
||||
};
|
||||
fileSystems."/home/user/Pictures" = {
|
||||
device = "/home/server/Storage/Thomas/Pictures";
|
||||
options = bind_options;
|
||||
};
|
||||
fileSystems."/home/user/Videos" = {
|
||||
device = "/home/server/Storage/Thomas/Videos";
|
||||
options = bind_options;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,26 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
pciutils
|
||||
file
|
||||
gnumake
|
||||
gcc
|
||||
cudatoolkit
|
||||
podman
|
||||
nvidia-container-toolkit
|
||||
];
|
||||
nixpkgs.config.cudaSupport = true;
|
||||
hardware.nvidia-container-toolkit.enable = true;
|
||||
hardware.nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = true;
|
||||
powerManagement.finegrained = false;
|
||||
open = false;
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
environment.systemPackages = with pkgs; [
|
||||
pciutils
|
||||
file
|
||||
gnumake
|
||||
gcc
|
||||
cudatoolkit
|
||||
podman
|
||||
nvidia-container-toolkit
|
||||
];
|
||||
nixpkgs.config.cudaSupport = true;
|
||||
hardware.nvidia-container-toolkit.enable = true;
|
||||
hardware.nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = true;
|
||||
powerManagement.finegrained = false;
|
||||
open = false;
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +1,33 @@
|
|||
{ ... }:
|
||||
{
|
||||
boot.initrd.supportedFilesystems = [ "zfs" ];
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
services.zfs.autoScrub.enable = true;
|
||||
services.sanoid = {
|
||||
enable = true;
|
||||
interval = "*:0,15,30,45:00";
|
||||
datasets = {
|
||||
"rpool/home" = {
|
||||
frequently = 8;
|
||||
yearly = 0;
|
||||
monthly = 0;
|
||||
weekly = 0;
|
||||
daily = 0;
|
||||
hourly = 0;
|
||||
frequent_period = 15;
|
||||
autoprune = true;
|
||||
autosnap = true;
|
||||
};
|
||||
"rpool/storage" = {
|
||||
frequently = 8;
|
||||
yearly = 0;
|
||||
monthly = 0;
|
||||
weekly = 0;
|
||||
daily = 0;
|
||||
hourly = 0;
|
||||
frequent_period = 15;
|
||||
autoprune = true;
|
||||
autosnap = true;
|
||||
};
|
||||
};
|
||||
{...}: {
|
||||
boot.initrd.supportedFilesystems = ["zfs"];
|
||||
boot.supportedFilesystems = ["zfs"];
|
||||
services.zfs.autoScrub.enable = true;
|
||||
services.sanoid = {
|
||||
enable = true;
|
||||
interval = "*:0,15,30,45:00";
|
||||
datasets = {
|
||||
"rpool/home" = {
|
||||
frequently = 8;
|
||||
yearly = 0;
|
||||
monthly = 0;
|
||||
weekly = 0;
|
||||
daily = 0;
|
||||
hourly = 0;
|
||||
frequent_period = 15;
|
||||
autoprune = true;
|
||||
autosnap = true;
|
||||
};
|
||||
"rpool/storage" = {
|
||||
frequently = 8;
|
||||
yearly = 0;
|
||||
monthly = 0;
|
||||
weekly = 0;
|
||||
daily = 0;
|
||||
hourly = 0;
|
||||
frequent_period = 15;
|
||||
autoprune = true;
|
||||
autosnap = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +1,41 @@
|
|||
{
|
||||
description = "Home Manager configuration used in Docker";
|
||||
description = "Home Manager configuration used in Docker";
|
||||
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
worktimer = {
|
||||
type = "git";
|
||||
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
||||
ref = "cli";
|
||||
};
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
worktimer = {
|
||||
type = "git";
|
||||
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
||||
ref = "cli";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [ ../../home/Docker.nix ];
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [../../home/Docker.nix];
|
||||
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,162 +1,171 @@
|
|||
{ lib, inputs, config, pkgs, ... }:
|
||||
let
|
||||
serverIP = "192.168.1.2";
|
||||
{
|
||||
lib,
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
serverIP = "192.168.1.2";
|
||||
in {
|
||||
imports = [
|
||||
(import ../Common/default.nix { inherit inputs pkgs; })
|
||||
# (import ../Common/nvidia.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/nfs.nix { inherit pkgs serverIP; })
|
||||
(import ../Common/android.nix { inherit pkgs; })
|
||||
];
|
||||
imports = [
|
||||
(import ../Common/default.nix {inherit inputs pkgs;})
|
||||
# (import ../Common/nvidia.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/desktop.nix {inherit inputs pkgs config;})
|
||||
(import ../Common/nfs.nix {inherit pkgs serverIP;})
|
||||
(import ../Common/android.nix {inherit pkgs;})
|
||||
];
|
||||
|
||||
# Kernel
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
# Kernel
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# AMD CPU
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ];
|
||||
boot.kernelModules = [ "zenpower amd_pstate=active" ];
|
||||
boot.kernelParams = ["amd_pstate=active"];
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
# AMD CPU
|
||||
boot.extraModulePackages = [config.boot.kernelPackages.zenpower];
|
||||
boot.kernelModules = ["zenpower amd_pstate=active"];
|
||||
boot.kernelParams = ["amd_pstate=active"];
|
||||
boot.initrd.kernelModules = ["amdgpu"];
|
||||
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
rocmPackages.clr.icd
|
||||
];
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
clinfo
|
||||
rocmPackages.rpp
|
||||
rocmPackages.clr
|
||||
rocmPackages.hipcc
|
||||
rocmPackages.rocm-smi
|
||||
];
|
||||
nixpkgs.config.rocmSupport = true;
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
acceleration = "rocm";
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
rocmPackages.clr.icd
|
||||
];
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
clinfo
|
||||
rocmPackages.rpp
|
||||
rocmPackages.clr
|
||||
rocmPackages.hipcc
|
||||
rocmPackages.rocm-smi
|
||||
];
|
||||
nixpkgs.config.rocmSupport = true;
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
acceleration = "rocm";
|
||||
};
|
||||
# nixpkgs.config.cudaSupport = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
|
||||
# Virtualization
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
users.users.user.extraGroups = ["libvirtd"];
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = ["10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128"];
|
||||
dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key";
|
||||
listenPort = 51820;
|
||||
peers = [
|
||||
{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = ["10.0.0.1/8"];
|
||||
endpoint = "192.168.1.1:13231";
|
||||
}
|
||||
];
|
||||
};
|
||||
# nixpkgs.config.cudaSupport = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
|
||||
networking.bridges = {
|
||||
"br0" = {
|
||||
interfaces = ["enp5s0"];
|
||||
};
|
||||
};
|
||||
networking.interfaces.br0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
|
||||
boot.kernel.sysctl."net.ipv6.conf.enp5s0.disable_ipv6" = true;
|
||||
|
||||
# Virtualization
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
users.users.user.extraGroups = [ "libvirtd" ];
|
||||
# networking.wireless.iwd.enable = true;
|
||||
# networking.wireless.iwd.settings = {
|
||||
# IPv6 = {
|
||||
# Enabled = true;
|
||||
# };
|
||||
# Settings = {
|
||||
# AutoConnect = true;
|
||||
# };
|
||||
# };
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = [ "10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128" ];
|
||||
dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key";
|
||||
listenPort = 51820;
|
||||
peers = [{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = [ "10.0.0.1/8" ];
|
||||
endpoint = "192.168.1.1:13231";
|
||||
}];
|
||||
};
|
||||
};
|
||||
# Programs & Services
|
||||
programs.gnupg.agent.enable = true;
|
||||
services.sunshine = {
|
||||
enable = true;
|
||||
autoStart = false;
|
||||
capSysAdmin = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
|
||||
networking.bridges = {
|
||||
"br0" = {
|
||||
interfaces = [ "enp5s0" ];
|
||||
};
|
||||
};
|
||||
networking.interfaces.br0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
|
||||
boot.kernel.sysctl."net.ipv6.conf.enp5s0.disable_ipv6" = true;
|
||||
|
||||
# networking.wireless.iwd.enable = true;
|
||||
# networking.wireless.iwd.settings = {
|
||||
# IPv6 = {
|
||||
# Enabled = true;
|
||||
# };
|
||||
# Settings = {
|
||||
# AutoConnect = true;
|
||||
# };
|
||||
# };
|
||||
|
||||
|
||||
# Programs & Services
|
||||
programs.gnupg.agent.enable = true;
|
||||
services.sunshine = {
|
||||
enable = true;
|
||||
autoStart = false;
|
||||
capSysAdmin = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
|
||||
specialisation = {
|
||||
vfio.configuration = {
|
||||
boot.blacklistedKernelModules = [ "k10temp" "nvidia" "nouveau" "radeon" "amdgpu"];
|
||||
boot = {
|
||||
initrd.kernelModules = [
|
||||
"kvm-amd"
|
||||
"vfio_pci"
|
||||
"vfio"
|
||||
"vfio_iommu_type1"
|
||||
# "amdgpu"
|
||||
# "nvidia_modeset"
|
||||
# "nvidia"
|
||||
# "nvidia_uvm"
|
||||
# "nvidia_drm"
|
||||
];
|
||||
kernelParams = [
|
||||
"amd_pstate=active"
|
||||
"amd_iommu=on"
|
||||
"vfio-pci.ids=10de:1b80,10de:10f0,1002:67df,1002:aaf0,1002:687f,1002:aaf8"
|
||||
];
|
||||
postBootCommands = ''
|
||||
DEVS="0000:0b:00.0 0000:0b:00.1 0000:05:00.0 0000:05:00.1
|
||||
for DEV in $DEVS; do
|
||||
echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override
|
||||
done
|
||||
modprobe -i vfio-pci
|
||||
'';
|
||||
};
|
||||
boot.extraModprobeConfig = "options vfio-pci ids=10de:1b80,10de:10f0,1002:67df,1002:aaf0,1002:687f,1002:aaf8";
|
||||
services.greetd.enable = lib.mkForce false;
|
||||
};
|
||||
vfio-nvidia.configuration = {
|
||||
boot.blacklistedKernelModules = [ "k10temp" "nvidia" "nouveau" ];
|
||||
boot = {
|
||||
initrd.kernelModules = [
|
||||
"kvm-amd"
|
||||
"vfio_pci"
|
||||
"vfio"
|
||||
"vfio_iommu_type1"
|
||||
"amdgpu"
|
||||
];
|
||||
kernelParams = [
|
||||
"amd_pstate=active"
|
||||
"amd_iommu=on"
|
||||
"vfio-pci.ids=10de:1b80,10de:10f0"
|
||||
];
|
||||
postBootCommands = ''
|
||||
DEVS="0000:0b:00.0 0000:0b:00.1
|
||||
for DEV in $DEVS; do
|
||||
echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override
|
||||
done
|
||||
modprobe -i vfio-pci
|
||||
'';
|
||||
};
|
||||
boot.extraModprobeConfig = "options vfio-pci ids=10de:1b80,10de:10f0";
|
||||
};
|
||||
};
|
||||
fonts.fontDir.enable = true;
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = [
|
||||
(pkgs.epsonscan2.override { withNonFreePlugins = true; withGui = true; } )
|
||||
specialisation = {
|
||||
vfio.configuration = {
|
||||
boot.blacklistedKernelModules = ["k10temp" "nvidia" "nouveau" "radeon" "amdgpu"];
|
||||
boot = {
|
||||
initrd.kernelModules = [
|
||||
"kvm-amd"
|
||||
"vfio_pci"
|
||||
"vfio"
|
||||
"vfio_iommu_type1"
|
||||
# "amdgpu"
|
||||
# "nvidia_modeset"
|
||||
# "nvidia"
|
||||
# "nvidia_uvm"
|
||||
# "nvidia_drm"
|
||||
];
|
||||
kernelParams = [
|
||||
"amd_pstate=active"
|
||||
"amd_iommu=on"
|
||||
"vfio-pci.ids=10de:1b80,10de:10f0,1002:67df,1002:aaf0,1002:687f,1002:aaf8"
|
||||
];
|
||||
postBootCommands = ''
|
||||
DEVS="0000:0b:00.0 0000:0b:00.1 0000:05:00.0 0000:05:00.1
|
||||
for DEV in $DEVS; do
|
||||
echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override
|
||||
done
|
||||
modprobe -i vfio-pci
|
||||
'';
|
||||
};
|
||||
boot.extraModprobeConfig = "options vfio-pci ids=10de:1b80,10de:10f0,1002:67df,1002:aaf0,1002:687f,1002:aaf8";
|
||||
services.greetd.enable = lib.mkForce false;
|
||||
};
|
||||
vfio-nvidia.configuration = {
|
||||
boot.blacklistedKernelModules = ["k10temp" "nvidia" "nouveau"];
|
||||
boot = {
|
||||
initrd.kernelModules = [
|
||||
"kvm-amd"
|
||||
"vfio_pci"
|
||||
"vfio"
|
||||
"vfio_iommu_type1"
|
||||
"amdgpu"
|
||||
];
|
||||
kernelParams = [
|
||||
"amd_pstate=active"
|
||||
"amd_iommu=on"
|
||||
"vfio-pci.ids=10de:1b80,10de:10f0"
|
||||
];
|
||||
postBootCommands = ''
|
||||
DEVS="0000:0b:00.0 0000:0b:00.1
|
||||
for DEV in $DEVS; do
|
||||
echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override
|
||||
done
|
||||
modprobe -i vfio-pci
|
||||
'';
|
||||
};
|
||||
boot.extraModprobeConfig = "options vfio-pci ids=10de:1b80,10de:10f0";
|
||||
};
|
||||
};
|
||||
fonts.fontDir.enable = true;
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = [
|
||||
(pkgs.epsonscan2.override {
|
||||
withNonFreePlugins = true;
|
||||
withGui = true;
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,32 @@
|
|||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/daf843cd-8e63-48ed-831a-e055929e86cb";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/daf843cd-8e63-48ed-831a-e055929e86cb";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/E1D9-7A48";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/E1D9-7A48";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
networking.useDHCP = lib.mkDefault false;
|
||||
networking.useDHCP = lib.mkDefault false;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +1,41 @@
|
|||
{
|
||||
description = "Home Manager configuration of server";
|
||||
description = "Home Manager configuration of server";
|
||||
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
worktimer = {
|
||||
type = "git";
|
||||
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
||||
ref = "cli";
|
||||
};
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
worktimer = {
|
||||
type = "git";
|
||||
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
||||
ref = "cli";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."server" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."server" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [ ../../home/Mallorea.nix ];
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [../../home/Mallorea.nix];
|
||||
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,36 @@
|
|||
{
|
||||
description = "Home Manager configuration of Pi";
|
||||
description = "Home Manager configuration of Pi";
|
||||
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
||||
let
|
||||
system = "aarch64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "aarch64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [ ../../home/Pi.nix ];
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [../../home/Pi.nix];
|
||||
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,53 +1,59 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
(import ../Common/default.nix { inherit inputs config pkgs; })
|
||||
(import ../Common/nvidia.nix { inherit pkgs config; })
|
||||
# (import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
];
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(import ../Common/default.nix {inherit inputs config pkgs;})
|
||||
(import ../Common/nvidia.nix {inherit pkgs config;})
|
||||
# (import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# services.sunshine = {
|
||||
# enable = true;
|
||||
# autoStart = false;
|
||||
# capSysAdmin = true;
|
||||
# openFirewall = true;
|
||||
# };
|
||||
# services.sunshine = {
|
||||
# enable = true;
|
||||
# autoStart = false;
|
||||
# capSysAdmin = true;
|
||||
# openFirewall = true;
|
||||
# };
|
||||
|
||||
boot.kernelParams = ["mitigations=off"];
|
||||
boot.kernelParams = ["mitigations=off"];
|
||||
|
||||
zramSwap.enable = true;
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = [ "10.0.0.12/24" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Riva.key";
|
||||
listenPort = 51820;
|
||||
peers = [{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = [ "10.0.0.1/8" ];
|
||||
endpoint = "192.168.1.1:13231";
|
||||
}];
|
||||
};
|
||||
};
|
||||
fileSystems."/home/server/Workspace" = {
|
||||
device = "/mnt/Workspace";
|
||||
fsType = "virtiofs";
|
||||
};
|
||||
fileSystems."/home/server/.cache/fzgo" = {
|
||||
device = "/mnt/fzgo_cache";
|
||||
fsType = "virtiofs";
|
||||
};
|
||||
fileSystems."/home/user/Workspace" = {
|
||||
device = "/home/server/Workspace";
|
||||
options = ["bind"];
|
||||
};
|
||||
services.resolved = {
|
||||
enable = false;
|
||||
};
|
||||
networking.nameservers = ["192.168.1.2"];
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
zramSwap.enable = true;
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = ["10.0.0.12/24"];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Riva.key";
|
||||
listenPort = 51820;
|
||||
peers = [
|
||||
{
|
||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||
allowedIPs = ["10.0.0.1/8"];
|
||||
endpoint = "192.168.1.1:13231";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
fileSystems."/home/server/Workspace" = {
|
||||
device = "/mnt/Workspace";
|
||||
fsType = "virtiofs";
|
||||
};
|
||||
fileSystems."/home/server/.cache/fzgo" = {
|
||||
device = "/mnt/fzgo_cache";
|
||||
fsType = "virtiofs";
|
||||
};
|
||||
fileSystems."/home/user/Workspace" = {
|
||||
device = "/home/server/Workspace";
|
||||
options = ["bind"];
|
||||
};
|
||||
services.resolved = {
|
||||
enable = false;
|
||||
};
|
||||
networking.nameservers = ["192.168.1.2"];
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,36 +1,39 @@
|
|||
# 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, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
|
||||
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/563963bd-8e27-4c9c-a1d6-d204ea7c43ff";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/563963bd-8e27-4c9c-a1d6-d204ea7c43ff";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/9F3C-9F3B";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/9F3C-9F3B";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,36 @@
|
|||
{
|
||||
description = "Home Manager configuration of Tolnedra";
|
||||
description = "Home Manager configuration of Tolnedra";
|
||||
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [ ../../home/Tolnedra.nix ];
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [../../home/Tolnedra.nix];
|
||||
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,36 @@
|
|||
{
|
||||
description = "Home Manager configuration of vault";
|
||||
description = "Home Manager configuration of vault";
|
||||
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."server" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
homeConfigurations."server" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [ ../../home/Vault.nix ];
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [../../home/Vault.nix];
|
||||
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
}; # allows access to flake inputs in hm modules
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue