commit f3635b0392f4667f99d1aacba210c1d7f8a178c1
parent 731ccb0f747d41cf0d46327eebfd30acf80ea213
Author: Milutin Popovic <milutin@popovic.xyz>
Date: Fri, 27 Mar 2026 21:19:03 +0000
bump
Diffstat:
7 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -50,6 +50,9 @@
pkgsLinux = nixpkgs.legacyPackages.${linuxSystem};
pkgsDarwin = nixpkgs.legacyPackages.${darwinSystem};
+
+ # Set at build time with: IS_WAYLAND=1 nixos-rebuild switch --flake .#host
+ isWayland = builtins.getEnv "IS_WAYLAND" == "1";
in
{
nixosConfigurations =
@@ -83,7 +86,12 @@
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
- inherit system inputs isDarwin;
+ inherit
+ system
+ inputs
+ isDarwin
+ isWayland
+ ;
standalone = false;
};
users.mika = import ./users/mika.nix;
@@ -117,7 +125,12 @@
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
- inherit system inputs isDarwin;
+ inherit
+ system
+ inputs
+ isDarwin
+ isWayland
+ ;
standalone = false;
};
users.mika = import ./users/mika.nix;
@@ -214,7 +227,12 @@
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
- inherit system inputs isDarwin;
+ inherit
+ system
+ inputs
+ isDarwin
+ isWayland
+ ;
standalone = false;
};
users.mika = import ./users/mika.nix;
@@ -235,7 +253,12 @@
inherit pkgs;
modules = [ ./users/mika.nix ];
extraSpecialArgs = {
- inherit system inputs isDarwin;
+ inherit
+ system
+ inputs
+ isDarwin
+ isWayland
+ ;
standalone = true;
};
};
diff --git a/justfile b/justfile
@@ -1,6 +1,12 @@
hostname := `hostname`
user := `whoami`
+os wayland:
+ IS_WAYLAND=1 sudo nixos-rebuild switch --flake ./#{{hostname}} --impure --show-trace
+
+os xorg:
+ sudo nixos-rebuild switch --flake ./#{{hostname}} --impure --show-trace
+
os:
sudo nixos-rebuild switch --flake ./#{{hostname}} --impure --show-trace
@@ -16,6 +22,12 @@ os_rollback:
hm:
home-manager switch -b backup --flake ./#{{user}} --impure
+hm wayland:
+ IS_WAYLAND=1 home-manager switch -b backup --flake ./#{{user}} --impure
+
+hm xorg:
+ home-manager switch -b backup --flake ./#{{user}} --impure
+
gc:
sudo nix-collect-garbage --delete-older-than 7d
nix-collect-garbage --delete-older-than 7d
diff --git a/lib/dotfiles.nix b/lib/dotfiles.nix
@@ -2,6 +2,6 @@
dotfiles = builtins.fetchGit {
url = "git://popovic.xyz/dots.git";
ref = "master";
- rev = "57c54e5f866a2e76faae1b1c640006965b55bbd9";
+ rev = "bd02e6caeb77dd35d41672df3c4d8654ba2e6bb3";
};
}
diff --git a/machines/frame/configuration.nix b/machines/frame/configuration.nix
@@ -180,6 +180,11 @@
hardware.bluetooth.enable = true;
hardware.sensor.iio.enable = false; # disable light sensors
security.rtkit.enable = true;
+ security.pam.services.swaylock = {
+ text = ''
+ auth include login
+ '';
+ };
# packages
nixpkgs.config.allowUnfree = true;
diff --git a/modules/niri.nix b/modules/niri.nix
@@ -42,7 +42,7 @@
"Mod+D".action.spawn = "dmenu-wl_run";
"Mod+P".action.spawn = "passmenu-otp";
"Mod+B".action.spawn = "dmenu-bluetooth";
- "Mod+Alt+S".action.spawn = "swaylock";
+ "Mod+Alt+L".action.spawn = "swaylock -f -c 000000";
"Mod+W".action.spawn = "spotify";
"Mod+Shift+P".action.spawn = "pavucontrol";
"Mod+Shift+B".action.spawn = "nautilus";
@@ -164,7 +164,7 @@
spawn-at-startup = [
{ command = [ "noctalia-shell" ]; }
{ command = [ "background" ]; }
- { command = [ "mako" ]; }
+ { command = [ "dunst" ]; }
{ command = [ "niri-monitors" ]; }
{ command = [ "nextcloud --background" ]; }
{
diff --git a/modules/packages.nix b/modules/packages.nix
@@ -99,23 +99,13 @@ with pkgs;
];
xorg = [
- dunst
- libnotify
xclip
feh
redshift
xidlehook
xcompmgr
xdotool
- xkblayout-state
- rsync
- devour
- power-profiles-daemon
- pavucontrol
- pamixer
- pulseaudio
scrot
- cryptsetup
]
++ (with suckless; [
dwm
@@ -146,6 +136,16 @@ with pkgs;
sxiv
gimp
chromium
+ power-profiles-daemon
+ libnotify
+ pavucontrol
+ xkblayout-state
+ cryptsetup
+ rsync
+ devour
+ pamixer
+ pulseaudio
+ dunst
];
communication = [
@@ -190,24 +190,20 @@ with pkgs;
];
development = [
- # tools
gh
tree-sitter
python313Packages.tiktoken
luajitPackages.jsregexp
- # Language servers
nil
marksman
nodejs
pnpm
- # Build tools
cmake
gnumake
gcc
- # Languages and runtimes
luarocks
javaPackages.compiler.openjdk17
lua5_1
diff --git a/users/mika.nix b/users/mika.nix
@@ -5,6 +5,7 @@
inputs,
standalone ? false,
isDarwin ? pkgs.stdenv.isDarwin,
+ isWayland,
...
}:
let
@@ -42,9 +43,9 @@ in
fonts
email
development
- wayland
]
- ++ lib.optionals (!isDarwin) [ xorg ]
+ ++ lib.optionals (!isDarwin || !isWayland) [ xorg ]
+ ++ lib.optionals (isWayland) [ wayland ]
);
file = {
@@ -77,6 +78,8 @@ in
../modules/theme.nix
../modules/xdg.nix
../modules/mbsync_timer.nix
+ ]
+ ++ lib.optionals (isWayland) [
../modules/niri.nix
../modules/alacitty.nix
../modules/noctalia.nix
