diff --git a/system/Vanguard.nix b/system/Vanguard.nix index a26d1cb2..7b39c126 100644 --- a/system/Vanguard.nix +++ b/system/Vanguard.nix @@ -65,35 +65,42 @@ services.hardware.openrgb.enable = true; networking.wg-quick.interfaces.wg0.configFile = "/etc/wireguard/gb-mnc-wg-001.conf"; system.stateVersion = "23.05"; - home-manager.users.${username} = { - imports = [ ./home/swww/default.nix ]; - home.stateVersion = "23.05"; - programs = { - btop.package = pkgs.btop-rocm; - obs-studio = { - enable = true; - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-vkcapture - obs-pipewire-audio-capture - input-overlay - ]; + home-manager.users.${username} = + { config, ... }: + { + imports = [ ./home/swww/default.nix ]; + home.stateVersion = "23.05"; + gtk.gtk3.bookmarks = + let + home = config.home.homeDirectory; + in + [ "file://${home}/Models" ]; + programs = { + btop.package = pkgs.btop-rocm; + obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-vkcapture + obs-pipewire-audio-capture + input-overlay + ]; + }; }; + wayland.windowManager.hyprland.settings = + let + primary = "Microstep MSI G27CQ4 E2"; + secondary = "Acer Technologies ED270R TJMEE0043W01"; + in + { + monitor = [ + "desc:${primary},2560x1440@144,1920x0,1.25,vrr,2" + "desc:${secondary},1920x1080@144,0x140,1.0,vrr,2" + ]; + workspace = [ + "5, monitor:desc:${primary}" + "6, monitor:desc:${primary}" + ]; + }; }; - wayland.windowManager.hyprland.settings = - let - primary = "Microstep MSI G27CQ4 E2"; - secondary = "Acer Technologies ED270R TJMEE0043W01"; - in - { - monitor = [ - "desc:${primary},2560x1440@144,1920x0,1.25,vrr,2" - "desc:${secondary},1920x1080@144,0x140,1.0,vrr,2" - ]; - workspace = [ - "5, monitor:desc:${primary}" - "6, monitor:desc:${primary}" - ]; - }; - }; } diff --git a/system/desktop.nix b/system/desktop.nix index edf8f48c..75af0985 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -1,5 +1,6 @@ { config, + lib, pkgs, username, ... @@ -126,7 +127,6 @@ home-manager.users.${username} = { config, - pkgs, osConfig, ... }: @@ -153,6 +153,16 @@ gtk = { enable = true; gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + gtk3.bookmarks = + with config.xdg.userDirs; + lib.mkBefore [ + "file://${desktop}" + "file://${documents}" + "file://${download}" + "file://${music}" + "file://${pictures}" + "file://${videos}" + ]; iconTheme = { package = (pkgs.papirus-icon-theme.override { color = "violet"; }); name = if config.lib.stylix.colors.variant == "light" then "Papirus-Light" else "Papirus-Dark"; diff --git a/system/work.nix b/system/work.nix index e6868477..ed64a5aa 100644 --- a/system/work.nix +++ b/system/work.nix @@ -16,5 +16,9 @@ proton.primary = lib.mkForce false; outlook.primary = lib.mkForce true; }; + gtk.gtk3.bookmarks = lib.mkAfter [ + "smb://msrv-cfshare.ccfepc.ccfe.ac.uk/ndrive/" + "smb://msrv-cfshare.ccfepc.ccfe.ac.uk/newt/" + ]; }; }