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

Compare commits

base: asmir:59bdec72c93638f5b2b1bad24f20a32f11da093c
Branches Tags
asmir:master
asmir:nftables_transition
asmir:gitea_typst
asmir:magento2
..
compare: asmir:3459bcaf396732f1f3e1ccbe638c18f0d8e96e7d
Branches Tags
asmir:master
asmir:nftables_transition
asmir:gitea_typst
asmir:magento2

No commits in common. "59bdec72c93638f5b2b1bad24f20a32f11da093c" and "3459bcaf396732f1f3e1ccbe638c18f0d8e96e7d" have entirely different histories.
59bdec72c9 ... 3459bcaf39

6 changed files with 27 additions and 44 deletions
Show Stats Expand all files Collapse all files

3
common/packages.nix
View File

@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
nix-xilinx, nix-xilinx,
system,
... ...
}: { }: {
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
@ -75,5 +74,5 @@
zip zip
z-lua z-lua
] ]
++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]); ++ (with nix-xilinx.packages.x86_64-linux; [vivado vitis vitis_hls model_composer xilinx-shell]);
} }

19
flake.nix
View File

@ -72,11 +72,10 @@
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 {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{_module.args = inputs;} {_module.args = inputs;}
{_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
@ -88,7 +87,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;};
} }
peerix.nixosModules.peerix peerix.nixosModules.peerix
{ {
@ -105,11 +104,10 @@
]; ];
}; };
mediabox = nixpkgs.lib.nixosSystem rec { mediabox = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{_module.args = inputs;} {_module.args = inputs;}
{_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
@ -122,7 +120,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;};
} }
peerix.nixosModules.peerix peerix.nixosModules.peerix
{ {
@ -139,11 +137,10 @@
]; ];
}; };
blue = nixpkgs.lib.nixosSystem rec { blue = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{_module.args = inputs;} {_module.args = inputs;}
{_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
@ -153,19 +150,17 @@
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;};
} }
]; ];
}; };
magpie = nixpkgs.lib.nixosSystem rec { magpie = nixpkgs.lib.nixosSystem {
system = "arm64-linux"; system = "arm64-linux";
modules = [ modules = [
{_module.args = inputs;} {_module.args = inputs;}
{_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
goatcounter.nixosModules.goatcounter goatcounter.nixosModules.goatcounter
simple-nixos-mailserver.nixosModule simple-nixos-mailserver.nixosModule
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
(builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix") (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")

8
home/home_packages.nix
View File

@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
inputs, inputs,
system,
... ...
}: { }: {
home.packages = with pkgs; home.packages = with pkgs;
@ -18,6 +17,7 @@
caddy caddy
cargo cargo
ccls ccls
cemu
cmake cmake
compsize compsize
cura cura
@ -55,7 +55,7 @@
openocd openocd
openscad openscad
pandoc pandoc
pass-wayland pass
patchelf patchelf
pavucontrol pavucontrol
pirate-get pirate-get
@ -111,8 +111,8 @@
zls zls
] ]
++ [ ++ [
inputs.swaysw.packages.${system}.swaysw inputs.swaysw.packages.x86_64-linux.swaysw
inputs.nvim.packages.${system}.nvim inputs.nvim.packages.x86_64-linux.nvim
(pkgs.callPackage ../packages/zapzap/default.nix {}) (pkgs.callPackage ../packages/zapzap/default.nix {})
(pkgs.callPackage ../packages/viber/default.nix {}) (pkgs.callPackage ../packages/viber/default.nix {})
(pkgs.callPackage ../packages/bubblewrap/default.nix {}) (pkgs.callPackage ../packages/bubblewrap/default.nix {})

35
home/sway.nix
View File

@ -2,21 +2,8 @@
config, config,
lib, lib,
pkgs, pkgs,
inputs,
system,
... ...
}: let }: {
cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
${pkgs.cliphist}/bin/cliphist list | \
${pkgs.wofi}/bin/wofi --dmenu --insensitive | \
${pkgs.cliphist}/bin/cliphist decode | \
${pkgs.wl-clipboard}/bin/wl-copy
'';
swaysw = inputs.swaysw.packages.${system}.swaysw;
zapzap = pkgs.callPackage ../packages/zapzap/default.nix {};
viber = pkgs.callPackage ../packages/viber/default.nix {};
term = "${pkgs.foot}/bin/footclient";
in {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
extraSessionCommands = ""; extraSessionCommands = "";
@ -71,15 +58,14 @@ in {
style = "Bold Semi-Condensed"; style = "Bold Semi-Condensed";
size = 12.0; size = 12.0;
}; };
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml"; statusCommand = "i3status-rs ~/.config/i3status-rust/config-top.toml";
} }
]; ];
keybindings = { keybindings = {
"Alt+Shift+q" = "kill"; "Alt+Shift+q" = "kill";
"Alt+Shift+Return" = "exec ${term}"; "Alt+Shift+Return" = "exec ${pkgs.foot}/bin/footclient";
"Alt+p" = "exec ${pkgs.dmenu-wayland}/bin/dmenu-wl_run -fn \"mono 14\""; "Alt+p" = "exec ${pkgs.dmenu-wayland}/bin/dmenu-wl_run -fn \"mono 14\"";
"Alt+c" = "exec ${pkgs.moreutils}/bin/lckdo cliphist_sway ${cliphist_sway}/bin/cliphist_sway";
"Alt+Shift+space" = "floating toggle"; "Alt+Shift+space" = "floating toggle";
"Alt+space" = "focus mode_toggle"; "Alt+space" = "focus mode_toggle";
@ -114,16 +100,21 @@ in {
"Alt+j" = "focus down"; "Alt+j" = "focus down";
"Alt+k" = "focus up"; "Alt+k" = "focus up";
"Alt+l" = "focus right"; "Alt+l" = "focus right";
"Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw"; "Alt+slash" = "exec swaysw";
"Alt+Escape" = "workspace back_and_forth"; "Alt+Escape" = "workspace back_and_forth";
"Alt+f" = "fullscreen enable"; "Alt+f" = "fullscreen enable";
"Mod4+l" = '' "Mod4+l" = ''
exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3''; exec swaymsg [app_id="python3"] scratchpad show || exec foot -a python3 python3'';
"Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${zapzap}/bin/zapzap"; "Mod4+h" = "exec swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec zapzap";
"Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber"; "Mod4+j" = "exec swaymsg [app_id=com.viber] scratchpad show || exec viber";
"Mod4+y" = '' "Mod4+y" = ''
exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer''; exec swaymsg [app_id="pulsemixer"] scratchpad show || exec foot -a pulsemixer pulsemixer'';
"XF86AudioRaiseVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') +5%";
"XF86AudioLowerVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') -5%";
"XF86AudioMute" = "exec pactl set-sink-mute $(pacmd list-sinks |awk '/* index:/{print $3}') toggle";
"XF86AudioMicMute" = "exec pactl set-source-mute $(pacmd list-sources |awk '/* index:/{print $3}') toggle";
}; };
}; };
}; };

3
mediabox/configuration.nix
View File

@ -7,7 +7,6 @@
lib, lib,
sops-nix, sops-nix,
zremap, zremap,
system,
... ...
}: { }: {
imports = []; imports = [];
@ -135,7 +134,7 @@
serviceConfig.Nice = -20; serviceConfig.Nice = -20;
script = '' script = ''
sleep 1 sleep 1
${zremap.defaultPackage.${system}}/bin/zremap \ ${zremap.defaultPackage.x86_64-linux}/bin/zremap \
/dev/input/by-path/platform-i8042-serio-0-event-kbd /dev/input/by-path/platform-i8042-serio-0-event-kbd
''; '';
}; };

3
nixy/configuration.nix
View File

@ -4,7 +4,6 @@
lib, lib,
nix-xilinx, nix-xilinx,
sops-nix, sops-nix,
system,
zremap, zremap,
... ...
}: { }: {
@ -145,7 +144,7 @@
serviceConfig.Nice = -20; serviceConfig.Nice = -20;
script = '' script = ''
sleep 1 sleep 1
${zremap.defaultPackage.${system}}/bin/zremap \ ${zremap.defaultPackage.x86_64-linux}/bin/zremap \
/dev/input/by-path/platform-i8042-serio-0-event-kbd /dev/input/by-path/platform-i8042-serio-0-event-kbd
''; '';
}; };