asmir/nixos_flake_config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: asmir:77e24e385a766fc68ed94de7163c8dcfbbaf6ffd
Branches Tags
asmir:master
asmir:gitea_typst
asmir:magento2
..
compare: asmir:89841d00aaeab6dab559888a948f5e72c5056802
Branches Tags
asmir:master
asmir:gitea_typst
asmir:magento2

No commits in common. "77e24e385a766fc68ed94de7163c8dcfbbaf6ffd" and "89841d00aaeab6dab559888a948f5e72c5056802" have entirely different histories.
77e24e385a ... 89841d00aa

23 changed files with 562 additions and 878 deletions
Show Stats Expand all files Collapse all files

70
blue/configuration.nix
View File

@ -2,8 +2,7 @@
config, config,
pkgs, pkgs,
... ...
}: }: {
{
imports = [ imports = [
]; ];
@ -15,16 +14,13 @@
gc.automatic = true; gc.automatic = true;
gc.options = "--delete-older-than 7d"; gc.options = "--delete-older-than 7d";
package = pkgs.nixVersions.latest; package = pkgs.nixVersions.latest;
settings.experimental-features = [ settings.experimental-features = ["nix-command" "flakes"];
"nix-command"
"flakes"
];
}; };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "msr.allow_writes=on" ]; kernelParams = ["msr.allow_writes=on"];
supportedFilesystems = [ "btrfs" ]; supportedFilesystems = ["btrfs"];
tmpOnTmpfs = true; tmpOnTmpfs = true;
initrd.compressor = "zstd"; initrd.compressor = "zstd";
loader.systemd-boot = { loader.systemd-boot = {
@ -43,7 +39,7 @@
doas.enable = true; doas.enable = true;
doas.extraRules = [ doas.extraRules = [
{ {
users = [ "akill" ]; users = ["akill"];
keepEnv = true; keepEnv = true;
persist = true; persist = true;
} }
@ -57,16 +53,15 @@
networking = { networking = {
firewall.enable = true; firewall.enable = true;
hostName = "blue"; hostName = "blue";
nameservers = [ nameservers = ["127.0.0.1" "::1"];
"127.0.0.1"
"::1"
];
dhcpcd.extraConfig = "nohook resolv.conf"; dhcpcd.extraConfig = "nohook resolv.conf";
networkmanager = { networkmanager = {
enable = true; enable = true;
dns = "none"; dns = "none";
# wifi.backend = "iwd"; /*
wifi.backend = "iwd";
*/
}; };
}; };
@ -97,8 +92,8 @@
services = { services = {
"caps2esc" = { "caps2esc" = {
description = "Intercepts keyboard udev events"; description = "Intercepts keyboard udev events";
wants = [ "systemd-udevd.service" ]; wants = ["systemd-udevd.service"];
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig.Nice = -20; serviceConfig.Nice = -20;
script = '' script = ''
${pkgs.interception-tools}/bin/intercept \ ${pkgs.interception-tools}/bin/intercept \
@ -157,10 +152,7 @@
windowManager.i3.enable = true; windowManager.i3.enable = true;
}; };
udev.packages = [ udev.packages = [pkgs.rtl-sdr pkgs.openhantek6022];
pkgs.rtl-sdr
pkgs.openhantek6022
];
tlp = { tlp = {
enable = true; enable = true;
@ -170,38 +162,32 @@
enable = true; enable = true;
bindings = [ bindings = [
{ {
keys = [ 113 ]; keys = [113];
events = [ "key" ]; events = ["key"];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
} }
{ {
keys = [ 114 ]; keys = [114];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
} }
{ {
keys = [ 115 ]; keys = [115];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
} }
{ {
keys = [ 224 ]; keys = [224];
events = [ "key" ]; events = ["key"];
command = "${pkgs.light}/bin/light -U 5"; command = "${pkgs.light}/bin/light -U 5";
} }
{ {
keys = [ 225 ]; keys = [225];
events = [ "key" ]; events = ["key"];
command = "${pkgs.light}/bin/light -A 5"; command = "${pkgs.light}/bin/light -A 5";
} }
]; ];
@ -251,7 +237,7 @@
allowBitmaps = true; allowBitmaps = true;
useEmbeddedBitmaps = true; useEmbeddedBitmaps = true;
defaultFonts = { defaultFonts = {
monospace = [ "JetBrainsMono" ]; monospace = ["JetBrainsMono"];
}; };
}; };
@ -320,14 +306,6 @@
users.users.akill = { users.users.akill = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout"];
"wireshark"
"kvm"
"tty"
"audio"
"sound"
"adbusers"
"dialout"
];
}; };
} }

54
blue/hardware-configuration.nix
View File

@ -6,77 +6,47 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
"xhci_pci" boot.initrd.kernelModules = [];
"ahci" boot.kernelModules = ["kvm-intel"];
"nvme" boot.extraModulePackages = [];
"usbhid"
"usb_storage"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=root" "compress=zstd" "noatime"];
"subvol=root"
"compress=zstd"
"noatime"
];
}; };
boot.initrd.luks.devices."enc_root".device = boot.initrd.luks.devices."enc_root".device = "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
"/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
fileSystems."/home" = { fileSystems."/home" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=home" "compress=zstd" "noatime"];
"subvol=home"
"compress=zstd"
"noatime"
];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=nix" "compress=zstd" "noatime"];
"subvol=nix"
"compress=zstd"
"noatime"
];
}; };
fileSystems."/var/log" = { fileSystems."/var/log" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=log" "compress=zstd" "noatime"];
"subvol=log"
"compress=zstd"
"noatime"
];
neededForBoot = true; neededForBoot = true;
}; };
fileSystems."/persist" = { fileSystems."/persist" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=persist" "compress=zstd" "noatime"];
"subvol=persist"
"compress=zstd"
"noatime"
];
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
@ -84,7 +54,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

14
common/packages.nix
View File

@ -3,10 +3,8 @@
nix-xilinx, nix-xilinx,
system, system,
... ...
}: }: {
{ environment.systemPackages = with pkgs;
environment.systemPackages =
with pkgs;
[ [
acpi acpi
binutils binutils
@ -94,11 +92,5 @@
zip zip
z-lua z-lua
] ]
++ (with nix-xilinx.packages.${system}; [ ++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]);
vivado
vitis
vitis_hls
model_composer
xilinx-shell
]);
} }

8
common/suspend.nix
View File

@ -4,11 +4,9 @@
pkgs, pkgs,
... ...
}: }:
with lib; with lib; let
let
cfg = config.services.batteryNotifier; cfg = config.services.batteryNotifier;
in in {
{
options = { options = {
services.batteryNotifier = { services.batteryNotifier = {
enable = mkOption { enable = mkOption {
@ -44,7 +42,7 @@ in
timerConfig.OnBootSec = "1m"; timerConfig.OnBootSec = "1m";
timerConfig.OnUnitInactiveSec = "1m"; timerConfig.OnUnitInactiveSec = "1m";
timerConfig.Unit = "lowbatt.service"; timerConfig.Unit = "lowbatt.service";
wantedBy = [ "timers.target" ]; wantedBy = ["timers.target"];
}; };
systemd.user.services."lowbatt" = { systemd.user.services."lowbatt" = {
description = "battery level notifier"; description = "battery level notifier";

26
flake.lock generated
View File

@ -89,11 +89,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1735344290,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1735531152,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736528609, "lastModified": 1733264107,
"narHash": "sha256-p0tYmTVnnFghamXEXD4w/lldCi604zIWDV4Ol9ubQ5g=", "narHash": "sha256-deB9iGjbuJJVy4N63x/QdpI3K5dbI2u3k6ioVfmPqr8=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "8245a48cc75cc74dea1b3ca89cb58f24f8e14f85", "rev": "6e26ec33fa074df2874d5e93a4c037700d2395a6",
"revCount": 42, "revCount": 40,
"type": "git", "type": "git",
"url": "https://git.project-cloud.net/asmir/nvim_flake" "url": "https://git.project-cloud.net/asmir/nvim_flake"
}, },
@ -263,11 +263,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736515725, "lastModified": 1735468296,
"narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27",
"type": "github" "type": "github"
}, },
"original": { "original": {

45
flake.nix
View File

@ -50,8 +50,7 @@
}; };
}; };
outputs = outputs = inputs @ {
inputs@{
home-manager, home-manager,
nixpkgs, nixpkgs,
nix-xilinx, nix-xilinx,
@ -63,18 +62,16 @@
swaysw, swaysw,
zremap, zremap,
... ...
}: }: let
let
pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs; pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
in in {
{
nixosConfigurations = rec { nixosConfigurations = rec {
nixy = nixpkgs.lib.nixosSystem rec { nixy = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ _module.args = inputs; } {_module.args = inputs;}
{ _module.args.system = system; } {_module.args.system = system;}
{ nix.registry.nixpkgs.flake = nixpkgs; } {nix.registry.nixpkgs.flake = nixpkgs;}
./common/packages.nix ./common/packages.nix
./common/suspend.nix ./common/suspend.nix
./nixy/configuration.nix ./nixy/configuration.nix
@ -85,7 +82,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.akill = import ./home/home.nix; 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"; home-manager.backupFileExtension = "home_backup";
} }
peerix.nixosModules.peerix peerix.nixosModules.peerix
@ -106,9 +103,9 @@
mediabox = nixpkgs.lib.nixosSystem rec { mediabox = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ _module.args = inputs; } {_module.args = inputs;}
{ _module.args.system = system; } {_module.args.system = system;}
{ nix.registry.nixpkgs.flake = nixpkgs; } {nix.registry.nixpkgs.flake = nixpkgs;}
./common/packages.nix ./common/packages.nix
./common/suspend.nix ./common/suspend.nix
./mediabox/configuration.nix ./mediabox/configuration.nix
@ -120,7 +117,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.akill = import ./home/home.nix; home-manager.users.akill = import ./home/home.nix;
home-manager.extraSpecialArgs = { inherit inputs system; }; home-manager.extraSpecialArgs = {inherit inputs system;};
} }
peerix.nixosModules.peerix peerix.nixosModules.peerix
{ {
@ -140,9 +137,9 @@
blue = nixpkgs.lib.nixosSystem rec { blue = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ _module.args = inputs; } {_module.args = inputs;}
{ _module.args.system = system; } {_module.args.system = system;}
{ nix.registry.nixpkgs.flake = nixpkgs; } {nix.registry.nixpkgs.flake = nixpkgs;}
./blue/configuration.nix ./blue/configuration.nix
./blue/hardware-configuration.nix ./blue/hardware-configuration.nix
./common/packages.nix ./common/packages.nix
@ -151,16 +148,16 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.akill = import ./home/home.nix; 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 { magpie = nixpkgs.lib.nixosSystem rec {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
{ _module.args = inputs; } {_module.args = inputs;}
{ _module.args.system = system; } {_module.args.system = system;}
{ nix.registry.nixpkgs.flake = nixpkgs; } {nix.registry.nixpkgs.flake = nixpkgs;}
./magpie/configuration.nix ./magpie/configuration.nix
./magpie/hardware-configuration.nix ./magpie/hardware-configuration.nix
simple-nixos-mailserver.nixosModule simple-nixos-mailserver.nixosModule
@ -171,11 +168,7 @@
}; };
devShell.x86_64-linux = pkgs.mkShell { devShell.x86_64-linux = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [sops ssh-to-age age];
sops
ssh-to-age
age
];
shellHook = '' shellHook = ''
echo "Configuring NixOS!" echo "Configuring NixOS!"
''; '';

52
home/home.nix
View File

@ -2,21 +2,12 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: let
let
qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" '' qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
firejail -- ${lib.getExe pkgs.qutebrowser} "$@" firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
''; '';
in in {
{ imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
imports = [
./zsh.nix
./i3status-rust.nix
./sway.nix
./i3.nix
./home_packages.nix
./whatsapp-for-linux.nix
];
home.stateVersion = "22.11"; home.stateVersion = "22.11";
home.username = "akill"; home.username = "akill";
@ -50,9 +41,7 @@ in
WLR_RENDERER = "vulkan"; WLR_RENDERER = "vulkan";
}; };
wayland.windowManager.sway = { wayland.windowManager.sway = {enable = true;};
enable = true;
};
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
@ -71,11 +60,7 @@ in
clock24 = true; clock24 = true;
keyMode = "vi"; keyMode = "vi";
terminal = "screen-256color"; terminal = "screen-256color";
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [sysstat net-speed gruvbox];
sysstat
net-speed
gruvbox
];
}; };
mpv = { mpv = {
@ -152,9 +137,7 @@ in
font = "JetBrainsMono:size=10"; font = "JetBrainsMono:size=10";
dpi-aware = "yes"; dpi-aware = "yes";
}; };
mouse = { mouse = {hide-when-typing = "yes";};
hide-when-typing = "yes";
};
}; };
}; };
@ -200,12 +183,8 @@ in
userEmail = "asmir.abdulahovic@gmail.com"; userEmail = "asmir.abdulahovic@gmail.com";
extraConfig = { extraConfig = {
init.defaultBranch = "master"; init.defaultBranch = "master";
pull = { pull = {rebase = true;};
rebase = true; credential = {helper = "store";};
};
credential = {
helper = "store";
};
}; };
signing.key = "020C42B7A9ABA3E2"; signing.key = "020C42B7A9ABA3E2";
signing.signByDefault = true; signing.signByDefault = true;
@ -213,14 +192,7 @@ in
obs-studio = { obs-studio = {
enable = true; enable = true;
plugins = with pkgs.obs-studio-plugins; [ plugins = with pkgs.obs-studio-plugins; [obs-vkcapture input-overlay obs-multi-rtmp obs-pipewire-audio-capture wlrobs obs-vaapi];
obs-vkcapture
input-overlay
obs-multi-rtmp
obs-pipewire-audio-capture
wlrobs
obs-vaapi
];
}; };
i3status-rust.enable = true; i3status-rust.enable = true;
@ -248,16 +220,14 @@ in
enableSshSupport = true; enableSshSupport = true;
}; };
swayidle = swayidle = let
let
locker = pkgs.writeShellScriptBin "swaylock_fancy" '' locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg) 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.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE" ${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
${pkgs.coreutils}/bin/rm "$TMP_FILE" ${pkgs.coreutils}/bin/rm "$TMP_FILE"
''; '';
in in {
{
enable = true; enable = true;
events = [ events = [
{ {

22
home/home_packages.nix
View File

@ -4,8 +4,7 @@
inputs, inputs,
system, system,
... ...
}: }: let
let
chromium_teams = pkgs.writeShellScriptBin "chromium_teams" '' chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/ ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
''; '';
@ -26,9 +25,8 @@ let
PROXY_PORT="1337" PROXY_PORT="1337"
${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@" ${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
''; '';
wrap_sh = wrap_sh = let
let bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix { };
in in
pkgs.writeShellScriptBin "wrap.sh" '' pkgs.writeShellScriptBin "wrap.sh" ''
if ${pkgs.coreutils-full}/bin/test $# -ne 1; then if ${pkgs.coreutils-full}/bin/test $# -ne 1; then
@ -43,10 +41,8 @@ let
--tmp-overlay "$FULL_PATH" \ --tmp-overlay "$FULL_PATH" \
"$SHELL" "$SHELL"
''; '';
in in {
{ home.packages = with pkgs;
home.packages =
with pkgs;
[ [
anydesk anydesk
appimage-run appimage-run
@ -61,7 +57,7 @@ in
ungoogled-chromium ungoogled-chromium
cmake cmake
compsize compsize
# cura /*cura*/
deluge deluge
dfu-util dfu-util
discord discord
@ -157,7 +153,7 @@ in
yt-dlp yt-dlp
zapzap zapzap
zathura zathura
# zeal-qt6 /*zeal-qt6*/
zig zig
] ]
++ [ ++ [
@ -170,7 +166,7 @@ in
] ]
++ [ ++ [
inputs.swaysw.packages.${system}.swaysw inputs.swaysw.packages.${system}.swaysw
(pkgs.callPackage ../packages/viber/default.nix { }) (pkgs.callPackage ../packages/viber/default.nix {})
(pkgs.callPackage ../packages/bubblewrap/default.nix { }) (pkgs.callPackage ../packages/bubblewrap/default.nix {})
]; ];
} }

33
home/i3.nix
View File

@ -2,11 +2,9 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: let
let
scratchpad_cmd = "floating enable, resize set 1502 845, move position center, move scratchpad, scratchpad show"; scratchpad_cmd = "floating enable, resize set 1502 845, move position center, move scratchpad, scratchpad show";
in in {
{
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
enable = true; enable = true;
package = pkgs.i3; package = pkgs.i3;
@ -55,28 +53,24 @@ in
"${modifier}+Escape" = "workspace back_and_forth"; "${modifier}+Escape" = "workspace back_and_forth";
"${modifier}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run"; "${modifier}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run";
"Mod4+l" = "Mod4+l" = "exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
"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+j" = "exec i3-msg [class=\"ViberPC\"] scratchpad show || exec viber";
"Mod4+m" = "exec i3-msg [class=\"Thunderbird\"] scratchpad show || exec thunderbird"; "Mod4+m" = "exec i3-msg [class=\"Thunderbird\"] scratchpad show || exec thunderbird";
"Mod4+y" = "Mod4+y" = "exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
"exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
}; };
window = { window = {
# border = 4; /*
border = 4;
*/
commands = [ commands = [
{ {
command = scratchpad_cmd; command = scratchpad_cmd;
criteria = { criteria = {instance = "pulsemixer_scr|python3_scr";};
instance = "pulsemixer_scr|python3_scr";
};
} }
{ {
command = scratchpad_cmd; command = scratchpad_cmd;
criteria = { criteria = {class = "Thunderbird";};
class = "Thunderbird";
};
} }
{ {
command = scratchpad_cmd; command = scratchpad_cmd;
@ -87,9 +81,7 @@ in
} }
{ {
command = "focus child, layout tabbed, focus"; command = "focus child, layout tabbed, focus";
criteria = { criteria = {class = "qutebrowser";};
class = "qutebrowser";
};
} }
]; ];
}; };
@ -98,10 +90,7 @@ in
{ {
position = "top"; position = "top";
fonts = { fonts = {
names = [ names = ["DejaVu Sans Mono" "FontAwesome5Free"];
"DejaVu Sans Mono"
"FontAwesome5Free"
];
style = "Fixed Bold SemiCondensed"; style = "Fixed Bold SemiCondensed";
size = 7.0; size = 7.0;
}; };

3
home/i3status-rust.nix
View File

@ -1,5 +1,4 @@
{ ... }: {...}: {
{
programs.i3status-rust = { programs.i3status-rust = {
bars.top = { bars.top = {
icons = "awesome5"; icons = "awesome5";

53
home/sway.nix
View File

@ -4,8 +4,7 @@
system, system,
lib, lib,
... ...
}: }: let
let
cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" '' cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
${lib.getExe pkgs.cliphist} list | \ ${lib.getExe pkgs.cliphist} list | \
${lib.getExe pkgs.wofi} --dmenu --insensitive | \ ${lib.getExe pkgs.wofi} --dmenu --insensitive | \
@ -17,10 +16,9 @@ let
${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy ${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
''; '';
swaysw = inputs.swaysw.packages.${system}.swaysw; 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"; term = "${pkgs.foot}/bin/footclient";
in in {
{
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
extraSessionCommands = ""; extraSessionCommands = "";
@ -28,7 +26,7 @@ in
config = { config = {
fonts = { fonts = {
names = [ "JetBrainsMono" ]; names = ["JetBrainsMono"];
style = "Bold Semi-Condensed"; style = "Bold Semi-Condensed";
size = 11.0; size = 11.0;
}; };
@ -36,21 +34,15 @@ in
window.commands = [ window.commands = [
{ {
command = "move scratchpad, resize set 1152 648"; command = "move scratchpad, resize set 1152 648";
criteria = { criteria = {app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";};
app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";
};
} }
{ {
command = "move scratchpad, resize set 1502 845"; command = "move scratchpad, resize set 1502 845";
criteria = { criteria = {app_id = "com.viber";};
app_id = "com.viber";
};
} }
{ {
command = "floating enable"; command = "floating enable";
criteria = { criteria = {app_id = "sws_cli";};
app_id = "sws_cli";
};
} }
]; ];
@ -69,25 +61,16 @@ in
}; };
input = { input = {
"type:keyboard" = { "type:keyboard" = {repeat_delay = "150";};
repeat_delay = "150"; "type:keyboard" = {repeat_rate = "70";};
}; "type:touchpad" = {tap = "enabled";};
"type:keyboard" = {
repeat_rate = "70";
};
"type:touchpad" = {
tap = "enabled";
};
}; };
bars = [ bars = [
{ {
position = "top"; position = "top";
fonts = { fonts = {
names = [ names = ["Iosevka" "FontAwesome"];
"Iosevka"
"FontAwesome"
];
style = "Bold Semi-Condensed"; style = "Bold Semi-Condensed";
size = 12.0; size = 12.0;
}; };
@ -141,14 +124,12 @@ in
"Alt+bracketright" = "focus output right"; "Alt+bracketright" = "focus output right";
"Alt+bracketleft" = "focus output left"; "Alt+bracketleft" = "focus output left";
"Mod4+l" = "Mod4+l" = ''
''exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}''; exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
"Mod4+j" = "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
"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+h" = "Mod4+y" = ''
"exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber"; exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
"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"; "Mod4+p" = "exec ${lib.getExe pkgs.tessen} -a copy";
}; };
}; };

7
home/whatsapp-for-linux.nix
View File

@ -1,8 +1,7 @@
{ lib, ... }: {lib, ...}:
with lib; with lib; {
{
xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" ( xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" (
generators.toINI { } { generators.toINI {} {
General = { General = {
zoom_level = 1; zoom_level = 1;
close_to_tray = false; close_to_tray = false;

3
home/zsh.nix
View File

@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
programs.z-lua = { programs.z-lua = {
enableAliases = true; enableAliases = true;
enableZshIntegration = true; enableZshIntegration = true;

78
magpie/configuration.nix
View File

@ -6,15 +6,11 @@
nvim, nvim,
system, system,
... ...
}: }: {
{ imports = [];
imports = [ ];
nix.optimise.automatic = true; nix.optimise.automatic = true;
nix.settings.experimental-features = [ nix.settings.experimental-features = ["nix-command" "flakes"];
"nix-command"
"flakes"
];
system.switch = { system.switch = {
enable = false; enable = false;
enableNg = true; enableNg = true;
@ -25,10 +21,7 @@
boot.loader.systemd-boot.configurationLimit = 2; boot.loader.systemd-boot.configurationLimit = 2;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelParams = [ boot.kernelParams = ["ip=dhcp" "console=tty"];
"ip=dhcp"
"console=tty"
];
boot.kernel.sysctl = { boot.kernel.sysctl = {
"net.core.default_qdisc" = "fq"; "net.core.default_qdisc" = "fq";
"net.ipv4.tcp_congestion_control" = "bbr"; "net.ipv4.tcp_congestion_control" = "bbr";
@ -36,17 +29,14 @@
boot.initrd = { boot.initrd = {
compressor = "zstd"; compressor = "zstd";
availableKernelModules = [ availableKernelModules = ["virtio-pci" "virtio-gpu"];
"virtio-pci"
"virtio-gpu"
];
systemd.enable = true; systemd.enable = true;
network = { network = {
enable = true; enable = true;
ssh = { ssh = {
enable = true; enable = true;
hostKeys = [ /etc/ssh_dummy_ed25519_key ]; hostKeys = [/etc/ssh_dummy_ed25519_key];
authorizedKeyFiles = [ ../nixy/ssh_pubkey ]; authorizedKeyFiles = [../nixy/ssh_pubkey];
}; };
}; };
}; };
@ -84,7 +74,7 @@
enable = true; enable = true;
debug = false; debug = false;
fqdn = "mail.project-cloud.net"; fqdn = "mail.project-cloud.net";
domains = [ "project-cloud.net" ]; domains = ["project-cloud.net"];
enableSubmissionSsl = true; enableSubmissionSsl = true;
enableImap = false; enableImap = false;
enableImapSsl = true; enableImapSsl = true;
@ -94,11 +84,11 @@
loginAccounts = { loginAccounts = {
"gitea@project-cloud.net" = { "gitea@project-cloud.net" = {
hashedPasswordFile = config.sops.secrets."gitea_mail_pw_hash".path; hashedPasswordFile = config.sops.secrets."gitea_mail_pw_hash".path;
aliases = [ "git@project-cloud.net" ]; aliases = ["git@project-cloud.net"];
}; };
"asmir@project-cloud.net" = { "asmir@project-cloud.net" = {
hashedPasswordFile = config.sops.secrets."asmir_mail_pw_hash".path; hashedPasswordFile = config.sops.secrets."asmir_mail_pw_hash".path;
aliases = [ "asmir.abdulahovic@project-cloud.net" ]; aliases = ["asmir.abdulahovic@project-cloud.net"];
}; };
}; };
certificateScheme = "acme-nginx"; certificateScheme = "acme-nginx";
@ -246,16 +236,10 @@
REGISTER_EMAIL_CONFIRM = true; REGISTER_EMAIL_CONFIRM = true;
}; };
settings."markup.restructuredtext" = settings."markup.restructuredtext" = let
let docutils =
docutils = pkgs.python3.withPackages ( pkgs.python3.withPackages (ps: with ps; [docutils pygments]);
ps: with ps; [ in {
docutils
pygments
]
);
in
{
ENABLED = true; ENABLED = true;
FILE_EXTENSIONS = ".rst"; FILE_EXTENSIONS = ".rst";
RENDER_COMMAND = "${docutils}/bin/rst2html.py"; RENDER_COMMAND = "${docutils}/bin/rst2html.py";
@ -278,7 +262,7 @@
paths = [ paths = [
"/var/lib/gitea" "/var/lib/gitea"
]; ];
exclude = [ ]; exclude = [];
repo = "ssh://na9fqv67@na9fqv67.repo.borgbase.com/./repo"; repo = "ssh://na9fqv67@na9fqv67.repo.borgbase.com/./repo";
encryption = { encryption = {
mode = "repokey-blake2"; mode = "repokey-blake2";
@ -295,10 +279,12 @@
adminEmail = "asmir.abdulahovic" + "@" + "gmail.com"; 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 = { systemd.services.gitea.serviceConfig = {
RestrictAddressFamilies = [ "AF_NETLINK" ]; RestrictAddressFamilies = ["AF_NETLINK"];
ProtectSystem = lib.mkForce false; ProtectSystem = lib.mkForce false;
}; };
@ -308,7 +294,7 @@
}; };
sops = { sops = {
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
secrets = { secrets = {
"asmir_mail_pw_hash".sopsFile = ./secrets/asmir_mail_pw_hash.yaml; "asmir_mail_pw_hash".sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
"borgbase_enc_key".sopsFile = ./secrets/borgbase_enc_key.yaml; "borgbase_enc_key".sopsFile = ./secrets/borgbase_enc_key.yaml;
@ -335,29 +321,21 @@
networking.hostName = "magpie"; networking.hostName = "magpie";
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [80 443 587 2049]; # http, mail, mail, nfs
80 networking.firewall.allowedUDPPorts = [443 51820]; #mail, wireguard
443
587
2049
]; # http, mail, mail, nfs
networking.firewall.allowedUDPPorts = [
443
51820
]; # mail, wireguard
networking.firewall.allowPing = true; networking.firewall.allowPing = true;
networking.firewall.logRefusedConnections = lib.mkDefault false; networking.firewall.logRefusedConnections = lib.mkDefault false;
networking.nat.enable = true; networking.nat.enable = true;
networking.nat.externalInterface = "enp1s0"; networking.nat.externalInterface = "enp1s0";
networking.nat.internalInterfaces = [ "wg0" ]; networking.nat.internalInterfaces = ["wg0"];
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.wireless.enable = false; networking.wireless.enable = false;
networking.wireguard.interfaces = { networking.wireguard.interfaces = {
wg0 = { wg0 = {
ips = [ "10.100.0.1/24" ]; ips = ["10.100.0.1/24"];
listenPort = 51820; listenPort = 51820;
# This allows the wireguard server to route your traffic to the internet and hence be like a VPN # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
@ -375,17 +353,17 @@
{ {
publicKey = builtins.readFile ../nixy/wg_pubkey; publicKey = builtins.readFile ../nixy/wg_pubkey;
presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path; 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; publicKey = builtins.readFile ../mediabox/wg_pubkey;
presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path; 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; publicKey = builtins.readFile ../common/wg_pubkey_workstation;
presharedKeyFile = config.sops.secrets."wg_preshared/workstation".path; presharedKeyFile = config.sops.secrets."wg_preshared/workstation".path;
allowedIPs = [ "10.100.0.4/32" ]; allowedIPs = ["10.100.0.4/32"];
} }
]; ];
}; };

18
magpie/hardware-configuration.nix
View File

@ -5,21 +5,15 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid" "sr_mod"];
"xhci_pci" boot.initrd.kernelModules = [];
"virtio_pci" boot.kernelModules = [];
"usbhid" boot.extraModulePackages = [];
"sr_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/118de1e5-f23e-4af3-a10a-054eded78152"; device = "/dev/disk/by-uuid/118de1e5-f23e-4af3-a10a-054eded78152";
@ -31,7 +25,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

119
mediabox/configuration.nix
View File

@ -8,14 +8,13 @@
system, system,
nvim, nvim,
... ...
}: }: {
{ imports = [];
imports = [ ];
system.stateVersion = "23.05"; system.stateVersion = "23.05";
system.autoUpgrade.enable = false; 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" = { sops.secrets."peerix/private" = {
sopsFile = ./secrets/peerix.yaml; sopsFile = ./secrets/peerix.yaml;
mode = "0400"; mode = "0400";
@ -37,31 +36,28 @@
gc.options = "--delete-older-than 7d"; gc.options = "--delete-older-than 7d";
package = pkgs.nixVersions.latest; package = pkgs.nixVersions.latest;
settings = { settings = {
experimental-features = [ experimental-features = ["nix-command" "flakes"];
"nix-command"
"flakes"
];
}; };
}; };
boot = { boot = {
initrd = { initrd = {
compressor = "zstd"; compressor = "zstd";
availableKernelModules = [ "e1000e" ]; availableKernelModules = ["e1000e"];
network = { network = {
enable = true; enable = true;
udhcpc.enable = true; udhcpc.enable = true;
ssh = { ssh = {
enable = true; enable = true;
hostKeys = [ /etc/ssh_dummy_ed25519_key ]; hostKeys = [/etc/ssh_dummy_ed25519_key];
authorizedKeys = [ (builtins.readFile ../nixy/ssh_pubkey) ]; authorizedKeys = [(builtins.readFile ../nixy/ssh_pubkey)];
}; };
}; };
}; };
kernelModules = [ "acpi_call" ]; kernelModules = ["acpi_call"];
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "msr.allow_writes=on" ]; kernelParams = ["msr.allow_writes=on"];
kernel.sysctl = { kernel.sysctl = {
"net.core.default_qdisc" = "fq"; "net.core.default_qdisc" = "fq";
"net.ipv4.tcp_congestion_control" = "bbr"; "net.ipv4.tcp_congestion_control" = "bbr";
@ -72,7 +68,7 @@
memtest86.enable = true; memtest86.enable = true;
}; };
readOnlyNixStore = true; readOnlyNixStore = true;
supportedFilesystems = [ "btrfs" ]; supportedFilesystems = ["btrfs"];
tmp.useTmpfs = true; tmp.useTmpfs = true;
tmp.tmpfsSize = "80%"; tmp.tmpfsSize = "80%";
}; };
@ -93,11 +89,7 @@
networking = { networking = {
firewall = { firewall = {
enable = true; enable = true;
allowedTCPPorts = [ allowedTCPPorts = [80 443 51820];
80
443
51820
];
}; };
hostName = "mediabox"; hostName = "mediabox";
@ -105,11 +97,8 @@
interfaces.wlp3s0.useDHCP = false; interfaces.wlp3s0.useDHCP = false;
useDHCP = false; useDHCP = false;
wireless.enable = false; wireless.enable = false;
wireless.interfaces = [ "wlp3s0" ]; wireless.interfaces = ["wlp3s0"];
nameservers = [ nameservers = ["127.0.0.1" "::1"];
"127.0.0.1"
"::1"
];
dhcpcd.extraConfig = "nohook resolv.conf"; dhcpcd.extraConfig = "nohook resolv.conf";
networkmanager.dns = "none"; networkmanager.dns = "none";
extraHosts = '' extraHosts = ''
@ -123,13 +112,13 @@
wireguard.interfaces = { wireguard.interfaces = {
wg0 = { wg0 = {
ips = [ "10.100.0.5/24" ]; ips = ["10.100.0.5/24"];
privateKeyFile = config.sops.secrets."wg_privkey".path; privateKeyFile = config.sops.secrets."wg_privkey".path;
peers = [ peers = [
{ {
publicKey = builtins.readFile ../magpie/wg_pubkey; publicKey = builtins.readFile ../magpie/wg_pubkey;
presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path; 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"; endpoint = "5.75.229.224:51820";
persistentKeepalive = 25; persistentKeepalive = 25;
} }
@ -141,7 +130,7 @@
time.timeZone = "Europe/Sarajevo"; time.timeZone = "Europe/Sarajevo";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nvim.overlays.${system}.overlay ]; nixpkgs.overlays = [nvim.overlays.${system}.overlay];
environment = { environment = {
homeBinInPath = true; homeBinInPath = true;
variables = { variables = {
@ -164,13 +153,13 @@
systemd = { systemd = {
services = { services = {
"macchanger-wireless" = { "macchanger-wireless" = {
after = [ "sys-subsystem-net-devices-wlp3s0.device" ]; after = ["sys-subsystem-net-devices-wlp3s0.device"];
before = [ "network-pre.target" ]; before = ["network-pre.target"];
bindsTo = [ "sys-subsystem-net-devices-wlp3s0.device" ]; bindsTo = ["sys-subsystem-net-devices-wlp3s0.device"];
description = "Changes MAC of my wireless interface for privacy reasons"; description = "Changes MAC of my wireless interface for privacy reasons";
stopIfChanged = false; stopIfChanged = false;
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
wants = [ "network-pre.target" ]; wants = ["network-pre.target"];
script = '' script = ''
${pkgs.macchanger}/bin/macchanger -e wlp3s0 || true ${pkgs.macchanger}/bin/macchanger -e wlp3s0 || true
''; '';
@ -179,8 +168,8 @@
"zremap" = { "zremap" = {
description = "Intercepts keyboard udev events"; description = "Intercepts keyboard udev events";
wants = [ "systemd-udevd.service" ]; wants = ["systemd-udevd.service"];
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig.Nice = -20; serviceConfig.Nice = -20;
script = '' script = ''
sleep 1 sleep 1
@ -191,16 +180,12 @@
"wakeonlan" = { "wakeonlan" = {
description = "Reenable wake on lan every boot"; description = "Reenable wake on lan every boot";
after = [ "network.target" ]; after = ["network.target"];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp0s25 wol m"; ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp0s25 wol m";
}; };
wantedBy = [ wantedBy = ["default.target" "suspend.target" "shutdown.target"];
"default.target"
"suspend.target"
"shutdown.target"
];
}; };
/* /*
@ -328,45 +313,39 @@
windowManager.icewm.enable = true; windowManager.icewm.enable = true;
}; };
udev.packages = [ ]; udev.packages = [];
tlp = { tlp = {
enable = true; enable = true;
settings = { }; settings = {};
}; };
actkbd = { actkbd = {
enable = true; enable = true;
bindings = [ bindings = [
{ {
keys = [ 121 ]; keys = [121];
events = [ "key" ]; events = ["key"];
command = "${pkgs.alsaUtils}/bin/amixer -q set Master toggle"; command = "${pkgs.alsaUtils}/bin/amixer -q set Master toggle";
} }
{ {
keys = [ 122 ]; keys = [122];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute";
} }
{ {
keys = [ 123 ]; keys = [123];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute";
} }
{ {
keys = [ 224 ]; keys = [224];
events = [ "key" ]; events = ["key"];
command = "/run/current-system/sw/bin/light -U 5"; command = "/run/current-system/sw/bin/light -U 5";
} }
{ {
keys = [ 225 ]; keys = [225];
events = [ "key" ]; events = ["key"];
command = "/run/current-system/sw/bin/light -A 5"; command = "/run/current-system/sw/bin/light -A 5";
} }
]; ];
@ -459,16 +438,7 @@
users.users.akill = { users.users.akill = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
"wireshark"
"wheel"
"kvm"
"tty"
"audio"
"sound"
"adbusers"
"transmission"
];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
(builtins.readFile ../nixy/ssh_pubkey) (builtins.readFile ../nixy/ssh_pubkey)
]; ];
@ -477,21 +447,12 @@
users.users.ado = { users.users.ado = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
"wireshark"
"wheel"
"kvm"
"tty"
"audio"
"sound"
"adbusers"
"transmission"
];
}; };
users.users.mediauser = { users.users.mediauser = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.bash; shell = pkgs.bash;
extraGroups = [ ]; extraGroups = [];
}; };
} }

50
mediabox/hardware-configuration.nix
View File

@ -5,32 +5,20 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
"xhci_pci" boot.initrd.kernelModules = [];
"ehci_pci" boot.kernelModules = ["kvm-intel"];
"ahci" boot.extraModulePackages = [];
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=root" "compress=lzo" "noatime"];
"subvol=root"
"compress=lzo"
"noatime"
];
}; };
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/60aa7671-bfee-451b-b871-ac7c5a4a9f3a"; boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/60aa7671-bfee-451b-b871-ac7c5a4a9f3a";
@ -38,41 +26,25 @@
fileSystems."/home" = { fileSystems."/home" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=home" "compress=lzo" "noatime"];
"subvol=home"
"compress=lzo"
"noatime"
];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=nix" "compress=lzo" "noatime"];
"subvol=nix"
"compress=lzo"
"noatime"
];
}; };
fileSystems."/persist" = { fileSystems."/persist" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=persist" "compress=lzo" "noatime"];
"subvol=persist"
"compress=lzo"
"noatime"
];
}; };
fileSystems."/var/log" = { fileSystems."/var/log" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=log" "compress=lzo" "noatime"];
"subvol=log"
"compress=lzo"
"noatime"
];
neededForBoot = true; neededForBoot = true;
}; };
@ -82,7 +54,7 @@
}; };
swapDevices = [ 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; hardware.cpu.intel.updateMicrocode = true;

9
modules/nextcloud.nix
View File

@ -2,8 +2,7 @@
config, config,
pkgs, pkgs,
... ...
}: }: {
{
# Enable Nginx # Enable Nginx
services.nginx = { services.nginx = {
enable = true; enable = true;
@ -62,7 +61,7 @@
enable = true; enable = true;
# Ensure the database, user, and permissions always exist # Ensure the database, user, and permissions always exist
ensureDatabases = [ "nextcloud" ]; ensureDatabases = ["nextcloud"];
ensureUsers = [ ensureUsers = [
{ {
name = "nextcloud"; name = "nextcloud";
@ -73,7 +72,7 @@
# Ensure that postgres is running before running the setup # Ensure that postgres is running before running the setup
systemd.services."nextcloud-setup" = { systemd.services."nextcloud-setup" = {
requires = [ "postgresql.service" ]; requires = ["postgresql.service"];
after = [ "postgresql.service" ]; after = ["postgresql.service"];
}; };
} }

27
modules/qbittorrent.nix
View File

@ -4,13 +4,11 @@
pkgs, pkgs,
... ...
}: }:
with lib; with lib; let
let
cfg = config.services.qbittorrent; cfg = config.services.qbittorrent;
configDir = "${cfg.dataDir}/.config"; configDir = "${cfg.dataDir}/.config";
openFilesLimit = 4096; openFilesLimit = 4096;
in in {
{
options.services.qbittorrent = { options.services.qbittorrent = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -69,24 +67,24 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.qbittorrent ]; environment.systemPackages = [pkgs.qbittorrent];
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
qbittorrent = prev.qbittorrent.override { guiSupport = false; }; qbittorrent = prev.qbittorrent.override {guiSupport = false;};
}) })
]; ];
networking.firewall = mkIf cfg.openFirewall { networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ]; allowedTCPPorts = [cfg.port];
allowedUDPPorts = [ cfg.port ]; allowedUDPPorts = [cfg.port];
}; };
systemd.services.qbittorrent = { systemd.services.qbittorrent = {
after = [ "network.target" ]; after = ["network.target"];
description = "qBittorrent Daemon"; description = "qBittorrent Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
path = [ pkgs.qbittorrent ]; path = [pkgs.qbittorrent];
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${pkgs.qbittorrent}/bin/qbittorrent-nox \ ${pkgs.qbittorrent}/bin/qbittorrent-nox \
@ -112,10 +110,7 @@ in
}; };
}; };
users.groups = mkIf (cfg.group == "qbittorrent") { users.groups =
qbittorrent = { mkIf (cfg.group == "qbittorrent") {qbittorrent = {gid = null;};};
gid = null;
};
};
}; };
} }

142
nixy/configuration.nix
View File

@ -6,9 +6,8 @@
system, system,
zremap, zremap,
... ...
}: }: {
{ imports = [];
imports = [ ];
system.stateVersion = "23.05"; system.stateVersion = "23.05";
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;
@ -18,7 +17,7 @@
}; };
sops = { sops = {
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
secrets = { secrets = {
"peerix/private" = { "peerix/private" = {
sopsFile = ./secrets/peerix.yaml; sopsFile = ./secrets/peerix.yaml;
@ -62,29 +61,17 @@
package = pkgs.nixVersions.latest; package = pkgs.nixVersions.latest;
settings = { settings = {
sandbox = true; sandbox = true;
experimental-features = [ experimental-features = ["nix-command" "flakes"];
"nix-command"
"flakes"
];
}; };
}; };
boot = { boot = {
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
usbip
v4l2loopback
];
initrd.compressor = "zstd"; initrd.compressor = "zstd";
initrd.kernelModules = [ ]; initrd.kernelModules = [];
initrd.systemd.enable = true; initrd.systemd.enable = true;
binfmt.emulatedSystems = [ binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
"wasm32-wasi" kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
"x86_64-windows"
];
kernelParams = [
"psmouse.synaptics_intertouch=0"
"mem_sleep_default=deep"
];
kernel.sysctl = { kernel.sysctl = {
"net.core.default_qdisc" = "fq"; "net.core.default_qdisc" = "fq";
"net.ipv4.tcp_congestion_control" = "bbr"; "net.ipv4.tcp_congestion_control" = "bbr";
@ -96,10 +83,7 @@
memtest86.enable = true; memtest86.enable = true;
}; };
readOnlyNixStore = true; readOnlyNixStore = true;
supportedFilesystems = [ supportedFilesystems = ["f2fs" "xfs"];
"f2fs"
"xfs"
];
tmp.useTmpfs = true; tmp.useTmpfs = true;
}; };
@ -110,7 +94,7 @@
doas.enable = true; doas.enable = true;
doas.extraRules = [ doas.extraRules = [
{ {
users = [ "akill" ]; users = ["akill"];
keepEnv = true; keepEnv = true;
persist = true; persist = true;
} }
@ -125,19 +109,11 @@
nftables.enable = true; nftables.enable = true;
firewall = { firewall = {
enable = true; enable = true;
allowedTCPPorts = [ allowedTCPPorts = [80 443 51820 8020];
80
443
51820
8020
];
}; };
hostName = "nixy"; hostName = "nixy";
nameservers = [ nameservers = ["127.0.0.1" "::1"];
"127.0.0.1"
"::1"
];
dhcpcd.extraConfig = "nohook resolv.conf"; dhcpcd.extraConfig = "nohook resolv.conf";
extraHosts = '' extraHosts = ''
@ -168,13 +144,13 @@
wireguard.interfaces = { wireguard.interfaces = {
wg0 = { wg0 = {
ips = [ "10.100.0.6/24" ]; ips = ["10.100.0.6/24"];
privateKeyFile = config.sops.secrets."wg_privkey".path; privateKeyFile = config.sops.secrets."wg_privkey".path;
peers = [ peers = [
{ {
publicKey = builtins.readFile ../magpie/wg_pubkey; publicKey = builtins.readFile ../magpie/wg_pubkey;
presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path; 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"; endpoint = "5.75.229.224:51820";
persistentKeepalive = 25; persistentKeepalive = 25;
} }
@ -182,12 +158,12 @@
}; };
neox_wg = { neox_wg = {
ips = [ "192.168.51.2/32" ]; ips = ["192.168.51.2/32"];
privateKeyFile = config.sops.secrets."wg_privkey".path; privateKeyFile = config.sops.secrets."wg_privkey".path;
peers = [ peers = [
{ {
publicKey = builtins.readFile ../nixy/wg_pubkey_nx; 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"; endpoint = "185.194.64.26:51820";
persistentKeepalive = 25; persistentKeepalive = 25;
} }
@ -199,10 +175,7 @@
time.timeZone = "Europe/Sarajevo"; time.timeZone = "Europe/Sarajevo";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
nix-xilinx.overlay
nvim.overlays.${system}.overlay
];
environment = { environment = {
etc = { etc = {
"firejail/qutebrowser.local".text = '' "firejail/qutebrowser.local".text = ''
@ -261,7 +234,7 @@
"netns@" = { "netns@" = {
description = "%I network namespace"; description = "%I network namespace";
before = [ "network.target" ]; before = ["network.target"];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
@ -272,11 +245,11 @@
"wg_proton" = { "wg_proton" = {
description = "wg network interface"; description = "wg network interface";
bindsTo = [ "netns@wg.service" ]; bindsTo = ["netns@wg.service"];
requires = [ "network-online.target" ]; requires = ["network-online.target"];
wants = [ "dnscrypt-proxy2_proton.service" ]; wants = ["dnscrypt-proxy2_proton.service"];
after = [ "netns@wg.service" ]; after = ["netns@wg.service"];
before = [ "dnscrypt-proxy2_proton.service" ]; before = ["dnscrypt-proxy2_proton.service"];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
@ -287,9 +260,7 @@
${pkgs.iproute2}/bin/ip link set proton_wg netns wg ${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 -n wg address add 10.2.0.2/32 dev proton_wg
${pkgs.iproute2}/bin/ip netns exec wg \ ${pkgs.iproute2}/bin/ip netns exec wg \
${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${ ${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${config.sops.secrets."wg_privkey_proton".path}"
config.sops.secrets."wg_privkey_proton".path
}"
${pkgs.iproute2}/bin/ip netns exec wg \ ${pkgs.iproute2}/bin/ip netns exec wg \
${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \ ${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \
endpoint "$ENDPOINT_IP:51820" \ endpoint "$ENDPOINT_IP:51820" \
@ -312,9 +283,9 @@
"network-online.target" "network-online.target"
"nss-lookup.target" "nss-lookup.target"
]; ];
before = [ "nss-lookup.target" ]; before = ["nss-lookup.target"];
after = [ "wg_proton.service" ]; after = ["wg_proton.service"];
partOf = [ "wg_proton.service" ]; partOf = ["wg_proton.service"];
serviceConfig = { serviceConfig = {
AmbientCapabilities = "CAP_NET_BIND_SERVICE"; AmbientCapabilities = "CAP_NET_BIND_SERVICE";
CacheDirectory = "dnscrypt-proxy"; CacheDirectory = "dnscrypt-proxy";
@ -401,10 +372,7 @@
}; };
udev = { udev = {
packages = [ packages = [pkgs.openhantek6022 pkgs.openocd];
pkgs.openhantek6022
pkgs.openocd
];
extraRules = '' extraRules = ''
#Xilinx FTDI #Xilinx FTDI
ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666" ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
@ -435,38 +403,32 @@
enable = true; enable = true;
bindings = [ bindings = [
{ {
keys = [ 113 ]; keys = [113];
events = [ "key" ]; events = ["key"];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
} }
{ {
keys = [ 114 ]; keys = [114];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
} }
{ {
keys = [ 115 ]; keys = [115];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
} }
{ {
keys = [ 224 ]; keys = [224];
events = [ "key" ]; events = ["key"];
command = "${pkgs.light}/bin/light -U 5"; command = "${pkgs.light}/bin/light -U 5";
} }
{ {
keys = [ 225 ]; keys = [225];
events = [ "key" ]; events = ["key"];
command = "${pkgs.light}/bin/light -A 5"; command = "${pkgs.light}/bin/light -A 5";
} }
]; ];
@ -492,12 +454,10 @@
}; };
}; };
borgbackup.jobs."borgbase" = borgbackup.jobs."borgbase" = let
let
user = config.users.users.akill; user = config.users.users.akill;
home = user.home; home = user.home;
in in {
{
user = user.name; user = user.name;
paths = [ paths = [
(home + "/pic/priv") (home + "/pic/priv")
@ -559,7 +519,7 @@
allowBitmaps = true; allowBitmaps = true;
useEmbeddedBitmaps = true; useEmbeddedBitmaps = true;
defaultFonts = { defaultFonts = {
monospace = [ "JetBrainsMono" ]; monospace = ["JetBrainsMono"];
}; };
}; };
@ -588,13 +548,6 @@
}; };
virtualisation = { virtualisation = {
libvirtd = {
enable = true;
allowedBridges = [
"virbr0"
"br0"
];
};
spiceUSBRedirection.enable = true; spiceUSBRedirection.enable = true;
containers.storage.settings = { containers.storage.settings = {
storage = { storage = {
@ -621,7 +574,7 @@
graphics = { graphics = {
enable = true; enable = true;
extraPackages = [ ]; extraPackages = [];
}; };
rtl-sdr.enable = true; rtl-sdr.enable = true;
}; };
@ -634,15 +587,6 @@
users.users.akill = { users.users.akill = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout" "wheel"];
"wireshark"
"kvm"
"tty"
"audio"
"sound"
"adbusers"
"dialout"
"wheel"
];
}; };
} }

51
nixy/hardware-configuration.nix
View File

@ -1,60 +1,39 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config, lib, pkgs, modulesPath, ... }:
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = [ imports =
(modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.luks.devices."crypt_dev".device = boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
"/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
boot.initrd.luks.devices."crypt_dev".allowDiscards = true; boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
"nvme"
"ehci_pci"
"xhci_pci"
"uas"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
"kvm-amd"
"amd-gpu"
];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2"; { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
fsType = "xfs"; fsType = "xfs";
}; };
fileSystems."/nix" = { fileSystems."/nix" =
device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047"; { device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
fsType = "xfs"; fsType = "xfs";
}; };
fileSystems."/home" = { fileSystems."/home" =
device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376"; { device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
fsType = "xfs"; fsType = "xfs";
}; };
fileSystems."/boot" = { fileSystems."/boot" =
device = "/dev/disk/by-uuid/828E-F3C3"; { device = "/dev/disk/by-uuid/828E-F3C3";
fsType = "vfat"; fsType = "vfat";
options = [ options = [ "fmask=0022" "dmask=0022" ];
"fmask=0022"
"dmask=0022"
];
}; };
swapDevices = [ ]; swapDevices = [ ];

2
packages/bubblewrap/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
description = "Unprivileged sandboxing tool"; description = "Unprivileged sandboxing tool";
homepage = "https://github.com/containers/bubblewrap"; homepage = "https://github.com/containers/bubblewrap";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [dotlambda];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "bwrap"; mainProgram = "bwrap";
}; };

16
packages/viber/default.nix
View File

@ -52,8 +52,8 @@ stdenv.mkDerivation {
hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM="; hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [makeWrapper];
buildInputs = [ dpkg ]; buildInputs = [dpkg];
dontUnpack = true; dontUnpack = true;
@ -115,8 +115,7 @@ stdenv.mkDerivation {
xorg.libxkbfile xorg.libxkbfile
]; ];
installPhase = installPhase = let
let
viberWrap = writeShellScriptBin "viberWrap" '' viberWrap = writeShellScriptBin "viberWrap" ''
${bubblewrap}/bin/bwrap --bind / / \ ${bubblewrap}/bin/bwrap --bind / / \
--dev /dev \ --dev /dev \
@ -125,8 +124,7 @@ stdenv.mkDerivation {
--bind $HOME/Downloads/ $HOME/Downloads \ --bind $HOME/Downloads/ $HOME/Downloads \
$@ $@
''; '';
in in ''
''
dpkg-deb -x $src $out dpkg-deb -x $src $out
mkdir -p $out/bin mkdir -p $out/bin
@ -163,9 +161,9 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "https://www.viber.com"; homepage = "https://www.viber.com";
description = "An instant messaging and Voice over IP (VoIP) app"; description = "An instant messaging and Voice over IP (VoIP) app";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [binaryNativeCode];
license = lib.licenses.unfree; license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ]; platforms = ["x86_64-linux"];
maintainers = with lib.maintainers; [ jagajaga ]; maintainers = with lib.maintainers; [jagajaga];
}; };
} }