1

Compare commits

...

9 Commits

10 changed files with 87 additions and 160 deletions

183
flake.lock generated
View File

@ -3,16 +3,17 @@
"ags": { "ags": {
"inputs": { "inputs": {
"astal": "astal", "astal": "astal",
"gnim": "gnim",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1744557573, "lastModified": 1751041811,
"narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", "narHash": "sha256-NGty9sYgiB5gSa1r0nN4vfaRZcARCQ5TgbpSAPq+umk=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", "rev": "5ee4f3c40f47e12334187ba9305f7c80ee1543fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -21,28 +22,6 @@
"type": "github" "type": "github"
} }
}, },
"ags_2": {
"inputs": {
"astal": "astal_2",
"nixpkgs": [
"hyprpanel",
"nixpkgs"
]
},
"locked": {
"lastModified": 1744557573,
"narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
"owner": "aylur",
"repo": "ags",
"rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
"type": "github"
},
"original": {
"owner": "aylur",
"repo": "ags",
"type": "github"
}
},
"astal": { "astal": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -51,54 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742571008, "lastModified": 1751040887,
"narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", "narHash": "sha256-fN0wK9vObApD6M0nBJFk687MLuobzO805hBkHM3eRAM=",
"owner": "aylur", "owner": "aylur",
"repo": "astal", "repo": "astal",
"rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", "rev": "71e88fcb57ea80b42efb7bff75a914e0b682059e",
"type": "github"
},
"original": {
"owner": "aylur",
"repo": "astal",
"type": "github"
}
},
"astal_2": {
"inputs": {
"nixpkgs": [
"hyprpanel",
"ags",
"nixpkgs"
]
},
"locked": {
"lastModified": 1742571008,
"narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
"owner": "aylur",
"repo": "astal",
"rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
"type": "github"
},
"original": {
"owner": "aylur",
"repo": "astal",
"type": "github"
}
},
"astal_3": {
"inputs": {
"nixpkgs": [
"hyprpanel",
"nixpkgs"
]
},
"locked": {
"lastModified": 1748416910,
"narHash": "sha256-FEQcs58HL8Fe4i7XlqVEUwthjxwvRvgX15gTTfW17sU=",
"owner": "aylur",
"repo": "astal",
"rev": "c1bd89a47c81c66ab5fc6872db5a916c0433fb89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +69,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1748971467, "lastModified": 1751041558,
"narHash": "sha256-RjwHv+vYlIDlEaQmpgZbgiQSf4c5I3DuVpzvlbAWQhs=", "narHash": "sha256-uSfdzrgBAZweKqRfMcioRK1QxDz2mjc73MxVI+fbAGA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "52a963560ebee290e278be63cfda460ce4df5e19", "rev": "50a1de22af011ea05433453f29c445050c4a747c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743550720, "lastModified": 1749398372,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5", "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,13 +186,29 @@
"type": "github" "type": "github"
} }
}, },
"gnim": {
"flake": false,
"locked": {
"lastModified": 1750803500,
"narHash": "sha256-6eM7gaRneUW+Zzg6xZtz6dllaFtUNDVnYH+dPx6XYP4=",
"owner": "aylur",
"repo": "gnim",
"rev": "ab86c755d5c610999ab0ddcb0f4d60b1ccf5c9c6",
"type": "github"
},
"original": {
"owner": "aylur",
"repo": "gnim",
"type": "github"
}
},
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1748942041, "lastModified": 1750837715,
"narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,11 +224,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748955489, "lastModified": 1750973805,
"narHash": "sha256-OmZXyW2g5qIuo5Te74McwR0TwauCO2sF3/SjGDVuxyg=", "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bb846c031be68a96466b683be32704ef6e07b159", "rev": "080e8b48b0318b38143d5865de9334f46d51fce3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,28 +237,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprpanel": {
"inputs": {
"ags": "ags_2",
"astal": "astal_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1750028451,
"narHash": "sha256-IQjlQcuoY89E1A1VkZo0lkpNy2ysXS9hXvtEGfhUoqQ=",
"owner": "jas-singhfsu",
"repo": "hyprpanel",
"rev": "e03666ab5d239e99b65a0df9cf33c6f47e145e4e",
"type": "github"
},
"original": {
"owner": "jas-singhfsu",
"repo": "hyprpanel",
"type": "github"
}
},
"ixx": { "ixx": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -362,11 +292,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747908601, "lastModified": 1749976779,
"narHash": "sha256-cSzec5IT7Imx9g+Rhpt4GxrLiNF++V+guzYCnWUjhAI=", "narHash": "sha256-Mjb4qsu+Fma1cXe1lGo0GqisvsiUeW0LfacziI7C7oM=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "798541edff98cfa895941abe35f3e056f319a193", "rev": "f8716e36f8864e2f50663fde364ddd8dce5d937f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +329,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746934494, "lastModified": 1749960154,
"narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", "rev": "424a40050cdc5f494ec45e46462d288f08c64475",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,11 +360,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1748810746, "lastModified": 1750646418,
"narHash": "sha256-1na8blYvU1F6HLwx/aFjrhUqpqZ0SCsnqqW9n2vXvok=", "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "78d9f40fd6941a1543ffc3ed358e19c69961d3c1", "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,11 +376,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1748693115, "lastModified": 1750776420,
"narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,11 +413,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1748942960, "lastModified": 1751053139,
"narHash": "sha256-gJf3WxvDbvCpzIBVju/5GY/olW7zs/B1zDmB52AWMUM=", "narHash": "sha256-FMcWdec8fAXs7kiOQBsD+vA/RzjqoDz3zoYgPDQpZlA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "9328f4437d5f788d1c066b274a0aea492dc5fde2", "rev": "c39f5f39c32e0a8fe91bff1cda847de7a0269411",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -528,11 +458,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1748973087, "lastModified": 1751060810,
"narHash": "sha256-ZN0XKKdCBC9eLeog7qYhfGPbajkPtQPdlxp/dhwONw4=", "narHash": "sha256-8lU/u/LhfCr8/0SmQBsAMwtj3IrMgybSQzY3FzEYpwc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "90add46380908ba4395f5f1dfec84224a3b0d4b9", "rev": "539d77173dba7799eafe4b77f993e1ad7419c28e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -551,11 +481,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748298102, "lastModified": 1749730855,
"narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -571,7 +501,6 @@
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprpanel": "hyprpanel",
"nix-alien": "nix-alien", "nix-alien": "nix-alien",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",

View File

@ -25,17 +25,13 @@
ags.url = "github:Aylur/ags"; ags.url = "github:Aylur/ags";
ags.inputs.nixpkgs.follows = "nixpkgs"; ags.inputs.nixpkgs.follows = "nixpkgs";
# Hyprpanel
hyprpanel.url = "github:jas-singhfsu/hyprpanel";
hyprpanel.inputs.nixpkgs.follows = "nixpkgs";
# Nix Package Search - nps # Nix Package Search - nps
nps.url = "github:OleMussmann/nps"; nps.url = "github:OleMussmann/nps";
nps.inputs.nixpkgs.follows = "nixpkgs"; nps.inputs.nixpkgs.follows = "nixpkgs";
# Declarative Flatpak # Declarative Flatpak
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak doesn't have this
# Creates an environment containing required libraries for an executable # Creates an environment containing required libraries for an executable
nix-alien.url = "github:thiagokokada/nix-alien"; nix-alien.url = "github:thiagokokada/nix-alien";

View File

@ -386,7 +386,7 @@ rec {
hunspellDicts.de_DE hunspellDicts.de_DE
# TODO: Module, I need to add python packages from multiple modules to the same interpreter # TODO: Module, I need to add python packages from multiple modules to the same interpreter
python312 python313
# Use NixCommunity binary cache # Use NixCommunity binary cache
cachix cachix
@ -461,7 +461,7 @@ rec {
enableFishIntegration = config.modules.fish.enable; enableFishIntegration = config.modules.fish.enable;
enableNushellIntegration = false; enableNushellIntegration = false;
enableXsessionIntegration = true; enableXsessionIntegration = true;
agents = ["ssh"]; # agents = ["ssh"]; # Deprecated
keys = ["id_ed25519"]; keys = ["id_ed25519"];
}; };

View File

@ -109,11 +109,11 @@
jetbrains.clion jetbrains.clion
jetbrains.rust-rover jetbrains.rust-rover
jetbrains.pycharm-professional jetbrains.pycharm-professional
jetbrains.idea-ultimate # jetbrains.idea-ultimate
jetbrains.webstorm # jetbrains.webstorm
# Unity Stuff # Unity Stuff
unityhub # unityhub # TODO: Disable until https://github.com/NixOS/nixpkgs/issues/418451 is closed
rider rider
dotnetCore dotnetCore
mono mono

View File

@ -23,6 +23,5 @@
inputs.nix-flatpak.homeManagerModules.nix-flatpak inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
inputs.ags.homeManagerModules.default inputs.ags.homeManagerModules.default
inputs.hyprpanel.homeManagerModules.hyprpanel
]; ];
} }

View File

@ -350,7 +350,8 @@ in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
systemd.enable = true; # Imports some variables into dbus systemd.enable = true; # Enable hyprland-session.target
systemd.variables = ["--all"]; # Import PATH into systemd
xwayland.enable = true; xwayland.enable = true;
settings = { settings = {

View File

@ -13,15 +13,12 @@ in {
config = lib.mkIf hyprpanel.enable { config = lib.mkIf hyprpanel.enable {
programs.hyprpanel = { programs.hyprpanel = {
enable = true; enable = true;
overwrite.enable = true;
systemd.enable = true; systemd.enable = true;
# settings = {};
# NOTE: Because the HM module sucks (mixes explicit options + JSON conversion), write everything as override... # NOTE: Because the HM module sucks (mixes explicit options + JSON conversion), write everything as override...
# HACK: Only override fully qualified quoted attributes to not override existing attrs with empty values # HACK: Only override fully qualified quoted attributes to not override existing attrs with empty values
# https://github.com/Jas-SinghFSU/HyprPanel/issues/886 # https://github.com/Jas-SinghFSU/HyprPanel/issues/886
override = { settings = {
# #
# Bar Config # Bar Config
# #

View File

@ -31,11 +31,8 @@ in {
(pkgs.ripgrep.override {withPCRE2 = true;}) (pkgs.ripgrep.override {withPCRE2 = true;})
# Dependencies # Dependencies
lua51Packages.lua-curl # For rest lua54Packages.jsregexp # For tree-sitter
lua51Packages.xml2lua # For rest # nodejs_latest
lua51Packages.mimetypes # For rest
lua51Packages.jsregexp # For tree-sitter
nodejs_latest
# Language servers # Language servers
clang-tools_18 clang-tools_18
@ -47,27 +44,31 @@ in {
nil nil
nixd nixd
basedpyright basedpyright
pyrefly
ty
rust-analyzer rust-analyzer
svelte-language-server svelte-language-server
tailwindcss-language-server tailwindcss-language-server
tex-fmt tex-fmt
texlab texlab
typescript typescript
vscode-langservers-extracted # vscode-langservers-extracted # includes nodejs
# Linters # Linters
checkstyle # java checkstyle # java
clippy # rust clippy # rust
clj-kondo # clojure clj-kondo # clojure
eslint_d # javascript eslint_d # javascript
python311Packages.flake8 python313Packages.ruff
lua51Packages.luacheck python313Packages.flake8
python313Packages.pylint
lua54Packages.luacheck
vale # text vale # text
statix # nix statix # nix
# Formatters # Formatters
alejandra # nix alejandra # nix
python311Packages.black python313Packages.black
google-java-format google-java-format
html-tidy html-tidy
jq # json jq # json
@ -698,7 +699,7 @@ in {
lua = ["luacheck"]; lua = ["luacheck"];
markdown = ["vale"]; markdown = ["vale"];
nix = ["statix"]; nix = ["statix"];
python = ["flake8"]; python = ["ruff" "flake8" "pylint"];
tex = ["chktex"]; tex = ["chktex"];
# rust = ["clippy"]; # Not supported, but integrated through rustaceanvim # rust = ["clippy"]; # Not supported, but integrated through rustaceanvim
text = ["vale"]; text = ["vale"];
@ -731,6 +732,8 @@ in {
config = let config = let
servers = mylib.generators.toLuaObject [ servers = mylib.generators.toLuaObject [
{name = "basedpyright";} {name = "basedpyright";}
# {name = "pyrefly";} # TODO: Config
# {name = "ty";} # TODO: Config
{ {
name = "clangd"; name = "clangd";
extraOptions = { extraOptions = {
@ -771,7 +774,7 @@ in {
{name = "clojure_lsp";} {name = "clojure_lsp";}
{name = "cmake";} {name = "cmake";}
{name = "cssls";} {name = "cssls";}
{name = "html";} # {name = "html";} # vscode-langservers-extracted
{name = "lua_ls";} {name = "lua_ls";}
{ {
name = "ltex"; name = "ltex";

View File

@ -14,7 +14,7 @@ vim.diagnostic.config({
vim.api.nvim_create_user_command("ToggleInlineDiagnostics", function() vim.api.nvim_create_user_command("ToggleInlineDiagnostics", function()
vim.g.enable_inline_diagnostics = not vim.g.enable_inline_diagnostics vim.g.enable_inline_diagnostics = not vim.g.enable_inline_diagnostics
vim.diagnostic.config({ virtual_text = vim.g.enable_inline_diagnostics, float = { border = "rounded" } }) vim.diagnostic.config({ virtual_text = vim.g.enable_inline_diagnostics, float = { border = "rounded" } })
require("notify")((vim.g.enable_inline_diagnostics and "Enabled" or "Disabled") .. " inline diagnostics") vim.notify((vim.g.enable_inline_diagnostics and "Enabled" or "Disabled") .. " inline diagnostics")
end, { end, {
desc = "Toggle inline diagnostics", desc = "Toggle inline diagnostics",
}) })
@ -23,7 +23,7 @@ end, {
vim.g.disable_autoformat = false vim.g.disable_autoformat = false
vim.api.nvim_create_user_command("ToggleAutoformat", function() vim.api.nvim_create_user_command("ToggleAutoformat", function()
vim.g.disable_autoformat = not vim.g.disable_autoformat vim.g.disable_autoformat = not vim.g.disable_autoformat
require("notify")((vim.g.disable_autoformat and "Disabled" or "Enabled") .. " autoformat-on-save") vim.notify((vim.g.disable_autoformat and "Disabled" or "Enabled") .. " autoformat-on-save")
end, { end, {
desc = "Toggle autoformat-on-save", desc = "Toggle autoformat-on-save",
}) })
@ -37,7 +37,7 @@ end
-- Check LSP server config -- Check LSP server config
vim.api.nvim_create_user_command("LspInspect", function() vim.api.nvim_create_user_command("LspInspect", function()
require("notify")(vim.inspect(vim.lsp.get_active_clients())) vim.notify(vim.inspect(vim.lsp.get_active_clients()))
end, { end, {
desc = "Print LSP server configuration", desc = "Print LSP server configuration",
}) })
@ -50,7 +50,7 @@ vim.api.nvim_create_user_command("ToggleAutoLint", function()
-- vim.diagnostic.reset(vim.api.nvim_get_current_buf()) -- vim.diagnostic.reset(vim.api.nvim_get_current_buf())
vim.diagnostic.reset() -- Reset for all buffers vim.diagnostic.reset() -- Reset for all buffers
end end
require("notify")((vim.g.disable_autolint and "Disabled" or "Enabled") .. " autolint-on-save") vim.notify((vim.g.disable_autolint and "Disabled" or "Enabled") .. " autolint-on-save")
end, { end, {
desc = "Toggle autolint-on-save", desc = "Toggle autolint-on-save",
}) })

View File

@ -91,7 +91,8 @@ with mylib.networking; {
}; };
# Make /tmp volatile # Make /tmp volatile
tmp.useTmpfs = true; # NOTE: Setting this to true can lead to large derivations running out of tmp space
tmp.useTmpfs = false;
}; };
security = { security = {
@ -514,7 +515,8 @@ with mylib.networking; {
]; ];
}; };
gnome.gnome-keyring.enable = true; # Some apps require this gnome.gnome-keyring.enable = false; # TODO: Do apps require this?
gnome.gcr-ssh-agent.enable = false;
}; };
virtualisation = { virtualisation = {