diff --git a/configuration.nix b/configuration.nix index 9abcaf0..653f866 100644 --- a/configuration.nix +++ b/configuration.nix @@ -14,25 +14,6 @@ ./services.nix ]; - console.colors = [ - "#002b36" - "#dc322f" - "#859900" - "#b58900" - "#268bd2" - "#d33682" - "#2aa198" - "#eee8d5" - "#002b36" - "#cb4b16" - "#586e75" - "#657b83" - "#839496" - "#6c71c4" - "#93a1a1" - "#fdf6e3" - ]; - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -62,32 +43,31 @@ LC_TIME = "de_DE.utf8"; }; - # Enable the GNOME Desktop Environment. - # services.xserver.desktopManager.gnome.enable = true; - # xserver options services.xserver = { displayManager = { lightdm.enable = true; - defaultSession = "xfce+i3"; + defaultSession = "none+i3"; }; enable = true; layout = "us"; xkbVariant = "alt-intl"; - desktopManager = { - xterm.enable = false; - xfce = { - enable = true; - noDesktop = true; - enableXfwm = false; - }; - }; windowManager.i3 = { enable = true; extraPackages = with pkgs; [ autotiling + brightnessctl + xorg.xev + dunst ]; }; + libinput = { + enable = true; + mouse = { + accelProfile = "flat"; + accelSpeed = "1.0"; + }; + }; }; # Configure console keymap @@ -114,9 +94,6 @@ #media-session.enable = true; }; - # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput.enable = true; - # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/i3/config.nix b/i3/config.nix index fea322d..3c7779d 100644 --- a/i3/config.nix +++ b/i3/config.nix @@ -32,11 +32,15 @@ in "${mod}+Shift+l" = "move right"; # split - "${mod}+q" = "split toggle"; - + "${mod}+e" = "split toggle"; + # control values + ## brightness + "XF86MonBrightnessUp" = "exec brightnessctl set 2%+"; + "XF86MonBrightnessDown" = "exec brightnessctl set 2%-"; }; startup = [ { command = "--no-startup-id autotiling"; always = true; } + { command = "--no-startup-id feh --bg-scale /etc/nixos/wallpaper.png"; always = true; } ]; } diff --git a/services.nix b/services.nix index ab86ef5..5ca10f1 100644 --- a/services.nix +++ b/services.nix @@ -1,6 +1,4 @@ { pkgs, ... }: { - services = { - gnome.gnome-keyring.enable = true; - }; + services = { }; } diff --git a/sync.sh b/sync.sh index b3a3553..39d5484 100755 --- a/sync.sh +++ b/sync.sh @@ -10,7 +10,7 @@ nixpkgs-fmt *.nix ./*/*.nix # cp -r /etc/nixos/ ./backup # copy over all the files to /etc/nixos/ -sudo cp -r ./configuration.nix ./rofi ./i3 ./fish ./kitty ./nvim/ ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/ +sudo cp -r ./configuration.nix ./wallpaper.png ./rofi ./i3 ./fish ./kitty ./nvim/ ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/ # build penrose and copy it to nixos folder # cd ./penrose diff --git a/user.nix b/user.nix index d65111a..e2a6348 100644 --- a/user.nix +++ b/user.nix @@ -12,7 +12,6 @@ ungoogled-chromium curl git - wireguard-tools networkmanagerapplet thunderbird @@ -38,6 +37,9 @@ mpv yt-dlp + # images + feh + # games steam diff --git a/wallpaper.png b/wallpaper.png new file mode 100644 index 0000000..3f282b6 Binary files /dev/null and b/wallpaper.png differ