From 3622d00200da2e589de74a745120960e7a5ff7a3 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Tue, 20 Feb 2024 18:57:18 +0530 Subject: [PATCH] [feat] Add nil for *.nix --- config/nix/common/home.nix | 9 ++++++++- config/nix/flake.lock | 24 ++++++++++++------------ config/nix/flake.nix | 1 + config/nix/linux/default.nix | 12 ++++++++++++ config/nix/linux/hyprland.nix | 2 +- config/nix/nixos/configuration.nix | 1 + config/nvim/lua/lsp.lua | 10 +++++++++- 7 files changed, 44 insertions(+), 15 deletions(-) diff --git a/config/nix/common/home.nix b/config/nix/common/home.nix index ee14e814..b54c6234 100644 --- a/config/nix/common/home.nix +++ b/config/nix/common/home.nix @@ -11,6 +11,9 @@ in { home.packages = with pkgs; [ + jq + tldr + spotify-player htop-vim qmk nodejs @@ -32,10 +35,13 @@ in { (nerdfonts.override { fonts = [ "Hasklig" ]; }) mpv ] ++ (if device.isLinux then [ + swaynotificationcenter + openocd-rp2040 + usbutils + picotool handlr-regex webcord-vencord spotify - spotify-player lsof wl-clipboard ncpamixer @@ -73,6 +79,7 @@ in { set fish_greeting ''; interactiveShellInit = '' + ${pkgs.spotify-player}/bin/spotify_player generate fish | source ${pkgs.macchina.outPath}/bin/macchina ''; }; diff --git a/config/nix/flake.lock b/config/nix/flake.lock index 7b99721c..ca358f4d 100644 --- a/config/nix/flake.lock +++ b/config/nix/flake.lock @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", + "lastModified": 1708294481, + "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", "type": "github" }, "original": { @@ -353,11 +353,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1708270612, - "narHash": "sha256-T5aQ/lnW7wlIDpg7QEb32eYswAFSndFM+kfRk8uNHwQ=", + "lastModified": 1708355784, + "narHash": "sha256-Pf95nr82DUDSVnUpzRERtnopjiLC7Zi7QuKtJtoc+XE=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "180a5205b9eb316e4b2916ae2ed0b2198912b9cd", + "rev": "18e8244580ccffc3eee086becb62800fc6854c61", "type": "github" }, "original": { @@ -519,11 +519,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { diff --git a/config/nix/flake.nix b/config/nix/flake.nix index 90068d7b..e5613d71 100644 --- a/config/nix/flake.nix +++ b/config/nix/flake.nix @@ -41,6 +41,7 @@ url = "github:JakeStanger/ironbar"; inputs.nixpkgs.follows = "nixpkgs"; }; + }; outputs = { nixpkgs, diff --git a/config/nix/linux/default.nix b/config/nix/linux/default.nix index f83ab17c..df6ee75b 100644 --- a/config/nix/linux/default.nix +++ b/config/nix/linux/default.nix @@ -7,4 +7,16 @@ ../linux/ironbar.nix ../linux/foot.nix ]; + systemd.user.services.spotify-player = { + Install = { WantedBy = [ "graphical-session.target" ]; }; + Unit = { + Description = "Spotify Player Daemon"; + After = [ "graphical-session.target" ]; + }; + Service = { + ExecStart = "${pkgs.spotify-player}/bin/spotify_player -d"; + Restart = "on-failure"; + RestartSec = "5"; + }; + }; } diff --git a/config/nix/linux/hyprland.nix b/config/nix/linux/hyprland.nix index cc4c32c7..c9e324af 100644 --- a/config/nix/linux/hyprland.nix +++ b/config/nix/linux/hyprland.nix @@ -16,7 +16,7 @@ kb_options = "ctrl:nocaps"; # kb_rules = ""; - follow_mouse = 1; + follow_mouse = 0; touchpad = { natural_scroll = true; diff --git a/config/nix/nixos/configuration.nix b/config/nix/nixos/configuration.nix index 8f186c2c..179dd0a7 100644 --- a/config/nix/nixos/configuration.nix +++ b/config/nix/nixos/configuration.nix @@ -23,6 +23,7 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + boot.bootspec.enable = true; networking.hostName = "ryu"; # Define your hostname. networking.nameservers = [ "1.1.1.1" "8.8.8.8" ]; diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua index 99450de5..f99de3a8 100644 --- a/config/nvim/lua/lsp.lua +++ b/config/nvim/lua/lsp.lua @@ -15,5 +15,13 @@ end) local lua_opts = lsp_zero.nvim_lua_ls() lspconfig.lua_ls.setup(lua_opts) -lspconfig.nil_ls.setup({}) +lspconfig.nil_ls.setup({ + settings = { + ['nil'] = { + formatting = { + command = { "nixfmt" }, + }, + }, + }, +}) lspconfig.clangd.setup({})