From 6da93561ea906e027bcbf1a497b5f8551f2a78d6 Mon Sep 17 00:00:00 2001 From: pagedMov Date: Tue, 15 Oct 2024 17:42:14 -0400 Subject: [PATCH] (desktop) Gen 488: Edited hostnames, moved steam back to home-manager config, added markdown to nixvim lsp, altered firefox bookmarks --- flake.lock | 20 +++++++++--------- hosts/desktop/steam.nix | 7 +------ modules/home/programs/eza.nix | 2 +- modules/home/programs/firefox.nix | 33 ++++++++++++++++++++++-------- modules/sys/hardware/network.nix | 9 +++++--- pkgs/nixvim/config/plugins/lsp.nix | 1 + 6 files changed, 44 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index e92feee..e2fe955 100644 --- a/flake.lock +++ b/flake.lock @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729027341, + "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "type": "github" }, "original": { @@ -748,11 +748,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -825,11 +825,11 @@ }, "nur": { "locked": { - "lastModified": 1728998640, - "narHash": "sha256-mbtviOFtza3J6e2wlkqICSj0PcqEsPpAlPuVnvLBAfM=", + "lastModified": 1729024314, + "narHash": "sha256-iV0bSTjoa3GDNQO85IVc5V5n1Dg9C1vDLhEWioO8924=", "owner": "nix-community", "repo": "NUR", - "rev": "9c76575706ddbe8b71b8dee7c399d7dba2141635", + "rev": "da1c520a9acd9a9d1402db1939c9b9a2fa49b4b8", "type": "github" }, "original": { @@ -870,7 +870,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-bjrRxs4ja1ulvgjlWN5IwfGdAVOwYQR6YSPCRVje52E=", + "narHash": "sha256-wk+pdZUCu13qvhHBrycwrvGnRUaf6dbLchr3yF96C1c=", "path": "./pkgs/nixvim", "type": "path" }, diff --git a/hosts/desktop/steam.nix b/hosts/desktop/steam.nix index 4c92277..0150d62 100644 --- a/hosts/desktop/steam.nix +++ b/hosts/desktop/steam.nix @@ -1,13 +1,8 @@ -{ pkgs, ... }: +{ ... }: { programs.steam = { enable = true; - extest.enable = true; remotePlay.openFirewall = true; - - extraCompatPackages = with pkgs; [ - proton-ge-bin - ]; }; } diff --git a/modules/home/programs/eza.nix b/modules/home/programs/eza.nix index 42b5479..e2390a6 100644 --- a/modules/home/programs/eza.nix +++ b/modules/home/programs/eza.nix @@ -5,7 +5,7 @@ enable = true; enableZshIntegration = false; extraOptions = [ "-1" "-h" "--group-directories-first" ]; - icons = true; + icons = "auto"; git = true; }; } diff --git a/modules/home/programs/firefox.nix b/modules/home/programs/firefox.nix index b5b55fe..9756305 100644 --- a/modules/home/programs/firefox.nix +++ b/modules/home/programs/firefox.nix @@ -26,14 +26,31 @@ profiles.${username} = { name = "${username}"; bookmarks = [ - { name = "NixOS Options"; - url = "https://search.nixos.org/options"; - } - { name = "Home Manager Options"; - url = "https://home-manager-options.extranix.com/"; - } - { name = "Nixvim Docs"; - url = "https://nix-community.github.io/nixvim/"; + { name = "Nix sites"; + toolbar = true; + bookmarks = [ + { name = "NixOS Options"; + url = "https://search.nixos.org/options"; + } + { name = "Home Manager Options"; + url = "https://home-manager-options.extranix.com/"; + } + { name = "Nixvim Docs"; + url = "https://nix-community.github.io/nixvim/"; + } + { name = "Noogle"; + url = "https://noogle.dev/"; + } + { name = "NixOS Wiki"; + url = "https://nixos.wiki/"; + } + { name = "NixOS Manual"; + url = "https://nixos.org/manual/nixos/stable"; + } + { name = "Nixpkgs Reference"; + url = "https://nixos.org/manual/nixpkgs/stable"; + } + ]; } { name = "Rust Manual"; url = "https://doc.rust-lang.org/book/ch01-03-hello-cargo.html"; diff --git a/modules/sys/hardware/network.nix b/modules/sys/hardware/network.nix index 8516fa9..a875995 100644 --- a/modules/sys/hardware/network.nix +++ b/modules/sys/hardware/network.nix @@ -1,11 +1,14 @@ -{ pkgs, ... }: +{ host, ... }: { networking = { networkmanager.enable = true; - hostName = "glasshaus"; + hostName = if (host == "desktop") then + "argon" else "mercury"; hosts = { - "192.168.1.163" = [ "glasshaus.info" ]; + "192.168.1.163" = [ "glasshaus" ]; + "192.168.1.111" = [ "argon" ]; + "192.168.1.223" = [ "mercury" ]; }; firewall = { enable = true; diff --git a/pkgs/nixvim/config/plugins/lsp.nix b/pkgs/nixvim/config/plugins/lsp.nix index 923503c..0a4193f 100644 --- a/pkgs/nixvim/config/plugins/lsp.nix +++ b/pkgs/nixvim/config/plugins/lsp.nix @@ -9,6 +9,7 @@ html.enable = true; jsonls.enable = true; lua-ls.enable = true; + marksman.enable = true; nil-ls.enable = true; pyright.enable = true; sqls.enable = true;