diff options
| -rw-r--r-- | args.nix | 5 | ||||
| -rw-r--r-- | bootloader.nix | 6 | ||||
| -rw-r--r-- | configuration.nix | 78 | ||||
| -rw-r--r-- | cups.nix | 5 | ||||
| -rw-r--r-- | keyboard.nix | 26 | ||||
| -rw-r--r-- | networking.nix | 9 | ||||
| -rw-r--r-- | packages.nix | 2 | ||||
| -rw-r--r-- | sound.nix | 13 |
8 files changed, 62 insertions, 82 deletions
diff --git a/args.nix b/args.nix deleted file mode 100644 index 4c92320..0000000 --- a/args.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: - -{ - programs.ssh.startAgent = true; -} diff --git a/bootloader.nix b/bootloader.nix deleted file mode 100644 index 89395d2..0000000 --- a/bootloader.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, ... }: - -{ - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; -} diff --git a/configuration.nix b/configuration.nix index 26c138e..f454846 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,20 +1,64 @@ { config, pkgs, ... }: - + let + compiledLayout = pkgs.runCommand "keyboard-layout" {} '' + ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${./files/neoqwertz.xkb} $out + ''; + in { - imports = - [ - ./hardware-configuration.nix - ./env.nix - ./packages.nix - ./bootloader.nix - ./plasma.nix - ./networking.nix - ./users.nix - ./sound.nix - ./cups.nix - ./args.nix - ./zsh.nix - ./keyboard.nix - ]; - system.stateVersion = "23.05"; + imports = [ + ./hardware-configuration.nix + ./env.nix + ./packages.nix + ./users.nix + ./zsh.nix + + # Desktop Environment to use + ./desktop/plasma.nix + ]; + + services = { + printing.enable = true; + xserver = { + layout = "de"; + #xkbVariant = ",neo"; + xkbOptions = "grp:win_space_toggle"; + displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY"; + }; + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + jack.enable = true; + }; + }; + + hardware.bluetooth.enable = true; + security.rtkit.enable = true; + + environment.systemPackages = [ pkgs.xorg.xkbcomp ]; + + i18n.defaultLocale = "en_US.UTF-8"; + + networking = { + hostName = "thinklappi"; + networkmanager.enable = true; + }; + + time.timeZone = "Europe/Berlin"; + + console = { + font = "Lat2-Terminus16"; + keyMap = "de"; + #useXkbConfig = true; # use xkbOptions in tty. + }; + + programs.ssh.startAgent = true; + + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + + system.stateVersion = "23.05"; } diff --git a/cups.nix b/cups.nix deleted file mode 100644 index 1c1eea0..0000000 --- a/cups.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.printing.enable = true; -} diff --git a/keyboard.nix b/keyboard.nix deleted file mode 100644 index 8c5545d..0000000 --- a/keyboard.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, pkgs, ... }: - - let - compiledLayout = pkgs.runCommand "keyboard-layout" {} '' - ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${./files/neoqwertz.xkb} $out - ''; - in -{ - services.xserver = { - layout = "de, de"; - #xkbVariant = ",neo"; - xkbOptions = "grp:win_space_toggle"; - #displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY"; - }; - - environment.systemPackages = [ pkgs.xorg.xkbcomp ]; - - i18n.defaultLocale = "en_US.UTF-8"; - - console = { - font = "Lat2-Terminus16"; - #keyMap = "de"; - useXkbConfig = true; # use xkbOptions in tty. - }; -} - diff --git a/networking.nix b/networking.nix deleted file mode 100644 index e0605a3..0000000 --- a/networking.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, pkgs, ... }: - -{ - networking.hostName = "thinklappi"; - networking.networkmanager.enable = true; - - time.timeZone = "Europe/Berlin"; - -} diff --git a/packages.nix b/packages.nix index 53b374c..7bf2440 100644 --- a/packages.nix +++ b/packages.nix @@ -38,7 +38,7 @@ tdesktop # another messenger (telegram) libsForQt5.kdeconnect-kde # communicate with my phone imagemagick # convertion and so on - nerdfonts # nice fonts, u know + #nerdfonts # nice fonts, u know alacritty # terminal zsh-you-should-use # reminder for aliasses jetbrains.idea-community # Java-IDE diff --git a/sound.nix b/sound.nix deleted file mode 100644 index 48ddf18..0000000 --- a/sound.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, pkgs, ... }: - -{ - hardware.bluetooth.enable = true; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; -} |