diff --git a/flake.lock b/flake.lock index 1acb920..ad9eced 100644 --- a/flake.lock +++ b/flake.lock @@ -335,11 +335,28 @@ "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "oh-my-fish": "oh-my-fish", + "sddm-theme-chili": "sddm-theme-chili", "telescope-file-browser-nvim": "telescope-file-browser-nvim", "vim-extra-plugins": "vim-extra-plugins", "vim-plugin-arpeggio": "vim-plugin-arpeggio" } }, + "sddm-theme-chili": { + "flake": false, + "locked": { + "lastModified": 1535340922, + "narHash": "sha256-wxWsdRGC59YzDcSopDRzxg8TfjjmA3LHrdWjepTuzgw=", + "owner": "MarianArlt", + "repo": "sddm-chili", + "rev": "6516d50176c3b34df29003726ef9708813d06271", + "type": "github" + }, + "original": { + "owner": "MarianArlt", + "repo": "sddm-chili", + "type": "github" + } + }, "telescope-file-browser-nvim": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index b284605..ecf0ed0 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + #### Nvim stuff neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; @@ -71,6 +72,12 @@ url = "github:oh-my-fish/oh-my-fish"; flake = false; }; + + #### Other github stuff + sddm-theme-chili = { + url = "github:MarianArlt/sddm-chili"; + flake = false; + }; }; outputs = inputs@{ self, nixpkgs, home-manager, ... }: diff --git a/modules/overlays/flakes.nix b/modules/overlays/flakes.nix index 7b9d98a..7216e0a 100644 --- a/modules/overlays/flakes.nix +++ b/modules/overlays/flakes.nix @@ -14,6 +14,7 @@ , vim-extra-plugins , vim-plugin-arpeggio , telescope-file-browser-nvim +, sddm-theme-chili , ... }: self: super: # installs a vim plugin from git with a given tag / branch @@ -67,4 +68,6 @@ in arpeggio = plugin "arpeggio" vim-plugin-arpeggio; }; + + sddm-theme-chili = sddm-theme-chili; } diff --git a/modules/xserver.nix b/modules/xserver.nix index f3c6d8f..f45eecc 100644 --- a/modules/xserver.nix +++ b/modules/xserver.nix @@ -1,11 +1,30 @@ -{ ... }: { +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + # Required for the sddm theme + libsForQt5.qt5.qtquickcontrols + libsForQt5.qt5.qtgraphicaleffects + libsForQt5.qt5.qtbase + ]; + services.xserver = { # Enable the X11 windowing system. enable = true; xkbOptions = "eurosign:e"; # Make the xmonad session the default - displayManager.defaultSession = "none+xmonad"; + # displayManager.defaultSession = "none+xmonad"; + displayManager = { + defaultSession = "none+xmonad"; + sddm = { + enable = true; + theme = "${pkgs.sddm-theme-chili}"; + }; + + autoLogin = { + enable = true; + user = "adrielus"; + }; + }; # Enable xmonad windowManager.xmonad = { @@ -14,14 +33,15 @@ }; # Enable xfce I think? - desktopManager = { - xterm.enable = false; - xfce = { - enable = true; - noDesktop = true; - enableXfwm = false; - }; - }; + # desktopManager = { + # xterm.enable = false; + # xfce = { + # enable = true; + # noDesktop = true; + # enableXfwm = false; + # }; + # }; + libinput = { # Enable touchpad support.