From 1e03626a6e3e6490eebea3d9874fc0e4b9d484fb Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sun, 22 Jun 2025 18:58:26 +0100 Subject: [PATCH 1/3] disabled zellij shell integration it was annoying me --- home-manager/zellij.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/zellij.nix b/home-manager/zellij.nix index 562ed92..b8714c0 100644 --- a/home-manager/zellij.nix +++ b/home-manager/zellij.nix @@ -2,7 +2,6 @@ { programs.zellij = { enable = true; - enableFishIntegration = true; exitShellOnExit = true; attachExistingSession = true; }; From b5ae84e64412cef0d32fb1a368892802c627de75 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Fri, 27 Jun 2025 10:58:39 +0100 Subject: [PATCH 2/3] switched to owncloud --- home-manager/home.nix | 3 ++- home-manager/hyprland.nix | 1 + home-manager/nextcloud.nix | 7 ------- home-manager/packages.nix | 3 ++- 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 home-manager/nextcloud.nix diff --git a/home-manager/home.nix b/home-manager/home.nix index 49e61de..21f8af4 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -15,7 +15,6 @@ ./fish.nix ./eza.nix ./nvf.nix - ./nextcloud.nix ./git.nix ./stylix.nix ./direnv.nix @@ -34,6 +33,8 @@ # Allow XWayland apps to not be weird after turning off xwayland scaling in hyprland.conf GDK_SCALE = 1; XCURSOR_SIZE = 24; + # Set hyprshot save directory + HYPRSHOT_DIR = "$HOME/Pictures/Screenshots"; # Set default editor EDITOR = "nvim"; NIXOS_OZONE_WL = 1; diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 5f0055c..72464a3 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -65,6 +65,7 @@ "nm-applet --indicator" "blueman-applet" "trayscale" + "owncloud" ]; # Declare all keybinds diff --git a/home-manager/nextcloud.nix b/home-manager/nextcloud.nix deleted file mode 100644 index 6f23c31..0000000 --- a/home-manager/nextcloud.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - services.nextcloud-client = { - enable = true; - startInBackground = true; - }; -} diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 0f62b3f..920ee97 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -8,7 +8,7 @@ bitwarden-desktop # Integrates with bitwarden extension wofi # Wayland app launcher nvtopPackages.amd # GPU monitor, more detailed than BTOP-rocm - signal-desktop # Signal messenger client + signal-desktop-bin # Signal messenger client nautilus # File manager (move to option maybe) element-desktop # Matrix client stable.jetbrains.idea-community # IDE @@ -46,6 +46,7 @@ networkmanagerapplet # Tray icon for managing networking blueman # Tray icon for managing bluetooth + owncloud-client # desktop sync client ]; services.flatpak.packages = [ "io.mrarm.mcpelauncher" # Minecraft bedrock edition launcher From 616ccc8357d035003c6e0f6bb3c8ba3a8e38af1d Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Fri, 27 Jun 2025 12:08:04 +0100 Subject: [PATCH 3/3] updated flake finally fixed the font issue lmao it just needed a cache rebuild see stylix issue #1290 --- flake.lock | 149 ++++++++++++++++++++++------------------------------- 1 file changed, 61 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 36841a2..89a1fc5 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1747867343, - "narHash": "sha256-FmEdhjLXtv92TQcFQHTetgVXkM4vBmD4nls8mvG9lMg=", + "lastModified": 1750597689, + "narHash": "sha256-3ComII0BkmdohISrshICQiAB6TU+VHHIRnWK0ckA0/s=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "2d87503f028c14f523f63ccb4a87d4b8d55c02d2", + "rev": "ec2ec4ec3f908ed9b125ea4afd52627bed60f183", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "crane": { "locked": { - "lastModified": 1746291859, - "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", "owner": "ipetkov", "repo": "crane", - "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1748832438, - "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", "owner": "nix-community", "repo": "disko", - "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1748830238, - "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", + "lastModified": 1750973805, + "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", + "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", "type": "github" }, "original": { @@ -441,11 +441,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1747056319, - "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", + "lastModified": 1750866260, + "narHash": "sha256-fo5NvfutMEw9OV+5rGYuCKjlNNjcnD3cKMbOfzusO/E=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", + "rev": "f40a3401f86d117affeeb8ca6f0ce5cd1ca3cc24", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "mnw": { "locked": { - "lastModified": 1748278309, - "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", + "lastModified": 1748710831, + "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "owner": "Gerg-L", "repo": "mnw", - "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", + "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "type": "github" }, "original": { @@ -489,22 +489,17 @@ }, "nil": { "inputs": { - "flake-utils": [ - "nvf", - "flake-utils" - ], "nixpkgs": [ "nvf", "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", + "lastModified": 1750047244, + "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", "owner": "oxalica", "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", + "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", "type": "github" }, "original": { @@ -547,11 +542,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -562,11 +557,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1748867139, - "narHash": "sha256-5tgvCRN9GT9DoVfKEYco+OTRmkPStOgu2uZV8+DLNN8=", + "lastModified": 1751018140, + "narHash": "sha256-hSZAxb/560wHT7t580BTo74WcdsHNxhmYLGNIx/ef1A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a09d57a6634396ca52fe3a951ba8e824d2fe2b2d", + "rev": "1aad15088d31cdcca6f6833f40c0e1ed5a2e3cec", "type": "github" }, "original": { @@ -578,11 +573,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748708770, - "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", + "lastModified": 1750838302, + "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a59eb7800787c926045d51b70982ae285faa2346", + "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", "type": "github" }, "original": { @@ -594,11 +589,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -610,11 +605,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -631,11 +626,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748864791, - "narHash": "sha256-YRRRbOEc8aXpzSvN3qdIkqtVQ9xjx9rgichtaSQ0qwY=", + "lastModified": 1751017028, + "narHash": "sha256-Ii8Dy9mvuhxZ4e9OihmMxfUHvQphiiADzpUqvBOwf3M=", "owner": "nix-community", "repo": "NUR", - "rev": "4ee0c2599266fb26e6ac3cb71836e96f25df446e", + "rev": "9954deeb1d4eea85c6e0187b545559b6480d0f63", "type": "github" }, "original": { @@ -682,11 +677,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748651104, - "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", + "lastModified": 1750842150, + "narHash": "sha256-slD1Nzr7SStRhQgC1WmrIsgrgwgRyag2MAxCSrjrxKg=", "owner": "notashelf", "repo": "nvf", - "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", + "rev": "f9ee813a230e1c0ba0e1a13e1747fd1b996f08dc", "type": "github" }, "original": { @@ -708,11 +703,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -746,33 +741,11 @@ ] }, "locked": { - "lastModified": 1747017456, - "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", + "lastModified": 1750560265, + "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5b07506ae89b025b14de91f697eba23b48654c52", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nvf", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", + "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", "type": "github" }, "original": { @@ -847,11 +820,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748803004, - "narHash": "sha256-dLGywKYxge3rzD6AqtVP0UmMHONdQNCWXj6i0lfm/UM=", + "lastModified": 1750950678, + "narHash": "sha256-ZNSjRDpaR/sAtrZNPO6RpGkHKdMb1oc1lkQN+6ZBvyU=", "owner": "nix-community", "repo": "stylix", - "rev": "5f841056ca60bea7312aeade957da084cd95b26e", + "rev": "c700d41bb8ee32baed490c8128c1077b2b27183b", "type": "github" }, "original": {