noa/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

format everything

Browse source
This commit is contained in:
Noa Aarts 2024-06-04 12:18:23 +02:00
parent 9c28397d38
commit b54f3d54f1
37 changed files with 1185 additions and 1173 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hosts/default/hardware-configuration.nix
View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
@ -14,17 +15,20 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/263716dd-52cb-4a91-ba0b-e39e492ed0e5"; {
device = "/dev/disk/by-uuid/263716dd-52cb-4a91-ba0b-e39e492ed0e5";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/B08E-916D"; {
device = "/dev/disk/by-uuid/B08E-916D";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/home/noa/Sync" = fileSystems."/home/noa/Sync" =
{ device = "/dev/disk/by-uuid/93a74173-8719-4be2-86b3-dc80588b9cf8"; {
device = "/dev/disk/by-uuid/93a74173-8719-4be2-86b3-dc80588b9cf8";
fsType = "ext4"; fsType = "ext4";
}; };

2
hosts/default/home.nix
View file

@ -162,7 +162,7 @@
name = name; name = name;
size = 32; size = 32;
package = package =
pkgs.runCommand "moveUp" {} '' pkgs.runCommand "moveUp" { } ''
mkdir -p $out/share/icons mkdir -p $out/share/icons
ln -s ${pkgs.fetchzip { ln -s ${pkgs.fetchzip {
url = url; url = url;

9
hosts/server/configuration.nix
View file

@ -6,7 +6,8 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
./disk-config.nix ./disk-config.nix
@ -33,9 +34,9 @@
settings = { settings = {
# auto optimise every so often # auto optimise every so often
auto-optimise-store = true; auto-optimise-store = true;
experimental-features = ["nix-command" "flakes"]; experimental-features = [ "nix-command" "flakes" ];
substituters = ["https://hyprland.cachix.org"]; substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
}; };
gc.automatic = false; gc.automatic = false;
}; };

3
hosts/server/hardware-configuration.nix
View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" ];

8
modules/applications/zsh.nix
View file

@ -10,12 +10,12 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.direnv = { programs.direnv = {
enable=true; enable = true;
enableZshIntegration=true; enableZshIntegration = true;
nix-direnv.enable=true; nix-direnv.enable = true;
}; };
programs.zsh = { programs.zsh = {
enable=true; enable = true;
shellAliases = lib.mkIf cfg.enableAliases { shellAliases = lib.mkIf cfg.enableAliases {
ll = "lsd -l"; ll = "lsd -l";
lt = "lsd -l --tree"; lt = "lsd -l --tree";

17
modules/automapaper/default.nix
View file

@ -49,7 +49,8 @@ in
config = lib.mkIf cfg.enable ( config = lib.mkIf cfg.enable (
let let
displays = lib.attrsets.mapAttrs (displayName: displayConfig: displays = lib.attrsets.mapAttrs
(displayName: displayConfig:
let let
init = builtins.toFile "init.frag" displayConfig.init; init = builtins.toFile "init.frag" displayConfig.init;
state = builtins.toFile "state.frag" displayConfig.state; state = builtins.toFile "state.frag" displayConfig.state;
@ -67,8 +68,10 @@ in
cycles=${builtins.toString displayConfig.cycles} cycles=${builtins.toString displayConfig.cycles}
frames_per_tick=${builtins.toString displayConfig.frames_per_tick} frames_per_tick=${builtins.toString displayConfig.frames_per_tick}
'' ''
) cfg.configurations; )
in { cfg.configurations;
in
{
modules.automapaper.configurations = modules.automapaper.configurations =
let let
conf = { conf = {
@ -98,7 +101,7 @@ in
stateColor = vec4(step(0.3, color), 0,0,step(0.3, color)); stateColor = vec4(step(0.3, color), 0,0,step(0.3, color));
}''; }'';
state= '' state = ''
#version 310 es #version 310 es
precision highp float; precision highp float;
@ -173,12 +176,14 @@ in
"DP-2" = conf; "DP-2" = conf;
}; };
wayland.windowManager.hyprland.settings.exec-once = lib.mkIf cfg.hyprland ( wayland.windowManager.hyprland.settings.exec-once = lib.mkIf cfg.hyprland (
lib.mapAttrsToList (name: config: lib.mapAttrsToList
(name: config:
"${ "${
inputs.automapaper.packages.${pkgs.system}.default inputs.automapaper.packages.${pkgs.system}.default
}/bin/automapaper -C ${ }/bin/automapaper -C ${
builtins.toFile "${name}.toml" config builtins.toFile "${name}.toml" config
}") displays }")
displays
); );
} }
); );

2
modules/games/minecraft.nix
View file

@ -5,7 +5,7 @@ in
{ {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = [ home.packages = [
(pkgs.prismlauncher.override{withWaylandGLFW=true;}) (pkgs.prismlauncher.override { withWaylandGLFW = true; })
]; ];
}; };
} }

13
modules/hyprland.nix
View file

@ -83,8 +83,8 @@ in
gaps_in = "2"; gaps_in = "2";
gaps_out = "3"; gaps_out = "3";
border_size = "3"; border_size = "3";
"col.active_border"="0xff950fad"; "col.active_border" = "0xff950fad";
"col.inactive_border"="0xff26052e"; "col.inactive_border" = "0xff26052e";
}; };
misc = { misc = {
key_press_enables_dpms = true; key_press_enables_dpms = true;
@ -136,10 +136,13 @@ in
",XF86AudioNext,exec,${pkgs.playerctl}/bin/playerctl next" ",XF86AudioNext,exec,${pkgs.playerctl}/bin/playerctl next"
] ]
++ ( ++ (
builtins.concatLists (builtins.genList ( builtins.concatLists (builtins.genList
x: let (
x:
let
ws = builtins.toString (x); ws = builtins.toString (x);
in [ in
[
"$mod,${ws},workspace,${ws}" "$mod,${ws},workspace,${ws}"
"ALT,${ws},movetoworkspace,${ws}" "ALT,${ws},movetoworkspace,${ws}"
] ]

6
modules/waybar/allmodules.nix
View file

@ -1,4 +1,4 @@
config: config:
[ "hyprland/workspaces" "tray" "hyprland/window" ] ++ [ "hyprland/workspaces" "tray" "hyprland/window" ] ++
[ "clock" ] ++ [ "clock" ] ++
[ "custom/vpn" "wireplumber" "network" "cpu" "memory" "custom/poweroff" ] [ "custom/vpn" "wireplumber" "network" "cpu" "memory" "custom/poweroff" ]

6
modules/waybar/default.nix
View file

@ -12,15 +12,15 @@ in
modules = { modules = {
left = lib.mkOption { left = lib.mkOption {
type = with lib.types; listOf (enum [ ]); type = with lib.types; listOf (enum [ ]);
default = []; default = [ ];
}; };
center = lib.mkOption { center = lib.mkOption {
type = with lib.types; listOf (enum [ ]); type = with lib.types; listOf (enum [ ]);
default = []; default = [ ];
}; };
right = lib.mkOption { right = lib.mkOption {
type = with lib.types; listOf (enum [ ]); type = with lib.types; listOf (enum [ ]);
default = []; default = [ ];
}; };
}; };
}; };

4
modules/waybar/namedmodules.nix
View file

@ -1,4 +1,4 @@
config: config:
builtins.map builtins.map
(n: {name = n; value = {enable = true;}; }) (n: { name = n; value = { enable = true; }; })
(import ./allmodules.nix config) (import ./allmodules.nix config)

2
modules/waybar/temperature.nix
View file

@ -13,7 +13,7 @@ in
hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input"; hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
critical-threshold = 80; critical-threshold = 80;
format = "{temperatureC}°C {icon}"; format = "{temperatureC}°C {icon}";
format-icons = ["" "" ""]; format-icons = [ "" "" "" ];
}; };
}; };
} }

2
modules/waybar/wireplumber.nix
View file

@ -12,7 +12,7 @@ in
format = "{volume}% {icon}"; format = "{volume}% {icon}";
format-muted = ""; format-muted = "";
on-click = "helvum"; on-click = "helvum";
format-icons = ["" "" ""]; format-icons = [ "" "" "" ];
}; };
}; };
} }

4
modules/wofi.nix
View file

@ -45,9 +45,7 @@ in
]; ];
programs.wofi = { programs.wofi = {
enable = true; enable = true;
settings = { settings = { };
};
style = '' style = ''
* { * {
outline: none; outline: none;