From 25897cac923b47e27a92d3e0901a53cebb77a1ae Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Tue, 23 Apr 2024 08:56:26 +0200 Subject: [PATCH 1/2] Added waydroid --- hosts/laptop/default.nix | 1 + hosts/laptop/home.nix | 1 + modules/home/programs/common.nix | 2 +- modules/home/programs/joplin.nix | 7 +++++++ modules/system/programs/waydroid.nix | 5 +++++ 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 modules/home/programs/joplin.nix create mode 100644 modules/system/programs/waydroid.nix diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index b684f47..a571c91 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -10,6 +10,7 @@ ../../modules/system/programs/syncthing.nix ../../modules/system/programs/thunar.nix ../../modules/system/programs/virtualization.nix + ../../modules/system/programs/waydroid.nix ../../modules/system/utils/common.nix ../../modules/system/utils/docker.nix ../../modules/system/utils/fprint.nix diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 9424697..eaf58d7 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -7,6 +7,7 @@ ../../modules/home/programs/common.nix ../../modules/home/programs/firefox.nix ../../modules/home/programs/git.nix + ../../modules/home/programs/joplin.nix ../../modules/home/programs/kitty.nix # ../../modules/home/programs/modrinth.nix ../../modules/home/programs/neovim diff --git a/modules/home/programs/common.nix b/modules/home/programs/common.nix index bcc17bc..218c099 100644 --- a/modules/home/programs/common.nix +++ b/modules/home/programs/common.nix @@ -6,7 +6,7 @@ onlyoffice-bin vlc signal-desktop - logseq + unstable.logseq webcord unstable.localsend bitwarden diff --git a/modules/home/programs/joplin.nix b/modules/home/programs/joplin.nix new file mode 100644 index 0000000..0d9896e --- /dev/null +++ b/modules/home/programs/joplin.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + unstable.joplin-desktop + ]; +} diff --git a/modules/system/programs/waydroid.nix b/modules/system/programs/waydroid.nix new file mode 100644 index 0000000..c194c51 --- /dev/null +++ b/modules/system/programs/waydroid.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + virtualisation.waydroid.enable = true; +} From 8c44307b001a101539dfbe1f78fd669b2967a8fd Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Fri, 10 May 2024 19:34:43 +0200 Subject: [PATCH 2/2] Leptos config --- flake.lock | 94 +++++++++++++++++++++---------- modules/home/programs/firefox.nix | 5 ++ 2 files changed, 68 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 135301e..aa8152b 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1711349769, - "narHash": "sha256-YyDJq/Cf57QIAvhIRiUkfft7zQP6sWG/KFVdtbptmEU=", + "lastModified": 1713931409, + "narHash": "sha256-GTdTWfJW1LT4OW9Sp5EAyuyc6Ig5Ez9lZZVG7rcEr8U=", "owner": "rycee", "repo": "nur-expressions", - "rev": "a6bc3598b9e686d1d0002df0ce435a10c81e19e9", + "rev": "afa2d40b6b54185449dc67c958107d5652035a3f", "type": "gitlab" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1711257659, - "narHash": "sha256-Z9D/lAibU9lu4Wc/HxfhlEegS5Qk6NGP11ODctlC9xk=", + "lastModified": 1713574676, + "narHash": "sha256-ZV/JEAi7vEUjq2rFBZ0tEPQvSwGM+9uU5npyPjFJkOs=", "owner": "getchoo", "repo": "nix-exprs", - "rev": "16d73312136ce647c7bcf2d79605fe1188469fcc", + "rev": "54f61b3c3c726d8b325583617edb0bb24a8764ab", "type": "github" }, "original": { @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1710888565, - "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "lastModified": 1712386041, + "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "type": "github" }, "original": { @@ -101,14 +101,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1710180874, - "narHash": "sha256-ZSn3wXQuRz36Ta/L+UCFKuUVG6QpwK2QmRkPjpQprU4=", + "lastModified": 1713472482, + "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=", "owner": "hyprwm", "repo": "hypridle", - "rev": "4395339a2dc410bcf49f3e24f9ed3024fdb25b0a", + "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1", "type": "github" }, "original": { @@ -122,14 +122,15 @@ "nixpkgs": [ "hypridle", "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1708212860, - "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -143,14 +144,15 @@ "nixpkgs": [ "hyprlock", "nixpkgs" - ] + ], + "systems": "systems_3" }, "locked": { - "lastModified": 1708212860, - "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -165,14 +167,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_4" }, "locked": { - "lastModified": 1711313012, - "narHash": "sha256-d0Shu3dqdJj9QKR3dnE4Mh8t66hUlfLGZl+9A9JsoI8=", + "lastModified": 1713777162, + "narHash": "sha256-cF5DfaRfqVcDSqIG+ePLPS9rATElKhWNLS/9MXpMzk8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "87fce7923fef1143b3a473abb2fc873e67664475", + "rev": "8658386f212f29447874fe62fa665c5864cdcc41", "type": "github" }, "original": { @@ -202,11 +204,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711124224, - "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "lastModified": 1713725259, + "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", + "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", "type": "github" }, "original": { @@ -232,11 +234,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -286,6 +288,36 @@ "repo": "default-linux", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } } }, "root": "root", diff --git a/modules/home/programs/firefox.nix b/modules/home/programs/firefox.nix index 1afbbb9..ee94b39 100644 --- a/modules/home/programs/firefox.nix +++ b/modules/home/programs/firefox.nix @@ -1,8 +1,13 @@ { inputs, pkgs, ... }: { + home.packages = with pkgs; [ + unstable.firefoxpwa + ]; + programs.firefox = { enable = true; +# nativeMessagingHosts = [ pkgs.unstable.firefoxpwa ]; profiles.xeovalyte = { search.engines = { "Nix" = {