diff --git a/flake.lock b/flake.lock index 89a1fc5..36841a2 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1750597689, - "narHash": "sha256-3ComII0BkmdohISrshICQiAB6TU+VHHIRnWK0ckA0/s=", + "lastModified": 1747867343, + "narHash": "sha256-FmEdhjLXtv92TQcFQHTetgVXkM4vBmD4nls8mvG9lMg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "ec2ec4ec3f908ed9b125ea4afd52627bed60f183", + "rev": "2d87503f028c14f523f63ccb4a87d4b8d55c02d2", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "crane": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1750903843, - "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", + "lastModified": 1748832438, + "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", "owner": "nix-community", "repo": "disko", - "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", + "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1750973805, - "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -441,11 +441,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750866260, - "narHash": "sha256-fo5NvfutMEw9OV+5rGYuCKjlNNjcnD3cKMbOfzusO/E=", + "lastModified": 1747056319, + "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f40a3401f86d117affeeb8ca6f0ce5cd1ca3cc24", + "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "mnw": { "locked": { - "lastModified": 1748710831, - "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", + "lastModified": 1748278309, + "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", "type": "github" }, "original": { @@ -489,17 +489,22 @@ }, "nil": { "inputs": { + "flake-utils": [ + "nvf", + "flake-utils" + ], "nixpkgs": [ "nvf", "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1750047244, - "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", + "lastModified": 1741118843, + "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "owner": "oxalica", "repo": "nil", - "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", + "rev": "577d160da311cc7f5042038456a0713e9863d09e", "type": "github" }, "original": { @@ -542,11 +547,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -557,11 +562,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1751018140, - "narHash": "sha256-hSZAxb/560wHT7t580BTo74WcdsHNxhmYLGNIx/ef1A=", + "lastModified": 1748867139, + "narHash": "sha256-5tgvCRN9GT9DoVfKEYco+OTRmkPStOgu2uZV8+DLNN8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1aad15088d31cdcca6f6833f40c0e1ed5a2e3cec", + "rev": "a09d57a6634396ca52fe3a951ba8e824d2fe2b2d", "type": "github" }, "original": { @@ -573,11 +578,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750838302, - "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { @@ -589,11 +594,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -605,11 +610,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -626,11 +631,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751017028, - "narHash": "sha256-Ii8Dy9mvuhxZ4e9OihmMxfUHvQphiiADzpUqvBOwf3M=", + "lastModified": 1748864791, + "narHash": "sha256-YRRRbOEc8aXpzSvN3qdIkqtVQ9xjx9rgichtaSQ0qwY=", "owner": "nix-community", "repo": "NUR", - "rev": "9954deeb1d4eea85c6e0187b545559b6480d0f63", + "rev": "4ee0c2599266fb26e6ac3cb71836e96f25df446e", "type": "github" }, "original": { @@ -677,11 +682,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1750842150, - "narHash": "sha256-slD1Nzr7SStRhQgC1WmrIsgrgwgRyag2MAxCSrjrxKg=", + "lastModified": 1748651104, + "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", "owner": "notashelf", "repo": "nvf", - "rev": "f9ee813a230e1c0ba0e1a13e1747fd1b996f08dc", + "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", "type": "github" }, "original": { @@ -703,11 +708,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -741,11 +746,33 @@ ] }, "locked": { - "lastModified": 1750560265, - "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", + "lastModified": 1747017456, + "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", + "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", "type": "github" }, "original": { @@ -820,11 +847,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750950678, - "narHash": "sha256-ZNSjRDpaR/sAtrZNPO6RpGkHKdMb1oc1lkQN+6ZBvyU=", + "lastModified": 1748803004, + "narHash": "sha256-dLGywKYxge3rzD6AqtVP0UmMHONdQNCWXj6i0lfm/UM=", "owner": "nix-community", "repo": "stylix", - "rev": "c700d41bb8ee32baed490c8128c1077b2b27183b", + "rev": "5f841056ca60bea7312aeade957da084cd95b26e", "type": "github" }, "original": { diff --git a/home-manager/home.nix b/home-manager/home.nix index 21f8af4..49e61de 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -15,6 +15,7 @@ ./fish.nix ./eza.nix ./nvf.nix + ./nextcloud.nix ./git.nix ./stylix.nix ./direnv.nix @@ -33,8 +34,6 @@ # 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 72464a3..5f0055c 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -65,7 +65,6 @@ "nm-applet --indicator" "blueman-applet" "trayscale" - "owncloud" ]; # Declare all keybinds diff --git a/home-manager/nextcloud.nix b/home-manager/nextcloud.nix new file mode 100644 index 0000000..6f23c31 --- /dev/null +++ b/home-manager/nextcloud.nix @@ -0,0 +1,7 @@ +{ ... }: +{ + services.nextcloud-client = { + enable = true; + startInBackground = true; + }; +} diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 920ee97..0f62b3f 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-bin # Signal messenger client + signal-desktop # Signal messenger client nautilus # File manager (move to option maybe) element-desktop # Matrix client stable.jetbrains.idea-community # IDE @@ -46,7 +46,6 @@ 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 diff --git a/home-manager/zellij.nix b/home-manager/zellij.nix index b8714c0..562ed92 100644 --- a/home-manager/zellij.nix +++ b/home-manager/zellij.nix @@ -2,6 +2,7 @@ { programs.zellij = { enable = true; + enableFishIntegration = true; exitShellOnExit = true; attachExistingSession = true; };