diff options
| -rw-r--r-- | apps.nix | 11 | ||||
| -rw-r--r-- | cachix/cuda-maintainers.nix | 13 | ||||
| -rw-r--r-- | desktop-environment.nix | 23 | ||||
| -rw-r--r-- | environment.nix | 3 | ||||
| -rw-r--r-- | hardware-configuration.nix | 1 | ||||
| -rw-r--r-- | nvidia.nix | 4 | ||||
| -rw-r--r-- | services.nix | 45 |
7 files changed, 75 insertions, 25 deletions
@@ -10,6 +10,17 @@ jetbrains.pycharm-professional jetbrains.clion wineWowPackages.stable + sqlite + libreoffice-qt6-fresh + + kdePackages.dolphin + # kio-extras + # ffmpegthumbs + # kdePackages.kdegraphics-thumbnailers + # kdePackages.kimageformats + + android-tools + scrcpy ]; # for Localsend diff --git a/cachix/cuda-maintainers.nix b/cachix/cuda-maintainers.nix new file mode 100644 index 0000000..b1d70d6 --- /dev/null +++ b/cachix/cuda-maintainers.nix @@ -0,0 +1,13 @@ + +{ + nix = { + settings = { + substituters = [ + "https://cuda-maintainers.cachix.org" + ]; + trusted-public-keys = [ + "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" + ]; + }; + }; +} diff --git a/desktop-environment.nix b/desktop-environment.nix new file mode 100644 index 0000000..3bfa07e --- /dev/null +++ b/desktop-environment.nix @@ -0,0 +1,23 @@ +{ config, pkgs, ... }: +let unstable = import <nixos-unstable> { config.allowUnfree = true; }; +in { + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = false; + programs.hyprland.enable = true; + programs.hyprlock.enable = true; + programs.foot.enable = true; + programs.waybar.enable = true; # status bar + programs.sway.enable = true; # lock screen, idle management + programs.dconf.enable = true; # needed for gsettings + environment.systemPackages = with pkgs; [ + wofi # app launcher + adwaita-icon-theme + swaybg + wl-clipboard + mako + lm_sensors + grim + slurp + ]; +} diff --git a/environment.nix b/environment.nix index 54d4fc2..4d83e91 100644 --- a/environment.nix +++ b/environment.nix @@ -10,4 +10,7 @@ inetutils btop ]; + fonts.packages = with pkgs; [ + nerd-fonts.jetbrains-mono + ]; } diff --git a/hardware-configuration.nix b/hardware-configuration.nix index e211ab1..fd119a3 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -11,7 +11,6 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/56ef1a1d-db2f-45e9-b66a-f70f673596bf"; @@ -8,8 +8,8 @@ in { nvidiaSettings = true; open = true; }; - boot.kernelParams = [ "acpi_backlight=none" ]; - boot.initrd.kernelModules = [ "nvidia" ]; + boot.kernelParams = [ "acpi_backlight=vendor" ]; + boot.initrd.kernelModules = [ "nvidia" "hp_wmi" ]; services.xserver.videoDrivers = [ "nvidia" ]; nixpkgs.config.cudaSupport = true; diff --git a/services.nix b/services.nix index 1c85666..1197d42 100644 --- a/services.nix +++ b/services.nix @@ -1,8 +1,9 @@ { config, pkgs, ... }: { - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + imports = + [ + ./desktop-environment.nix + ]; services.xserver.xkb = { layout = "us"; variant = ""; @@ -29,24 +30,24 @@ acceleration = "cuda"; }; services.kanata = { - enable = true; - keyboards = { - "keyboard".config = '' - (defsrc - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] ret - caps a s d f g h j k l ; ' \ - lsft z x c v b n m , . / rsft - lctl lmet lalt spc ralt rmet rctl - ) - (deflayer qwerty - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] ret - esc a s d f g h j k l ; ' \ - lsft z x c v b n m , . / rsft - lctl lmet lalt spc ralt rmet rctl - ) - ''; + enable = true; + keyboards = { + "keyboard".config = '' + (defsrc + grv 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] ret + caps a s d f g h j k l ; ' \ + lsft z x c v b n m , . / rsft + lctl lmet lalt spc ralt rmet rctl + ) + (deflayer qwerty + grv 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] ret + esc a s d f g h j k l ; ' \ + lsft z x c v b n m , . / rsft + lctl lmet lalt spc ralt rmet rctl + ) + ''; + }; }; -}; } |