From 806c44f7b38655cdbd8b410f43500d13a5f9ab33 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Fri, 2 Dec 2022 12:18:21 +0100 Subject: [PATCH] minor updates --- flake.nix | 1 + nixos/common/generic-lxc.nix | 2 +- nixos/hosts/thalassa/aoife/home/.gitignore | 1 + nixos/hosts/thalassa/aoife/home/dconf.nix | 15 ++++++++++++++- nixos/hosts/thalassa/aoife/home/default.nix | 20 ++++++++++++++++++-- nixos/hosts/thalassa/null/networking.nix | 2 +- 6 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 nixos/hosts/thalassa/aoife/home/.gitignore diff --git a/flake.nix b/flake.nix index 37254b7b..ad800cbe 100644 --- a/flake.nix +++ b/flake.nix @@ -140,6 +140,7 @@ k9s kubectl kubectx + statix terraform nixfmt nixUnstable diff --git a/nixos/common/generic-lxc.nix b/nixos/common/generic-lxc.nix index d4db44c4..0c1c286c 100644 --- a/nixos/common/generic-lxc.nix +++ b/nixos/common/generic-lxc.nix @@ -1,4 +1,4 @@ -{ _ }: { +_: { # See also: https://blog.xirion.net/posts/nixos-proxmox-lxc/ # Supress systemd services that don't work (correctly) on LXC diff --git a/nixos/hosts/thalassa/aoife/home/.gitignore b/nixos/hosts/thalassa/aoife/home/.gitignore new file mode 100644 index 00000000..16bf7065 --- /dev/null +++ b/nixos/hosts/thalassa/aoife/home/.gitignore @@ -0,0 +1 @@ +jonathan_dconf diff --git a/nixos/hosts/thalassa/aoife/home/dconf.nix b/nixos/hosts/thalassa/aoife/home/dconf.nix index 49222e77..ed8db574 100644 --- a/nixos/hosts/thalassa/aoife/home/dconf.nix +++ b/nixos/hosts/thalassa/aoife/home/dconf.nix @@ -17,7 +17,7 @@ with lib.hm.gvariant; "org/gnome/mutter" = { attach-modal-dialogs = true; - dynamic-workspaces = true; + dynamic-workspaces = false; edge-tiling = true; focus-change-on-pointer-rest = true; workspaces-only-on-primary = true; @@ -28,6 +28,15 @@ with lib.hm.gvariant; toggle-tiled-right = [ "bracketright" ]; }; + "org/gnome/shell/keybindings" = { toggle-overview = [ "d" ]; }; + + "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; }; + + "org/gnome/desktop/wm/preferences" = { + auto-raise = true; + num-workspaces = 6; + }; + "org/gnome/desktop/wm/keybindings" = { raise-or-lower = [ "s" ]; switch-applications = [ "Tab" ]; @@ -36,10 +45,14 @@ with lib.hm.gvariant; move-to-workspace-2 = [ "at" ]; move-to-workspace-3 = [ "numbersign" ]; move-to-workspace-4 = [ "dollar" ]; + move-to-workspace-5 = [ "percent" ]; + move-to-workspace-6 = [ "asciicircum" ]; switch-to-workspace-1 = [ "1" ]; switch-to-workspace-2 = [ "2" ]; switch-to-workspace-3 = [ "3" ]; switch-to-workspace-4 = [ "4" ]; + switch-to-workspace-5 = [ "5" ]; + switch-to-workspace-6 = [ "6" ]; toggle-fullscreen = [ "f" ]; toggle-maximized = [ "m" ]; }; diff --git a/nixos/hosts/thalassa/aoife/home/default.nix b/nixos/hosts/thalassa/aoife/home/default.nix index f7639867..2c2c7cdd 100644 --- a/nixos/hosts/thalassa/aoife/home/default.nix +++ b/nixos/hosts/thalassa/aoife/home/default.nix @@ -80,9 +80,25 @@ in { "rust-analyzer.server.path" = "${pkgs.rust-analyzer}/bin/rust-analyzer"; "terminal.integrated.defaultProfile.linux" = "zsh"; "nix.enableLanguageServer" = true; # Enable LSP. - "nix.serverPath" = - "${pkgs.nil}/bin/nil"; # The path to the LSP server executable. + "nix.serverPath" = "${pkgs.nil}/bin/nil"; "[nix]" = { "editor.defaultFormatter" = "brettm12345.nixfmt-vscode"; }; + # Don't index unecessary things + "files.exclude" = { + "**/.vscode" = true; + "**/.git" = true; + "**/.svn" = true; + "**/.hg" = true; + "**/.deps" = true; + "**/CVS" = true; + "**/.DS_Store" = true; + "/bin" = true; + "/boot" = true; + "/cdrom" = true; + "/dev" = true; + "/proc" = true; + "/etc" = true; + "/nix" = true; + }; }; extensions = with pkgs.vscode-extensions; with pkgs.v.vscode-extensions; [ diff --git a/nixos/hosts/thalassa/null/networking.nix b/nixos/hosts/thalassa/null/networking.nix index 51cd7990..66bab882 100644 --- a/nixos/hosts/thalassa/null/networking.nix +++ b/nixos/hosts/thalassa/null/networking.nix @@ -1,4 +1,4 @@ -{ _ }: +_: { services.v.dns = { enable = true;