diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 38a387d..ed6fb5c 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -19,6 +19,10 @@ tor-browser nix-search-cli mpv - dolphin + element-desktop + mission-center + nvtop ]; + + nixpkgs.config.allowUnfree = true; } diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 7fb3a98..cb60ef2 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -44,9 +44,7 @@ zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' menu no zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' - zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' eval "$(fzf --zsh)" - eval "$(zoxide init --cmd cd zsh)" ''; }; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 918c017..b2ac280 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -12,6 +12,8 @@ ./misc/misc.nix ]; + nixpkgs.config.allowUnfree = true; + # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you # accidentally delete configuration.nix. diff --git a/nixos/environments/gnome.nix b/nixos/environments/gnome.nix index 09b3483..ce7d35f 100644 --- a/nixos/environments/gnome.nix +++ b/nixos/environments/gnome.nix @@ -1,7 +1,9 @@ { ... }: { - services.xserver.enable = false; + services.xserver.enable = true; + services.xserver.videoDrivers = ["nvidia"]; services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.wayland = true; services.xserver.desktopManager.gnome.enable = true; -} \ No newline at end of file +} diff --git a/nixos/hardware/fstab.nix b/nixos/hardware/fstab.nix index 321df02..b8cbc26 100644 --- a/nixos/hardware/fstab.nix +++ b/nixos/hardware/fstab.nix @@ -2,12 +2,12 @@ { fileSystems."/" = - { device = "/dev/disk/by-uuid/6f9a4486-8f14-468f-aecb-5e0df8af2309"; + { device = "/dev/disk/by-uuid/afce32c1-67df-4324-aebb-a113b71317b9"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4A4B-5B94"; + { device = "/dev/disk/by-uuid/12CE-A600"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/nixos/services/services.nix b/nixos/services/services.nix index 25567fb..406d113 100644 --- a/nixos/services/services.nix +++ b/nixos/services/services.nix @@ -10,4 +10,6 @@ ./libinput.nix ./networkmanager.nix ]; + + services.flatpak.enable = true; }