diff --git a/.gitignore b/.gitignore index e69de29..1135f58 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +.mozilla diff --git a/README.md b/README.md index c54ad69..b96723c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,11 @@ Frustrations with other methods tend to be bitrot and config drift - very annoyi ## Getting started -TBC +To Install + +``` +# nixos-rebuild switch --flake github:truxnell/nix-config#HOST +``` ## Goals diff --git a/nixos/hosts/common/nixos/packages.nix b/nixos/hosts/common/nixos/packages.nix index 44e649a..1f0991e 100644 --- a/nixos/hosts/common/nixos/packages.nix +++ b/nixos/hosts/common/nixos/packages.nix @@ -12,6 +12,7 @@ # TODO Move nixpkgs-fmt nil + gh ]; programs.mtr.enable = true; diff --git a/nixos/hosts/common/optional/gnome.nix b/nixos/hosts/common/optional/gnome.nix index 9eaf16f..5067dbe 100644 --- a/nixos/hosts/common/optional/gnome.nix +++ b/nixos/hosts/common/optional/gnome.nix @@ -1,34 +1,53 @@ { config, pkgs, lib, ... }: { - # Ref: https://nixos.wiki/wiki/GNOME + # Ref: https://nixos.wiki/wiki/GNOME - # Enable GNOME with this 3 wierd tricks - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + # GNOME plz + services.xserver = { + enable = true; + desktopManager.gnome.enable = true; + displayManager = { + gdm.enable = true; + defaultSession = "gnome"; # TODO move to config overlay + autoLogin.user = "truxnell"; # TODO move to config overlay + }; + layout = "us"; # `localctl` will give you - # And dconf - programs.dconf.enable = true; - # Exclude default GNOME packages that dont interest me. - environment.gnome.excludePackages = (with pkgs; [ - gnome-photos - gnome-tour - ]) ++ (with pkgs.gnome; [ - cheese # webcam tool - gnome-music - gnome-terminal - gedit # text editor - epiphany # web browser - geary # email reader - evince # document viewer - gnome-characters - totem # video player - tali # poker game - iagno # go game - hitori # sudoku game - atomix # puzzle game - ]); + # Touchpad + libinput = { + enable = true; + touchpad = { + naturalScrolling = true; + middleEmulation = false; + tapping = true; + }; + }; + }; -} \ No newline at end of file + + # And dconf + programs.dconf.enable = true; + + # Exclude default GNOME packages that dont interest me. + environment.gnome.excludePackages = (with pkgs; [ + gnome-photos + gnome-tour + ]) ++ (with pkgs.gnome; [ + cheese # webcam tool + gnome-music + gnome-terminal + gedit # text editor + epiphany # web browser + geary # email reader + evince # document viewer + gnome-characters + totem # video player + tali # poker game + iagno # go game + hitori # sudoku game + atomix # puzzle game + ]); + +} diff --git a/nixos/hosts/nixosvm/hardware-configuration.nix b/nixos/hosts/nixosvm/hardware-configuration.nix index 5a08a8b..89cfd28 100644 --- a/nixos/hosts/nixosvm/hardware-configuration.nix +++ b/nixos/hosts/nixosvm/hardware-configuration.nix @@ -20,7 +20,7 @@ { device = "/dev/disk/by-uuid/5572-019E"; fsType = "vfat"; }; - + swapDevices = [ { device = "/dev/disk/by-uuid/34d04571-5752-426a-b4bc-48c88a1a4def"; } ];