Compare commits

..

No commits in common. "93b80d45f49b481b68d4c9f468b7e7447164e99e" and "995714ced3940fd75f74459744c73cbb661250af" have entirely different histories.

8 changed files with 60 additions and 38 deletions

View file

@ -102,7 +102,8 @@ with builtins;
security.rtkit.enable = true; security.rtkit.enable = true;
users.users.jade = {
users.users.jade = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "input" "uinput" "libvirtd" "adbusers" "dialout" "plugdev" "wireshark" ]; extraGroups = [ "wheel" "input" "uinput" "libvirtd" "adbusers" "dialout" "plugdev" "wireshark" ];
packages = [ packages = [

View file

@ -79,6 +79,40 @@
nixos-hardware.nixosModules.apple-t2 nixos-hardware.nixosModules.apple-t2
]; ];
}; };
schrottserver = nixpkgs-stable.lib.nixosSystem {
specialArgs = {
inherit inputs;
};
system = "x86_64-linux";
modules = [
./hosts/schrottserver/configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.jade = { nixosConfig, pkgs, ... }: {
home.sessionVariables.TZ = nixosConfig.time.timeZone;
home.stateVersion = "${nixosConfig.system.stateVersion}";
};
}
];
};
katzencafe = nixpkgs-stable.lib.nixosSystem {
specialArgs = {
inherit inputs;
};
system = "aarch64-linux";
modules = [
./hosts/katzencafe/configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.jade = { nixosConfig, pkgs, ... }: {
home.sessionVariables.TZ = nixosConfig.time.timeZone;
home.stateVersion = "${nixosConfig.system.stateVersion}";
};
}
];
};
}; };
}; };
} }

View file

@ -40,7 +40,7 @@
swapDevices = [{ swapDevices = [{
device = "/swap/swapfile"; device = "/swap/swapfile";
size = (1024 * 24); size = (1024 * 12);
}]; }];
# 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

View file

@ -1,8 +1,8 @@
test:
sudo nixos-rebuild test --flake . --impure
build: build:
sudo nixos-rebuild switch --flake . --impure sudo nixos-rebuild switch --flake . --impure
test:
sudo nixos-rebuild test --flake . --impure
update: update:
nix flake update --commit-lock-file nix flake update --commit-lock-file

View file

@ -21,8 +21,5 @@ in {
systemd.services.evremap = { systemd.services.evremap = {
script = "${evremap}/bin/evremap remap ${../../other/remaps-${config.networking.hostName}.toml}"; script = "${evremap}/bin/evremap remap ${../../other/remaps-${config.networking.hostName}.toml}";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
unitConfig = {
Restart = "on-failure";
};
}; };
} }

View file

@ -7,6 +7,9 @@ in with lib; {
enable = mkEnableOption "Enable gaming stuff"; enable = mkEnableOption "Enable gaming stuff";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
#nixpkgs.overlays = [
#(import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay
#];
programs.steam.enable = true; programs.steam.enable = true;
home-manager.users.jade = { pkgs, ... }: { home-manager.users.jade = { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -87,54 +87,41 @@
"network-base" = { "network-base" = {
type = "internal/network"; type = "internal/network";
interval = 5; interval = 5;
format-connected = "<ramp-signal> <label-connected>"; format-connected = "<label-connected>";
format-disconnected = "<label-disconnected>"; format-disconnected = "<label-disconnected>";
label-disconnected = "󰣼"; label-disconnected = "%{F#F0C674}%ifname%%{F#707880} disconnected";
label-disconnected-foreground = "#d65d0e";
ramp.signal = [ "󰣾" "󰣴" "󰣶" "󰣸" "󰣺" ];
ramp-signal-foreground = "#d65d0e";
ramp-signal-foreground-0 = "#cc241d";
ramp-signal-foreground-4 = "#bdae93";
}; };
"module/wlan" = { "module/wlan" = {
"inherit" = "network-base"; "inherit" = "network-base";
interface-type = "wireless"; interface-type = "wireless";
label-connected = "%{F#F0C674}%{F-} %local_ip%"; label-connected = "%{F#F0C674}%ifname%%{F-} %essid% %local_ip%";
}; };
"module/battery" = { "module/battery" = {
type = "internal/battery"; type = "internal/battery";
poll-interval = 1; poll-interval = 1;
full-at = 96;
battery = "BAT0"; battery = "BAT0";
adapter = "ADP1"; adapter = "ADP1";
time-format = "%H%{F#7c6f64}:%{F#d5c4a1}%M"; time-format = "%H:%M";
label-charging = "%{F#98971a}󰚥 %{F#ebdbb2}%percentage%%%{F#d5c4a1} %time%"; label-charging = "%percentage%% %time%";
format-charging = "<ramp-capacity> <label-charging>"; format-charging = "<ramp-capacity> 󰚥 <label-charging>";
label-discharging = "%percentage%%%{F#bdae93} %time%"; label-discharging = "%percentage%% %time%";
format-discharging = "<ramp-capacity> <label-discharging>"; format-discharging = "<ramp-capacity> <label-discharging>";
label-full = "%{F#d65d0e}󰁹%{F#ebdbb2} %percentage%%"; label-full = "%percentage%%";
format-full = "<label-full>"; format-full = "󰁹 <label-full>";
label-low = "%{F#d65d0e}󰂎%{F#ebdbb2} %percentage%%"; label-low = "%percentage%%";
format-low = "<label-low>"; format-low = "󰂎 <label-low>";
ramp.capacity = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ]; ramp.capacity = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
ramp-capacity-foreground = "#d65d0e";
ramp-capacity-foreground-0 = "#cc241d";
ramp-capacity-foreground-1 = "#cc241d";
ramp-capacity-foreground-2 = "#cc241d";
ramp-capacity-foreground-7 = "#bdae93";
ramp-capacity-foreground-8 = "#bdae93";
ramp-capacity-foreground-9 = "#bdae93";
}; };
"module/date" = { "module/date" = {
type = "internal/date"; type = "internal/date";
interval = 1; interval = 1;
date = "%Y%{F#7c6f64}-%{F#ebdbb2}%m%{F#7c6f64}-%{F#ebdbb2}%d"; date = "%Y-%m-%d %H:%M:%S";
time = "%H%{F#7c6f64}:%{F#ebdbb2}%M%{F#7c6f64}:%{F#ebdbb2}%S"; label = "%date%";
label = "%{F#d65d0e}󰃭%{F#ebdbb2} %date% %{F#d65d0e}󱑌%{F#ebdbb2} %time%"; label-foreground = "\${colors.foreground}";
}; };
"settings" = { "settings" = {

View file

@ -6,7 +6,7 @@ def main [
let currentnet = ( let currentnet = (
nmcli -m tabular connection show --active nmcli -m tabular connection show --active
| from ssv | detect columns
| first | first
| get name | get name
); );