diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/configuration.nix | 37 | ||||
| -rw-r--r-- | nixos/greetd-sway.nix | 15 | ||||
| -rw-r--r-- | nixos/greetd.nix | 33 | ||||
| -rw-r--r-- | nixos/grub.nix | 64 | ||||
| -rw-r--r-- | nixos/sddm-theme.nix | 14 |
5 files changed, 124 insertions, 39 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 784aeb7..6af8188 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -9,7 +9,8 @@ }: { imports = [ ../common/variables.nix - #./greetd-sway.nix + ./greetd.nix + ./grub.nix ./nvidia.nix ./fonts.nix ./services/laptop.preset.nix @@ -55,33 +56,21 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_zen; supportedFilesystems = ["ntfs"]; - loader = { - efi.canTouchEfiVariables = true; - grub = { - enable = true; - useOSProber = true; - efiSupport = true; - fsIdentifier = "label"; - devices = ["nodev"]; - extraEntries = '' - menuentry "Reboot" { - reboot - } - menuentry "Poweroff" { - halt - } - ''; - }; - }; }; security.polkit.enable = true; + environment.systemPackages = with pkgs; [ + libsForQt5.qt5.qtquickcontrols2 + libsForQt5.qt5.qtgraphicaleffects + ]; + time.hardwareClockInLocalTime = true; services = { - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; + #displayManager.sddm = { + # enable = true; + # wayland.enable = true; + # theme = "${import ./sddm-theme.nix {inherit pkgs;}}"; + #}; automatic-timezoned.enable = true; openssh = { enable = true; diff --git a/nixos/greetd-sway.nix b/nixos/greetd-sway.nix deleted file mode 100644 index ac6b04e..0000000 --- a/nixos/greetd-sway.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: { - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${pkgs.sway}/bin/sway"; - }; - }; - }; -} diff --git a/nixos/greetd.nix b/nixos/greetd.nix new file mode 100644 index 0000000..212cde7 --- /dev/null +++ b/nixos/greetd.nix @@ -0,0 +1,33 @@ +{ + pkgs, + config, + lib, + ... +}: let + tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; +in { + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${tuigreet} --time --remember --cmd Hyprland"; + user = "greeter"; + }; + }; + }; + + # this is a life saver. + # literally no documentation about this anywhere. + # might be good to write about this... + # https://www.reddit.com/r/NixOS/comments/u0cdpi/tuigreet_with_xmonad_how/ + systemd.services.greetd.serviceConfig = { + Type = "idle"; + StandardInput = "tty"; + StandardOutput = "tty"; + StandardError = "journal"; # Without this errors will spam on screen + # Without these bootlogs will spam on screen + TTYReset = true; + TTYVHangup = true; + TTYVTDisallocate = true; + }; +} diff --git a/nixos/grub.nix b/nixos/grub.nix new file mode 100644 index 0000000..5af6773 --- /dev/null +++ b/nixos/grub.nix @@ -0,0 +1,64 @@ +{ + config, + pkgs, + ... +}: let + distro-grub-themes = pkgs.stdenv.mkDerivation { + pname = "distro-grub-themes"; + version = "3.1"; + src = pkgs.fetchFromGitHub { + owner = "AdisonCavani"; + repo = "distro-grub-themes"; + rev = "v3.1"; + hash = "sha256-ZcoGbbOMDDwjLhsvs77C7G7vINQnprdfI37a9ccrmPs="; + }; + installPhase = "cp -r customize/nixos $out"; + }; + xenlism-grub-themes = pkgs.stdenv.mkDerivation { + pname = "xenlism-grub-themes"; + version = "1.0"; + src = pkgs.fetchFromGitHub { + owner = "xenlism"; + repo = "Grub-themes"; + rev = "40ac048df9aacfc053c515b97fcd24af1a06762f"; + hash = "sha256-ProTKsFocIxWAFbYgQ46A+GVZ7mUHXxZrvdiPJqZJ6I="; + }; + installPhase = "cp -r xenlism-grub-1080p-nixos/Xenlism-Nixos $out"; + }; +in { + environment.systemPackages = with pkgs; [hack-font]; + boot.supportedFilesystems = ["ntfs"]; + #fileSystems."/mnt/winsys" = { + # device = "/dev/nvme0n1p5"; + # fsType = "ntfs-3g"; + # options = [ "rw" "uid=1000" ]; + #}; + #fileSystems."/mnt/windata" = { + # device = "/dev/nvme0n1p3"; + # fsType = "ntfs-3g"; + # options = [ "rw" "uid=1000" ]; + #}; + boot.loader = { + efi = { + canTouchEfiVariables = true; + }; + grub = { + enable = true; + efiSupport = true; + device = "nodev"; + fsIdentifier = "label"; + devices = ["nodev"]; + extraEntries = '' + menuentry "Reboot" { + reboot + } + menuentry "Poweroff" { + halt + } + ''; + useOSProber = true; + configurationLimit = 10; + theme = xenlism-grub-themes; + }; + }; +} diff --git a/nixos/sddm-theme.nix b/nixos/sddm-theme.nix new file mode 100644 index 0000000..463038d --- /dev/null +++ b/nixos/sddm-theme.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: +pkgs.stdenv.mkDerivation { + name = "sddm-theme"; + src = pkgs.fetchFromGitHub { + owner = "stepanzubkov"; + repo = "where-is-my-sddm-theme"; + rev = "4e55b6a549b559e1d7d21b84e301e427d5b8d005"; + sha256 = "126fdmgw6d8iw0rx8jcwvjzri3jd7x6dbp5y8h11ri2csya6s5wp"; + }; + installPhase = '' + mkdir -p $out + cp -R ./where_is_my_sddm_theme_qt5/* $out/ + ''; +} |