Lots of changes

This commit is contained in:
xeovalyte 2024-09-05 19:20:03 +02:00
parent 5d25dcf186
commit 59e360139f
Signed by: xeovalyte
SSH Key Fingerprint: SHA256:kSQDrQDmKzljJzfGYcd3m9RqHi4h8rSwkZ3sQ9kBURo
11 changed files with 95 additions and 27 deletions

12
flake.lock generated
View File

@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1720954236,
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
"lastModified": 1725001927,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
"rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"type": "github"
},
"original": {
@ -88,11 +88,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {

View File

@ -25,6 +25,7 @@
};
in
{
# Laptop Configuration
nixosConfigurations = {
xv-laptop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -33,12 +34,18 @@
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./hosts/laptop
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = { inherit inputs nix-colors; };
home-manager.users.xeovalyte.imports = [ ./hosts/laptop/home.nix ];
}
];
};
};
homeConfigurations = {
"xeovalyte@xv-laptop" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs nix-colors; };
modules = [
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./hosts/laptop/home.nix
];
};
};
@ -54,6 +61,7 @@
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.backupFileExtension = "backup";
home-manager.extraSpecialArgs = { inherit inputs nix-colors; };
home-manager.users.xeovalyte.imports = [ ./hosts/desktop/home.nix ];
}

View File

@ -8,6 +8,7 @@
../../modules/system/gui/hyprland.nix
../../modules/system/gui/steam.nix
../../modules/system/gui/thunar.nix
# ../../modules/system/gui/plasma.nix
# CLI
../../modules/system/cli/common.nix
@ -49,6 +50,8 @@
boot.kernelPackages = pkgs.linuxPackages_latest;
hardware.opentabletdriver.enable = true;
system.stateVersion = "24.05";
}

View File

@ -15,6 +15,7 @@
../../modules/home/cli/ssh.nix
];
options = {
host = lib.mkOption {
type = with lib.types; str;
@ -32,7 +33,6 @@
host = "xv-laptop";
home.packages = with pkgs; [
# Desktop Applications
kdenlive
@ -48,7 +48,7 @@
# Office
libreoffice
onlyoffice-bin
unstable.onlyoffice-bin
# Image editing
gimp
@ -59,6 +59,9 @@
unstable.drawio
];
# Enable home-manager
programs.home-manager.enable = true;
home.stateVersion = "24.05";
};

View File

@ -3,7 +3,6 @@
{
home.packages = with pkgs; [
unstable.devenv
unstable.surrealist
cloc
];

View File

@ -105,8 +105,8 @@
url = "https://youtube.com";
}
{
label = "Schoolportaal";
url = "https://coenecoopcollege.sharepoint.com/";
label = "My TU Delft";
url = "https://my.tudelft.nl/";
}
];
"signon.rememberSignons" = false;

View File

@ -2,7 +2,6 @@
{
imports = [
# ./hyprpaper.nix
./waybar.nix
./fixes.nix
./dunst.nix
@ -19,6 +18,8 @@
nwg-bar
powertop
lxqt.lxqt-policykit
networkmanagerapplet
];
wayland.windowManager.hyprland = {
@ -33,6 +34,8 @@
exec-once = [
"waybar"
"lxqt-policykit-agent"
"nm-applet"
"blueman-applet"
];
"$mod" = "SUPER";

View File

@ -35,6 +35,29 @@
thunderbird.enable = true;
thunderbird.profiles = [ "default" ];
};
# tudelft = {
# imap = {
# host = "outlook.office365.com";
# port = 993;
# tls = {
# enable = true;
# };
# };
# smtp = {
# host = "smtp-a.tudelft.nl";
# port = 465;
# tls = {
# enable = true;
# useStartTls = false;
# };
# };
# address = "tboomers@tudelft.nl";
# realName = "Timo Boomers";
# userName = "tboomers@tudelft.nl";
# primary = false;
# thunderbird.enable = true;
# thunderbird.profiles = [ "default" ];
# };
xeovalyte = {
imap = {
host = "mail.xeovalyte.dev";

View File

@ -8,16 +8,29 @@
};
# Configure display manager
services.greetd = {
# services.greetd = {
# enable = true;
# settings = {
# default_session = {
# command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --time --cmd Hyprland";
# user = "xeovalyte";
# };
# };
# };
# SDDM configuration
environment.systemPackages = with pkgs; [
libsForQt5.qt5.qtquickcontrols2
libsForQt5.qt5.qtgraphicaleffects
];
services.displayManager.sddm = {
enable = true;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --time --cmd Hyprland";
user = "xeovalyte";
};
};
wayland.enable = true;
theme = "${import ./sddm-theme.nix { inherit pkgs; }}";
};
# Sound configuration
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
@ -28,6 +41,7 @@
pulse.enable = true;
};
# Keyring configuration
security.polkit.enable = true;
services.gnome.gnome-keyring.enable = true;
security.pam.services.greetd.enableGnomeKeyring = true;

View File

@ -1,9 +1,9 @@
{ pkgs, ... }:
{
services.xserver.enable = true;
services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true;
services.desktopManager.plasma6.enable = true;
hardware.pulseaudio.enable = false;

View File

@ -0,0 +1,15 @@
{ pkgs }:
pkgs.stdenv.mkDerivation {
name = "sddm-theme";
src = pkgs.fetchFromGitHub {
owner = "MarianArlt";
repo = "sddm-sugar-dark";
rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";
sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
};
installPhase = ''
mkdir -p $out
cp -R ./* $out/
'';
}