diff --git a/flake.lock b/flake.lock index 7698471..2b596fd 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774098279, - "narHash": "sha256-OoQRoQmwCuBBXObi82F6C+eYV1lYCt5Va5k/VckJ6vo=", + "lastModified": 1776420287, + "narHash": "sha256-0P2QyDM8R1FFww//TNDLTRVnVkQxVdbEVQiVuyD1SqY=", "owner": "catppuccin", "repo": "nix", - "rev": "cb374516af3ccc3aa0c6ef518292bf4ae417a60e", + "rev": "bdf0285dc7978ebd78b76054631d7ef05680895e", "type": "github" }, "original": { @@ -26,11 +26,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774497795, - "narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=", + "lastModified": 1776484970, + "narHash": "sha256-nx7CgawAdPzBHjve8pFv1K4nmlVpEF2wAe8ApkDcJwU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "11af6f465a038233b8123022dcb7e293f3229f11", + "rev": "d02b22b3511f25943c6e938b673626764b74b5b2", "type": "gitlab" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1774293042, - "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", + "lastModified": 1776454077, + "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", + "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774777275, - "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=", + "lastModified": 1775490113, + "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd", + "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1774736237, - "narHash": "sha256-uQ+Was7QP9Bupr0XZyZXOAD32Ox8z2mJnevT2FmDwS8=", + "lastModified": 1776539146, + "narHash": "sha256-zuaO3Gi+HUf4Udv6wiCsK29SKh/Q6kwacpTn8gIwyZY=", "owner": "NotAShelf", "repo": "nvf", - "rev": "a0636d5c977743851c91d3c2e74bfac90be48835", + "rev": "2809f4d43071e124f316ecf6dd0c68302f1078af", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1774760784, - "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=", + "lastModified": 1776119890, + "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5", + "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1774242250, - "narHash": "sha256-pchbnY7KVnH26g4O3LZO8vpshInqNj937gAqlPob1Mk=", + "lastModified": 1776538405, + "narHash": "sha256-qjo8xO4p/Kn4OrtVwkW8XPH0xaHq5QLu6MMhSf+gJ/w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f19c3e6683c2d2f3fcfcb88fb691931a104bc47c", + "rev": "179a2e63531541cb009208c913d7ddf7046ea2b6", "type": "github" }, "original": { diff --git a/modules/base/default.nix b/modules/base/default.nix index bc64efa..df9cdc2 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -11,6 +11,7 @@ ./locale.nix ./nix.nix ./packages.nix + ./sleep.nix ./user.nix ]; diff --git a/modules/base/sleep.nix b/modules/base/sleep.nix new file mode 100644 index 0000000..3773077 --- /dev/null +++ b/modules/base/sleep.nix @@ -0,0 +1,13 @@ +{ + systemd.sleep.settings.Sleep = { + # AllowSuspend = "no"; + AllowHybridSleep = "no"; + AllowSuspendThenHibernate = "no"; + HibernationMode = "shutdown"; + }; + + boot.kernelParams = [ + "vm.swappiness=30" + "hibernate.compressor=lz4" + ]; +} \ No newline at end of file diff --git a/modules/desktop/README.md b/modules/desktop/README.md index 620b9c4..9cdba8a 100644 --- a/modules/desktop/README.md +++ b/modules/desktop/README.md @@ -1,3 +1,5 @@ This module contains common desktop configs -This means stuff like Vesktop and alike will be defined here \ No newline at end of file +This means stuff like Vesktop and alike will be defined here + +YOU NEED TO IMPORT `plasma/` manually! \ No newline at end of file diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 1e48baf..48af777 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { imports = [ ./tailscale.nix @@ -11,6 +11,14 @@ ./home ]; + environment.systemPackages = with pkgs; [ + neovide + featherpad + protonmail-desktop + ]; + + environment.variables.EDITOR = "neovide"; + catppuccin.enable = true; catppuccin.cache.enable = true; diff --git a/modules/desktop/home/default.nix b/modules/desktop/home/default.nix index 9f68151..4f51117 100644 --- a/modules/desktop/home/default.nix +++ b/modules/desktop/home/default.nix @@ -1,9 +1,10 @@ { imports = [ + ./zen-browser ./element.nix ./packages.nix + ./thunderbird.nix ./vesktop.nix - ./zen-browser ]; catppuccin.enable = true; diff --git a/modules/desktop/home/sent_them_to_another_world_by_team4g_dlqk4x8-pre.png b/modules/desktop/home/sent_them_to_another_world_by_team4g_dlqk4x8-pre.png new file mode 100644 index 0000000..4b6134d Binary files /dev/null and b/modules/desktop/home/sent_them_to_another_world_by_team4g_dlqk4x8-pre.png differ diff --git a/modules/desktop/home/thunderbird.nix b/modules/desktop/home/thunderbird.nix new file mode 100644 index 0000000..29b3f0a --- /dev/null +++ b/modules/desktop/home/thunderbird.nix @@ -0,0 +1,24 @@ +{ + # Thunderbird + programs.thunderbird = { + enable = true; + profiles.default = { + # name = "Default"; + isDefault = true; + }; + }; + + # Calendars + accounts.calendar.accounts.Main = { + # name = "Main"; + primary = true; + + remote = { + type = "caldav"; + url = "http://dav.kurin.pi/radicale/ghostfox/3c2f5ce4-2fa6-1c5e-b08b-8ce2386c3739/"; + userName = "ghostfox"; + }; + + thunderbird.enable = true; + }; +} \ No newline at end of file diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix new file mode 100644 index 0000000..c9679ad --- /dev/null +++ b/modules/desktop/plasma/default.nix @@ -0,0 +1,16 @@ +{ inports, pkgs, ... }: +{ + environment.plasma6.excludePackages = with pkgs.kdePackages; [ + elisa + kwrite + kate + okular + ]; + + home-manager.sharedModules = [ + inputs.plasma-manager.homeModules.plasma-manager + ./home + ]; + + services.desktopManager.plasma6.enable = true; +} \ No newline at end of file diff --git a/modules/desktop/plasma/home/default.nix b/modules/desktop/plasma/home/default.nix new file mode 100644 index 0000000..60216b5 --- /dev/null +++ b/modules/desktop/plasma/home/default.nix @@ -0,0 +1,6 @@ +{ + # programs.plasma = { + # enable = true; + # immutableByDefault = true; + # }; +} \ No newline at end of file