From e8bde7a3bffe945eb67951356f21cd5b7b6da8a5 Mon Sep 17 00:00:00 2001 From: Christian Ott Date: Tue, 21 Jan 2025 10:44:47 +0100 Subject: [PATCH] NixOS update with necessary config changes --- configuration.nix | 11 ++++------- flake.lock | 18 +++++++++--------- greeter.nix | 2 +- home.nix | 10 +++------- hyperland/default.nix | 2 +- 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/configuration.nix b/configuration.nix index ff028b4..ca30c49 100644 --- a/configuration.nix +++ b/configuration.nix @@ -44,6 +44,7 @@ environment.etc."NetworkManager/dnsmasq.d/00-cave.conf".text = '' server=/.mibex.ch/172.31.13.27 server=/huus/192.168.15.2 + address=/git.christianott.ch/git.christianott.ch/tux.social/woelkli.christianott.ch/192.168.15.4 server=192.168.15.2 server=192.168.50.1 server=1.1.1.1 @@ -66,13 +67,9 @@ # https://nixos.wiki/wiki/Fonts fonts with icons fonts.packages = with pkgs; [ font-awesome - (nerdfonts.override { - fonts = [ - "JetBrainsMono" - "CascadiaCode" - "FiraCode" - ]; - }) + nerd-fonts.jetbrains-mono + nerd-fonts.caskaydia-cove + nerd-fonts.fira-code ]; fonts.fontconfig = { defaultFonts = { diff --git a/flake.lock b/flake.lock index 6733ad4..04a6b3a 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { diff --git a/greeter.nix b/greeter.nix index fb05f43..e5908c3 100644 --- a/greeter.nix +++ b/greeter.nix @@ -12,7 +12,7 @@ let # https://github.com/bytemouse/config/blob/48d9be51a9666c9b62f4b8e84322b9d892ee0aea/modules/gnome.nix#L11 gnome-script = pkgs.writeShellScriptBin "gnome-script" '' export XDG_SESSION_TYPE=wayland - ${pkgs.dbus}/bin/dbus-run-session ${pkgs.gnome.gnome-session}/bin/gnome-session + ${pkgs.dbus}/bin/dbus-run-session ${pkgs.gnome-session}/bin/gnome-session ''; gnome-desktop = pkgs.makeDesktopItem { name = "gnome-desktop"; diff --git a/home.nix b/home.nix index e8e4b11..6789eb4 100644 --- a/home.nix +++ b/home.nix @@ -47,13 +47,9 @@ nextcloud-client font-awesome - (nerdfonts.override { - fonts = [ - "JetBrainsMono" - "CascadiaCode" - "FiraCode" - ]; - }) + nerd-fonts.jetbrains-mono + nerd-fonts.caskaydia-cove + nerd-fonts.fira-code ]; diff --git a/hyperland/default.nix b/hyperland/default.nix index 7b96662..136f987 100644 --- a/hyperland/default.nix +++ b/hyperland/default.nix @@ -47,7 +47,7 @@ in enable = true; settings = { ipc = false; - splash = true; + splash = false; splash_offset = 5; splash_color = "rgb(ebdbb8)";