diff --git a/flake.lock b/flake.lock index 25e4a8a..8f53cb4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -74,34 +53,11 @@ "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1749201010, - "narHash": "sha256-haiPLogZwEFQTrIarZD92LUK7ScIcMbtEzPlcC988Qk=", - "owner": "nix-community", - "repo": "NUR", - "rev": "17efc5275a8f21e2b48f39ecade74cdaff3ba411", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nur": "nur" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -118,27 +74,6 @@ "repo": "default", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 52bd761..821936f 100644 --- a/flake.nix +++ b/flake.nix @@ -8,17 +8,16 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nur = { - url = "github:nix-community/NUR"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # nur = { + # url = "github:nix-community/NUR"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; outputs = { nixpkgs, flake-utils, home-manager, - nur, ... }: let @@ -28,9 +27,6 @@ "aarch64-linux" ]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - overlays = [ - nur.overlays.default - ]; in { nixosConfigurations = { @@ -48,15 +44,11 @@ acc // { "irl-${system}" = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { - inherit system overlays; - }; + pkgs = import nixpkgs { inherit system; }; modules = [ ./home/irl.nix ]; }; "irl-gui-${system}" = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { - inherit system overlays; - }; + pkgs = import nixpkgs { inherit system; }; modules = [ ./home/irl.nix { diff --git a/home/irl.nix b/home/irl.nix index dde5137..a0470d3 100644 --- a/home/irl.nix +++ b/home/irl.nix @@ -13,21 +13,17 @@ in config = { home.username = "irl"; - home.homeDirectory = - if lib.strings.hasSuffix "darwin" pkgs.system then "/Users/irl" else "/home/irl"; + home.homeDirectory = "/home/irl"; home.stateVersion = "25.05"; home.packages = with pkgs; [ fish neofetch - rust-analyzer starship tree ]; home.shellAliases = { hms = - "home-manager switch --flake ~/.config/nix-configs#irl" - + (if cfg.gui-packages then "-gui" else "") - + "-${pkgs.system}"; + "home-manager switch --flake ~/.config/nix-configs#irl" + (if cfg.gui-packages then "-gui" else ""); }; programs.bash = { enable = true; @@ -43,15 +39,11 @@ in enable = true; profiles.irl = { extensions = { - force = true; - packages = with pkgs.nur.repos.rycee.firefox-addons; [ - bitwarden - kagi-search - privacy-badger - ]; - }; - settings = { - "extensions.autoDisableScope" = 0; + # packages = with pkgs.nur.repos.rycee.firefox-addons; [ + # bitwarden + # kagi-search + # privacy-badger + # ]; }; }; }; @@ -94,47 +86,8 @@ in vimdiffAlias = true; plugins = with pkgs.vimPlugins; [ bufferline-nvim - nvim-lspconfig nvim-treesitter.withAllGrammars ]; - extraLuaConfig = '' - vim.lsp.config('rust_analyzer', { - settings = { - ['rust-analyzer'] = {}, - }, - }) - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('my.lsp', {}), - callback = function(args) - local client = assert(vim.lsp.get_client_by_id(args.data.client_id)) - if client:supports_method('textDocument/implementation') then - -- Create a keymap for vim.lsp.buf.implementation ... - end - - -- Enable auto-completion. Note: Use CTRL-Y to select an item. |complete_CTRL-Y| - if client:supports_method('textDocument/completion') then - -- Optional: trigger autocompletion on EVERY keypress. May be slow! - -- local chars = {}; for i = 32, 126 do table.insert(chars, string.char(i)) end - -- client.server_capabilities.completionProvider.triggerCharacters = chars - - vim.lsp.completion.enable(true, client.id, args.buf, {autotrigger = true}) - end - - -- Auto-format ("lint") on save. - -- Usually not needed if server supports "textDocument/willSaveWaitUntil". - if not client:supports_method('textDocument/willSaveWaitUntil') - and client:supports_method('textDocument/formatting') then - vim.api.nvim_create_autocmd('BufWritePre', { - group = vim.api.nvim_create_augroup('my.lsp', {clear=false}), - buffer = args.buf, - callback = function() - vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 }) - end, - }) - end - end, - }) - ''; }; programs.starship = { enable = true; diff --git a/nixos/hosts/laptop/default.nix b/nixos/hosts/laptop/default.nix index 21e6574..f81eb56 100644 --- a/nixos/hosts/laptop/default.nix +++ b/nixos/hosts/laptop/default.nix @@ -53,7 +53,7 @@ hardware.gpgSmartcards.enable = true; programs.gnupg.agent = { enable = true; - # enableSSHSupport = true; + enableSSHSupport = true; }; system.stateVersion = "25.05";