Merge branch 'main' into stylix

This commit is contained in:
Evie Litherland-Smith 2024-09-20 07:41:50 +01:00
commit 7e2ab5a640
3 changed files with 9 additions and 2 deletions

View file

@ -1,9 +1,9 @@
{ pkgs, username, ... }: { username, ... }:
{ {
imports = [ ./laptop.nix ]; imports = [ ./laptop.nix ];
home-manager.users.${username} = { home-manager.users.${username} = {
home.packages = [ pkgs.prusa-slicer ];
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
output."eDP-1".scale = "1.25";
workspaceOutputAssign = [ workspaceOutputAssign = [
{ {
output = "eDP-1"; output = "eDP-1";

View file

@ -5,6 +5,8 @@
imports = [ ./home/work.nix ]; imports = [ ./home/work.nix ];
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
output = { output = {
# Built-in
"eDP-1".scale = "1.25";
# Work # Work
"Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5"; "Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5";
# Home # Home

View file

@ -239,6 +239,11 @@
"url": "https://data.jet.uk", "url": "https://data.jet.uk",
"tags": ["Work", "JET", "Data"] "tags": ["Work", "JET", "Data"]
}, },
{
"name": "JET Dashboard",
"url": "https://data.jet.uk/dashboard/sessions/",
"tags": ["Work", "JET", "Data"]
},
{ {
"name": "PPF Query", "name": "PPF Query",
"url": "https://data.jet.uk/ppf/browse/ppfquery", "url": "https://data.jet.uk/ppf/browse/ppfquery",