pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-06-19 05:58:10 +01:00
parent cb7001e7c3 a47b3c4ef9
commit 79d24a991e
8 changed files with 127 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/desktop/sway.nix
View file

@ -32,6 +32,8 @@ in {
size = 12.0;
};
bars = [];
modifier = lib.mkDefault "Mod4";
terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm";
keybindings = lib.mkOptionDefault {
"${modifier}+Return" = "exec ${term}";
"${modifier}+q" = "kill";

33
home/gui/firefox.nix
View file

@ -28,38 +28,7 @@
}
];
};
bookmarks = [
{
name = "Wikipedia";
tags = ["wiki"];
keyword = "wiki";
url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
}
{
name = "kernel.org";
url = "https://www.kernel.org";
}
{
name = "Toolbar";
toolbar = true;
bookmarks = [
{
name = "Nix sites";
bookmarks = [
{
name = "homepage";
url = "https://nixos.org/";
}
{
name = "wiki";
tags = ["wiki" "nix"];
url = "https://nixos.wiki/";
}
];
}
];
}
];
bookmarks = [];
search = {
default = "DuckDuckGo";
force = true;

41
machines/H0615/elitherl.nix
View file

@ -10,4 +10,45 @@
teams-for-linux
zoom-us
];
wayland.windowManager.hyprland.extraConfig = ''
source=./common.conf
monitor=HDMI-A-1,preferred,auto,auto
monitor=DP-1,preferred,auto,auto,transform,1
windowrule = float, title:^([Zz]oom).*$
windowrule = center, title:^([Zz]oom).*$
# windowrule = workspace 4 silent, ^(Microsoft Teams - Preview)$
windowrule = workspace 4, title:^([Zz]oom).*$
windowrule = workspace 5 silent, ^(Nxplayer.bin)$
wsbind=1,HDMI-A-1
wsbind=2,HDMI-A-1
wsbind=3,HDMI-A-1
wsbind=4,HDMI-A-1
wsbind=5,HDMI-A-1
# exec-once = firefox
# exec-once = teams
'';
programs.waybar = {
settings = {
main = {
"modules-left" = ["wlr/workspaces"];
"modules-center" = ["clock"];
"modules-right" = [
"cpu"
"memory"
"temperature"
"pulseaudio"
"bluetooth"
"network"
"backlight"
"battery"
"battery#bat2"
"tray"
];
};
};
};
}

52
machines/Northstar/xenia.nix
View file

@ -1,5 +1,9 @@
{pkgs, ...}: {
imports = [../../home/personal.nix];
imports = [
../../home/personal.nix
../../home/gui/firefox.nix
../../home/desktop/sway.nix
];
home.username = "xenia";
home.homeDirectory = "/home/xenia";
home.stateVersion = "22.11";
@ -7,7 +11,53 @@
programs.bash.bashrcExtra = ''
source $HOME/.nix-profile/etc/profile.d/nix.sh
'';
programs.firefox.package = pkgs.firefox-wayland;
services.syncthing.enable = true;
fonts.fontconfig.enable = true;
wayland.windowManager.sway = {
config = {
input = {
"*" = {xkb_layout = "gb";};
"touch" = {map_to_output = "DSI-1";};
"touchpad" = {click_method = "clickfinger";};
"10182:3632:hid-over-i2c_27C6:0E30" = {map_to_output = "DSI-1";};
};
modifier = "Mod1";
terminal = "{pkgs.foot}/bin/foot";
output = {
DSI-1 = {
scale = "2.0";
transform = "270";
bg = "~/nixos/wallpaper.jpg fill";
};
};
gaps = {
inner = 5;
top = 5;
bottom = 5;
left = 20;
right = 20;
};
startup = [
{command = "dunst";}
{command = "waybar";}
# {command = "rot8";}
];
};
};
programs.waybar = {
settings = {
main = {
"include" = [
"~/.config/waybar/modules.json"
"~/.config/waybar/layout.json"
];
"modules-left" = ["sway/workspaces"];
"modules-center" = ["clock#compact"];
"modules-right" = ["network#compact" "backlight" "battery" "tray"];
};
};
};
}

4
machines/Vanguard/default.nix
View file

@ -4,6 +4,7 @@
../../hardware/audio.nix
../../hardware/bluetooth.nix
../../locales/en_GB.nix
../../desktop/hyprland.nix
../../services/sshd
];
networking = {
@ -39,7 +40,8 @@
enable = true;
settings = rec {
initial_session = {
command = "${pkgs.gamescope}/bin/gamescope --steam -- steam -tenfoot -pipewire-dmabuf";
# command = "${pkgs.gamescope}/bin/gamescope --steam -- steam -tenfoot -pipewire-dmabuf";
command = "sway";
user = "xenia";
};
default_session = initial_session;

30
machines/Vanguard/xenia.nix
View file

@ -1,11 +1,36 @@
{...}: {
imports = [../../home/personal.nix];
imports = [
../../home/personal.nix
../../home/gui
../../home/desktop/sway.nix
];
home.username = "xenia";
home.homeDirectory = "/home/xenia";
home.stateVersion = "22.11";
# wayland.windowManager.hyprland.extraConfig = ''
# source=./common.conf
# monitor=HDMI-A-2,preferred,auto,2.00
# '';
wayland.windowManager.sway = {
config = {
input = {"*" = {xkb_layout = "gb";};};
modifier = "Mod4";
output = {
HDMI-A-2 = {
scale = "2.0";
bg = "~/nixos/wallpaper.jpg fill";
};
};
gaps = {
inner = 5;
outer = 20;
};
startup = [{command = "dunst";} {command = "waybar";} {command = "steam";}];
};
};
programs.waybar.settings.main = {
"modules-left" = ["wlr/workspaces"];
"modules-left" = ["sway/workspaces"];
"modules-center" = ["clock"];
"modules-right" = [
"cpu"
@ -16,7 +41,6 @@
"network"
"backlight"
"battery"
"battery#bat2"
"tray"
];
};

2
services/syncthing/devices/J0162.nix
View file

@ -1 +1 @@
{...}: {services.syncthing.devices."J0162".id = "YH3SFCU-2RGJMWU-MLU7KX6-6QJR6CF-VTREUCT-I23C2J7-7HOISZZ-PMTXZQM";}
{...}: {services.syncthing.devices."J0162".id = "NTMLN4U-RPYURFR-P322MUO-2WJGAAF-CLV3RLL-SDUNLTD-4AXVIWG-GBDY3AF";}

2
services/syncthing/devices/Vanguard.nix
View file

@ -1 +1 @@
{...}: {services.syncthing.devices."vanguard".id = "YNGBLJP-TWY6Y3C-DPPYAWL-3ZQFNQH-RDPIU5T-L54UI62-FPPA3JQ-WYXBZQZ";}
{...}: {services.syncthing.devices."vanguard".id = "FKLNHNW-UDMXEBH-M4O5Y2C-FH4AYXR-7FJF3GY-3FAVL2E-OPZ4YWL-DA6XSAT";}