diff --git a/flake.nix b/flake.nix index a2e62a7..ba998fb 100644 --- a/flake.nix +++ b/flake.nix @@ -119,7 +119,6 @@ ./modules/waydroid.nix ./modules/packages.nix ./modules/aagl.nix - ./modules/virtualisation.nix inputs.aagl.nixosModules.default inputs.lanzaboote.nixosModules.lanzaboote inputs.musnix.nixosModules.musnix diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 5f0055c..3065b71 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -12,24 +12,14 @@ # Monitor config for home desk layout monitor = [ "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, -960x-1080, auto" # left external monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, 960x-1080, auto" # right external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, -960x-1080, auto" # left external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, 960x-1080, auto" # right external monitor ]; workspace = [ - "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" - "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" + "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" + "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" "name:main, monitor:eDP-2, default:true, persistent:true" ]; - windowrulev2 = [ - "keepaspectratio,class:^(floorp)$,title:^(Picture-in-Picture)$" - "noborder,class:^(floorp)$,title:^(Picture-in-Picture)$" - #"fakefullscreen,class:^(floorp)$,title:^(Floorp)$" - #"fakefullscreen,class:^(floorp)$,title:^(Picture-in-Picture)$" - "pin,class:^(floorp)$,title:^(Floorp)$" - "pin,class:^(floorp)$,title:^(Picture-in-Picture)$" - "float,class:^(floorp)$,title:^(Floorp)$" - "float,class:^(floorp)$,title:^(Picture-in-Picture)$" - ]; # Define SUPER key as mod key "$mod" = "SUPER"; @@ -40,7 +30,7 @@ follow_mouse = 1; mouse_refocus = false; touchpad = { - disable_while_typing = false; + disable_while_typing = true; }; }; gestures = { diff --git a/home-manager/nvf.nix b/home-manager/nvf.nix index 98d2f60..d86a97a 100644 --- a/home-manager/nvf.nix +++ b/home-manager/nvf.nix @@ -9,11 +9,8 @@ name = "base16"; }; - statusline.lualine.enable = true; # statusline - telescope.enable = true; # fuzzy finder - filetree.neo-tree.enable = true; # filetree - binds.cheatsheet.enable = true; # telescope-searchable cheatsheet - binds.hardtime-nvim.enable = true; # stops you using arrow keys for navigation and recommends vim motions + statusline.lualine.enable = true; + telescope.enable = true; viAlias = true; vimAlias = true; diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 0f62b3f..5ebe093 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -15,6 +15,7 @@ telegram-desktop # Telegram messenger client pavucontrol # Useful audio control GUI stable.prismlauncher # Minecraft launcher + virt-manager # QEMU manager bat # cat but with syntax highlighting bc # terminal calculator wget # download files diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index 9dd9499..3d8dd24 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -34,8 +34,6 @@ networking.hostName = "gabbielaptop"; # Define your hostname. - programs.dconf.enable = true; # required for some apps that are just github code i compile myself instead of using a package - hardware.graphics = { enable = true; enable32Bit = true; @@ -134,7 +132,6 @@ "wheel" "dialout" "audio" - "libvirtd" ]; shell = pkgs.fish; }; diff --git a/modules/aagl.nix b/modules/aagl.nix index 16990b3..2f332c1 100644 --- a/modules/aagl.nix +++ b/modules/aagl.nix @@ -1,4 +1,4 @@ -{ ... }: +{ config, ... }: { programs.honkers-railway-launcher.enable = true; } diff --git a/modules/packages.nix b/modules/packages.nix index fcccb1f..80f794f 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -15,6 +15,6 @@ pciutils dmidecode nixd - adwaita-icon-theme + qemu ]; } diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix deleted file mode 100644 index 4bbef72..0000000 --- a/modules/virtualisation.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}:{ - virtualisation.libvirtd = { - enable = true; - }; - programs.virt-manager.enable = true; -}