Compare commits
1 Commits
master
...
gitea_typs
| Author | SHA1 | Date | |
|---|---|---|---|
f601854156
|
@ -2,8 +2,7 @@
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
];
|
||||
|
||||
@ -15,16 +14,13 @@
|
||||
gc.automatic = true;
|
||||
gc.options = "--delete-older-than 7d";
|
||||
package = pkgs.nixVersions.latest;
|
||||
settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
settings.experimental-features = ["nix-command" "flakes"];
|
||||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = [ "msr.allow_writes=on" ];
|
||||
supportedFilesystems = [ "btrfs" ];
|
||||
kernelParams = ["msr.allow_writes=on"];
|
||||
supportedFilesystems = ["btrfs"];
|
||||
tmpOnTmpfs = true;
|
||||
initrd.compressor = "zstd";
|
||||
loader.systemd-boot = {
|
||||
@ -43,7 +39,7 @@
|
||||
doas.enable = true;
|
||||
doas.extraRules = [
|
||||
{
|
||||
users = [ "akill" ];
|
||||
users = ["akill"];
|
||||
keepEnv = true;
|
||||
persist = true;
|
||||
}
|
||||
@ -57,16 +53,15 @@
|
||||
networking = {
|
||||
firewall.enable = true;
|
||||
hostName = "blue";
|
||||
nameservers = [
|
||||
"127.0.0.1"
|
||||
"::1"
|
||||
];
|
||||
nameservers = ["127.0.0.1" "::1"];
|
||||
dhcpcd.extraConfig = "nohook resolv.conf";
|
||||
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
dns = "none";
|
||||
# wifi.backend = "iwd";
|
||||
/*
|
||||
wifi.backend = "iwd";
|
||||
*/
|
||||
};
|
||||
};
|
||||
|
||||
@ -97,8 +92,8 @@
|
||||
services = {
|
||||
"caps2esc" = {
|
||||
description = "Intercepts keyboard udev events";
|
||||
wants = [ "systemd-udevd.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = ["systemd-udevd.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
serviceConfig.Nice = -20;
|
||||
script = ''
|
||||
${pkgs.interception-tools}/bin/intercept \
|
||||
@ -157,10 +152,7 @@
|
||||
windowManager.i3.enable = true;
|
||||
};
|
||||
|
||||
udev.packages = [
|
||||
pkgs.rtl-sdr
|
||||
pkgs.openhantek6022
|
||||
];
|
||||
udev.packages = [pkgs.rtl-sdr pkgs.openhantek6022];
|
||||
|
||||
tlp = {
|
||||
enable = true;
|
||||
@ -170,38 +162,32 @@
|
||||
enable = true;
|
||||
bindings = [
|
||||
{
|
||||
keys = [ 113 ];
|
||||
events = [ "key" ];
|
||||
keys = [113];
|
||||
events = ["key"];
|
||||
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
|
||||
}
|
||||
|
||||
{
|
||||
keys = [ 114 ];
|
||||
events = [
|
||||
"key"
|
||||
"rep"
|
||||
];
|
||||
keys = [114];
|
||||
events = ["key" "rep"];
|
||||
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
|
||||
}
|
||||
|
||||
{
|
||||
keys = [ 115 ];
|
||||
events = [
|
||||
"key"
|
||||
"rep"
|
||||
];
|
||||
keys = [115];
|
||||
events = ["key" "rep"];
|
||||
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
|
||||
}
|
||||
|
||||
{
|
||||
keys = [ 224 ];
|
||||
events = [ "key" ];
|
||||
keys = [224];
|
||||
events = ["key"];
|
||||
command = "${pkgs.light}/bin/light -U 5";
|
||||
}
|
||||
|
||||
{
|
||||
keys = [ 225 ];
|
||||
events = [ "key" ];
|
||||
keys = [225];
|
||||
events = ["key"];
|
||||
command = "${pkgs.light}/bin/light -A 5";
|
||||
}
|
||||
];
|
||||
@ -251,7 +237,7 @@
|
||||
allowBitmaps = true;
|
||||
useEmbeddedBitmaps = true;
|
||||
defaultFonts = {
|
||||
monospace = [ "JetBrainsMono" ];
|
||||
monospace = ["JetBrainsMono"];
|
||||
};
|
||||
};
|
||||
|
||||
@ -320,14 +306,6 @@
|
||||
users.users.akill = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [
|
||||
"wireshark"
|
||||
"kvm"
|
||||
"tty"
|
||||
"audio"
|
||||
"sound"
|
||||
"adbusers"
|
||||
"dialout"
|
||||
];
|
||||
extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout"];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,77 +6,47 @@
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=root"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=root" "compress=zstd" "noatime"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."enc_root".device =
|
||||
"/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
|
||||
boot.initrd.luks.devices."enc_root".device = "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=home"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=home" "compress=zstd" "noatime"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=nix"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=nix" "compress=zstd" "noatime"];
|
||||
};
|
||||
|
||||
fileSystems."/var/log" = {
|
||||
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=log"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=log" "compress=zstd" "noatime"];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=persist"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=persist" "compress=zstd" "noatime"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
@ -84,7 +54,7 @@
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
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
|
||||
|
||||
@ -3,10 +3,8 @@
|
||||
nix-xilinx,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
{
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
}: {
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
acpi
|
||||
binutils
|
||||
@ -23,7 +21,6 @@
|
||||
dnsmasq
|
||||
dnsutils
|
||||
dtach
|
||||
ethtool
|
||||
f2fs-tools
|
||||
fd
|
||||
file
|
||||
@ -94,11 +91,5 @@
|
||||
zip
|
||||
z-lua
|
||||
]
|
||||
++ (with nix-xilinx.packages.${system}; [
|
||||
vivado
|
||||
vitis
|
||||
vitis_hls
|
||||
model_composer
|
||||
xilinx-shell
|
||||
]);
|
||||
++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]);
|
||||
}
|
||||
|
||||
@ -4,11 +4,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.services.batteryNotifier;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options = {
|
||||
services.batteryNotifier = {
|
||||
enable = mkOption {
|
||||
@ -44,7 +42,7 @@ in
|
||||
timerConfig.OnBootSec = "1m";
|
||||
timerConfig.OnUnitInactiveSec = "1m";
|
||||
timerConfig.Unit = "lowbatt.service";
|
||||
wantedBy = [ "timers.target" ];
|
||||
wantedBy = ["timers.target"];
|
||||
};
|
||||
systemd.user.services."lowbatt" = {
|
||||
description = "battery level notifier";
|
||||
|
||||
64
flake.lock
generated
64
flake.lock
generated
@ -89,16 +89,15 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736373539,
|
||||
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
|
||||
"lastModified": 1730016908,
|
||||
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
|
||||
"rev": "e83414058edd339148dc142a8437edb9450574c8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@ -126,11 +125,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1736200483,
|
||||
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
|
||||
"lastModified": 1732981179,
|
||||
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
|
||||
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -140,21 +139,37 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-24_11": {
|
||||
"nixpkgs-24_05": {
|
||||
"locked": {
|
||||
"lastModified": 1734083684,
|
||||
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
|
||||
"lastModified": 1717144377,
|
||||
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
|
||||
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-24.11",
|
||||
"ref": "nixos-24.05",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1729973466,
|
||||
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvim": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -162,11 +177,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736528609,
|
||||
"narHash": "sha256-p0tYmTVnnFghamXEXD4w/lldCi604zIWDV4Ol9ubQ5g=",
|
||||
"lastModified": 1733261583,
|
||||
"narHash": "sha256-HOVUtrhtJ16umPuEODuVE9fx+JmDCRp7wIxnEART0Eg=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "8245a48cc75cc74dea1b3ca89cb58f24f8e14f85",
|
||||
"revCount": 42,
|
||||
"rev": "a09a34997ce692c7a2e8e434b44433156a73088c",
|
||||
"revCount": 38,
|
||||
"type": "git",
|
||||
"url": "https://git.project-cloud.net/asmir/nvim_flake"
|
||||
},
|
||||
@ -240,14 +255,14 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-24_11": "nixpkgs-24_11"
|
||||
"nixpkgs-24_05": "nixpkgs-24_05"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1735230346,
|
||||
"narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
|
||||
"lastModified": 1722877200,
|
||||
"narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
|
||||
"rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -260,14 +275,15 @@
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736515725,
|
||||
"narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
|
||||
"lastModified": 1729999681,
|
||||
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
|
||||
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
47
flake.nix
47
flake.nix
@ -35,7 +35,7 @@
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.11";
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
@ -50,8 +50,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
inputs@{
|
||||
outputs = inputs @ {
|
||||
home-manager,
|
||||
nixpkgs,
|
||||
nix-xilinx,
|
||||
@ -63,18 +62,16 @@
|
||||
swaysw,
|
||||
zremap,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
|
||||
in
|
||||
{
|
||||
in {
|
||||
nixosConfigurations = rec {
|
||||
nixy = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
{ _module.args = inputs; }
|
||||
{ _module.args.system = system; }
|
||||
{ nix.registry.nixpkgs.flake = nixpkgs; }
|
||||
{_module.args = inputs;}
|
||||
{_module.args.system = system;}
|
||||
{nix.registry.nixpkgs.flake = nixpkgs;}
|
||||
./common/packages.nix
|
||||
./common/suspend.nix
|
||||
./nixy/configuration.nix
|
||||
@ -85,7 +82,7 @@
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.akill = import ./home/home.nix;
|
||||
home-manager.extraSpecialArgs = { inherit inputs system; };
|
||||
home-manager.extraSpecialArgs = {inherit inputs system;};
|
||||
home-manager.backupFileExtension = "home_backup";
|
||||
}
|
||||
peerix.nixosModules.peerix
|
||||
@ -106,9 +103,9 @@
|
||||
mediabox = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
{ _module.args = inputs; }
|
||||
{ _module.args.system = system; }
|
||||
{ nix.registry.nixpkgs.flake = nixpkgs; }
|
||||
{_module.args = inputs;}
|
||||
{_module.args.system = system;}
|
||||
{nix.registry.nixpkgs.flake = nixpkgs;}
|
||||
./common/packages.nix
|
||||
./common/suspend.nix
|
||||
./mediabox/configuration.nix
|
||||
@ -120,7 +117,7 @@
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.akill = import ./home/home.nix;
|
||||
home-manager.extraSpecialArgs = { inherit inputs system; };
|
||||
home-manager.extraSpecialArgs = {inherit inputs system;};
|
||||
}
|
||||
peerix.nixosModules.peerix
|
||||
{
|
||||
@ -140,9 +137,9 @@
|
||||
blue = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
{ _module.args = inputs; }
|
||||
{ _module.args.system = system; }
|
||||
{ nix.registry.nixpkgs.flake = nixpkgs; }
|
||||
{_module.args = inputs;}
|
||||
{_module.args.system = system;}
|
||||
{nix.registry.nixpkgs.flake = nixpkgs;}
|
||||
./blue/configuration.nix
|
||||
./blue/hardware-configuration.nix
|
||||
./common/packages.nix
|
||||
@ -151,16 +148,16 @@
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.akill = import ./home/home.nix;
|
||||
home-manager.extraSpecialArgs = { inherit inputs system; };
|
||||
home-manager.extraSpecialArgs = {inherit inputs system;};
|
||||
}
|
||||
];
|
||||
};
|
||||
magpie = nixpkgs.lib.nixosSystem rec {
|
||||
system = "aarch64-linux";
|
||||
modules = [
|
||||
{ _module.args = inputs; }
|
||||
{ _module.args.system = system; }
|
||||
{ nix.registry.nixpkgs.flake = nixpkgs; }
|
||||
{_module.args = inputs;}
|
||||
{_module.args.system = system;}
|
||||
{nix.registry.nixpkgs.flake = nixpkgs;}
|
||||
./magpie/configuration.nix
|
||||
./magpie/hardware-configuration.nix
|
||||
simple-nixos-mailserver.nixosModule
|
||||
@ -171,11 +168,7 @@
|
||||
};
|
||||
|
||||
devShell.x86_64-linux = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
sops
|
||||
ssh-to-age
|
||||
age
|
||||
];
|
||||
buildInputs = with pkgs; [sops ssh-to-age age];
|
||||
shellHook = ''
|
||||
echo "Configuring NixOS!"
|
||||
'';
|
||||
|
||||
@ -2,21 +2,12 @@
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
|
||||
firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
|
||||
'';
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./zsh.nix
|
||||
./i3status-rust.nix
|
||||
./sway.nix
|
||||
./i3.nix
|
||||
./home_packages.nix
|
||||
./whatsapp-for-linux.nix
|
||||
];
|
||||
in {
|
||||
imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
|
||||
|
||||
home.stateVersion = "22.11";
|
||||
home.username = "akill";
|
||||
@ -50,9 +41,7 @@ in
|
||||
WLR_RENDERER = "vulkan";
|
||||
};
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
};
|
||||
wayland.windowManager.sway = {enable = true;};
|
||||
|
||||
programs = {
|
||||
home-manager.enable = true;
|
||||
@ -71,11 +60,7 @@ in
|
||||
clock24 = true;
|
||||
keyMode = "vi";
|
||||
terminal = "screen-256color";
|
||||
plugins = with pkgs.tmuxPlugins; [
|
||||
sysstat
|
||||
net-speed
|
||||
gruvbox
|
||||
];
|
||||
plugins = with pkgs.tmuxPlugins; [sysstat net-speed gruvbox];
|
||||
};
|
||||
|
||||
mpv = {
|
||||
@ -152,9 +137,7 @@ in
|
||||
font = "JetBrainsMono:size=10";
|
||||
dpi-aware = "yes";
|
||||
};
|
||||
mouse = {
|
||||
hide-when-typing = "yes";
|
||||
};
|
||||
mouse = {hide-when-typing = "yes";};
|
||||
};
|
||||
};
|
||||
|
||||
@ -200,12 +183,8 @@ in
|
||||
userEmail = "asmir.abdulahovic@gmail.com";
|
||||
extraConfig = {
|
||||
init.defaultBranch = "master";
|
||||
pull = {
|
||||
rebase = true;
|
||||
};
|
||||
credential = {
|
||||
helper = "store";
|
||||
};
|
||||
pull = {rebase = true;};
|
||||
credential = {helper = "store";};
|
||||
};
|
||||
signing.key = "020C42B7A9ABA3E2";
|
||||
signing.signByDefault = true;
|
||||
@ -213,14 +192,7 @@ in
|
||||
|
||||
obs-studio = {
|
||||
enable = true;
|
||||
plugins = with pkgs.obs-studio-plugins; [
|
||||
obs-vkcapture
|
||||
input-overlay
|
||||
obs-multi-rtmp
|
||||
obs-pipewire-audio-capture
|
||||
wlrobs
|
||||
obs-vaapi
|
||||
];
|
||||
plugins = with pkgs.obs-studio-plugins; [obs-vkcapture input-overlay obs-multi-rtmp obs-pipewire-audio-capture wlrobs obs-vaapi];
|
||||
};
|
||||
|
||||
i3status-rust.enable = true;
|
||||
@ -248,16 +220,14 @@ in
|
||||
enableSshSupport = true;
|
||||
};
|
||||
|
||||
swayidle =
|
||||
let
|
||||
swayidle = let
|
||||
locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
|
||||
TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
|
||||
${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
|
||||
${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
|
||||
${pkgs.coreutils}/bin/rm "$TMP_FILE"
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
enable = true;
|
||||
events = [
|
||||
{
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
inputs,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
|
||||
${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
|
||||
'';
|
||||
@ -26,9 +25,8 @@ let
|
||||
PROXY_PORT="1337"
|
||||
${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
|
||||
'';
|
||||
wrap_sh =
|
||||
let
|
||||
bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix { };
|
||||
wrap_sh = let
|
||||
bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
|
||||
in
|
||||
pkgs.writeShellScriptBin "wrap.sh" ''
|
||||
if ${pkgs.coreutils-full}/bin/test $# -ne 1; then
|
||||
@ -43,10 +41,8 @@ let
|
||||
--tmp-overlay "$FULL_PATH" \
|
||||
"$SHELL"
|
||||
'';
|
||||
in
|
||||
{
|
||||
home.packages =
|
||||
with pkgs;
|
||||
in {
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
anydesk
|
||||
appimage-run
|
||||
@ -61,7 +57,7 @@ in
|
||||
ungoogled-chromium
|
||||
cmake
|
||||
compsize
|
||||
# cura
|
||||
/*cura*/
|
||||
deluge
|
||||
dfu-util
|
||||
discord
|
||||
@ -124,7 +120,6 @@ in
|
||||
python3Packages.west
|
||||
remmina
|
||||
river
|
||||
rizin
|
||||
rtorrent
|
||||
sbcl
|
||||
screen
|
||||
@ -158,7 +153,7 @@ in
|
||||
yt-dlp
|
||||
zapzap
|
||||
zathura
|
||||
# zeal-qt6
|
||||
/*zeal-qt6*/
|
||||
zig
|
||||
]
|
||||
++ [
|
||||
@ -171,7 +166,7 @@ in
|
||||
]
|
||||
++ [
|
||||
inputs.swaysw.packages.${system}.swaysw
|
||||
(pkgs.callPackage ../packages/viber/default.nix { })
|
||||
(pkgs.callPackage ../packages/bubblewrap/default.nix { })
|
||||
(pkgs.callPackage ../packages/viber/default.nix {})
|
||||
(pkgs.callPackage ../packages/bubblewrap/default.nix {})
|
||||
];
|
||||
}
|
||||
|
||||
33
home/i3.nix
33
home/i3.nix
@ -2,11 +2,9 @@
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
scratchpad_cmd = "floating enable, resize set 1502 845, move position center, move scratchpad, scratchpad show";
|
||||
in
|
||||
{
|
||||
in {
|
||||
xsession.windowManager.i3 = {
|
||||
enable = true;
|
||||
package = pkgs.i3;
|
||||
@ -55,28 +53,24 @@ in
|
||||
"${modifier}+Escape" = "workspace back_and_forth";
|
||||
"${modifier}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run";
|
||||
|
||||
"Mod4+l" =
|
||||
"exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
|
||||
"Mod4+l" = "exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
|
||||
"Mod4+j" = "exec i3-msg [class=\"ViberPC\"] scratchpad show || exec viber";
|
||||
"Mod4+m" = "exec i3-msg [class=\"Thunderbird\"] scratchpad show || exec thunderbird";
|
||||
"Mod4+y" =
|
||||
"exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
|
||||
"Mod4+y" = "exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
|
||||
};
|
||||
|
||||
window = {
|
||||
# border = 4;
|
||||
/*
|
||||
border = 4;
|
||||
*/
|
||||
commands = [
|
||||
{
|
||||
command = scratchpad_cmd;
|
||||
criteria = {
|
||||
instance = "pulsemixer_scr|python3_scr";
|
||||
};
|
||||
criteria = {instance = "pulsemixer_scr|python3_scr";};
|
||||
}
|
||||
{
|
||||
command = scratchpad_cmd;
|
||||
criteria = {
|
||||
class = "Thunderbird";
|
||||
};
|
||||
criteria = {class = "Thunderbird";};
|
||||
}
|
||||
{
|
||||
command = scratchpad_cmd;
|
||||
@ -87,9 +81,7 @@ in
|
||||
}
|
||||
{
|
||||
command = "focus child, layout tabbed, focus";
|
||||
criteria = {
|
||||
class = "qutebrowser";
|
||||
};
|
||||
criteria = {class = "qutebrowser";};
|
||||
}
|
||||
];
|
||||
};
|
||||
@ -98,10 +90,7 @@ in
|
||||
{
|
||||
position = "top";
|
||||
fonts = {
|
||||
names = [
|
||||
"DejaVu Sans Mono"
|
||||
"FontAwesome5Free"
|
||||
];
|
||||
names = ["DejaVu Sans Mono" "FontAwesome5Free"];
|
||||
style = "Fixed Bold SemiCondensed";
|
||||
size = 7.0;
|
||||
};
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
programs.i3status-rust = {
|
||||
bars.top = {
|
||||
icons = "awesome5";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
system,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
|
||||
${lib.getExe pkgs.cliphist} list | \
|
||||
${lib.getExe pkgs.wofi} --dmenu --insensitive | \
|
||||
@ -17,10 +17,9 @@ let
|
||||
${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
|
||||
'';
|
||||
swaysw = inputs.swaysw.packages.${system}.swaysw;
|
||||
viber = pkgs.callPackage ../packages/viber/default.nix { };
|
||||
viber = pkgs.callPackage ../packages/viber/default.nix {};
|
||||
term = "${pkgs.foot}/bin/footclient";
|
||||
in
|
||||
{
|
||||
in {
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
extraSessionCommands = "";
|
||||
@ -28,7 +27,7 @@ in
|
||||
|
||||
config = {
|
||||
fonts = {
|
||||
names = [ "JetBrainsMono" ];
|
||||
names = ["JetBrainsMono"];
|
||||
style = "Bold Semi-Condensed";
|
||||
size = 11.0;
|
||||
};
|
||||
@ -36,21 +35,15 @@ in
|
||||
window.commands = [
|
||||
{
|
||||
command = "move scratchpad, resize set 1152 648";
|
||||
criteria = {
|
||||
app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";
|
||||
};
|
||||
criteria = {app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";};
|
||||
}
|
||||
{
|
||||
command = "move scratchpad, resize set 1502 845";
|
||||
criteria = {
|
||||
app_id = "com.viber";
|
||||
};
|
||||
criteria = {app_id = "com.viber";};
|
||||
}
|
||||
{
|
||||
command = "floating enable";
|
||||
criteria = {
|
||||
app_id = "sws_cli";
|
||||
};
|
||||
criteria = {app_id = "sws_cli";};
|
||||
}
|
||||
];
|
||||
|
||||
@ -69,25 +62,16 @@ in
|
||||
};
|
||||
|
||||
input = {
|
||||
"type:keyboard" = {
|
||||
repeat_delay = "150";
|
||||
};
|
||||
"type:keyboard" = {
|
||||
repeat_rate = "70";
|
||||
};
|
||||
"type:touchpad" = {
|
||||
tap = "enabled";
|
||||
};
|
||||
"type:keyboard" = {repeat_delay = "150";};
|
||||
"type:keyboard" = {repeat_rate = "70";};
|
||||
"type:touchpad" = {tap = "enabled";};
|
||||
};
|
||||
|
||||
bars = [
|
||||
{
|
||||
position = "top";
|
||||
fonts = {
|
||||
names = [
|
||||
"Iosevka"
|
||||
"FontAwesome"
|
||||
];
|
||||
names = ["Iosevka" "FontAwesome"];
|
||||
style = "Bold Semi-Condensed";
|
||||
size = 12.0;
|
||||
};
|
||||
@ -141,14 +125,12 @@ in
|
||||
"Alt+bracketright" = "focus output right";
|
||||
"Alt+bracketleft" = "focus output left";
|
||||
|
||||
"Mod4+l" =
|
||||
''exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
|
||||
"Mod4+j" =
|
||||
"exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
|
||||
"Mod4+h" =
|
||||
"exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
|
||||
"Mod4+y" =
|
||||
''exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
|
||||
"Mod4+l" = ''
|
||||
exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
|
||||
"Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
|
||||
"Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
|
||||
"Mod4+y" = ''
|
||||
exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
|
||||
"Mod4+p" = "exec ${lib.getExe pkgs.tessen} -a copy";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
{ lib, ... }:
|
||||
with lib;
|
||||
{
|
||||
{lib, ...}:
|
||||
with lib; {
|
||||
xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" (
|
||||
generators.toINI { } {
|
||||
generators.toINI {} {
|
||||
General = {
|
||||
zoom_level = 1;
|
||||
close_to_tray = false;
|
||||
|
||||
13
home/zsh.nix
13
home/zsh.nix
@ -1,5 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
programs.z-lua = {
|
||||
enableAliases = true;
|
||||
enableZshIntegration = true;
|
||||
@ -8,6 +7,7 @@
|
||||
programs.zsh = {
|
||||
autocd = true;
|
||||
enableCompletion = false;
|
||||
syntaxHighlighting.enable = true;
|
||||
defaultKeymap = "viins";
|
||||
|
||||
shellAliases = {
|
||||
@ -43,8 +43,8 @@
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "sindresorhus";
|
||||
repo = "pure";
|
||||
rev = "92b8e9057988566b37ff695e70e2e9bbeb7196c8";
|
||||
hash = "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A=";
|
||||
rev = "a02209d36c8509c0e62f44324127632999c9c0cf";
|
||||
hash = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
|
||||
};
|
||||
file = "pure.plugin.zsh";
|
||||
}
|
||||
@ -63,11 +63,6 @@
|
||||
};
|
||||
file = "sudo.plugin.zsh";
|
||||
}
|
||||
{
|
||||
name = "zsh-fast-syntax-highlighting";
|
||||
src = pkgs.zsh-fast-syntax-highlighting;
|
||||
file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
|
||||
}
|
||||
];
|
||||
|
||||
envExtra = '''';
|
||||
|
||||
@ -6,15 +6,11 @@
|
||||
nvim,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ];
|
||||
}: {
|
||||
imports = [];
|
||||
|
||||
nix.optimise.automatic = true;
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
system.switch = {
|
||||
enable = false;
|
||||
enableNg = true;
|
||||
@ -25,10 +21,7 @@
|
||||
boot.loader.systemd-boot.configurationLimit = 2;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = [
|
||||
"ip=dhcp"
|
||||
"console=tty"
|
||||
];
|
||||
boot.kernelParams = ["ip=dhcp"];
|
||||
boot.kernel.sysctl = {
|
||||
"net.core.default_qdisc" = "fq";
|
||||
"net.ipv4.tcp_congestion_control" = "bbr";
|
||||
@ -36,17 +29,14 @@
|
||||
|
||||
boot.initrd = {
|
||||
compressor = "zstd";
|
||||
availableKernelModules = [
|
||||
"virtio-pci"
|
||||
"virtio-gpu"
|
||||
];
|
||||
availableKernelModules = ["virtio-pci"];
|
||||
systemd.enable = true;
|
||||
network = {
|
||||
enable = true;
|
||||
ssh = {
|
||||
enable = true;
|
||||
hostKeys = [ /etc/ssh_dummy_ed25519_key ];
|
||||
authorizedKeyFiles = [ ../nixy/ssh_pubkey ];
|
||||
hostKeys = [/etc/ssh_dummy_ed25519_key];
|
||||
authorizedKeyFiles = [../nixy/ssh_pubkey];
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -84,7 +74,7 @@
|
||||
enable = true;
|
||||
debug = false;
|
||||
fqdn = "mail.project-cloud.net";
|
||||
domains = [ "project-cloud.net" ];
|
||||
domains = ["project-cloud.net"];
|
||||
enableSubmissionSsl = true;
|
||||
enableImap = false;
|
||||
enableImapSsl = true;
|
||||
@ -94,11 +84,11 @@
|
||||
loginAccounts = {
|
||||
"gitea@project-cloud.net" = {
|
||||
hashedPasswordFile = config.sops.secrets."gitea_mail_pw_hash".path;
|
||||
aliases = [ "git@project-cloud.net" ];
|
||||
aliases = ["git@project-cloud.net"];
|
||||
};
|
||||
"asmir@project-cloud.net" = {
|
||||
hashedPasswordFile = config.sops.secrets."asmir_mail_pw_hash".path;
|
||||
aliases = [ "asmir.abdulahovic@project-cloud.net" ];
|
||||
aliases = ["asmir.abdulahovic@project-cloud.net"];
|
||||
};
|
||||
};
|
||||
certificateScheme = "acme-nginx";
|
||||
@ -246,21 +236,22 @@
|
||||
REGISTER_EMAIL_CONFIRM = true;
|
||||
};
|
||||
|
||||
settings."markup.restructuredtext" =
|
||||
let
|
||||
docutils = pkgs.python3.withPackages (
|
||||
ps: with ps; [
|
||||
docutils
|
||||
pygments
|
||||
]
|
||||
);
|
||||
in
|
||||
{
|
||||
settings."markup.restructuredtext" = let
|
||||
docutils =
|
||||
pkgs.python3.withPackages (ps: with ps; [docutils pygments]);
|
||||
in {
|
||||
ENABLED = true;
|
||||
FILE_EXTENSIONS = ".rst";
|
||||
RENDER_COMMAND = "${docutils}/bin/rst2html.py";
|
||||
IS_INPUT_FILE = false;
|
||||
};
|
||||
|
||||
settings."markup.typst" = {
|
||||
ENABLED = true;
|
||||
FILE_EXTENSIONS = ".typ";
|
||||
RENDER_COMMAND = "timeout 30s ${lib.getExe pkgs.python3Packages.pygments} -f html -O full";
|
||||
IS_INPUT_FILE = false;
|
||||
};
|
||||
};
|
||||
|
||||
services.nfs.server.enable = false;
|
||||
@ -278,7 +269,7 @@
|
||||
paths = [
|
||||
"/var/lib/gitea"
|
||||
];
|
||||
exclude = [ ];
|
||||
exclude = [];
|
||||
repo = "ssh://na9fqv67@na9fqv67.repo.borgbase.com/./repo";
|
||||
encryption = {
|
||||
mode = "repokey-blake2";
|
||||
@ -295,10 +286,12 @@
|
||||
adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
|
||||
};
|
||||
|
||||
# needed for sendmail mail functionality
|
||||
users.users.gitea.extraGroups = [ "postdrop" ];
|
||||
/*
|
||||
needed for sendmail mail functionality
|
||||
*/
|
||||
users.users.gitea.extraGroups = ["postdrop"];
|
||||
systemd.services.gitea.serviceConfig = {
|
||||
RestrictAddressFamilies = [ "AF_NETLINK" ];
|
||||
RestrictAddressFamilies = ["AF_NETLINK"];
|
||||
ProtectSystem = lib.mkForce false;
|
||||
};
|
||||
|
||||
@ -308,7 +301,7 @@
|
||||
};
|
||||
|
||||
sops = {
|
||||
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
secrets = {
|
||||
"asmir_mail_pw_hash".sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
|
||||
"borgbase_enc_key".sopsFile = ./secrets/borgbase_enc_key.yaml;
|
||||
@ -335,29 +328,21 @@
|
||||
networking.hostName = "magpie";
|
||||
|
||||
networking.firewall.enable = true;
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
587
|
||||
2049
|
||||
]; # http, mail, mail, nfs
|
||||
networking.firewall.allowedUDPPorts = [
|
||||
443
|
||||
51820
|
||||
]; # mail, wireguard
|
||||
networking.firewall.allowedTCPPorts = [80 443 587 2049]; # http, mail, mail, nfs
|
||||
networking.firewall.allowedUDPPorts = [443 51820]; #mail, wireguard
|
||||
networking.firewall.allowPing = true;
|
||||
networking.firewall.logRefusedConnections = lib.mkDefault false;
|
||||
|
||||
networking.nat.enable = true;
|
||||
networking.nat.externalInterface = "enp1s0";
|
||||
networking.nat.internalInterfaces = [ "wg0" ];
|
||||
networking.nat.internalInterfaces = ["wg0"];
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
networking.wireless.enable = false;
|
||||
|
||||
networking.wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = [ "10.100.0.1/24" ];
|
||||
ips = ["10.100.0.1/24"];
|
||||
listenPort = 51820;
|
||||
|
||||
# This allows the wireguard server to route your traffic to the internet and hence be like a VPN
|
||||
@ -375,17 +360,17 @@
|
||||
{
|
||||
publicKey = builtins.readFile ../nixy/wg_pubkey;
|
||||
presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path;
|
||||
allowedIPs = [ "10.100.0.6/32" ];
|
||||
allowedIPs = ["10.100.0.6/32"];
|
||||
}
|
||||
{
|
||||
publicKey = builtins.readFile ../mediabox/wg_pubkey;
|
||||
presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path;
|
||||
allowedIPs = [ "10.100.0.5/32" ];
|
||||
allowedIPs = ["10.100.0.5/32"];
|
||||
}
|
||||
{
|
||||
publicKey = builtins.readFile ../common/wg_pubkey_workstation;
|
||||
presharedKeyFile = config.sops.secrets."wg_preshared/workstation".path;
|
||||
allowedIPs = [ "10.100.0.4/32" ];
|
||||
allowedIPs = ["10.100.0.4/32"];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@ -5,21 +5,15 @@
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"virtio_pci"
|
||||
"usbhid"
|
||||
"sr_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = [];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/118de1e5-f23e-4af3-a10a-054eded78152";
|
||||
@ -31,7 +25,7 @@
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
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
|
||||
|
||||
@ -8,14 +8,13 @@
|
||||
system,
|
||||
nvim,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ];
|
||||
}: {
|
||||
imports = [];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
system.autoUpgrade.enable = false;
|
||||
|
||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
sops.secrets."peerix/private" = {
|
||||
sopsFile = ./secrets/peerix.yaml;
|
||||
mode = "0400";
|
||||
@ -37,31 +36,28 @@
|
||||
gc.options = "--delete-older-than 7d";
|
||||
package = pkgs.nixVersions.latest;
|
||||
settings = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
initrd = {
|
||||
compressor = "zstd";
|
||||
availableKernelModules = [ "e1000e" ];
|
||||
availableKernelModules = ["e1000e"];
|
||||
network = {
|
||||
enable = true;
|
||||
udhcpc.enable = true;
|
||||
ssh = {
|
||||
enable = true;
|
||||
hostKeys = [ /etc/ssh_dummy_ed25519_key ];
|
||||
authorizedKeys = [ (builtins.readFile ../nixy/ssh_pubkey) ];
|
||||
hostKeys = [/etc/ssh_dummy_ed25519_key];
|
||||
authorizedKeys = [(builtins.readFile ../nixy/ssh_pubkey)];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
kernelModules = [ "acpi_call" ];
|
||||
kernelModules = ["acpi_call"];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = [ "msr.allow_writes=on" ];
|
||||
kernelParams = ["msr.allow_writes=on"];
|
||||
kernel.sysctl = {
|
||||
"net.core.default_qdisc" = "fq";
|
||||
"net.ipv4.tcp_congestion_control" = "bbr";
|
||||
@ -72,7 +68,7 @@
|
||||
memtest86.enable = true;
|
||||
};
|
||||
readOnlyNixStore = true;
|
||||
supportedFilesystems = [ "btrfs" ];
|
||||
supportedFilesystems = ["btrfs"];
|
||||
tmp.useTmpfs = true;
|
||||
tmp.tmpfsSize = "80%";
|
||||
};
|
||||
@ -93,11 +89,7 @@
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
51820
|
||||
];
|
||||
allowedTCPPorts = [80 443 51820];
|
||||
};
|
||||
|
||||
hostName = "mediabox";
|
||||
@ -105,11 +97,8 @@
|
||||
interfaces.wlp3s0.useDHCP = false;
|
||||
useDHCP = false;
|
||||
wireless.enable = false;
|
||||
wireless.interfaces = [ "wlp3s0" ];
|
||||
nameservers = [
|
||||
"127.0.0.1"
|
||||
"::1"
|
||||
];
|
||||
wireless.interfaces = ["wlp3s0"];
|
||||
nameservers = ["127.0.0.1" "::1"];
|
||||
dhcpcd.extraConfig = "nohook resolv.conf";
|
||||
networkmanager.dns = "none";
|
||||
extraHosts = ''
|
||||
@ -123,13 +112,13 @@
|
||||
|
||||
wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = [ "10.100.0.5/24" ];
|
||||
ips = ["10.100.0.5/24"];
|
||||
privateKeyFile = config.sops.secrets."wg_privkey".path;
|
||||
peers = [
|
||||
{
|
||||
publicKey = builtins.readFile ../magpie/wg_pubkey;
|
||||
presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path;
|
||||
allowedIPs = [ "10.100.0.0/24" ];
|
||||
allowedIPs = ["10.100.0.0/24"];
|
||||
endpoint = "5.75.229.224:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
@ -141,7 +130,7 @@
|
||||
time.timeZone = "Europe/Sarajevo";
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [ nvim.overlays.${system}.overlay ];
|
||||
nixpkgs.overlays = [nvim.overlays.${system}.overlay];
|
||||
environment = {
|
||||
homeBinInPath = true;
|
||||
variables = {
|
||||
@ -164,13 +153,13 @@
|
||||
systemd = {
|
||||
services = {
|
||||
"macchanger-wireless" = {
|
||||
after = [ "sys-subsystem-net-devices-wlp3s0.device" ];
|
||||
before = [ "network-pre.target" ];
|
||||
bindsTo = [ "sys-subsystem-net-devices-wlp3s0.device" ];
|
||||
after = ["sys-subsystem-net-devices-wlp3s0.device"];
|
||||
before = ["network-pre.target"];
|
||||
bindsTo = ["sys-subsystem-net-devices-wlp3s0.device"];
|
||||
description = "Changes MAC of my wireless interface for privacy reasons";
|
||||
stopIfChanged = false;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network-pre.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
wants = ["network-pre.target"];
|
||||
script = ''
|
||||
${pkgs.macchanger}/bin/macchanger -e wlp3s0 || true
|
||||
'';
|
||||
@ -179,8 +168,8 @@
|
||||
|
||||
"zremap" = {
|
||||
description = "Intercepts keyboard udev events";
|
||||
wants = [ "systemd-udevd.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = ["systemd-udevd.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
serviceConfig.Nice = -20;
|
||||
script = ''
|
||||
sleep 1
|
||||
@ -191,16 +180,12 @@
|
||||
|
||||
"wakeonlan" = {
|
||||
description = "Reenable wake on lan every boot";
|
||||
after = [ "network.target" ];
|
||||
after = ["network.target"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp0s25 wol m";
|
||||
};
|
||||
wantedBy = [
|
||||
"default.target"
|
||||
"suspend.target"
|
||||
"shutdown.target"
|
||||
];
|
||||
wantedBy = ["default.target" "suspend.target" "shutdown.target"];
|
||||
};
|
||||
|
||||
/*
|
||||
@ -328,45 +313,39 @@
|
||||
windowManager.icewm.enable = true;
|
||||
};
|
||||
|
||||
udev.packages = [ ];
|
||||
udev.packages = [];
|
||||
|
||||
tlp = {
|
||||
enable = true;
|
||||
settings = { };
|
||||
settings = {};
|
||||
};
|
||||
|
||||
actkbd = {
|
||||
enable = true;
|
||||
bindings = [
|
||||
{
|
||||
keys = [ 121 ];
|
||||
events = [ "key" ];
|
||||
keys = [121];
|
||||
events = ["key"];
|
||||
command = "${pkgs.alsaUtils}/bin/amixer -q set Master toggle";
|
||||
}
|
||||
{
|
||||
keys = [ 122 ];
|
||||
events = [
|
||||
"key"
|
||||
"rep"
|
||||
];
|
||||
keys = [122];
|
||||
events = ["key" "rep"];
|
||||
command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute";
|
||||
}
|
||||
{
|
||||
keys = [ 123 ];
|
||||
events = [
|
||||
"key"
|
||||
"rep"
|
||||
];
|
||||
keys = [123];
|
||||
events = ["key" "rep"];
|
||||
command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute";
|
||||
}
|
||||
{
|
||||
keys = [ 224 ];
|
||||
events = [ "key" ];
|
||||
keys = [224];
|
||||
events = ["key"];
|
||||
command = "/run/current-system/sw/bin/light -U 5";
|
||||
}
|
||||
{
|
||||
keys = [ 225 ];
|
||||
events = [ "key" ];
|
||||
keys = [225];
|
||||
events = ["key"];
|
||||
command = "/run/current-system/sw/bin/light -A 5";
|
||||
}
|
||||
];
|
||||
@ -459,16 +438,7 @@
|
||||
users.users.akill = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [
|
||||
"wireshark"
|
||||
"wheel"
|
||||
"kvm"
|
||||
"tty"
|
||||
"audio"
|
||||
"sound"
|
||||
"adbusers"
|
||||
"transmission"
|
||||
];
|
||||
extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
|
||||
openssh.authorizedKeys.keys = [
|
||||
(builtins.readFile ../nixy/ssh_pubkey)
|
||||
];
|
||||
@ -477,21 +447,12 @@
|
||||
users.users.ado = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [
|
||||
"wireshark"
|
||||
"wheel"
|
||||
"kvm"
|
||||
"tty"
|
||||
"audio"
|
||||
"sound"
|
||||
"adbusers"
|
||||
"transmission"
|
||||
];
|
||||
extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
|
||||
};
|
||||
|
||||
users.users.mediauser = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.bash;
|
||||
extraGroups = [ ];
|
||||
extraGroups = [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,32 +5,20 @@
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=root"
|
||||
"compress=lzo"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=root" "compress=lzo" "noatime"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/60aa7671-bfee-451b-b871-ac7c5a4a9f3a";
|
||||
@ -38,41 +26,25 @@
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=home"
|
||||
"compress=lzo"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=home" "compress=lzo" "noatime"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=nix"
|
||||
"compress=lzo"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=nix" "compress=lzo" "noatime"];
|
||||
};
|
||||
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=persist"
|
||||
"compress=lzo"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=persist" "compress=lzo" "noatime"];
|
||||
};
|
||||
|
||||
fileSystems."/var/log" = {
|
||||
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=log"
|
||||
"compress=lzo"
|
||||
"noatime"
|
||||
];
|
||||
options = ["subvol=log" "compress=lzo" "noatime"];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
@ -82,7 +54,7 @@
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/7b44ab02-84ff-4ffd-be26-58247cf5a982"; }
|
||||
{device = "/dev/disk/by-uuid/7b44ab02-84ff-4ffd-be26-58247cf5a982";}
|
||||
];
|
||||
|
||||
hardware.cpu.intel.updateMicrocode = true;
|
||||
|
||||
@ -2,8 +2,7 @@
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
# Enable Nginx
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
@ -62,7 +61,7 @@
|
||||
enable = true;
|
||||
|
||||
# Ensure the database, user, and permissions always exist
|
||||
ensureDatabases = [ "nextcloud" ];
|
||||
ensureDatabases = ["nextcloud"];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "nextcloud";
|
||||
@ -73,7 +72,7 @@
|
||||
|
||||
# Ensure that postgres is running before running the setup
|
||||
systemd.services."nextcloud-setup" = {
|
||||
requires = [ "postgresql.service" ];
|
||||
after = [ "postgresql.service" ];
|
||||
requires = ["postgresql.service"];
|
||||
after = ["postgresql.service"];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,13 +4,11 @@
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.services.qbittorrent;
|
||||
configDir = "${cfg.dataDir}/.config";
|
||||
openFilesLimit = 4096;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.services.qbittorrent = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
@ -69,24 +67,24 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.qbittorrent ];
|
||||
environment.systemPackages = [pkgs.qbittorrent];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
qbittorrent = prev.qbittorrent.override { guiSupport = false; };
|
||||
qbittorrent = prev.qbittorrent.override {guiSupport = false;};
|
||||
})
|
||||
];
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ cfg.port ];
|
||||
allowedUDPPorts = [ cfg.port ];
|
||||
allowedTCPPorts = [cfg.port];
|
||||
allowedUDPPorts = [cfg.port];
|
||||
};
|
||||
|
||||
systemd.services.qbittorrent = {
|
||||
after = [ "network.target" ];
|
||||
after = ["network.target"];
|
||||
description = "qBittorrent Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ pkgs.qbittorrent ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
path = [pkgs.qbittorrent];
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.qbittorrent}/bin/qbittorrent-nox \
|
||||
@ -112,10 +110,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = mkIf (cfg.group == "qbittorrent") {
|
||||
qbittorrent = {
|
||||
gid = null;
|
||||
};
|
||||
};
|
||||
users.groups =
|
||||
mkIf (cfg.group == "qbittorrent") {qbittorrent = {gid = null;};};
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,12 +6,8 @@
|
||||
system,
|
||||
zremap,
|
||||
...
|
||||
}:
|
||||
let
|
||||
USER = "akill";
|
||||
in
|
||||
{
|
||||
imports = [ ];
|
||||
}: {
|
||||
imports = [];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
system.autoUpgrade.enable = false;
|
||||
@ -21,7 +17,7 @@ in
|
||||
};
|
||||
|
||||
sops = {
|
||||
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
secrets = {
|
||||
"peerix/private" = {
|
||||
sopsFile = ./secrets/peerix.yaml;
|
||||
@ -48,12 +44,12 @@ in
|
||||
|
||||
"borgbase_enc_key" = {
|
||||
sopsFile = ./secrets/borgbase_enc_key.yaml;
|
||||
owner = config.users.users.${USER}.name;
|
||||
owner = config.users.users.akill.name;
|
||||
};
|
||||
|
||||
"borgbase_ssh_key" = {
|
||||
sopsFile = ./secrets/borgbase_ssh_key.yaml;
|
||||
owner = config.users.users.${USER}.name;
|
||||
owner = config.users.users.akill.name;
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -65,29 +61,18 @@ in
|
||||
package = pkgs.nixVersions.latest;
|
||||
settings = {
|
||||
sandbox = true;
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
extraModulePackages = with config.boot.kernelPackages; [
|
||||
usbip
|
||||
v4l2loopback
|
||||
];
|
||||
extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
|
||||
initrd.compressor = "zstd";
|
||||
initrd.kernelModules = [ ];
|
||||
initrd.kernelModules = [];
|
||||
initrd.systemd.enable = true;
|
||||
binfmt.emulatedSystems = [
|
||||
"wasm32-wasi"
|
||||
"x86_64-windows"
|
||||
];
|
||||
kernelParams = [
|
||||
"psmouse.synaptics_intertouch=0"
|
||||
"mem_sleep_default=deep"
|
||||
];
|
||||
binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
|
||||
kernel.sysctl = {
|
||||
"net.core.default_qdisc" = "fq";
|
||||
"net.ipv4.tcp_congestion_control" = "bbr";
|
||||
@ -99,9 +84,7 @@ in
|
||||
memtest86.enable = true;
|
||||
};
|
||||
readOnlyNixStore = true;
|
||||
supportedFilesystems = [
|
||||
"xfs"
|
||||
];
|
||||
supportedFilesystems = ["f2fs" "xfs"];
|
||||
tmp.useTmpfs = true;
|
||||
};
|
||||
|
||||
@ -112,7 +95,7 @@ in
|
||||
doas.enable = true;
|
||||
doas.extraRules = [
|
||||
{
|
||||
users = [ USER ];
|
||||
users = ["akill"];
|
||||
keepEnv = true;
|
||||
persist = true;
|
||||
}
|
||||
@ -124,22 +107,13 @@ in
|
||||
};
|
||||
|
||||
networking = {
|
||||
nftables.enable = true;
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
51820
|
||||
8020
|
||||
];
|
||||
allowedTCPPorts = [80 443 51820 8020];
|
||||
};
|
||||
|
||||
hostName = "nixy";
|
||||
nameservers = [
|
||||
"127.0.0.1"
|
||||
"::1"
|
||||
];
|
||||
nameservers = ["127.0.0.1" "::1"];
|
||||
dhcpcd.extraConfig = "nohook resolv.conf";
|
||||
|
||||
extraHosts = ''
|
||||
@ -170,13 +144,13 @@ in
|
||||
|
||||
wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = [ "10.100.0.6/24" ];
|
||||
ips = ["10.100.0.6/24"];
|
||||
privateKeyFile = config.sops.secrets."wg_privkey".path;
|
||||
peers = [
|
||||
{
|
||||
publicKey = builtins.readFile ../magpie/wg_pubkey;
|
||||
presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path;
|
||||
allowedIPs = [ "10.100.0.0/24" ];
|
||||
allowedIPs = ["10.100.0.0/24"];
|
||||
endpoint = "5.75.229.224:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
@ -184,12 +158,12 @@ in
|
||||
};
|
||||
|
||||
neox_wg = {
|
||||
ips = [ "192.168.51.2/32" ];
|
||||
ips = ["192.168.51.2/32"];
|
||||
privateKeyFile = config.sops.secrets."wg_privkey".path;
|
||||
peers = [
|
||||
{
|
||||
publicKey = builtins.readFile ../nixy/wg_pubkey_nx;
|
||||
allowedIPs = [ "192.168.2.0/24" ];
|
||||
allowedIPs = ["192.168.2.0/24"];
|
||||
endpoint = "185.194.64.26:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
@ -201,10 +175,7 @@ in
|
||||
time.timeZone = "Europe/Sarajevo";
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [
|
||||
nix-xilinx.overlay
|
||||
nvim.overlays.${system}.overlay
|
||||
];
|
||||
nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
|
||||
environment = {
|
||||
etc = {
|
||||
"firejail/qutebrowser.local".text = ''
|
||||
@ -263,7 +234,7 @@ in
|
||||
|
||||
"netns@" = {
|
||||
description = "%I network namespace";
|
||||
before = [ "network.target" ];
|
||||
before = ["network.target"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
@ -274,11 +245,11 @@ in
|
||||
|
||||
"wg_proton" = {
|
||||
description = "wg network interface";
|
||||
bindsTo = [ "netns@wg.service" ];
|
||||
requires = [ "network-online.target" ];
|
||||
wants = [ "dnscrypt-proxy2_proton.service" ];
|
||||
after = [ "netns@wg.service" ];
|
||||
before = [ "dnscrypt-proxy2_proton.service" ];
|
||||
bindsTo = ["netns@wg.service"];
|
||||
requires = ["network-online.target"];
|
||||
wants = ["dnscrypt-proxy2_proton.service"];
|
||||
after = ["netns@wg.service"];
|
||||
before = ["dnscrypt-proxy2_proton.service"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
@ -289,9 +260,7 @@ in
|
||||
${pkgs.iproute2}/bin/ip link set proton_wg netns wg
|
||||
${pkgs.iproute2}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
|
||||
${pkgs.iproute2}/bin/ip netns exec wg \
|
||||
${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${
|
||||
config.sops.secrets."wg_privkey_proton".path
|
||||
}"
|
||||
${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${config.sops.secrets."wg_privkey_proton".path}"
|
||||
${pkgs.iproute2}/bin/ip netns exec wg \
|
||||
${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \
|
||||
endpoint "$ENDPOINT_IP:51820" \
|
||||
@ -314,9 +283,9 @@ in
|
||||
"network-online.target"
|
||||
"nss-lookup.target"
|
||||
];
|
||||
before = [ "nss-lookup.target" ];
|
||||
after = [ "wg_proton.service" ];
|
||||
partOf = [ "wg_proton.service" ];
|
||||
before = ["nss-lookup.target"];
|
||||
after = ["wg_proton.service"];
|
||||
partOf = ["wg_proton.service"];
|
||||
serviceConfig = {
|
||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||
CacheDirectory = "dnscrypt-proxy";
|
||||
@ -360,7 +329,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
coredump.enable = false;
|
||||
extraConfig = ''
|
||||
DefaultTimeoutStartSec=30s
|
||||
DefaultTimeoutStopSec=30s
|
||||
@ -403,10 +371,7 @@ in
|
||||
};
|
||||
|
||||
udev = {
|
||||
packages = [
|
||||
pkgs.openhantek6022
|
||||
pkgs.openocd
|
||||
];
|
||||
packages = [pkgs.openhantek6022 pkgs.openocd];
|
||||
extraRules = ''
|
||||
#Xilinx FTDI
|
||||
ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
|
||||
@ -437,38 +402,32 @@ in
|
||||
enable = true;
|
||||
bindings = [
|
||||
{
|
||||
keys = [ 113 ];
|
||||
events = [ "key" ];
|
||||
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master toggle'";
|
||||
keys = [113];
|
||||
events = ["key"];
|
||||
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
|
||||
}
|
||||
|
||||
{
|
||||
keys = [ 114 ];
|
||||
events = [
|
||||
"key"
|
||||
"rep"
|
||||
];
|
||||
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%- unmute'";
|
||||
keys = [114];
|
||||
events = ["key" "rep"];
|
||||
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
|
||||
}
|
||||
|
||||
{
|
||||
keys = [ 115 ];
|
||||
events = [
|
||||
"key"
|
||||
"rep"
|
||||
];
|
||||
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%+ unmute'";
|
||||
keys = [115];
|
||||
events = ["key" "rep"];
|
||||
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
|
||||
}
|
||||
|
||||
{
|
||||
keys = [ 224 ];
|
||||
events = [ "key" ];
|
||||
keys = [224];
|
||||
events = ["key"];
|
||||
command = "${pkgs.light}/bin/light -U 5";
|
||||
}
|
||||
|
||||
{
|
||||
keys = [ 225 ];
|
||||
events = [ "key" ];
|
||||
keys = [225];
|
||||
events = ["key"];
|
||||
command = "${pkgs.light}/bin/light -A 5";
|
||||
}
|
||||
];
|
||||
@ -488,18 +447,16 @@ in
|
||||
"https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
|
||||
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
|
||||
];
|
||||
cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md";
|
||||
cache_file = "public-resolvers.md";
|
||||
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
borgbackup.jobs."borgbase" =
|
||||
let
|
||||
user = config.users.users.${USER};
|
||||
borgbackup.jobs."borgbase" = let
|
||||
user = config.users.users.akill;
|
||||
home = user.home;
|
||||
in
|
||||
{
|
||||
in {
|
||||
user = user.name;
|
||||
paths = [
|
||||
(home + "/pic/priv")
|
||||
@ -561,7 +518,7 @@ in
|
||||
allowBitmaps = true;
|
||||
useEmbeddedBitmaps = true;
|
||||
defaultFonts = {
|
||||
monospace = [ "JetBrainsMono" ];
|
||||
monospace = ["JetBrainsMono"];
|
||||
};
|
||||
};
|
||||
|
||||
@ -590,13 +547,6 @@ in
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
libvirtd = {
|
||||
enable = true;
|
||||
allowedBridges = [
|
||||
"virbr0"
|
||||
"br0"
|
||||
];
|
||||
};
|
||||
spiceUSBRedirection.enable = true;
|
||||
containers.storage.settings = {
|
||||
storage = {
|
||||
@ -623,7 +573,7 @@ in
|
||||
|
||||
graphics = {
|
||||
enable = true;
|
||||
extraPackages = [ ];
|
||||
extraPackages = [];
|
||||
};
|
||||
rtl-sdr.enable = true;
|
||||
};
|
||||
@ -633,18 +583,9 @@ in
|
||||
algorithm = "zstd";
|
||||
};
|
||||
|
||||
users.users.${USER} = {
|
||||
users.users.akill = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [
|
||||
"wireshark"
|
||||
"kvm"
|
||||
"tty"
|
||||
"audio"
|
||||
"sound"
|
||||
"adbusers"
|
||||
"dialout"
|
||||
"wheel"
|
||||
];
|
||||
extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout" "wheel"];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,60 +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,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.luks.devices."crypt_dev".device =
|
||||
"/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
|
||||
boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
|
||||
boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"ehci_pci"
|
||||
"xhci_pci"
|
||||
"uas"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
boot.kernelModules = [
|
||||
"kvm-amd"
|
||||
"amd-gpu"
|
||||
];
|
||||
boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/828E-F3C3";
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/828E-F3C3";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Unprivileged sandboxing tool";
|
||||
homepage = "https://github.com/containers/bubblewrap";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
maintainers = with maintainers; [dotlambda];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "bwrap";
|
||||
};
|
||||
|
||||
@ -52,8 +52,8 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ dpkg ];
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
buildInputs = [dpkg];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -115,8 +115,7 @@ stdenv.mkDerivation {
|
||||
xorg.libxkbfile
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
installPhase = let
|
||||
viberWrap = writeShellScriptBin "viberWrap" ''
|
||||
${bubblewrap}/bin/bwrap --bind / / \
|
||||
--dev /dev \
|
||||
@ -125,8 +124,7 @@ stdenv.mkDerivation {
|
||||
--bind $HOME/Downloads/ $HOME/Downloads \
|
||||
$@
|
||||
'';
|
||||
in
|
||||
''
|
||||
in ''
|
||||
dpkg-deb -x $src $out
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -163,9 +161,9 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = "https://www.viber.com";
|
||||
description = "An instant messaging and Voice over IP (VoIP) app";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
sourceProvenance = with lib.sourceTypes; [binaryNativeCode];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ jagajaga ];
|
||||
platforms = ["x86_64-linux"];
|
||||
maintainers = with lib.maintainers; [jagajaga];
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user