rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-01-19 01:21:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

systemd 254 arrived, switched back to sway

Browse source
This commit is contained in:
Rouven Seifert 2023-09-29 10:32:24 +02:00
parent e7cb531d8b
commit b81a7a669a
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
14 changed files with 96 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -236,11 +236,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1695555223, "lastModified": 1695886142,
"narHash": "sha256-YEJcTOg6Lt4lxKJxcir1TLN/OZYdCHFe7lXskJGhcHY=", "narHash": "sha256-5g5meWSsNT2lTRu6CJyOBFEzHe3GomjSDQyIwUm39AU=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "7702e130ba93f885ac56be5818b93c544a00538f", "rev": "77fe8f214b15b8297a9f2f8ed929994559604d6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,11 +255,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695550077, "lastModified": 1695738267,
"narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=", "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a88df2fb101778bfd98a17556b3a2618c6c66091", "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +371,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1695541019, "lastModified": 1695887975,
"narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=", "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296", "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1695360818, "lastModified": 1695830400,
"narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
hosts/falkenstein-1/modules/networks/default.nix
View file

@ -14,7 +14,15 @@
useNetworkd = true; useNetworkd = true;
enableIPv6 = true; enableIPv6 = true;
}; };
services.resolved.dnssec = "true"; services.resolved = {
dnssec = "true";
fallbackDns = [
"9.9.9.9"
"149.112.112.112"
"2620:fe::fe"
"2620:fe::9"
];
};
systemd.network = { systemd.network = {
enable = true; enable = true;
networks."10-loopback" = { networks."10-loopback" = {

1
hosts/nuc/default.nix
View file

@ -49,7 +49,6 @@
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
console = { console = {
font = "Lat2-Terminus16";
keyMap = "dvorak"; keyMap = "dvorak";
}; };

8
hosts/nuc/modules/networks/default.nix
View file

@ -8,7 +8,13 @@
}; };
services.resolved = { services.resolved = {
enable = true; enable = true;
dnssec = "yes"; dnssec = "true";
fallbackDns = [
"9.9.9.9"
"149.112.112.112"
"2620:fe::fe"
"2620:fe::9"
];
# make room for the adguard dns # make room for the adguard dns
extraConfig = '' extraConfig = ''
[Resolve] [Resolve]

8
hosts/thinkpad/default.nix
View file

@ -11,6 +11,7 @@
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
# boot.initrd.systemd.additionalUpstreamUnits = [ "systemd-vconsole-setup.service" ];
boot = { boot = {
# Lanzaboote currently replaces the systemd-boot module. # Lanzaboote currently replaces the systemd-boot module.
# This setting is usually set to true in configuration.nix # This setting is usually set to true in configuration.nix
@ -94,7 +95,8 @@
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
console = { console = {
keyMap = "dvorak"; keyMap = "dvorak";
font = "Lat2-Terminus16"; # font = "Lat2-Terminus16";
# earlySetup = true;
colors = let colors = config.home-manager.users.rouven.colorScheme.colors; in colors = let colors = config.home-manager.users.rouven.colorScheme.colors; in
[ [
colors.base00 colors.base00
@ -129,6 +131,10 @@
sound.enable = true; sound.enable = true;
#hardware.pulseaudio.enable = true; #hardware.pulseaudio.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
# hardware.opentabletdriver = {
# enable = true;
# daemon.enable = true;
# };
security = { security = {
polkit.enable = true; polkit.enable = true;

2
hosts/thinkpad/modules/greetd/default.nix
View file

@ -4,7 +4,7 @@
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd river"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd sway";
}; };
}; };
}; };

12
hosts/thinkpad/modules/networks/default.nix
View file

@ -11,8 +11,16 @@
owner = config.users.users.systemd-network.name; owner = config.users.users.systemd-network.name;
}; };
}; };
# allow downgrade since fritzbox at home doesn't support it (yet?) services.resolved = {
services.resolved.dnssec = "allow-downgrade"; fallbackDns = [
"9.9.9.9"
"149.112.112.112"
"2620:fe::fe"
"2620:fe::9"
];
# allow downgrade since fritzbox at home doesn't support it (yet?)
dnssec = "allow-downgrade";
};
networking = { networking = {
useNetworkd = true; useNetworkd = true;
hostName = "thinkpad"; hostName = "thinkpad";

2
users/rouven/default.nix
View file

@ -5,7 +5,7 @@
users.users.rouven = { users.users.rouven = {
description = "Rouven Seifert"; description = "Rouven Seifert";
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "video" "libvirtd" "tss" ]; extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" ];
initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1"; initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1";
}; };
home-manager.useUserPackages = true; home-manager.useUserPackages = true;

1
users/rouven/modules/packages.nix
View file

@ -57,6 +57,7 @@
hcloud hcloud
jq jq
logseq logseq
xournalpp
# programming languages # programming languages
cargo cargo

4
users/rouven/modules/wayland/default.nix
View file

@ -2,9 +2,8 @@
{ {
imports = [ imports = [
# ./sway.nix ./sway.nix
./breaktimer.nix ./breaktimer.nix
./river.nix
./waybar.nix ./waybar.nix
./shikane.nix ./shikane.nix
]; ];
@ -15,6 +14,7 @@
swaynotificationcenter swaynotificationcenter
playerctl playerctl
wdisplays wdisplays
(libinput.override { eventGUISupport = true; })
]; ];
services.swayidle = { services.swayidle = {

1
users/rouven/modules/wayland/river.nix
View file

@ -26,6 +26,7 @@
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad drag enabled riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad drag enabled
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad accel-profile adaptive riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad accel-profile adaptive
riverctl spawn "${pkgs.swaybg}/bin/swaybg -i ${../../../../images/wallpaper.png} -m fill" riverctl spawn "${pkgs.swaybg}/bin/swaybg -i ${../../../../images/wallpaper.png} -m fill"

31
users/rouven/modules/wayland/shikane.nix
View file

@ -33,6 +33,37 @@
} }
]; ];
} }
{
# TODO home vertical
name = "home-vertical";
output = [
{
match = "eDP-1";
enable = true;
position = {
x = 1080;
y = 0;
};
}
{
match = "DP-3";
enable = true;
position = {
x = 0;
y = 0;
};
transform = "270";
}
{
match = "HDMI-A-1";
enable = true;
position = {
x = 3000;
y = 0;
};
}
];
}
{ {
name = "external-monitor-default"; name = "external-monitor-default";
output = [ output = [

11
users/rouven/modules/wayland/sway.nix
View file

@ -7,10 +7,13 @@
config = rec { config = rec {
startup = [ startup = [
{ {
command = "${lib.getExe pkgs.swaybg} -i ${../../../../images/wallpaper.png}"; command = "${lib.getExe pkgs.swaybg} -i ${../../../../images/wallpaper.png} -m fill";
} }
{ {
command = lib.getExe pkgs.autotiling-rs; command = "${pkgs.autotiling-rs}/bin/autotiling-rs";
}
{
command = ''swaymsg -t subscribe -m "['workspace']" | jq --unbuffered -r 'select(.change == "focus") | .current.output' | xargs -L1 swaymsg input 1386:884:Wacom_Intuos_S_Pen map_to_output'';
} }
]; ];
modifier = "Mod4"; modifier = "Mod4";
@ -30,6 +33,7 @@
tap = "enabled"; tap = "enabled";
drag = "enabled"; drag = "enabled";
middle_emulation = "enabled"; middle_emulation = "enabled";
accel_profile = "adaptive";
}; };
}; };
keybindings = keybindings =
@ -38,7 +42,7 @@
"Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot copy area"; "Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
"XF86Launch2" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot save area - | ${lib.getExe pkgs.swappy} -f -"; "XF86Launch2" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot save area - | ${lib.getExe pkgs.swappy} -f -";
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 10"; "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 10";
"XF86MonBrightnessDown" = "exec ${kgs.light}/bin/light -U 10"; "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 10";
"XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle"; "XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
"XF86AudioMicMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle"; "XF86AudioMicMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
"XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%"; "XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
@ -56,3 +60,4 @@
}; };
}; };
} }

17
users/rouven/modules/wayland/waybar.nix
View file

@ -10,8 +10,7 @@
layer = "top"; layer = "top";
position = "top"; position = "top";
height = 26; height = 26;
# modules-left = [ "wlr/workspaces" "custom/spotifytitle" "hyprland/window" ]; modules-left = [ "sway/workspaces" "custom/spotifytitle" "sway/window" ];
modules-left = [ "river/tags" "custom/spotifytitle" "river/window" ];
modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ]; modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
network = { network = {
format-wifi = " {essid} ({signalStrength}%)"; format-wifi = " {essid} ({signalStrength}%)";
@ -21,11 +20,11 @@
format-disconnected = "Disconnected ⚠"; format-disconnected = "Disconnected ⚠";
format-alt = "{ifname}: {ipaddr}/{cidr}"; format-alt = "{ifname}: {ipaddr}/{cidr}";
}; };
"river/tags" = { "sway/workspaces" = {
format = "{icon}"; format = "{icon}";
on-click = "activate"; on-click = "activate";
}; };
"river/window" = { "sway/window" = {
format = " {}"; format = " {}";
# separate-outputs = true; # separate-outputs = true;
}; };
@ -114,22 +113,18 @@
background-color: transparent; background-color: transparent;
} }
#tags button { #workspaces button {
padding: 0 5px; padding: 0 5px;
background-color: transparent; background-color: transparent;
color: #${config.colorScheme.colors.base05}; color: #${config.colorScheme.colors.base05};
} }
#tags button.occupied {
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
}
#tags button.focused { #workspaces button.focused {
background-color: #${config.colorScheme.colors.base04}; background-color: #${config.colorScheme.colors.base04};
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05}; box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
} }
#tags button.urgent { #workspaces button.urgent {
background-color: #eb4d4b; background-color: #eb4d4b;
} }