diff --git a/flake.lock b/flake.lock index a94445d..e418cff 100644 --- a/flake.lock +++ b/flake.lock @@ -127,26 +127,6 @@ "type": "github" } }, - "hydractify-bot": { - "inputs": { - "naersk": "naersk", - "nixpkgs": "nixpkgs_2", - "utils": "utils" - }, - "locked": { - "lastModified": 1736252359, - "narHash": "sha256-zbYyO3Litc2PBqcgJGaRyp6nJpy/Zx3f3ucJC312rRE=", - "owner": "hydractify", - "repo": "hydractify-bot", - "rev": "b8b2de9252fdbdea688f85d621b0782a6936efe6", - "type": "github" - }, - "original": { - "owner": "hydractify", - "repo": "hydractify-bot", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -215,9 +195,9 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -367,35 +347,20 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1721727458, - "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", - "owner": "nix-community", - "repo": "naersk", - "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "naersk", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", - "path": "/nix/store/lsy6c2f9alj2gkjj36h754kk63x6701l-source", - "type": "path" + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -415,38 +380,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1729850857, - "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1734649271, "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", @@ -490,9 +423,8 @@ "inputs": { "clipboard-sync": "clipboard-sync", "home-manager": "home-manager", - "hydractify-bot": "hydractify-bot", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "spicetify-nix": "spicetify-nix" } }, @@ -518,21 +450,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -547,24 +464,6 @@ "type": "github" } }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index da30eaf..5fb0e8d 100644 --- a/flake.nix +++ b/flake.nix @@ -20,8 +20,6 @@ }; hyprland.url = "github:hyprwm/Hyprland"; - - hydractify-bot.url = "github:hydractify/hydractify-bot"; }; outputs = diff --git a/modules/home-manager/programs/default.nix b/modules/home-manager/programs/default.nix index e18c2d7..977e328 100644 --- a/modules/home-manager/programs/default.nix +++ b/modules/home-manager/programs/default.nix @@ -9,11 +9,11 @@ ./git.nix ./hyprland ./mangohud.nix - ./neovim ./obs-studio.nix ./rofi ./spotify ./tmux ./waybar.nix + ./neovim ]; } diff --git a/modules/home-manager/programs/neovim/lsp.nix b/modules/home-manager/programs/neovim/lsp.nix index ed96f0c..448958d 100644 --- a/modules/home-manager/programs/neovim/lsp.nix +++ b/modules/home-manager/programs/neovim/lsp.nix @@ -113,17 +113,6 @@ in }, }, }, - rust_analyzer = { - settings = { - ["rust-analyzer"] = { - cargo = { - extraEnv = { CARGO_PROFILE_RUST_ANALYZER_INHERITS = "dev" }, - extraArgs = { "--profile", "rust-analyzer" }, - }, - check = { command = "check", extraArgs = {} }, - }, - } - } }, -- customize how language servers are attached handlers = { diff --git a/specific/desktop/home-manager.nix b/specific/desktop/home-manager.nix index 18201c4..5791032 100644 --- a/specific/desktop/home-manager.nix +++ b/specific/desktop/home-manager.nix @@ -10,7 +10,6 @@ ../../modules/home-manager ./services/openttd.nix ./services/terraria.nix - ./services/hydractify-bot.nix ]; # Home Manager needs a bit of information about you and the paths it should @@ -87,7 +86,7 @@ let base = appimageTools.defaultFhsEnvArgs; in - buildFHSEnv ( + buildFHSUserEnv ( base // { name = "fhs"; diff --git a/specific/desktop/services/hydractify-bot.nix b/specific/desktop/services/hydractify-bot.nix deleted file mode 100644 index f11cdb8..0000000 --- a/specific/desktop/services/hydractify-bot.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ hydractify-bot, pkgs, ... }: - -{ - systemd.user.services.hydractify-bot = { - Install.WantedBy = [ "default.target" ]; - - Unit.Description = "Hydractify bot"; - Unit.After = "postgresql.service"; - - Service = { - ExecStart = "${hydractify-bot.defaultPackage.${pkgs.system}}/bin/hydractify"; - Restart = "on-failure"; - Type = "simple"; - WorkingDirectory = "/mnt/internal/hydractify/GitHub/hydractify"; - }; - }; -} diff --git a/specific/laptop/home-manager.nix b/specific/laptop/home-manager.nix index cfccf3c..7f6ed4a 100644 --- a/specific/laptop/home-manager.nix +++ b/specific/laptop/home-manager.nix @@ -78,7 +78,7 @@ let base = appimageTools.defaultFhsEnvArgs; in - buildFHSEnv ( + buildFHSUserEnv ( base // { name = "fhs"; @@ -91,8 +91,11 @@ # # pkgs.appimageTools provides basic packages required by most software. (base.targetPkgs pkgs) - ++ (with pkgs; [ - ]) + ++ ( + with pkgs; + [ + ] + ) ); profile = "export FHS=1"; runScript = "bash";