diff --git a/TODO b/TODO index 828d4de..135edf2 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,10 @@ implement agenix + +figure out a way to get firefox policies and plugins set up in webapps + fix theme gen for gtk+kde+kvantum - apply defaults/replacements from https://github.com/nana-4/materia-theme/blob/master/change_color.sh to https://github.com/PapirusDevelopmentTeam/materia-kde/tree/master + +is theme gen relevant with cosmic? diff --git a/flake.lock b/flake.lock index 41b95a7..286060d 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712599322, - "narHash": "sha256-q/XXK9bWmTmh9aRKT9/QyC02L7j4/cR8D/XglFPGd5A=", + "lastModified": 1713879663, + "narHash": "sha256-hIwbELgx8E40jwnVI2d8pumR811c10cU0OSzugyp2AA=", "owner": "helix-editor", "repo": "helix", - "rev": "ae85f5ff712db6729032f302494eba0ca5655510", + "rev": "89a9f2be788017615f6d2406d4e12f50949a5492", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1712462372, - "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=", + "lastModified": 1713906585, + "narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9", + "rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa", "type": "github" }, "original": { @@ -263,16 +263,15 @@ ] }, "locked": { - "lastModified": 1710888565, - "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "lastModified": 1713789879, + "narHash": "sha256-4Wt3Bg6uOnvwZcECBZaFEdzlWRlGLgd8DqLL4ugLdxg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "rev": "46833c3115e8858370880d892748f0927d8193c3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -300,11 +299,11 @@ ] }, "locked": { - "lastModified": 1712459390, - "narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=", + "lastModified": 1713869268, + "narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "4676d72d872459e1e3a248d049609f110c570e9a", + "rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c", "type": "github" }, "original": { @@ -322,11 +321,11 @@ ] }, "locked": { - "lastModified": 1712592417, - "narHash": "sha256-2gUcX5rdZlMOk3eKbEwXx9riLIoCzC20Cdg3oiQnwoU=", + "lastModified": 1713589173, + "narHash": "sha256-8LBvfDbnuPMrF43bmejUZwD9TuP081iuG1nLl8m0jM4=", "owner": "nix-community", "repo": "nix-ld-rs", - "rev": "ce9406c15dfde5233101d3deb464b3c2bcc23916", + "rev": "c4f56b515ed0bf8c2cd4d6a13224067017a6dc39", "type": "github" }, "original": { @@ -378,11 +377,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712592356, - "narHash": "sha256-t8B7oqt8IwEh0obg2ZaIa2E5I9XUiKJS7JmM6z7AjgU=", + "lastModified": 1713894248, + "narHash": "sha256-6K5bu1Pe0EIibKKILXAjBW7N5QLQZ858u/mBReYNQY4=", "owner": "nix-community", "repo": "nixd", - "rev": "c217f098f0a41af48d510150d13fd8b97fd8df88", + "rev": "a8d7322d35dce8c0d6a54eb24213cfe31f5339d3", "type": "github" }, "original": { @@ -399,11 +398,11 @@ ] }, "locked": { - "lastModified": 1712621687, - "narHash": "sha256-RcU4hRzPxWZcTBqHDJOncwZQ6frT4zZakXoDUDhn+40=", + "lastModified": 1713838558, + "narHash": "sha256-X+zHtAxW8gk2oMKyQeHukAr9YPb5Wn3U36A+sbSnC94=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "81bb8d11d1049dd7a5ff54d1889f0cf45d731368", + "rev": "f09f8fbb1b97efdb32f8711e37a31266c04a264f", "type": "github" }, "original": { @@ -446,11 +445,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -511,11 +510,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710097495, - "narHash": "sha256-B7Ea7q7hU7SE8wOPJ9oXEBjvB89yl2csaLjf5v/7jr8=", + "lastModified": 1713596654, + "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d40e866b1f98698d454dad8f592fe7616ff705a4", + "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", "type": "github" }, "original": { @@ -527,11 +526,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -543,27 +542,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711124224, - "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1712618213, - "narHash": "sha256-72SqUCVrovvN+U0vJEOsSpHer+X5rbjhmOtvyhDkORg=", + "lastModified": 1713912298, + "narHash": "sha256-r0xi+Sso/4z6r3un+dloRXcOJHnQkv5fybKJTI//wA8=", "owner": "nix-community", "repo": "NUR", - "rev": "f76da9a924dc46ae71ea1694b290e6309fe5fb8c", + "rev": "12d272c11768b65067f621034eaf507932e2fc2e", "type": "github" }, "original": { @@ -578,11 +577,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1712484920, - "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=", + "lastModified": 1713805120, + "narHash": "sha256-WmqVyblqQ3g2Bmm+WONc1OnUuOuULQRIQya9wCLp5o8=", "owner": "pjones", "repo": "plasma-manager", - "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3", + "rev": "ffeef9dc96a5a0e442479c94a6000f93b69aeaac", "type": "github" }, "original": { @@ -671,11 +670,11 @@ ] }, "locked": { - "lastModified": 1712542394, - "narHash": "sha256-UZebDBECRSrJqw4K+LxZ6qFdYnScu6q1XCwqtsu1cas=", + "lastModified": 1713838472, + "narHash": "sha256-lCdDz6/YgyXdFRHall3P+dCETRpfz3Pi9eREnA9RX6k=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ece8bdb3c3b58def25f204b9a1261dee55d7c9c0", + "rev": "28a9436d356181603fb0d333565431c3d952f299", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index db856bb..8c48b92 100644 --- a/home/home.nix +++ b/home/home.nix @@ -135,6 +135,13 @@ in { name = "ChatGPT"; icon = ./icons/ChatGPT.png; }; + "StudyTAFE" = { + url = "https://www.studytafensw.edu.au"; + id = 4; + extraSettings = config.programs.firefox.profiles.default.settings; + name = "TAFE Study"; + icon = ./icons/tafe.jpg; + }; }; programs.atuin = { diff --git a/home/icons/tafe.jpg b/home/icons/tafe.jpg new file mode 100644 index 0000000..d9da590 Binary files /dev/null and b/home/icons/tafe.jpg differ diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index e50d8dd..f6d2879 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let officialAddon = name: { @@ -19,6 +18,7 @@ in { config.programs.firefox = { enable = true; + policies = { DisableTelemetry = true; DisableFirefoxStudies = true; @@ -34,10 +34,10 @@ in { DisableFirefoxScreenshots = true; DisableAppUpdate = true; DisablePrivateBrowsing = true; + DontCheckDefaultBrowser = true; OverrideFirstRunPage = ""; OverridePostUpdatePage = ""; - DontCheckDefaultBrowser = true; DisplayBookmarksToolbar = "newtab"; # alternatives: "always" or "newtab" DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" SearchBar = "unified"; # alternative: "separate" @@ -82,9 +82,5 @@ in { "widget.use-xdg-desktop-portal.mime-handler" = 1; }; }; - - nativeMessagingHosts = [ - pkgs.libsForQt5.plasma-browser-integration - ]; }; } diff --git a/home/util/firefox-webapp.nix b/home/util/firefox-webapp.nix index 1d174e0..fb14465 100644 --- a/home/util/firefox-webapp.nix +++ b/home/util/firefox-webapp.nix @@ -42,6 +42,7 @@ settings = cfg.extraSettings // { + "browser.startup.homepage" = builtins.toString cfg.url; "browser.sessionstore.resume_session_once" = false; "browser.sessionstore.resume_from_crash" = false; "browser.cache.disk.enable" = false; diff --git a/system/configuration.nix b/system/configuration.nix index fbca96b..f16a0ee 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -89,13 +89,6 @@ # enableQt5Integration = true; # for plasma6 runUsingSystemd = true; }; - - # displayManager.sddm = { - # # wayland.enable = true; # experimental? - # # wayland.compositor = "kwin"; - # enable = true; - # }; - # displayManager.defaultSession = "plasmawayland"; }; services.desktopManager.cosmic.enable = true; services.displayManager.cosmic-greeter.enable = true; @@ -156,8 +149,6 @@ git - starship - cachix alejandra