Compare commits

...

10 Commits

7 changed files with 103 additions and 146 deletions

View File

@@ -1,8 +1,6 @@
{ { pkgs
pkgs, , system
nix-xilinx, , ...
system,
...
}: }:
{ {
environment.systemPackages = environment.systemPackages =
@@ -20,7 +18,7 @@
bluez-tools bluez-tools
btop btop
busybox busybox
curlHTTP3 curl
dfu-util dfu-util
dhcpcd dhcpcd
direnv direnv
@@ -98,12 +96,5 @@
xfsprogs xfsprogs
zip zip
z-lua z-lua
] ];
++ (with nix-xilinx.packages.${system}; [
vivado
vitis
vitis_hls
model_composer
xilinx-shell
]);
} }

75
flake.lock generated
View File

@@ -35,11 +35,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1761588595,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750779888, "lastModified": 1763988335,
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -103,16 +103,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755928099, "lastModified": 1764536451,
"narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4a44fb9f7555da362af9d499817084f4288a957f", "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -140,32 +140,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755922037, "lastModified": 1764522689,
"narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-25_05": {
"locked": {
"lastModified": 1753749649,
"narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -177,11 +161,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756466297, "lastModified": 1764594740,
"narHash": "sha256-3K54DWzsAvphmLuRDAU+QjR9vAd8XDXVSCIN0olTfBM=", "narHash": "sha256-YLyM7w1j7BcOK9F+L7x7iY9wfOzPfcIBWW9LeU9Wzoo=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "a595413b88bdf05c2f35d2bba467519a6a03dd9e", "rev": "878c87430f5e3c109f183a1822988b1c32413131",
"revCount": 46, "revCount": 51,
"type": "git", "type": "git",
"url": "https://git.project-cloud.net/asmir/nvim_flake" "url": "https://git.project-cloud.net/asmir/nvim_flake"
}, },
@@ -232,15 +216,14 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-25_05": "nixpkgs-25_05"
}, },
"locked": { "locked": {
"lastModified": 1756130152, "lastModified": 1764381008,
"narHash": "sha256-3qcN28djoBqqhEqOv8ve3/+wD0lLR2YCVV1EZ4SYfjo=", "narHash": "sha256-s+/BuhPPSJHpPRcylqfW+3UFyYsHjAhKdtPSxusYn0U=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "b49ae46f226430854102c207fdcb55e2de8e884e", "rev": "76bd7a85e78a9b8295782a9cf719ec3489d8eb55",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -256,11 +239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1764483358,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -328,11 +311,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737802495, "lastModified": 1764579633,
"narHash": "sha256-Q+bZnH7uQM5T/G+xCGSRU3bTJqD70NeE4vLXLXLCm7k=", "narHash": "sha256-gOD5RMHOB9Fw4T3nk2a95YdU0J24QU3uWUiZVIQza64=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "4962f12867b0b6c4c4d39b98e6016e7f925a802c", "rev": "b0707744e2b4a077e759145cdbfa8d8d1017e732",
"revCount": 23, "revCount": 25,
"type": "git", "type": "git",
"url": "https://git.project-cloud.net/asmir/zremap" "url": "https://git.project-cloud.net/asmir/zremap"
}, },

View File

@@ -2,7 +2,7 @@
description = "NixOS configuration"; description = "NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nix-xilinx = { nix-xilinx = {
url = "gitlab:asmir.abdulahovic/nix-xilinx"; url = "gitlab:asmir.abdulahovic/nix-xilinx";
@@ -30,7 +30,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -46,23 +46,22 @@
}; };
outputs = outputs =
inputs@{ inputs@{ home-manager
home-manager, , nixpkgs
nixpkgs, , nix-xilinx
nix-xilinx, , nvim
nvim, , project-cloud
project-cloud, , simple-nixos-mailserver
simple-nixos-mailserver, , sops-nix
sops-nix, , 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 = {
nixy = nixpkgs.lib.nixosSystem rec { nixy = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [

View File

@@ -1,5 +1,10 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
home.sessionVariables = {
/*ZDOTDIR = "\"$HOME/\".config/zsh";*/
/*HISTFILE = "\"$XDG_STATE_HOME\"/zsh/history";*/
};
programs.z-lua = { programs.z-lua = {
enableAliases = true; enableAliases = true;
enableZshIntegration = true; enableZshIntegration = true;
@@ -9,6 +14,16 @@
autocd = true; autocd = true;
enableCompletion = false; enableCompletion = false;
defaultKeymap = "viins"; defaultKeymap = "viins";
/* dotDir = "\"$XDG_CONFIG_HOME\"/zsh"; */
setOptions = [
"c_bases"
"completealiases"
"completeinword"
"nobeep"
"nopromptcr"
"notify"
];
shellAliases = { shellAliases = {
cfind = "${pkgs.cscope}/bin/cscope -C -R -L1"; cfind = "${pkgs.cscope}/bin/cscope -C -R -L1";
@@ -43,8 +58,8 @@
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "sindresorhus"; owner = "sindresorhus";
repo = "pure"; repo = "pure";
rev = "92b8e9057988566b37ff695e70e2e9bbeb7196c8"; rev = "54bd501c802283dee0940457da6eb3e642bd1453";
hash = "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A="; hash = "sha256-AZSxP2g6BWoxyiSQH7yzbbbfGcwD8jgnXPPfcYwJUL0=";
}; };
file = "pure.plugin.zsh"; file = "pure.plugin.zsh";
} }
@@ -55,18 +70,13 @@
} }
{ {
name = "zsh-sudo"; name = "zsh-sudo";
src = pkgs.fetchFromGitHub { src = pkgs.oh-my-zsh;
owner = "hcgraf"; file = "share/oh-my-zsh/plugins/sudo/sudo.plugin.zsh";
repo = "zsh-sudo";
rev = "d8084def6bb1bde2482e7aa636743f40c69d9b32";
sha256 = "1dpm51w3wjxil8sxqw4qxim5kmf6afmkwz1yfhldpdlqm7rfwpi3";
};
file = "sudo.plugin.zsh";
} }
{ {
name = "zsh-fast-syntax-highlighting"; name = "zsh-fast-syntax-highlighting";
src = pkgs.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 # binds
bindkey '^K' fzf-file-widget bindkey '^K' fzf-file-widget
# options
setopt nobeep
setopt nopromptcr
setopt c_bases
setopt completeinword
setopt completealiases
setopt notify
#
RPS1="" RPS1=""
#
function chpwd() { function chpwd() {
ls; ls;
} }

View File

@@ -64,7 +64,6 @@ in
librewolf = { librewolf = {
enable = true; enable = true;
package = pkgs.librewolf-wayland;
settings = { settings = {
"webgl.disable" = true; "webgl.disable" = true;
"middlemouse.paste" = false; "middlemouse.paste" = false;
@@ -208,9 +207,11 @@ in
git = { git = {
enable = true; enable = true;
userName = "Asmir A"; settings = {
userEmail = "asmir.abdulahovic@gmail.com"; user = {
extraConfig = { name = "Asmir A";
email = "asmir.abdulahovic@gmail.com";
};
init.defaultBranch = "master"; init.defaultBranch = "master";
pull = { pull = {
rebase = true; rebase = true;

View File

@@ -67,7 +67,7 @@ in
compsize compsize
kdePackages.ark kdePackages.ark
ungoogled-chromium ungoogled-chromium
# cura cura-appimage
deluge deluge
dfu-util dfu-util
discord discord
@@ -91,7 +91,7 @@ in
imagemagick imagemagick
imv imv
inkscape inkscape
jellyfin-media-player #jellyfin-media-player
kdePackages.kdenlive kdePackages.kdenlive
kicad kicad
kodi-wayland kodi-wayland
@@ -99,7 +99,7 @@ in
libnotify libnotify
libreoffice-qt6-fresh libreoffice-qt6-fresh
libva-utils libva-utils
linuxPackages_latest.perf perf
lsix lsix
lsix lsix
mediainfo mediainfo
@@ -115,13 +115,13 @@ in
openocd openocd
openscad openscad
pandoc pandoc
paraview #paraview
pass-wayland pass-wayland
patchelf patchelf
pavucontrol pavucontrol
pay-respects pay-respects
pirate-get pirate-get
poppler_utils poppler-utils
powertop powertop
pulsemixer pulsemixer
pwvucontrol pwvucontrol
@@ -130,7 +130,7 @@ in
qucs-s qucs-s
radeontop radeontop
remmina remmina
river river-classic
rizin rizin
rtorrent rtorrent
sbcl sbcl
@@ -153,7 +153,7 @@ in
waybar waybar
wdisplays wdisplays
weechat weechat
whatsapp-for-linux wasistlos
wine wine
wireshark wireshark
wl-clipboard wl-clipboard

View File

@@ -1,5 +1,4 @@
{ config { config
, nix-xilinx
, nvim , nvim
, pkgs , pkgs
, system , system
@@ -7,16 +6,16 @@
, ... , ...
}: }:
let let
USER = "akill"; USER = "akill";
in in
{ {
imports = [ ]; imports = [ ];
system.stateVersion = "23.05"; system = {
system.autoUpgrade.enable = false; stateVersion = "23.05";
system.switch = { autoUpgrade.enable = false;
enable = true; #etc.overlay.enable = true;
enableNg = true; #nixos-init.enable = true;
}; };
sops = { sops = {
@@ -101,7 +100,7 @@ in
enable = true; enable = true;
memtest86.enable = true; memtest86.enable = true;
}; };
readOnlyNixStore = true; nixStoreMountOpts = [ "ro" ];
supportedFilesystems = [ supportedFilesystems = [
"xfs" "xfs"
]; ];
@@ -205,7 +204,6 @@ in
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
nix-xilinx.overlay
nvim.overlays.${system}.overlay nvim.overlays.${system}.overlay
]; ];
environment = { environment = {
@@ -256,8 +254,8 @@ in
# List services that you want to enable: # List services that you want to enable:
systemd = { systemd = {
#sysusers.enable = true;
services = { services = {
# Fix issue where systemd-vconsole-setup failes to find keymap # Fix issue where systemd-vconsole-setup failes to find keymap
systemd-vconsole-setup = { systemd-vconsole-setup = {
unitConfig = { unitConfig = {
@@ -294,9 +292,9 @@ in
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-proxy_proton.service" ];
after = [ "netns@wg.service" ]; after = [ "netns@wg.service" ];
before = [ "dnscrypt-proxy2_proton.service" ]; before = [ "dnscrypt-proxy_proton.service" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
@@ -326,7 +324,7 @@ in
}; };
}; };
"dnscrypt-proxy2_proton" = { "dnscrypt-proxy_proton" = {
description = "DNSCrypt-proxy client proton"; description = "DNSCrypt-proxy client proton";
wants = [ wants = [
"network-online.target" "network-online.target"
@@ -339,7 +337,7 @@ in
AmbientCapabilities = "CAP_NET_BIND_SERVICE"; AmbientCapabilities = "CAP_NET_BIND_SERVICE";
CacheDirectory = "dnscrypt-proxy"; CacheDirectory = "dnscrypt-proxy";
DynamicUser = true; 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; LockPersonality = true;
LogsDirectory = "dnscrypt-proxy"; LogsDirectory = "dnscrypt-proxy";
MemoryDenyWriteExecute = true; MemoryDenyWriteExecute = true;
@@ -379,10 +377,10 @@ in
}; };
coredump.enable = false; coredump.enable = false;
extraConfig = '' settings.Manager = {
DefaultTimeoutStartSec=30s DefaultTimeoutStartSec = "30s";
DefaultTimeoutStopSec=30s DefaultTimeoutStopSec = "30s";
''; };
}; };
services = { services = {
@@ -395,6 +393,7 @@ in
ntp.enable = true; ntp.enable = true;
openssh.enable = true; openssh.enable = true;
printing.enable = true; printing.enable = true;
userborn.enable = true;
pipewire = { pipewire = {
enable = true; enable = true;
@@ -497,7 +496,7 @@ in
]; ];
}; };
dnscrypt-proxy2 = { dnscrypt-proxy = {
enable = true; enable = true;
settings = { settings = {
ipv6_servers = true; ipv6_servers = true;
@@ -556,26 +555,10 @@ in
SystemMaxUse=50M SystemMaxUse=50M
''; '';
logind.extraConfig = '' logind.settings.Login = {
KillUserProcesses=yes KillUserProcesses = true;
'';
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;
};
};
}; };
}; };
fonts = { fonts = {
@@ -602,13 +585,12 @@ in
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-color-emoji noto-fonts-color-emoji
noto-fonts-emoji
proggyfonts proggyfonts
siji siji
terminus_font terminus_font
terminus_font_ttf terminus_font_ttf
ubuntu_font_family ubuntu-classic
vistafonts vista-fonts
]; ];
}; };
@@ -640,6 +622,7 @@ in
enable = true; enable = true;
settings = { settings = {
General = { General = {
Experimental = true;
Enable = "Source,Sink,Media,Socket"; Enable = "Source,Sink,Media,Socket";
}; };
}; };