Reorganise a lot of things, clean up some files

Pull program expressions inside hyprland directory (e.g. rofi, waybar,
etc...) up one level.

Convert everything into package-name/default.nix format for
consistency

Move common home imports from flake.nix into hyprland/default.nix,
flake.nix now only defaults into importing hyprland, to be consistent
with how system imports work

Remove some old files: calendar and contact setup, sweet theme pkgs

Move xdg.configFile expressions from home/default.nix into a
config/default.nix, keeping the files to be linked in the config dir
as well (still need to do ipython though)

flake.nix

@@ -23,14 +23,7 @@
         shell = "fish";
         systemModules = [ ./system/hyprland.nix ];
         serviceModules = [ ];
-        homeModules = [
+        homeModules = [ ./home/hyprland/default.nix ];
-          ./home/default.nix
-          ./home/emacs.nix
-          ./home/firefox.nix
-          ./home/accounts/default.nix
-          ./home/hyprland/default.nix
-          ./home/nyxt/default.nix
-        ];
         stateVersion = "23.05";
       };
       systemConfig = { hostName ? default.hostName, user ? default.user

home/accounts/calendar.nix

@@ -1,72 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs = {
-    vdirsyncer.enable = true;
-    khal = {
-      enable = true;
-      locale = {
-        timeformat = "%H:%M";
-        dateformat = "%Y-%m-%d";
-        longdateformat = "%Y-%m-%d %a";
-        datetimeformat = "%Y-%m-%d %H:%M";
-        longdatetimeformat = "%Y-%m-%d %H:%M";
-      };
-    };
-  };
-  services.vdirsyncer.enable = true;
-  accounts.calendar = {
-    basePath = ".calendar";
-    accounts = let
-      local = {
-        type = "filesystem";
-        fileExt = ".ics";
-      };
-    in {
-      nextcloud = rec {
-        inherit local;
-        primary = lib.mkDefault true;
-        primaryCollection = "personal";
-        remote = {
-          type = "caldav";
-          url = "https://cloud.xenia.me.uk/remote.php/dav";
-          userName = "xenia";
-          passwordCommand = [
-            "${pkgs.libsecret}/bin/secret-tool"
-            "lookup"
-            "url"
-            "cloud.xenia.me.uk"
-          ];
-        };
-        vdirsyncer = {
-          enable = lib.mkDefault true;
-          collections = [ "from a" ];
-          metadata = [ "color" ];
-        };
-        khal = {
-          inherit (vdirsyncer) enable;
-          type = "discover";
-        };
-      };
-      outlook = let emailConfig = config.accounts.email.accounts.outlook;
-      in rec {
-        inherit local;
-        primary = lib.mkDefault false;
-        primaryCollection = "Work";
-        remote = {
-          inherit (emailConfig) userName passwordCommand;
-          type = "caldav";
-          url = "http://localhost:1080/users/${remote.userName}/calendar/";
-        };
-        vdirsyncer = {
-          enable = lib.mkDefault emailConfig.mbsync.enable;
-          collections = [ "Work" "Network" "Operations" "Other" ];
-        };
-        khal = {
-          inherit (vdirsyncer) enable;
-          type = "discover";
-        };
-      };
-    };
-  };
-}

home/accounts/contact.nix

@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.vdirsyncer.enable = true;
-  accounts.contact = {
-    basePath = ".contact";
-    accounts = let
-      calendarAccounts = config.accounts.calendar.accounts;
-      local = {
-        type = "filesystem";
-        fileExt = ".vcf";
-      };
-    in {
-      nextcloud = {
-        inherit local;
-        remote = {
-          inherit (calendarAccounts.nextcloud.remote) userName passwordCommand;
-          type = "carddav";
-          url =
-            "https://cloud.xenia.me.uk/remote.php/dav/addressbooks/users/xenia/contacts-1/";
-        };
-        vdirsyncer = {
-          inherit (calendarAccounts.nextcloud.vdirsyncer) enable;
-          collections = [ "from a" ];
-        };
-      };
-    };
-  };
-}

home/config/default.nix

@@ -0,0 +1,11 @@
+{ ... }: {
+  # TODO: ipython config file
+  xdg.configFile = {
+    "bat/themes/Catppuccin-mocha.tmTheme".source = ./Catppuccin-mocha.tmTheme;
+    "jupyter/jupyter_server_config.py".source = ./jupyter_server_config.py;
+    "jupyter/jupyter_nbconvert_config.py".source =
+      ./jupyter_nbconvert_config.py;
+    "jupyter/lab/user-settings".source = ./jupyterlab-user-settings;
+    "pypoetry/config.toml".source = ./poetry-config.toml;
+  };
+}

home/default.nix

@@ -1,5 +1,5 @@
 { lib, ... }: {
-  imports = [ ./scripts/default.nix ];
+  imports = [ ./config/default.nix ./scripts/default.nix ];
   stylix.targets = {
     avizo.enable = true;
     firefox.enable = true;
@@ -9,15 +9,6 @@
     swaylock.enable = true;
     xresources.enable = true;
   };
-  xdg.configFile = {
-    "bat/themes/Catppuccin-mocha.tmTheme".source = ./Catppuccin-mocha.tmTheme;
-    "pypoetry/config.toml".source = ./poetry-config.toml;
-    "jupyter/jupyter_server_config.py".source =
-      ./jupyter-config/jupyter_server_config.py;
-    "jupyter/jupyter_nbconvert_config.py".source =
-      ./jupyter-config/jupyter_nbconvert_config.py;
-    "jupyter/lab/user-settings".source = ./jupyter-config/lab/user-settings;
-  };
   programs = rec {
     bash.enable = true;
     fish.enable = true;

home/hyprland/default.nix

@@ -1,5 +1,16 @@
 { config, lib, pkgs, ... }: {
-  imports = [ ./waybar/default.nix ./obs/default.nix ];
+  imports = [
+    ../default.nix
+    ../accounts/default.nix
+    ../swaylock/default.nix
+    ../waybar/default.nix
+    ../rofi/default.nix
+    ../swaync/default.nix
+    ../emacs/default.nix
+    ../nyxt/default.nix
+    ../firefox/default.nix
+    ../obs/default.nix
+  ];
   services = {
     gpg-agent.pinentryFlavor = "gnome3";
     avizo.enable = true;
@@ -11,75 +22,20 @@
       tray = "never";
     };
   };
-  programs = {
+  programs.foot = {
-    foot = {
+    enable = true;
-      enable = true;
+    settings = {
-      settings = {
+      main = {
-        main = {
+        pad = "10x10";
-          pad = "10x10";
+        locked-title = false;
-          locked-title = false;
+        notify-focus-inhibit = true;
-          notify-focus-inhibit = true;
+        selection-target = "both";
-          selection-target = "both";
-        };
-        bell = {
-          urgent = true;
-          notify = true;
-        };
-        mouse = { hide-when-typing = "yes"; };
       };
-    };
+      bell = {
-    rofi = {
+        urgent = true;
-      enable = true;
+        notify = true;
-      package = pkgs.rofi-wayland;
-      location = "center";
-      terminal = "foot";
-      pass = {
-        enable = true;
-        package = pkgs.rofi-pass-wayland;
-        extraConfig = ''
-          USERNAME_field='login'
-        '';
-      };
-      extraConfig = let
-        power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
-      in {
-        modi = "window,run,drun,ssh,${power-menu},combi";
-        combi-modi = "window,drun,ssh";
-        sidebar-mode = true;
-        sort = true;
-        sorting-method = "fzf";
-        matching = "fuzzy";
-        icon-theme = config.gtk.iconTheme.name;
-        show-icons = true;
-        application-fallback-icon = "󰋙 ";
-        drun-display-format = "{icon} {name} ({categories})";
-        disable-history = false;
-        hide-scrollbar = true;
-        display-window = " 󰧨  Move ";
-        display-run = " 󰅴  Run ";
-        display-drun = " 󱓞  Apps ";
-        display-ssh = " 󰢹  SSH ";
-        display-combi = " 󰛡  Combi ";
-        display-power-menu = " 󰐥  Power ";
-      };
-    };
-    swaylock = {
-      enable = true;
-      package = pkgs.swaylock-effects;
-      # Settings are specifically for swaylock-effects
-      settings = {
-        indicator-radius = 100;
-        indicator-thickness = 10;
-        indicator-caps-lock = true;
-        ignore-empty-password = true;
-        show-failed-attempts = true;
-        effect-blur =
-          with config.wayland.windowManager.hyprland.settings.decoration.blur;
-          "${toString size}x${toString passes}";
-        effect-vignette = "0.5:0.5";
-        grace = 0.5;
-        fade-in = 0.2;
       };
+      mouse = { hide-when-typing = "yes"; };
     };
   };
   gtk = {
@@ -102,15 +58,12 @@
       name = "Catppuccin-Mocha-Standard-Lavender-Dark";
     };
   };
-  xdg = {
+  xdg.configFile = {
-    configFile = {
+    "hypr/extra.conf" = lib.mkDefault { text = ""; };
-      "hypr/extra.conf" = lib.mkDefault { text = ""; };
+    "hypr/hyprpaper.conf".text = ''
-      "hypr/hyprpaper.conf".text = ''
+      preload = ${config.stylix.image}
-        preload = ${config.stylix.image}
+      wallpaper = ,${config.stylix.image}
-        wallpaper = ,${config.stylix.image}
+    '';
-      '';
-      "swaync/style.css".source = ./swaync/style.css;
-    };
   };
   wayland.windowManager.hyprland = {
     enable = true;

home/hyprland/rofi/default.nix

@@ -1,145 +0,0 @@
-{ config, pkgs, ... }: {
-  programs.rofi = {
-    enable = true;
-    package = pkgs.rofi-wayland;
-    location = 0;
-    terminal = "foot";
-    pass = {
-      enable = true;
-      package = pkgs.rofi-pass-wayland;
-      extraConfig = ''
-        USERNAME_field='login'
-      '';
-    };
-    theme = let inherit (config.lib.formats.rasi) mkLiteral;
-    in {
-      "*" = {
-        bg-col = "#1e1e2e";
-        bg-col-light = "#1e1e2e";
-        border-col = "#1e1e2e";
-        selected-col = "#1e1e2e";
-        blue = "#89b4fa";
-        fg-col = "#cdd6f4";
-        fg-col2 = "#f38ba8";
-        grey = "#6c7086";
-
-        width = 600;
-        font = "Iosevka Nerd Font 18";
-      };
-
-      "element-text, element-icon , mode-switcher" = {
-        background-color = mkLiteral "inherit";
-        text-color = mkLiteral "inherit";
-      };
-
-      window = {
-        height = "360px";
-        border = "3px";
-        border-color = "@border-col";
-        background-color = "@bg-col";
-      };
-
-      mainbox = { background-color = "@bg-col"; };
-
-      inputbar = {
-        children = [ "prompt" "entry" ];
-        background-color = "@bg-col";
-        border-radius = "5px";
-        padding = "2px";
-      };
-
-      prompt = {
-        background-color = "@blue";
-        padding = "6px";
-        text-color = "@bg-col";
-        border-radius = "3px";
-        margin = "20px 0px 0px 20px";
-      };
-
-      textbox-prompt-colon = {
-        expand = false;
-        str = " =";
-      };
-
-      entry = {
-        padding = "6px";
-        margin = "20px 0px 0px 10px";
-        text-color = "@fg-col";
-        background-color = "@bg-col";
-      };
-
-      listview = {
-        border = "0px 0px 0px";
-        padding = "6px 0px 0px";
-        margin = "10px 0px 0px 20px";
-        columns = 2;
-        lines = 5;
-        background-color = "@bg-col";
-      };
-
-      element = {
-        padding = "5px";
-        background-color = "@bg-col";
-        text-color = "@fg-col";
-      };
-
-      element-icon = { size = "25px"; };
-
-      "element selected" = {
-        background-color = "@selected-col";
-        text-color = "@fg-col2";
-      };
-
-      mode-switcher = { spacing = 0; };
-
-      button = {
-        padding = "10px";
-        background-color = "@bg-col-light";
-        text-color = "@grey";
-        vertical-align = 0.5;
-        horizontal-align = 0.5;
-      };
-
-      "button selected" = {
-        background-color = "@bg-col";
-        text-color = "@blue";
-      };
-
-      message = {
-        background-color = "@bg-col-light";
-        margin = "2px";
-        padding = "2px";
-        border-radius = "5px";
-      };
-
-      textbox = {
-        padding = "6px";
-        margin = "20px 0px 0px 20px";
-        text-color = "@blue";
-        background-color = "@bg-col-light";
-      };
-
-    };
-    extraConfig =
-      let power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
-      in {
-        modi = "window,run,drun,ssh,${power-menu},combi";
-        combi-modi = "window,drun,ssh";
-        sidebar-mode = true;
-        sort = true;
-        sorting-method = "fzf";
-        matching = "fuzzy";
-        icon-theme = config.gtk.iconTheme.name;
-        show-icons = true;
-        application-fallback-icon = "󰋙";
-        drun-display-format = "{icon} {name} ({categories})";
-        disable-history = false;
-        hide-scrollbar = true;
-        display-window = " 󰧨  Move ";
-        display-run = " 󰅴  Run ";
-        display-drun = " 󱓞  Apps ";
-        display-ssh = " 󰢹  SSH ";
-        display-combi = " 󰛡  Combi ";
-      };
-  };
-}

home/jupyter-config/lab/workspaces/default-37a8.jupyterlab-workspace

@@ -1 +0,0 @@
-{"data":{"layout-restorer:data":{"main":{"dock":{"type":"tab-area","currentIndex":0,"widgets":[]}},"down":{"size":0,"widgets":[]},"left":{"collapsed":false,"visible":true,"current":"filebrowser","widgets":["filebrowser","running-sessions","@jupyterlab/toc:plugin","extensionmanager.main-view"]},"right":{"collapsed":true,"visible":true,"widgets":["jp-property-inspector","debugger-sidebar"]},"relativeSizes":[0.2102140161034704,0.7897859838965297,0],"top":{"simpleVisibility":true}},"@jupyterlab/settingeditor-extension:form-ui":{"sizes":[0.13349514563106796,0.866504854368932],"container":{"plugin":"@jupyterlab/cell-toolbar-extension:plugin","sizes":[0.5,0.5]}}},"metadata":{"id":"default"}}

home/jupyter-config/migrated

@@ -1 +0,0 @@
-2024-01-17T09:44:58.834026+00:00

home/nyxt/home_bookmarks.lisp

@@ -1,28 +0,0 @@
-(
-(:url "https://app.tado.com/en/main/home" :title "tado" :date "2023-12-11T10:29:57.000000Z")
-(:url "https://apps.powerapps.com/play/e/default-c6ac664b-ae27-4d5d-b4e6-bb5717196fc7/a/c403a9ad-95e0-47b7-8c82-752b22a6d6f5?tenantId=c6ac664b-ae27-4d5d-b4e6-bb5717196fc7&source=portal" :title "J2 Roster" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://data.jet.uk/" :title "JET Data Services" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://git.xenia.me.uk/" :title "Gitea" :date "2023-12-12T07:26:26.000000Z")
-(:url "https://github.com/" :title "GitHub" :date "2023-12-12T07:26:26.000000Z")
-(:url "https://invidious.private.coffee/" :title "Invidious" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://libbyapp.com/shelf" :title "Libby" :date "2023-12-12T07:26:26.000000Z")
-(:url "https://myaccount.myenergi.com/" :title "myenergi account" :date "2023-12-11T10:29:57.000000Z")
-(:url "https://nucleus.ukaea.uk/" :title "Nucleus" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://support.starlabs.systems/status/f4e20eac-0056-42ae-91bd-4d75bf9b90fa" :title "Byte II Updates" :date "2023-12-27T14:25:38.000000Z")
-(:url "https://teams.microsoft.com/" :title "Microsoft Teams" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://tech.lgbt/" :title "Mastodon" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://ukaea.elearning247.com/" :title "elearning247.com" :date "2023-12-21T16:33:54.000000Z")
-(:url "https://ukaea.zoom.us/j/3578310614" :title "SC Zoom Room" :date "2023-12-07T14:09:50.000000Z")
-(:url "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php" :title "Physics Summary" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://wiki.jetdata.eu/open/index.php?title=CXS:Topic3" :title "KS5" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://wiki.jetdata.eu/open/index.php?title=Diagnostic_Coordinator_Wiki" :title "Diagnostic Coordinator" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://wiki.jetdata.eu/open/index.php?title=KT3_Journals" :title "KT3" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://wiki.jetdata.eu/open/index.php?title=Ks5:roster3008" :title "KS5 Roster" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://wiki.jetdata.eu/open/index.php?title=Main_Page" :title "OpenWiki Home" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://wiki.jetdata.eu/open/index.php?title=Spectroscopy_Group:index" :title "Spectroscopy OpenWiki" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://wiki.jetdata.eu/open/index.php?title=Spectroscopy_RDE_Roster" :title "Spectroscopy RDE Roster" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://www.jspo.jet.uk/pages/operations/jpecreports_2023.html" :title "JET Exploitation Unit" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://www.kobo.com/gb/en" :title "Kobo Store" :date "2023-11-24T10:37:23.000000Z")
-(:url "https://www.nhsapp.service.nhs.uk/patient/" :title "NHS App" :date "2023-12-12T07:26:00.000000Z")
-(:url "https://www.twitch.tv/" :title "Twitch" :date "2023-12-21T16:33:28.000000Z")
-)

home/nyxt/work_bookmarks.lisp

@@ -1,38 +0,0 @@
-(
- (:url "https://cdn-01.jet.uk/allopcams.html" :title "JET Ops Cams" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://data.jet.uk/" :title "JET Data Services" :date "2023-12-20T11:35:45.000000Z")
- (:url "http://elitherl.gitpages.ccfe.ac.uk/bms-uncertainty-propagation/" :title "BMS Uncertainty Propagation Project" :date "2023-12-20T11:35:46.000000Z")
- (:url "http://elitherl.gitpages.ccfe.ac.uk/jupyterhub-project-handover/index.html" :title "Digital Logbook handover documentation" :date "2023-12-20T11:35:46.000000Z")
- (:url "http://elitherl.gitpages.ccfe.ac.uk/jupyterlab-reference/index.html" :title "Digital Research Logbook reference docs" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://git.ccfe.ac.uk/" :title "GitLab" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://github.com/" :title "GitHub" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://intranet.ccfe.ac.uk/mastu-handbook" :title "UKAEA MAST-U – Diagnostic handbook" :date "2024-01-05T11:39:22.000000Z")
- (:url "https://jupyter-test.apps.l:8000/" :title "JupyterHub" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://marval.service.ukaea.uk/MSMSelfService/Index.aspx" :title "Marval Helpdesk" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://nucleus.ukaea.uk/#home" :title "Nucleus" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://nucleus.ukaea.uk/Interact/Pages/Section/Default.aspx?Section=6216" :title "Logbook nucleus community" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://payrollclaims.ccfe.ac.uk/User/" :title "Payroll Claims" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://ubw.unit4cloud.com/uk_aea_prod_web/Default.aspx" :title "U4BW" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://user.iter.org/?uid=E6CMF9" :title "ITER CXRS design description" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://users.euro-fusion.org/openwiki/index.php/Beam_emission_project" :title "Beam emission project - Openwiki" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://users.euro-fusion.org/openwiki/index.php/Spectroscopy_Group:index" :title "Spectroscopy Wiki" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://users.euro-fusion.org/openwiki/index.php?title=Diagnostic_Coordinator_Wiki" :title "DCO Wiki" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php" :title "Physics Summary" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://users.mastu.ukaea.uk/" :title "MAST-U Users" :date "2024-01-05T11:37:15.000000Z")
- (:url "https://users.mastu.ukaea.uk/experiments/campaign-plan" :title "Campaign Plan | MAST-U Users" :date "2024-01-05T11:39:05.000000Z")
- (:url "https://users.mastu.ukaea.uk/internal/latest-session" :title "Latest Session | MAST-U Operations" :date "2024-01-05T11:38:46.000000Z")
- (:url "https://users.mastu.ukaea.uk/internal/shot-index" :title "Shot Index | MAST-U Operations" :date "2024-01-05T11:37:39.000000Z")
- (:url "http://w3.jet.uk/index.shtml" :title "JET" :date "2023-12-20T11:35:45.000000Z")
- (:url "http://webmimic.jet.uk/DB/codas/kj4-uxd7.mim.html" :title "kj4-uxd7.mim mimic" :date "2023-12-20T11:35:45.000000Z")
- (:url "http://webmimic.jet.uk/DG/codas/ks5.mim.html" :title "ks5.mim mimic" :date "2023-12-20T11:35:45.000000Z")
- (:url "http://webmimic.jet.uk/DG/codas/kt3spec.mim.html" :title "kt3spec.mim mimic" :date "2023-12-20T11:35:45.000000Z")
- (:url "http://webmimic.jet.uk/MC/codas/globala.mim.html" :title "globala.mim mimic" :date "2023-12-20T11:35:45.000000Z")
- (:url "http://webmimic.jet.uk/MC/codas/globalc.mim.html" :title "globalc.mim mimic" :date "2023-12-20T11:35:45.000000Z")
- (:url "http://webmimic.jet.uk/MC/codas/globald.mim.html" :title "globald.mim mimic" :date "2023-12-20T11:35:45.000000Z")
- (:url "http://webmimic.jet.uk/mc/codas/countdown" :title "countdown.mim mimic" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://wiki.jetdata.eu/open/index.php?title=CXS:Topic3" :title "KS5" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://wiki.jetdata.eu/open/index.php?title=KT3_Journals" :title "KT3" :date "2023-12-20T11:35:45.000000Z")
- (:url "https://www.cherab.info/" :title "Cherab’s documentation" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://www.jspo.jet.uk/pages/operations/jpecreports_2023.html" :title "JPEC reports" :date "2023-12-20T11:35:46.000000Z")
- (:url "https://www.raysect.org/" :title "Raysect Documentation" :date "2023-12-20T11:35:46.000000Z")
- )