Compare commits
21 Commits
8c14099721
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
80b587e7fd
|
|||
|
c28eac7e5e
|
|||
|
94ed73d865
|
|||
|
5a8b310ac7
|
|||
|
5604d83743
|
|||
|
e27772c045
|
|||
|
59d66d327d
|
|||
|
b829904e5d
|
|||
|
2e89da4e3b
|
|||
|
86642401b0
|
|||
|
9b91a96a73
|
|||
|
63597639c9
|
|||
|
262afbacee
|
|||
|
881080ffd2
|
|||
|
bc3c1f4a2c
|
|||
|
ce7808f193
|
|||
|
426203082a
|
|||
|
b1746a6756
|
|||
|
5796eef05a
|
|||
|
a5cf31c5b4
|
|||
|
a9cf86654f
|
@@ -1,8 +1,6 @@
|
||||
{
|
||||
pkgs,
|
||||
nix-xilinx,
|
||||
system,
|
||||
...
|
||||
{ pkgs
|
||||
, system
|
||||
, ...
|
||||
}:
|
||||
{
|
||||
environment.systemPackages =
|
||||
@@ -20,7 +18,7 @@
|
||||
bluez-tools
|
||||
btop
|
||||
busybox
|
||||
curlHTTP3
|
||||
curl
|
||||
dfu-util
|
||||
dhcpcd
|
||||
direnv
|
||||
@@ -98,12 +96,5 @@
|
||||
xfsprogs
|
||||
zip
|
||||
z-lua
|
||||
]
|
||||
++ (with nix-xilinx.packages.${system}; [
|
||||
vivado
|
||||
vitis
|
||||
vitis_hls
|
||||
model_composer
|
||||
xilinx-shell
|
||||
]);
|
||||
];
|
||||
}
|
||||
|
||||
75
flake.lock
generated
75
flake.lock
generated
@@ -35,11 +35,11 @@
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"lastModified": 1761588595,
|
||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -61,11 +61,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750779888,
|
||||
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
|
||||
"lastModified": 1763988335,
|
||||
"narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
|
||||
"rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -103,16 +103,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1753288231,
|
||||
"narHash": "sha256-WcMW9yUDfER8kz4NdCaaI/ep0Ef91L+Nf7MetNzHZc4=",
|
||||
"lastModified": 1764536451,
|
||||
"narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7b5a978e00273b8676c530c03d315f5b75fae564",
|
||||
"rev": "3fdd076e08049a9c7a83149b270440d9787d2df5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -140,32 +140,16 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1753345091,
|
||||
"narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
|
||||
"lastModified": 1764522689,
|
||||
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
|
||||
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-25_05": {
|
||||
"locked": {
|
||||
"lastModified": 1751741127,
|
||||
"narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "29e290002bfff26af1db6f64d070698019460302",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -177,11 +161,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748077877,
|
||||
"narHash": "sha256-sxWrjcRygvs7Fz9gxjSm54ul8+NtU29V+PLAPR6ZfY0=",
|
||||
"lastModified": 1764594740,
|
||||
"narHash": "sha256-YLyM7w1j7BcOK9F+L7x7iY9wfOzPfcIBWW9LeU9Wzoo=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "b23265403c87af272c74cda484a840b0f22306f5",
|
||||
"revCount": 43,
|
||||
"rev": "878c87430f5e3c109f183a1822988b1c32413131",
|
||||
"revCount": 51,
|
||||
"type": "git",
|
||||
"url": "https://git.project-cloud.net/asmir/nvim_flake"
|
||||
},
|
||||
@@ -232,15 +216,14 @@
|
||||
"git-hooks": "git-hooks",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-25_05": "nixpkgs-25_05"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1753285640,
|
||||
"narHash": "sha256-ofa021NeHDXAxg5J8mSnn8rHa393PAlD85ZCetP4Qa0=",
|
||||
"lastModified": 1764381008,
|
||||
"narHash": "sha256-s+/BuhPPSJHpPRcylqfW+3UFyYsHjAhKdtPSxusYn0U=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "ce87c8a9771d1a20c3fa3b60113b9b0821627dcb",
|
||||
"rev": "76bd7a85e78a9b8295782a9cf719ec3489d8eb55",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -256,11 +239,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752544651,
|
||||
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
|
||||
"lastModified": 1764483358,
|
||||
"narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "2c8def626f54708a9c38a5861866660395bb3461",
|
||||
"rev": "5aca6ff67264321d47856a2ed183729271107c9c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -328,11 +311,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737802495,
|
||||
"narHash": "sha256-Q+bZnH7uQM5T/G+xCGSRU3bTJqD70NeE4vLXLXLCm7k=",
|
||||
"lastModified": 1764579633,
|
||||
"narHash": "sha256-gOD5RMHOB9Fw4T3nk2a95YdU0J24QU3uWUiZVIQza64=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "4962f12867b0b6c4c4d39b98e6016e7f925a802c",
|
||||
"revCount": 23,
|
||||
"rev": "b0707744e2b4a077e759145cdbfa8d8d1017e732",
|
||||
"revCount": 25,
|
||||
"type": "git",
|
||||
"url": "https://git.project-cloud.net/asmir/zremap"
|
||||
},
|
||||
|
||||
27
flake.nix
27
flake.nix
@@ -2,7 +2,7 @@
|
||||
description = "NixOS configuration";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
|
||||
nix-xilinx = {
|
||||
url = "gitlab:asmir.abdulahovic/nix-xilinx";
|
||||
@@ -30,7 +30,7 @@
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
@@ -46,23 +46,22 @@
|
||||
};
|
||||
|
||||
outputs =
|
||||
inputs@{
|
||||
home-manager,
|
||||
nixpkgs,
|
||||
nix-xilinx,
|
||||
nvim,
|
||||
project-cloud,
|
||||
simple-nixos-mailserver,
|
||||
sops-nix,
|
||||
swaysw,
|
||||
zremap,
|
||||
...
|
||||
inputs@{ home-manager
|
||||
, nixpkgs
|
||||
, nix-xilinx
|
||||
, nvim
|
||||
, project-cloud
|
||||
, simple-nixos-mailserver
|
||||
, sops-nix
|
||||
, swaysw
|
||||
, zremap
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
|
||||
in
|
||||
{
|
||||
nixosConfigurations = rec {
|
||||
nixosConfigurations = {
|
||||
nixy = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
|
||||
@@ -110,7 +110,6 @@ in
|
||||
nix-init
|
||||
nixpkgs-fmt
|
||||
nix-prefetch-git
|
||||
nodePackages.peerflix
|
||||
nom
|
||||
openems
|
||||
openocd
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
home.sessionVariables = {
|
||||
/*ZDOTDIR = "\"$HOME/\".config/zsh";*/
|
||||
/*HISTFILE = "\"$XDG_STATE_HOME\"/zsh/history";*/
|
||||
};
|
||||
|
||||
programs.z-lua = {
|
||||
enableAliases = true;
|
||||
enableZshIntegration = true;
|
||||
@@ -9,6 +14,16 @@
|
||||
autocd = true;
|
||||
enableCompletion = false;
|
||||
defaultKeymap = "viins";
|
||||
/* dotDir = "\"$XDG_CONFIG_HOME\"/zsh"; */
|
||||
|
||||
setOptions = [
|
||||
"c_bases"
|
||||
"completealiases"
|
||||
"completeinword"
|
||||
"nobeep"
|
||||
"nopromptcr"
|
||||
"notify"
|
||||
];
|
||||
|
||||
shellAliases = {
|
||||
cfind = "${pkgs.cscope}/bin/cscope -C -R -L1";
|
||||
@@ -43,8 +58,8 @@
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "sindresorhus";
|
||||
repo = "pure";
|
||||
rev = "92b8e9057988566b37ff695e70e2e9bbeb7196c8";
|
||||
hash = "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A=";
|
||||
rev = "54bd501c802283dee0940457da6eb3e642bd1453";
|
||||
hash = "sha256-AZSxP2g6BWoxyiSQH7yzbbbfGcwD8jgnXPPfcYwJUL0=";
|
||||
};
|
||||
file = "pure.plugin.zsh";
|
||||
}
|
||||
@@ -55,18 +70,13 @@
|
||||
}
|
||||
{
|
||||
name = "zsh-sudo";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "hcgraf";
|
||||
repo = "zsh-sudo";
|
||||
rev = "d8084def6bb1bde2482e7aa636743f40c69d9b32";
|
||||
sha256 = "1dpm51w3wjxil8sxqw4qxim5kmf6afmkwz1yfhldpdlqm7rfwpi3";
|
||||
};
|
||||
file = "sudo.plugin.zsh";
|
||||
src = pkgs.oh-my-zsh;
|
||||
file = "share/oh-my-zsh/plugins/sudo/sudo.plugin.zsh";
|
||||
}
|
||||
{
|
||||
name = "zsh-fast-syntax-highlighting";
|
||||
src = pkgs.zsh-fast-syntax-highlighting;
|
||||
file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
|
||||
file = "share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh";
|
||||
}
|
||||
];
|
||||
|
||||
@@ -76,18 +86,8 @@
|
||||
# binds
|
||||
bindkey '^K' fzf-file-widget
|
||||
|
||||
# options
|
||||
setopt nobeep
|
||||
setopt nopromptcr
|
||||
setopt c_bases
|
||||
setopt completeinword
|
||||
setopt completealiases
|
||||
setopt notify
|
||||
|
||||
#
|
||||
RPS1=""
|
||||
|
||||
#
|
||||
function chpwd() {
|
||||
ls;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,6 @@ in
|
||||
libva-utils
|
||||
nixpkgs-fmt
|
||||
nix-prefetch-git
|
||||
nodePackages.peerflix
|
||||
pandoc
|
||||
paraview
|
||||
pass-wayland
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
{ lib
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
|
||||
@@ -50,6 +49,12 @@ in
|
||||
WLR_RENDERER = "vulkan";
|
||||
};
|
||||
|
||||
home.pointerCursor = {
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
name = "Adwaita";
|
||||
size = 38;
|
||||
};
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
};
|
||||
@@ -59,7 +64,6 @@ in
|
||||
|
||||
librewolf = {
|
||||
enable = true;
|
||||
package = pkgs.librewolf-wayland;
|
||||
settings = {
|
||||
"webgl.disable" = true;
|
||||
"middlemouse.paste" = false;
|
||||
@@ -80,19 +84,25 @@ in
|
||||
|
||||
mpv = {
|
||||
enable = true;
|
||||
scripts = [
|
||||
pkgs.mpvScripts.uosc
|
||||
pkgs.mpvScripts.autosubsync-mpv
|
||||
];
|
||||
config = {
|
||||
osc = "no";
|
||||
osd-bar = "no";
|
||||
border = "no";
|
||||
slang = "eng,en";
|
||||
alang = "eng,en";
|
||||
hwdec = "auto";
|
||||
vo = "gpu-next";
|
||||
ao = "pipewire";
|
||||
osd-bar = "no";
|
||||
border = "no";
|
||||
script-opts-set = "";
|
||||
ytdl-format = "bestvideo[height<=?1080]+bestaudio/best";
|
||||
};
|
||||
|
||||
bindings = {
|
||||
"s" = "script-binding uosc/subtitles";
|
||||
"a" = "script-binding uosc/audio";
|
||||
WHEEL_UP = "ignore";
|
||||
WHEEL_DOWN = "ignore";
|
||||
WHEEL_LEFT = "ignore";
|
||||
@@ -197,9 +207,11 @@ in
|
||||
|
||||
git = {
|
||||
enable = true;
|
||||
userName = "Asmir A";
|
||||
userEmail = "asmir.abdulahovic@gmail.com";
|
||||
extraConfig = {
|
||||
settings = {
|
||||
user = {
|
||||
name = "Asmir A";
|
||||
email = "asmir.abdulahovic@gmail.com";
|
||||
};
|
||||
init.defaultBranch = "master";
|
||||
pull = {
|
||||
rebase = true;
|
||||
@@ -267,11 +279,11 @@ in
|
||||
${pkgs.coreutils}/bin/rm $ALL_IMGS
|
||||
'';
|
||||
in
|
||||
/*
|
||||
/*
|
||||
refresh_i3status = pkgs.writeShellScriptBin "refresh_i3status" ''
|
||||
${pkgs.coreutils}/bin/sleep 1 && ${pkgs.procps}/bin/pkill -USR1 i3status-rs
|
||||
'';
|
||||
*/
|
||||
*/
|
||||
{
|
||||
enable = true;
|
||||
events = [
|
||||
|
||||
@@ -67,7 +67,7 @@ in
|
||||
compsize
|
||||
kdePackages.ark
|
||||
ungoogled-chromium
|
||||
# cura
|
||||
cura-appimage
|
||||
deluge
|
||||
dfu-util
|
||||
discord
|
||||
@@ -91,7 +91,7 @@ in
|
||||
imagemagick
|
||||
imv
|
||||
inkscape
|
||||
jellyfin-media-player
|
||||
#jellyfin-media-player
|
||||
kdePackages.kdenlive
|
||||
kicad
|
||||
kodi-wayland
|
||||
@@ -99,7 +99,7 @@ in
|
||||
libnotify
|
||||
libreoffice-qt6-fresh
|
||||
libva-utils
|
||||
linuxPackages_latest.perf
|
||||
perf
|
||||
lsix
|
||||
lsix
|
||||
mediainfo
|
||||
@@ -110,19 +110,18 @@ in
|
||||
nix-init
|
||||
nixpkgs-fmt
|
||||
nix-prefetch-git
|
||||
nodePackages.peerflix
|
||||
nom
|
||||
openems
|
||||
openocd
|
||||
openscad
|
||||
pandoc
|
||||
paraview
|
||||
#paraview
|
||||
pass-wayland
|
||||
patchelf
|
||||
pavucontrol
|
||||
pay-respects
|
||||
pirate-get
|
||||
poppler_utils
|
||||
poppler-utils
|
||||
powertop
|
||||
pulsemixer
|
||||
pwvucontrol
|
||||
@@ -131,7 +130,7 @@ in
|
||||
qucs-s
|
||||
radeontop
|
||||
remmina
|
||||
river
|
||||
river-classic
|
||||
rizin
|
||||
rtorrent
|
||||
sbcl
|
||||
@@ -154,7 +153,7 @@ in
|
||||
waybar
|
||||
wdisplays
|
||||
weechat
|
||||
whatsapp-for-linux
|
||||
wasistlos
|
||||
wine
|
||||
wireshark
|
||||
wl-clipboard
|
||||
|
||||
@@ -14,10 +14,6 @@
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
system.switch = {
|
||||
enable = false;
|
||||
enableNg = true;
|
||||
};
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
@@ -113,7 +109,7 @@
|
||||
};
|
||||
|
||||
services.journald.extraConfig = ''SystemMaxUse=50M '';
|
||||
services.logind.extraConfig = ''KillUserProcesses=yes '';
|
||||
services.logind.settings.Login = { KillUserProcesses = true; };
|
||||
services.openssh.settings.PermitRootLogin = "prohibit-password";
|
||||
services.openssh.enable = true;
|
||||
services.openssh.listenAddresses = [
|
||||
@@ -177,7 +173,6 @@
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
package = pkgs.nginxQuic;
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
@@ -301,12 +296,6 @@
|
||||
startAt = "daily";
|
||||
};
|
||||
|
||||
services.seafile = {
|
||||
enable = false;
|
||||
initialAdminPassword = "admin";
|
||||
adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
|
||||
};
|
||||
|
||||
# needed for sendmail mail functionality
|
||||
users.users.gitea.extraGroups = [ "postdrop" ];
|
||||
systemd.services.gitea.serviceConfig = {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ config
|
||||
, nix-xilinx
|
||||
, nvim
|
||||
, pkgs
|
||||
, system
|
||||
@@ -7,16 +6,16 @@
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
USER = "akill";
|
||||
USER = "akill";
|
||||
in
|
||||
{
|
||||
imports = [ ];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
system.autoUpgrade.enable = false;
|
||||
system.switch = {
|
||||
enable = true;
|
||||
enableNg = true;
|
||||
system = {
|
||||
stateVersion = "23.05";
|
||||
autoUpgrade.enable = false;
|
||||
etc.overlay.enable = true;
|
||||
nixos-init.enable = true;
|
||||
};
|
||||
|
||||
sops = {
|
||||
@@ -89,7 +88,7 @@ in
|
||||
"amdgpu.sg_display=0"
|
||||
"amdgpu.gttsize=2048"
|
||||
];
|
||||
kernelPackages = pkgs.linuxPackages_hardened;
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernel.sysctl = {
|
||||
"net.core.default_qdisc" = "fq";
|
||||
"net.ipv4.tcp_congestion_control" = "bbr";
|
||||
@@ -101,7 +100,7 @@ in
|
||||
enable = true;
|
||||
memtest86.enable = true;
|
||||
};
|
||||
readOnlyNixStore = true;
|
||||
nixStoreMountOpts = [ "ro" ];
|
||||
supportedFilesystems = [
|
||||
"xfs"
|
||||
];
|
||||
@@ -205,7 +204,6 @@ in
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [
|
||||
nix-xilinx.overlay
|
||||
nvim.overlays.${system}.overlay
|
||||
];
|
||||
environment = {
|
||||
@@ -256,8 +254,8 @@ in
|
||||
|
||||
# List services that you want to enable:
|
||||
systemd = {
|
||||
#sysusers.enable = true;
|
||||
services = {
|
||||
|
||||
# Fix issue where systemd-vconsole-setup failes to find keymap
|
||||
systemd-vconsole-setup = {
|
||||
unitConfig = {
|
||||
@@ -294,9 +292,9 @@ in
|
||||
description = "wg network interface";
|
||||
bindsTo = [ "netns@wg.service" ];
|
||||
requires = [ "network-online.target" ];
|
||||
wants = [ "dnscrypt-proxy2_proton.service" ];
|
||||
wants = [ "dnscrypt-proxy_proton.service" ];
|
||||
after = [ "netns@wg.service" ];
|
||||
before = [ "dnscrypt-proxy2_proton.service" ];
|
||||
before = [ "dnscrypt-proxy_proton.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
@@ -326,7 +324,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
"dnscrypt-proxy2_proton" = {
|
||||
"dnscrypt-proxy_proton" = {
|
||||
description = "DNSCrypt-proxy client proton";
|
||||
wants = [
|
||||
"network-online.target"
|
||||
@@ -339,7 +337,7 @@ in
|
||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||
CacheDirectory = "dnscrypt-proxy";
|
||||
DynamicUser = true;
|
||||
ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${config.services.dnscrypt-proxy2.configFile}";
|
||||
ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${config.services.dnscrypt-proxy.configFile}";
|
||||
LockPersonality = true;
|
||||
LogsDirectory = "dnscrypt-proxy";
|
||||
MemoryDenyWriteExecute = true;
|
||||
@@ -379,10 +377,10 @@ in
|
||||
};
|
||||
|
||||
coredump.enable = false;
|
||||
extraConfig = ''
|
||||
DefaultTimeoutStartSec=30s
|
||||
DefaultTimeoutStopSec=30s
|
||||
'';
|
||||
settings.Manager = {
|
||||
DefaultTimeoutStartSec = "30s";
|
||||
DefaultTimeoutStopSec = "30s";
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
@@ -395,6 +393,7 @@ in
|
||||
ntp.enable = true;
|
||||
openssh.enable = true;
|
||||
printing.enable = true;
|
||||
userborn.enable = true;
|
||||
|
||||
pipewire = {
|
||||
enable = true;
|
||||
@@ -452,8 +451,8 @@ in
|
||||
|
||||
batteryNotifier = {
|
||||
enable = true;
|
||||
notifyCapacity = 20;
|
||||
suspendCapacity = 10;
|
||||
notifyCapacity = 12;
|
||||
suspendCapacity = 5;
|
||||
};
|
||||
|
||||
actkbd = {
|
||||
@@ -497,7 +496,7 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
dnscrypt-proxy2 = {
|
||||
dnscrypt-proxy = {
|
||||
enable = true;
|
||||
settings = {
|
||||
ipv6_servers = true;
|
||||
@@ -556,26 +555,10 @@ in
|
||||
SystemMaxUse=50M
|
||||
'';
|
||||
|
||||
logind.extraConfig = ''
|
||||
KillUserProcesses=yes
|
||||
'';
|
||||
|
||||
seafile = {
|
||||
enable = false;
|
||||
initialAdminPassword = "admin";
|
||||
adminEmail = "asmir.abdulahovic@gmail.com";
|
||||
ccnetSettings = {
|
||||
General = {
|
||||
SERVICE_URL = "http://127.0.0.1:8020";
|
||||
};
|
||||
};
|
||||
seafileSettings = {
|
||||
fileserver = {
|
||||
host = "0.0.0.0";
|
||||
port = 8082;
|
||||
};
|
||||
};
|
||||
logind.settings.Login = {
|
||||
KillUserProcesses = true;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
fonts = {
|
||||
@@ -602,13 +585,12 @@ in
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-color-emoji
|
||||
noto-fonts-emoji
|
||||
proggyfonts
|
||||
siji
|
||||
terminus_font
|
||||
terminus_font_ttf
|
||||
ubuntu_font_family
|
||||
vistafonts
|
||||
ubuntu-classic
|
||||
vista-fonts
|
||||
];
|
||||
};
|
||||
|
||||
@@ -640,6 +622,7 @@ in
|
||||
enable = true;
|
||||
settings = {
|
||||
General = {
|
||||
Experimental = true;
|
||||
Enable = "Source,Sink,Media,Socket";
|
||||
};
|
||||
};
|
||||
@@ -653,22 +636,24 @@ in
|
||||
};
|
||||
|
||||
zramSwap = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
algorithm = "zstd";
|
||||
};
|
||||
|
||||
users.users.${USER} = {
|
||||
isNormalUser = true;
|
||||
initialHashedPassword = "$y$j9T$XGffGsmN/u.wO5wZ.cBml/$9iCw3eWY0GSUH/aA8ESCAxKeTCAMqY21XQF7b5ujxD6";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [
|
||||
"wireshark"
|
||||
"kvm"
|
||||
"tty"
|
||||
"audio"
|
||||
"sound"
|
||||
"adbusers"
|
||||
"audio"
|
||||
"dialout"
|
||||
"kvm"
|
||||
"plugdev"
|
||||
"sound"
|
||||
"tty"
|
||||
"wheel"
|
||||
"wireshark"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user