moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: moritz:6a1b81565ab777716a287d1a00f4de7ba5101e9e
Branches Tags
moritz:nixos
..
compare: moritz:ac9b136e6c684a0a007dc585339a333b46ca7abd
Branches Tags
moritz:nixos

No commits in common. "6a1b81565ab777716a287d1a00f4de7ba5101e9e" and "ac9b136e6c684a0a007dc585339a333b46ca7abd" have entirely different histories.
6a1b81565a ... ac9b136e6c

9 changed files with 59 additions and 215 deletions
Show stats Expand all files Collapse all files

19
flake.lock
View file

@ -1071,24 +1071,6 @@
"type": "github"
}
},
"river": {
"flake": false,
"locked": {
"lastModified": 1711107438,
"narHash": "sha256-4nvFniKdJX+ZsoliFmWSzIAtZefekBCxmGS9xonHQN8=",
"ref": "refs/heads/master",
"rev": "b77b42f0d640457411204bbae346df1d1a0c4f44",
"revCount": 1214,
"submodules": true,
"type": "git",
"url": "https://github.com/riverwm/river"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://github.com/riverwm/river"
}
},
"root": {
"inputs": {
"actions-preview-nvim": "actions-preview-nvim",
@ -1117,7 +1099,6 @@
"nur": "nur",
"nvim-lspconfig": "nvim-lspconfig",
"pre-commit-hooks": "pre-commit-hooks",
"river": "river",
"smartcolumn-nvim": "smartcolumn-nvim",
"stable": "stable",
"statuscol-nvim": "statuscol-nvim",

4
flake.nix
View file

@ -48,10 +48,6 @@
hawtkeys-nvim.flake = false;
hawtkeys-nvim.url = "github:tris203/hawtkeys.nvim";
# river
river.url = "git+https://github.com/riverwm/river?submodules=1";
river.flake = false;
# Hyprland
hypr-contrib.url = "github:hyprwm/contrib";
hyprland.url = "github:hyprwm/Hyprland";

14
hosts/nixos-desktop/default.nix
View file

@ -21,22 +21,16 @@
impermanence.enable = true;
webis.enable = true;
};
programs.river = {
enable = true;
programs.hyprland = {
nvidiaSupport = true;
monitors = [ "HDMI-A-1,3840x2160,auto,1.2" ",preferred,auto,1" ];
extraConfig = "exec=hyprctl keyword monitor HDMI-A-1,3840x2160@120,auto,1.2";
keyboardLayouts = [ "us" "de" ];
};
programs.hyprland.enable = false;
programs.exercism.enable = true;
services.wallpaper.enable = true;
};
home-manager.users.moritz.services.kanshi.profiles = {
default = {
outputs = [
{ criteria = "HDMI-A-1"; mode = "3840x2160@60"; scale = 1.2; }
];
};
};
home-manager.users.moritz.home.packages = with pkgs; [
anki
calibre

6
modules/config/theming/_catppuccin.nix
View file

@ -31,12 +31,6 @@
}:
{
my.programs.tofi.settings = {
text-color = "#${text}";
prompt-color = "#${red}";
selection-color = "#${yellow}";
background-color = "#${base}";
};
home-manager.users.moritz = {
programs = {
fzf.colors = {

16
modules/config/theming/default.nix
View file

@ -31,20 +31,6 @@ in
};
config = mkIf cfg.enable {
my.programs.tofi.settings = {
font-size = "20";
font =
let
fontBasePath = pkgs.nerdfonts.override {
fonts = [ "FiraCode" ];
};
in
"${fontBasePath}/share/fonts/truetype/NerdFonts/FiraCodeNerdFont-Regular.ttf";
height = "360";
width = "720";
outline-width = "0";
border-width = "0";
};
home-manager.users.moritz = {
services.polybar = {
config = {
@ -53,7 +39,7 @@ in
monitor = "\${env:MONITOR}";
bottom = true;
width = "100%";
height = 15;
heigth = 15;
border-size = 2;

1
modules/profiles/impermanence.nix
View file

@ -54,7 +54,6 @@ in
".local/share/nvim"
".local/share/zoxide"
".local/state/nvim"
".local/state/tofi-history"
".mozilla"
"Documents"
"Downloads"

6
modules/programs/foot.nix
View file

@ -20,10 +20,8 @@ in
settings = {
main = {
term = "xterm-256color";
font = "FiraCode Nerd Font:size=10";
};
colors = {
alpha = 0.98;
font = "FiraCode Nerd Font:size=8";
dpi-aware = true;
};
};
};

164
modules/programs/river/default.nix
View file

@ -17,7 +17,11 @@ in
description = "list of keyboard layouts";
default = [ "de" "us" ];
};
nvidiaSupport = mkEnableOption "nvidiaSupport";
monitors = mkOption {
type = types.listOf types.str;
description = "monitor settings";
default = [ ",preferred,auto,1" ];
};
};
config = mkIf cfg.enable {
@ -26,45 +30,23 @@ in
programs = {
wallpaper.enable = true;
foot.enable = true;
tofi.enable = true;
rofi.enable = true;
};
wallpapers.enable = true;
services = {
dunst.enable = true;
wallpaper = {
enable = true;
target = "river-session.target";
# target = "hyprland-session.target";
};
spotify-player.target = "river-session.target";
# spotify-player.target = "hyprland-session.target";
};
};
home-manager.users.moritz = {
home.packages = with pkgs; [
rivercarro
];
services.kanshi = {
enable = true;
systemdTarget = "river-session.target";
};
# enable home-manager module
wayland.windowManager.river = {
enable = true;
package = pkgs.river.overrideAttrs (old: {
src = inputs.river;
version = lib.my.mkVersionInput inputs.river;
# HACK: to change wlroots to 0.17.x
buildInputs = with pkgs; [
libGL
libevdev
libinput
libxkbcommon
pixman
udev
wayland-protocols
wlroots_0_17
xorg.libX11
];
});
settings = {
border-width = 2;
declare-mode = [
@ -75,47 +57,11 @@ in
map = {
normal = {
"Super Q" = "close";
"Super Return" = ''spawn "systemctl --user is-active --quiet foot && footclient --no-wait || foot"'';
"Super Return" = "spawn footclient";
"Super+Shift Return" = "spawn foot";
"Super R" = ''spawn 'exec $(tofi-run --fuzzy-match=true)' '';
"Super W" = ''spawn "pkill -USR1 waybar"'';
"Super+Shift R" = "spawn ~/.config/river/init";
# Focus view
"Super J" = "focus-view next";
"Super K" = "focus-view previous";
# swap the focused view
"Super+Shift J" = "swap next";
"Super+Shift K" = "swap previous";
# focus output
"Super Period" = "focus-output next";
"Super Comma" = "focus-output previous";
# send to output
"Super+Shift Period" = "send-to-output next";
"Super+Shift Comma" = "send-to-output previous";
# bump in layout stack
"Super Z" = "zoom";
};
};
map-pointer = {
normal = {
"Super BTN_LEFT" = "move-view";
"Super BTN_RIGHT" = "resize-view";
"Super BTN_MIDDLE" = "toggle-float";
};
};
};
extraConfig = /* bash */ ''
riverctl default-layout rivercarro
rivercarro_pid="$(pidof rivercarro)"
if [[ -z $rivercarro_pid ]]; then
rivercarro -inner-gaps 4 -outer-gaps 4
fi
'';
};
# add waybar as a status bar
@ -125,7 +71,7 @@ in
# start using systemd service
systemd = {
enable = true;
target = "river-session.target";
# target = "hyprland-session.target";
};
settings = {
@ -134,7 +80,7 @@ in
layer = "top";
position = "top";
height = 20;
modules-left = [ "river/tags" ];
modules-left = [ "river/mode" ];
modules-center = [ "river/window" ];
modules-right = [ "network" "memory" "cpu" "battery" "clock" ];
};
@ -174,7 +120,7 @@ in
command = "${pkgs.systemd}/bin/loginctl lock-session";
}
];
systemdTarget = "river-session.target";
# systemdTarget = "hyprland-session.target";
};
};
@ -194,30 +140,24 @@ in
# additional environment variables
environment.sessionVariables =
{
XDG_CURRENT_DESKTOP = "river";
XDG_SESSION_TYPE = "wayland";
XDG_SESSION_DESKTOP = "river";
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
QT_QPA_PLATFORM = "wayland;xcb";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_QPA_PLATFORMTHEME = "qt5ct";
_JAVA_AWT_WM_NONEREPARENTING = "1";
} // (optionalAttrs cfg.nvidiaSupport
{
GBM_BACKEND = "nvidia-drm";
GDK_BACKEND = "wayland";
LIBVA_DRIVER_NAME = "nvidia";
MOZ_ENABLE_WAYLAND = "1";
WLR_DRM_DEVICES = "/dev/dri/card0";
WLR_DRM_NO_ATOMIC = "1";
WLR_NO_HARDWARE_CURSORS = "1";
XDG_CURRENT_DESKTOP = "river";
_GL_GSYNC_ALLOWED = "0";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
__GL_VRR_ALLOWED = "0";
});
# environment.sessionVariables =
# {
# XDG_CURRENT_DESKTOP = "Hyprland";
# XDG_SESSION_TYPE = "wayland";
# XDG_SESSION_DESKTOP = "Hyprland";
# QT_AUTO_SCREEN_SCALE_FACTOR = "1";
# QT_QPA_PLATFORM = "wayland;xcb";
# QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
# QT_QPA_PLATFORMTHEME = "qt5ct";
# _JAVA_AWT_WM_NONEREPARENTING = "1";
# } // (optionalAttrs cfg.nvidiaSupport
# {
# LIBVA_DRIVER_NAME = "nvidia";
# GBM_BACKEND = "nvidia-drm";
# __GLX_VENDOR_LIBRARY_NAME = "nvidia";
# WLR_NO_HARDWARE_CURSORS = "1";
# __GL_VRR_ALLOWED = "0";
# });
services = {
dbus.enable = true;
@ -242,26 +182,26 @@ in
};
security.rtkit.enable = true;
home-manager.users.moritz.systemd.user.services =
let
units = [ "waybar" ];
mkAfter = _: {
Unit = {
After = [ "river-session.target" ];
Wants = [ "river-session.target" ];
};
};
in
genAttrs units mkAfter;
systemd.user.services =
let
units = [ "pipewire" "xdg-desktop-portal" "wireplumber" ];
mkAfter = _: {
after = [ "river-session.target" ];
wants = [ "river-session.target" ];
};
in
genAttrs units mkAfter;
# home-manager.users.moritz.systemd.user.services =
# let
# units = [ "waybar" ];
# mkAfter = _: {
# Unit = {
# After = [ "hyprland-session.target" ];
# Wants = [ "hyprland-session.target" ];
# };
# };
# in
# genAttrs units mkAfter;
#
# systemd.user.services =
# let
# units = [ "pipewire" "xdg-desktop-portal" "xdg-desktop-portal-hyprland" "wireplumber" ];
# mkAfter = _: {
# after = [ "hyprland-session.target" ];
# wants = [ "hyprland-session.target" ];
# };
# in
# genAttrs units mkAfter;
};
}

44
modules/programs/tofi.nix
View file

@ -1,44 +0,0 @@
{ config
, lib
, pkgs
, ...
}:
with lib;
let
cfg = config.my.programs.tofi;
configText =
let
settingsStrings = mapAttrsToList (name: value: "${name} = ${value}") cfg.settings;
in
concatLines settingsStrings;
in
{
options.my.programs.tofi = {
enable = mkEnableOption "tofi";
settings = mkOption {
type = with types; attrsOf str;
default = { };
};
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
(lib.mkIf config.networking.networkmanager.enable networkmanager_dmenu)
# (lib.mkIf config.hardware.bluetooth.enable rofi-bluetooth)
# rofi-power-menu
];
home-manager.users.moritz = {
home.packages = with pkgs; [ tofi ];
xdg = {
enable = true;
configFile."tofi/config".text = configText;
configFile."networkmanager-dmenu/config.ini".text = ''
[dmenu]
dmenu_command = tofi
'';
};
};
};
}