Compare commits

...

5 Commits

Author SHA1 Message Date
Nathan McCarty d2380abc66
Add bitwarden window rule 2023-06-28 19:35:24 -04:00
Nathan McCarty 37958c3111
Fix firefox window rules 2023-06-28 19:35:24 -04:00
Nathan McCarty 0221d0a74e
Add kdenlive 2023-06-28 19:35:24 -04:00
Nathan McCarty d7c2e79df0
Switch levitation to podman 2023-06-28 19:35:24 -04:00
Nathan McCarty 4e745ee4f1
Try out gdm 2023-06-28 19:35:24 -04:00
6 changed files with 36 additions and 29 deletions

View File

@ -197,13 +197,18 @@ in with lib; {
windowrulev2 = center,class:^(.blueman-manager-wrapped)$ windowrulev2 = center,class:^(.blueman-manager-wrapped)$
# firefox Picture-in-Picture # firefox Picture-in-Picture
windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$ windowrulev2 = nofullscreenrequest,class^(firefox-beta)$,title:^(Picture-in-Picture)$
windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$ windowrulev2 = float,class^(firefox-beta)$,title:^(Picture-in-Picture)$
windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$ windowrulev2 = pin,class^(firefox-beta)$,title:^(Picture-in-Picture)$
# firefox bitwarden
windowrulev2 = nofullscreenrequest,class^(firefox-beta)$,title:^(Extension: Bitwarden)
windowrulev2 = float,class^(firefox-beta)$,title:^(Extension: Bitwarden)
windowrulev2 = pin,class^(firefox-beta)$,title:^(Extension: Bitwarden)
# firefox figma micro indicator # firefox figma micro indicator
windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Firefox Sharing Indicator)$ windowrulev2 = nofullscreenrequest,class^(firefox-beta)$,title:^(Firefox Sharing Indicator)$
windowrulev2 = float,class:^(firefox)$,title:^(Firefox Sharing Indicator)$ windowrulev2 = float,class^(firefox-beta)$,title:^(Firefox Sharing Indicator)$
# Common modals # Common modals
windowrule = float,title:^(Open)$ windowrule = float,title:^(Open)$

View File

@ -19,6 +19,9 @@ in {
playerctl playerctl
ncmpcpp ncmpcpp
ario ario
libsForQt5.kdenlive
mediainfo
glaxnimate
]; ];
# Register haruna as the default video player # Register haruna as the default video player
xdg.mimeApps.defaultApplications = { xdg.mimeApps.defaultApplications = {

View File

@ -53,6 +53,10 @@ in {
setupGrub = true; setupGrub = true;
nix.autoUpdate = false; nix.autoUpdate = false;
harden = false; harden = false;
virtualization = {
docker = false;
podman = true;
};
windows = { windows = {
enable = true; enable = true;
mount = { mount = {

View File

@ -194,6 +194,7 @@ in {
virtualization = { virtualization = {
qemu = mkDefaultOption "qemu" config.nathan.config.isDesktop; qemu = mkDefaultOption "qemu" config.nathan.config.isDesktop;
docker = mkDefaultOption "docker" config.nathan.config.isDesktop; docker = mkDefaultOption "docker" config.nathan.config.isDesktop;
podman = mkEnableOption "podman";
lxc = mkEnableOption "lxc"; lxc = mkEnableOption "lxc";
nixos = nixos =
mkDefaultOption "nixos containers" config.nathan.config.isDesktop; mkDefaultOption "nixos containers" config.nathan.config.isDesktop;

View File

@ -4,14 +4,14 @@ in with lib; {
config = mkMerge [ config = mkMerge [
(mkIf nc.hyprland.enableGreetd { (mkIf nc.hyprland.enableGreetd {
# Greetd for login # Greetd for login
programs.regreet = { # programs.regreet = {
enable = true; # enable = true;
settings = { GTK = { font_name = "Roboto 16"; }; }; # settings = { GTK = { font_name = "Roboto 16"; }; };
}; # };
services.greetd = { # services.greetd = {
enable = true; # enable = true;
settings = { default_session.command = "cage -s -- regreet"; }; # settings = { default_session.command = "cage -s -- regreet"; };
}; # };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Greeter packages # Greeter packages
cage cage
@ -23,9 +23,14 @@ in with lib; {
# Turn on GDM for login # Turn on GDM for login
services.xserver = { services.xserver = {
enable = true; enable = true;
autorun = false; autorun = true;
# Enable plasma for the applications # Enable plasma for the applications
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
displayManager.defaultSession = "hyprland";
displayManager.gdm = {
enable = true;
wayland = true;
};
}; };
# Setup drivers # Setup drivers
hardware.opengl = { hardware.opengl = {
@ -42,21 +47,6 @@ in with lib; {
gsettings-desktop-schemas gsettings-desktop-schemas
lxappearance lxappearance
kde-gtk-config kde-gtk-config
(stdenv.mkDerivation rec {
pname = "sddm-sugar-dark-theme";
version = "1.2";
dontBuild = true;
installPhase = ''
mkdir -p $out/share/sddm/themes
cp -aR $src $out/share/sddm/themes/sugar-dark
'';
src = fetchFromGitHub {
owner = "MarianArlt";
repo = "sddm-sugar-dark";
rev = "v${version}";
sha256 = "0gx0am7vq1ywaw2rm1p015x90b75ccqxnb1sz3wy8yjl27v82yhb";
};
})
]; ];
qt.platformTheme = "qt5ct"; qt.platformTheme = "qt5ct";
# Enable and configure hyperland # Enable and configure hyperland

View File

@ -36,6 +36,10 @@ in with lib; {
}; };
}; };
}) })
(mkIf nc.virtualization.podman {
virtualisation.podman.enable = true;
environment.systemPackages = with pkgs; [ x11docker ];
})
# (mkIf nc.virtualization.crosvm { # (mkIf nc.virtualization.crosvm {
# environment.systemPackages = # environment.systemPackages =
# with inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; [ # with inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; [