post 24.05 fixes

This commit is contained in:
Florian Schmitt 2024-07-03 14:53:55 +03:00
parent 637d902291
commit 8b18da737a
3 changed files with 10 additions and 9 deletions

View file

@ -4,13 +4,16 @@ NixOS config files to make a perfect (for me) server or desktop environment and
Mostly all was stolen, I mean inspired by [tazjin's nix files from TVL's repo](https://code.tvl.fyi/tree/users/tazjin/) Mostly all was stolen, I mean inspired by [tazjin's nix files from TVL's repo](https://code.tvl.fyi/tree/users/tazjin/)
## Installation and setup ## Installation and setup
On a fresh NixOS installation On a fresh NixOS installation
- check out this repository, for example in your home `git clone https://code.mrflos.pw/mrflos/nixos-config.git ~/nixos-config` (ideally fork this repo and clone it with ssh to be able to commit your customs) - check out this repository, for example in your home `git clone https://code.mrflos.pw/mrflos/nixos-config.git ~/nixos-config` (ideally fork this repo and clone it with ssh to be able to commit your customs)
- copy the NixOS generated configuration to the `machines` folder `cp /etc/hardware-configuration.nix ~/nixos-config/machines/<machinename>-hardware-configuration.nix` - copy the NixOS generated configuration to the `machines` folder `cp /etc/hardware-configuration.nix ~/nixos-config/machines/<machinename>-hardware-configuration.nix`
- copy the example configuration file in the `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/<machinename>-configuration.nix` - copy the example configuration file in the `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/<machinename>-configuration.nix`
- edit your machine configuration file `~/nixos-config/machines/<machinename>-configuration.nix`, make changes and uncomment modules according to your needs for this machine - edit your machine configuration file `~/nixos-config/machines/<machinename>-configuration.nix`, make changes and uncomment modules according to your needs for this machine
- copy the example configuration file `~/nixos-config/configuration.example.nix` to `~/nixos-config/configuration.nix` - copy the example configuration file `~/nixos-config/configuration.example.nix` to `~/nixos-config/configuration.nix`
- edit the main configuration file `~/nixos-config/configuration.nix` and point to the right files - edit the main configuration file `~/nixos-config/configuration.nix` and point to the right files
```nix ```nix
# NixOS config entry point # NixOS config entry point
# import the hardware and configuration files specific to your machine # import the hardware and configuration files specific to your machine
@ -22,6 +25,7 @@ On a fresh NixOS installation
]; ];
} }
``` ```
- move the old `/etc/nixos` folder `sudo mv /etc/nixos /etc/nixos.old` and symlink your custom one `sudo ln -s ~/nixos-config /etc/nixos` - move the old `/etc/nixos` folder `sudo mv /etc/nixos /etc/nixos.old` and symlink your custom one `sudo ln -s ~/nixos-config /etc/nixos`
- run the install `sudo nixos-rebuild switch` - run the install `sudo nixos-rebuild switch`
- if all good don't forget to commit your changes - if all good don't forget to commit your changes

View file

@ -47,13 +47,13 @@
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { services.xserver = {
layout = "us"; xkb.layout = "us";
xkbVariant = ""; xkb.variant = "";
}; };
fileSystems."/mnt/nas/music" = fileSystems."/mnt/nas/music" =
@ -110,7 +110,6 @@
../modules/desktop.nix ../modules/desktop.nix
../modules/fonts.nix ../modules/fonts.nix
../modules/home-config.nix ../modules/home-config.nix
# ../modules/laptop.nix
../modules/local-dev.nix ../modules/local-dev.nix
../modules/nixos.nix ../modules/nixos.nix
]; ];

View file

@ -29,12 +29,10 @@
displayManager.defaultSession = "plasmawayland"; displayManager.defaultSession = "plasmawayland";
displayManager.sddm.wayland.enable = true; displayManager.sddm.wayland.enable = true;
displayManager.sddm.enableHidpi = true; displayManager.sddm.enableHidpi = true;
displayManager.sddm.theme = "rose-pine";
xserver = { xserver = {
enable = true; enable = true;
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
displayManager.sddm.wayland.enable = true;
displayManager.sddm.enableHidpi = true;
displayManager.sddm.theme = "rose-pine";
}; };
dbus.enable = true; dbus.enable = true;
}; };