From e11bf88fe232a30a5375c49fb462b21d9c4232d4 Mon Sep 17 00:00:00 2001 From: Redyf Date: Fri, 12 Jan 2024 17:33:29 -0300 Subject: [PATCH] feat: Add Neve (my neovim distro) --- flake.lock | 207 +++++++++++++----- flake.nix | 6 +- home/desktop/dev/editors/default.nix | 3 +- home/desktop/dev/editors/neve/default.nix | 9 + home/desktop/dev/editors/nvim/default.nix | 121 +--------- .../graphical/wms/hyprland/default.nix | 4 +- .../services/wayland/waybar/default.nix | 21 +- hosts/redyf/configuration.nix | 62 +++--- 8 files changed, 207 insertions(+), 226 deletions(-) create mode 100644 home/desktop/dev/editors/neve/default.nix diff --git a/flake.lock b/flake.lock index 050c52bd..80a70132 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,29 @@ { "nodes": { - "NixOS-WSL": { + "Neve": { "inputs": { - "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "nixvim": "nixvim" + }, + "locked": { + "lastModified": 1704944139, + "narHash": "sha256-j7jRazfZJEP481nX4PYoK+akrtHCNA3aqdINcYFnM7o=", + "owner": "redyf", + "repo": "Neve", + "rev": "e9a5427e6ad1fa92ba81dd34af51e0f60c12a4a2", + "type": "github" + }, + "original": { + "owner": "redyf", + "repo": "Neve", + "type": "github" + } + }, + "NixOS-WSL": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -57,11 +77,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -73,11 +93,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -89,6 +109,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "Neve", "nixvim", "nixpkgs" ] @@ -127,7 +148,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1685518550, @@ -145,7 +166,25 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" }, "locked": { "lastModified": 1685518550, @@ -164,6 +203,7 @@ "gitignore": { "inputs": { "nixpkgs": [ + "Neve", "nixvim", "pre-commit-hooks", "nixpkgs" @@ -186,15 +226,17 @@ "home-manager": { "inputs": { "nixpkgs": [ + "Neve", + "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1704980804, - "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", "owner": "nix-community", "repo": "home-manager", - "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "type": "github" }, "original": { @@ -206,16 +248,15 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1704980804, + "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", "type": "github" }, "original": { @@ -227,8 +268,8 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", - "systems": "systems_2", + "nixpkgs": "nixpkgs_3", + "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, @@ -323,7 +364,7 @@ }, "hyprlang": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1704287638, @@ -341,7 +382,7 @@ }, "hyprlang_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1704287638, @@ -416,6 +457,7 @@ "nix-darwin": { "inputs": { "nixpkgs": [ + "Neve", "nixvim", "nixpkgs" ] @@ -436,18 +478,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-lib": { @@ -466,6 +506,38 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1702645756, "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", @@ -481,7 +553,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1704722960, "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", @@ -497,7 +569,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -513,7 +585,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1704194953, "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", @@ -529,7 +601,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1702645756, "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", @@ -545,7 +617,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1703961334, "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", @@ -564,19 +636,17 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1704958333, - "narHash": "sha256-yYgtaJnaDtUzd2X5jL+Zy38rtKPEu328oy5x7cOaH+I=", + "lastModified": 1704923462, + "narHash": "sha256-mm/fdctlgmCclvEY61SnLmuIdKtUOzTz6+l1/Tch0A0=", "owner": "nix-community", "repo": "nixvim", - "rev": "0379ab34cc7bc1b846bfdbb3d6707f5c8b03ce2c", + "rev": "65689c5dd889091cbfd61f0d49e0a5e69243de12", "type": "github" }, "original": { @@ -587,11 +657,11 @@ }, "nur": { "locked": { - "lastModified": 1705085962, - "narHash": "sha256-qjCMyBlcuzkIRxwXuARjV9CXWIP+9ssFa+xSEAR4VE8=", + "lastModified": 1705088644, + "narHash": "sha256-dG3Ck5OZZSdJZwokeWsAV5XpYPXIjyrIf9VR5SktjkQ=", "owner": "nix-community", "repo": "NUR", - "rev": "159f2e6f40cbf70be977dee501f5b4df641908d9", + "rev": "83a28718371d3741673cbc587e2e2cb770ff4226", "type": "github" }, "original": { @@ -602,14 +672,16 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ + "Neve", "nixvim", "nixpkgs" ], "nixpkgs-stable": [ + "Neve", "nixvim", "nixpkgs" ] @@ -630,14 +702,14 @@ }, "root": { "inputs": { + "Neve": "Neve", "NixOS-WSL": "NixOS-WSL", "berkeley": "berkeley", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hyprland": "hyprland", "monolisa": "monolisa", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_3", - "nixvim": "nixvim", + "nixpkgs": "nixpkgs_5", "nur": "nur", "sf-mono-liga-src": "sf-mono-liga-src", "spicetify-nix": "spicetify-nix", @@ -663,8 +735,8 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1704167711, @@ -697,16 +769,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -726,6 +798,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -740,7 +827,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -755,7 +842,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -773,8 +860,8 @@ "waybar-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": "nixpkgs_5", - "systems": "systems_5", + "nixpkgs": "nixpkgs_7", + "systems": "systems_6", "wlroots": "wlroots_2", "xdph": "xdph_2" }, @@ -834,8 +921,8 @@ "inputs": { "hyprland-protocols": "hyprland-protocols_3", "hyprlang": "hyprlang_3", - "nixpkgs": "nixpkgs_7", - "systems": "systems_6" + "nixpkgs": "nixpkgs_9", + "systems": "systems_7" }, "locked": { "lastModified": 1704659450, diff --git a/flake.nix b/flake.nix index 94ddb4ee..628cea25 100644 --- a/flake.nix +++ b/flake.nix @@ -17,11 +17,7 @@ nur.url = "github:nix-community/NUR"; nix-colors.url = "github:misterio77/nix-colors"; spicetify-nix.url = "github:the-argus/spicetify-nix"; - - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + Neve.url = "github:redyf/Neve"; # SFMono w/ patches sf-mono-liga-src = { diff --git a/home/desktop/dev/editors/default.nix b/home/desktop/dev/editors/default.nix index fc4f1ae3..2c94f3e2 100644 --- a/home/desktop/dev/editors/default.nix +++ b/home/desktop/dev/editors/default.nix @@ -1,6 +1,7 @@ _: { imports = [ - ./nvim + ./neve + # ./nvim # ./helix # ./emacs # ./vscode diff --git a/home/desktop/dev/editors/neve/default.nix b/home/desktop/dev/editors/neve/default.nix new file mode 100644 index 00000000..9743e472 --- /dev/null +++ b/home/desktop/dev/editors/neve/default.nix @@ -0,0 +1,9 @@ +{ inputs +, config +, pkgs +, ... +}: { + home.packages = with pkgs; [ + inputs.Neve.packages.${system}.default + ]; +} diff --git a/home/desktop/dev/editors/nvim/default.nix b/home/desktop/dev/editors/nvim/default.nix index a0579d28..090bc836 100644 --- a/home/desktop/dev/editors/nvim/default.nix +++ b/home/desktop/dev/editors/nvim/default.nix @@ -1,21 +1,10 @@ -{ inputs -, config -, pkgs -, ... -}: -# let -# cfg = config.modules.nvim; -# jabuti-nvim = pkgs.vimUtils.buildVimPlugin { -# name = "jabuti-nvim"; -# src = pkgs.fetchFromGitHub { -# owner = "jabuti-theme"; -# repo = "jabuti-nvim"; -# rev = "17f1b94cbf1871a89cdc264e4a8a2b3b4f7c76d2"; -# sha256 = "sha256-iPjwx/rTd98LUPK1MUfqKXZhQ5NmKx/rN8RX1PIuDFA="; -# }; -# }; -# in { { + inputs, + config, + pkgs, + system, + ... +}: { programs.neovim = { enable = true; package = pkgs.neovim-unwrapped; @@ -25,103 +14,5 @@ withRuby = false; withNodeJs = false; withPython3 = false; - # extraPackages = with pkgs; [ - # texlab # latex LSP - # nil # nix language server - # sumneko-lua-language-server # lua lsp - # stylua # lua linter - # uncrustify # C and stuff - # shellcheck # shell - # alejandra # nix formatter - # gopls # go - # revive # go formatter - # asmfmt # go formatter 2 - # ccls # cpp - # black # python - # shellcheck # bash - # shfmt # shell - # nodejs # take a guess - # marksman # markdown language server - # nodePackages.pyright - # nodePackages.prettier - # nodePackages.stylelint - # nodePackages.jsonlint # JSON - # nodePackages.typescript-language-server # Typescript - # nodePackages.vscode-langservers-extracted # HTML, CSS, JavaScript - # nodePackages.yarn - # nodePackages.bash-language-server - # nodePackages.node2nix # node and tix, we game - # ]; - plugins = with pkgs.vimPlugins; [ - # { - # plugin = jabuti-nvim; - # config = "colorscheme jabuti"; - # } - # copilot-lua - # lsp_lines-nvim - # vim-nix - # nvim-ts-autotag - # cmp-nvim-lsp-signature-help - # cmp-buffer - # comment-nvim - # lsp_lines-nvim - # null-ls-nvim - # vim-fugitive - # friendly-snippets - # luasnip - # rust-tools-nvim - # crates-nvim - # vim-illuminate - # cmp_luasnip - # nvim-cmp - # impatient-nvim - # indent-blankline-nvim - # nvim-tree-lua - # telescope-nvim - # nvim-web-devicons - # cmp-nvim-lsp - # cmp-path - # catppuccin-nvim - # lspkind-nvim - # nvim-lspconfig - # hop-nvim - # alpha-nvim - # nvim-autopairs - # nvim-colorizer-lua - # nvim-ts-rainbow - # gitsigns-nvim - # toggleterm-nvim - # todo-comments-nvim - # (nvim-treesitter.withPlugins (plugins: - # with plugins; [ - # tree-sitter-python - # tree-sitter-c - # tree-sitter-nix - # tree-sitter-cpp - # tree-sitter-rust - # tree-sitter-toml - # tree-sitter-json - # tree-sitter-lua - # tree-sitter-go - # tree-sitter-java - # tree-sitter-typescript - # tree-sitter-javascript - # tree-sitter-cmake - # tree-sitter-comment - # tree-sitter-http - # tree-sitter-regex - # tree-sitter-dart - # tree-sitter-make - # tree-sitter-html - # tree-sitter-css - # tree-sitter-latex - # tree-sitter-bibtex - # tree-sitter-php - # tree-sitter-sql - # tree-sitter-zig - # tree-sitter-dockerfile - # tree-sitter-markdown - # ])) - ]; }; } diff --git a/home/desktop/graphical/wms/hyprland/default.nix b/home/desktop/graphical/wms/hyprland/default.nix index 0fb5f5aa..6a47b950 100644 --- a/home/desktop/graphical/wms/hyprland/default.nix +++ b/home/desktop/graphical/wms/hyprland/default.nix @@ -15,7 +15,7 @@ opacity = ".85"; cursor = "macOS-BigSur"; in { - environment.systemPackages = with pkgs; [ + home.packages = with pkgs; [ grim slurp swappy @@ -327,7 +327,7 @@ in { ''; }; # Hyprland configuration files - home.configFile = { + xdg.configFile = { "hypr/autostart".source = ./autostart; "hypr/store/dynamic_out.txt".source = ./store/dynamic_out.txt; "hypr/store/prev.txt".source = ./store/prev.txt; diff --git a/home/desktop/services/wayland/waybar/default.nix b/home/desktop/services/wayland/waybar/default.nix index 62bf79df..c71bd55e 100644 --- a/home/desktop/services/wayland/waybar/default.nix +++ b/home/desktop/services/wayland/waybar/default.nix @@ -1,8 +1,9 @@ -{ pkgs -, lib -, config -, osConfig -, ... +{ + pkgs, + lib, + config, + osConfig, + ... }: with lib; let # Bar v1 @@ -14,13 +15,9 @@ with lib; let # Tokyonight # waybar_config = import ./tokyonight/config.nix {inherit osConfig config lib pkgs;}; # waybar_style = import ./tokyonight/style.nix {inherit (config) colorscheme;}; - waybar_config = import ./catppuccin/config.nix { inherit osConfig config lib pkgs; }; - waybar_style = import ./catppuccin/style.nix { inherit (config) colorscheme; }; -in -{ - home.packages = with pkgs; [ - python39Packages.requests - ]; + waybar_config = import ./catppuccin/config.nix {inherit osConfig config lib pkgs;}; + waybar_style = import ./catppuccin/style.nix {inherit (config) colorscheme;}; +in { programs.waybar = { enable = true; package = pkgs.waybar; diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix index 6c90f892..7f5d515b 100644 --- a/hosts/redyf/configuration.nix +++ b/hosts/redyf/configuration.nix @@ -1,8 +1,8 @@ -{ - config, - pkgs, - inputs, - ... +{ config +, pkgs +, inputs +, Neve +, ... }: { imports = [ # Include the results of the hardware scan. @@ -11,10 +11,10 @@ # Bootloader. boot = { - kernelModules = ["v4l2loopback"]; # Autostart kernel modules on boot - extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; # loopback module to make OBS virtual camera work - kernelParams = ["nvidia.NVreg_PreserveVideoMemoryAllocations=1"]; - supportedFilesystems = ["ntfs"]; + kernelModules = [ "v4l2loopback" ]; # Autostart kernel modules on boot + extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; # loopback module to make OBS virtual camera work + kernelParams = [ "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ]; + supportedFilesystems = [ "ntfs" ]; loader = { systemd-boot.enable = false; timeout = 10; @@ -30,12 +30,12 @@ configurationLimit = 3; theme = pkgs.fetchFromGitHub - { - owner = "Lxtharia"; - repo = "minegrub-theme"; - rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3"; - sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap"; - }; + { + owner = "Lxtharia"; + repo = "minegrub-theme"; + rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3"; + sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap"; + }; # theme = pkgs.fetchFromGitHub { # owner = "shvchk"; @@ -155,9 +155,9 @@ fontconfig = { enable = true; defaultFonts = { - serif = ["Times, Noto Serif"]; - sansSerif = ["Helvetica Neue LT Std, Helvetica, Noto Sans"]; - monospace = ["Courier Prime, Courier, Noto Sans Mono"]; + serif = [ "Times, Noto Serif" ]; + sansSerif = [ "Helvetica Neue LT Std, Helvetica, Noto Sans" ]; + monospace = [ "Courier Prime, Courier, Noto Sans Mono" ]; }; }; }; @@ -183,12 +183,19 @@ XCURSOR_SIZE = "32"; QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + EDITOR = "nvim"; }; sessionVariables = { NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland # WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia. DEFAULT_BROWSER = "${pkgs.brave}/bin/brave"; # Set default browser }; + systemPackages = with pkgs; [ + git + wget + playerctl + inputs.xdg-portal-hyprland.packages.${system}.xdg-desktop-portal-hyprland + ]; }; hardware = { @@ -202,7 +209,7 @@ opengl = { enable = true; driSupport32Bit = true; - extraPackages = with pkgs; [nvidia-vaapi-driver]; + extraPackages = with pkgs; [ nvidia-vaapi-driver ]; }; }; @@ -226,7 +233,7 @@ enableContribAndExtras = true; }; }; - videoDrivers = ["nvidia"]; + videoDrivers = [ "nvidia" ]; layout = "br"; xkbVariant = ""; libinput = { @@ -266,7 +273,7 @@ description = "redyf"; initialPassword = "123456"; shell = pkgs.zsh; - extraGroups = ["networkmanager" "wheel" "input" "docker" "libvirtd"]; + extraGroups = [ "networkmanager" "wheel" "input" "docker" "libvirtd" ]; }; }; }; @@ -279,7 +286,7 @@ wheelNeedsPassword = true; extraRules = [ { - users = ["redyf"]; + users = [ "redyf" ]; keepEnv = true; persist = true; } @@ -287,21 +294,14 @@ }; }; - environment.systemPackages = with pkgs; [ - git - wget - playerctl - inputs.xdg-portal-hyprland.packages.${system}.xdg-desktop-portal-hyprland - ]; - # Enables flakes + garbage collector nix = { package = pkgs.nixFlakes; extraOptions = "experimental-features = nix-command flakes"; settings = { auto-optimise-store = true; - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + substituters = [ "https://hyprland.cachix.org" ]; + trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; gc = { automatic = true;