From 777de7677eda52a0074172f997e8784ba9cac920 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Sat, 27 May 2023 17:50:24 +0200 Subject: [PATCH] a --- flake.lock | 12 ++++++------ home-manager/home.nix | 22 ++++++++++++++++------ nixos/configuration.nix | 17 ++++++++++++++++- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 2a5eaf3..f5cd5ce 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684398685, - "narHash": "sha256-TRE62m91iZ5ArVMgA+uj22Yda8JoQuuhc9uwZ+NoX+0=", + "lastModified": 1685043448, + "narHash": "sha256-U3BwyDc2OzBcZ8tD09qXibyivgOtOQFTFCVgFyJ+6MM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "628d4bb6e9f4f0c30cfd9b23d3c1cdcec9d3cb5c", + "rev": "9886352ec9ab3945896ee8a4185e961fe29df209", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nur": { "locked": { - "lastModified": 1685126679, - "narHash": "sha256-cOZiSirGQ4gP7Q2Yoht/rtEaAZgsHum6xm3NjN82In0=", + "lastModified": 1685195147, + "narHash": "sha256-if/jAWcPs5dLsOvS2F85FpU7yRxtlXPMeDjMncOD+NI=", "owner": "nix-community", "repo": "NUR", - "rev": "a502f8367bdd5fedb9eb19b70fec1513c3d0d1b5", + "rev": "4bbb9fc2160ca5dc0f2450dc8e9faeb4cd04af26", "type": "github" }, "original": { diff --git a/home-manager/home.nix b/home-manager/home.nix index 3fd6764..ae83cb3 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -52,6 +52,7 @@ spotify nixpkgs-fmt rnix-lsp + fzf ]; # Enable home-manager and git @@ -92,12 +93,18 @@ bookmarks = [ { - name = "NixOS options"; - url = "https://search.nixos.org/options"; - } - { - name = "home-manager options"; - url = "https://rycee.gitlab.io/home-manager/options.html"; + name = "Nix sites"; + toolbar = true; + bookmarks = [ + { + name = "NixOS options"; + url = "https://search.nixos.org/options"; + } + { + name = "home-manager options"; + url = "https://rycee.gitlab.io/home-manager/options.html"; + } + ]; } ]; }; @@ -116,6 +123,9 @@ programs.fish = { enable = true; + interactiveShellInit = '' + set fish_greeting # Disable greeting + ''; }; programs.zoxide = { diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 81c7615..da1d8da 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -77,7 +77,14 @@ # Enable the GNOME Desktop Environment. displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; + desktopManager.gnome = { + enable = true; + extraGSettingsOverrides = '' + [org.gnome.mutter] + experimental-features=['scale-monitor-framebuffer'] + ''; + extraGSettingsOverridePackages = [ pkgs.gnome.mutter ]; + }; # Configure keymap in X11 layout = "ch"; @@ -85,6 +92,14 @@ # ndivia drivers videoDrivers = [ "nvidia" ]; + + # mouse settings + # https://unix.stackexchange.com/questions/58900/how-to-scroll-the-screen-using-the-middle-click + #libinput.mouse = { + # scrollMethod = "button"; + # # 2=middle mouse button + # scrollButton = 2; + #}; }; hardware.opengl.enable = true;