From ca39b169c2158a5cb07d4bb5634566e6b1e4a627 Mon Sep 17 00:00:00 2001 From: tristan Date: Thu, 24 Oct 2024 10:45:12 +0100 Subject: [PATCH 1/2] nixbook: tidying, add gopls --- home/programs/neovim/default.nix | 5 +++-- home/workstation.nix | 3 +-- lib/nixvim.nix | 2 +- nixos/programs/pipewire.nix | 3 +-- nixos/workstation.nix | 13 ------------- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix index 4e99ede..4685486 100644 --- a/home/programs/neovim/default.nix +++ b/home/programs/neovim/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{config, pkgs, lib, ...}: { programs.nixvim = { enable = true; @@ -8,7 +8,8 @@ programs.vscode = { extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim]; userSettings = { - "vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim"; + "vscode-neovim.neovimExecutablePaths.linux" = + lib.getExe config.programs.nixvim.package; "extensions.experimental.affinity" = { "asvetliakov.vscode-neovim" = 1; }; diff --git a/home/workstation.nix b/home/workstation.nix index 0a6c574..88ebdcf 100644 --- a/home/workstation.nix +++ b/home/workstation.nix @@ -36,8 +36,7 @@ programs.rbw.settings.pinentry = pkgs.pinentry-gnome3; - home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ"; - home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = '' + xdg.configFile."pipewire/pipewire.conf.d/raop-discover.conf".text = '' context.modules = [ { name = libpipewire-module-raop-discover diff --git a/lib/nixvim.nix b/lib/nixvim.nix index 2d44525..b94c0e9 100644 --- a/lib/nixvim.nix +++ b/lib/nixvim.nix @@ -188,6 +188,7 @@ servers = { ts-ls.enable = true; nil-ls.enable = true; + gopls.enable = true; }; keymaps = { lspBuf = { @@ -263,7 +264,6 @@ }; oil.enable = true; - autoclose.enable = true; ts-autotag.enable = true; guess-indent.enable = true; }; diff --git a/nixos/programs/pipewire.nix b/nixos/programs/pipewire.nix index 2610134..57a8694 100644 --- a/nixos/programs/pipewire.nix +++ b/nixos/programs/pipewire.nix @@ -7,9 +7,8 @@ alsa.support32Bit = true; pulse.enable = true; jack.enable = true; + raopOpenFirewall = true; }; - # pipewire raop - networking.firewall.allowedUDPPorts = [6002 6001]; # network streaming networking.firewall.allowedTCPPorts = [4713]; } diff --git a/nixos/workstation.nix b/nixos/workstation.nix index ebb0c3a..b997b05 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -10,19 +10,6 @@ ]; security.polkit.enable = true; - systemd.user.services.polkit-gnome-authentication-agent-1 = { - description = "polkit-gnome-authentication-agent-1"; - wantedBy = ["graphical-session.target"]; - wants = ["graphical-session.target"]; - after = ["graphical-session.target"]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; - }; - }; hardware.opentabletdriver.enable = true; From 825381f98bee58ee6d759f9561f48a545631bf9e Mon Sep 17 00:00:00 2001 From: tristan Date: Thu, 24 Oct 2024 10:45:14 +0100 Subject: [PATCH 2/2] format --- hardware/fcs-tristan-nixbook.nix | 3 +-- home/programs/graphical.nix | 6 +----- home/programs/neovim/default.nix | 9 +++++++-- home/programs/work.nix | 1 - lib/nixvim.nix | 24 ++++++++++++++++-------- nixos/modules/work.nix | 1 - pkgs/mongodb.nix | 10 ++++++---- 7 files changed, 31 insertions(+), 23 deletions(-) diff --git a/hardware/fcs-tristan-nixbook.nix b/hardware/fcs-tristan-nixbook.nix index 17d970e..a3370d4 100644 --- a/hardware/fcs-tristan-nixbook.nix +++ b/hardware/fcs-tristan-nixbook.nix @@ -60,7 +60,7 @@ in { boot.plymouth.enable = true; boot.initrd.verbose = false; boot.consoleLogLevel = 1; - boot.kernelParams = [ "quiet" "udev.log_level=3" ]; + boot.kernelParams = ["quiet" "udev.log_level=3"]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -110,5 +110,4 @@ in { }; } ]; - } diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 6d8b720..a398bec 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ ./pcmanfm.nix ./mpv.nix @@ -34,7 +31,6 @@ bitwarden ]; - xdg.mimeApps.defaultApplications = { "application/pdf" = "sioyek.desktop"; }; diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix index 4685486..5508be3 100644 --- a/home/programs/neovim/default.nix +++ b/home/programs/neovim/default.nix @@ -1,9 +1,14 @@ -{config, pkgs, lib, ...}: { +{ + config, + pkgs, + lib, + ... +}: { programs.nixvim = { enable = true; } - // ( import ../../../lib/nixvim.nix {inherit pkgs;} ); + // (import ../../../lib/nixvim.nix {inherit pkgs;}); programs.vscode = { extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim]; diff --git a/home/programs/work.nix b/home/programs/work.nix index 4b26bc1..803b582 100644 --- a/home/programs/work.nix +++ b/home/programs/work.nix @@ -41,7 +41,6 @@ in { remoteWorkspaceFolder=$(echo $res | ${jq} -r '.remoteWorkspaceFolder') docker exec -it --workdir=$remoteWorkspaceFolder $containerId bash '')) - ]; home.sessionVariables = { diff --git a/lib/nixvim.nix b/lib/nixvim.nix index b94c0e9..221fc0c 100644 --- a/lib/nixvim.nix +++ b/lib/nixvim.nix @@ -202,7 +202,7 @@ cmp = { enable = true; - settings = { + settings = { mapping = { "" = "cmp.mapping.complete()"; "" = "cmp.mapping.scroll_docs(4)"; @@ -213,9 +213,9 @@ "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; }; sources = [ - { name = "nvim_lsp"; } - { name = "path"; } - { name = "buffer"; } + {name = "nvim_lsp";} + {name = "path";} + {name = "buffer";} ]; }; }; @@ -256,9 +256,18 @@ enable = true; lookahead = true; keymaps = { - "af" = { query = "@function.outer"; desc = "Function Outer"; }; - "ac" = { query = "@comment.outer"; desc = "Comment Outer"; }; - "if" = { query = "@function.inner"; desc = "Function Inner"; }; + "af" = { + query = "@function.outer"; + desc = "Function Outer"; + }; + "ac" = { + query = "@comment.outer"; + desc = "Comment Outer"; + }; + "if" = { + query = "@function.inner"; + desc = "Function Inner"; + }; }; }; }; @@ -267,5 +276,4 @@ ts-autotag.enable = true; guess-indent.enable = true; }; - } diff --git a/nixos/modules/work.nix b/nixos/modules/work.nix index bd1427f..675ac39 100644 --- a/nixos/modules/work.nix +++ b/nixos/modules/work.nix @@ -17,7 +17,6 @@ in { "openssl-1.1.1w" # required for mongodb ]; - networking = { networkmanager = { plugins = [pkgs.networkmanager-openvpn]; diff --git a/pkgs/mongodb.nix b/pkgs/mongodb.nix index 6900602..46f2cac 100644 --- a/pkgs/mongodb.nix +++ b/pkgs/mongodb.nix @@ -1,6 +1,9 @@ -{stdenv, pkgs, ...}: -let - version = "6.0.14"; +{ + stdenv, + pkgs, + ... +}: let + version = "6.0.14"; in stdenv.mkDerivation { name = "mongodb"; @@ -29,4 +32,3 @@ in runHook postInstall ''; } -