Compare commits

...

3 Commits

Author SHA1 Message Date
m3tam3re b9c6b6c0e7 from xorg to wayland 2023-04-09 11:12:23 +02:00
m3tam3re 4908eeb0a5 hyprland 2023-04-07 06:09:28 +02:00
m3tam3re e78f011441 hyprland 2023-04-06 17:12:19 +02:00
28 changed files with 802 additions and 150 deletions

View File

@ -19,6 +19,22 @@
"type": "github"
}
},
"base16-schemes": {
"flake": false,
"locked": {
"lastModified": 1665690101,
"narHash": "sha256-J2ZvNaVFkqaTXzYO5L+jyRORfIOavFPKvWItP6UTMKs=",
"owner": "tinted-theming",
"repo": "base16-schemes",
"rev": "a3dc916cf90471a422c0bfe1bb4b1bdd12185ced",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-schemes",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
@ -98,6 +114,67 @@
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_3",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1680783435,
"narHash": "sha256-Vm1QMU0U8xvJiPDct9NkcCr9X6jtTVGz84Mo9YyeXnk=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "a740e3e5174cfb4f572ec3b82291e5288f5fecc3",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671839510,
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1672236234,
"narHash": "sha256-dpBIuxcDEvJbLD8fTipE0A0JbQD1lZB94zYFPoh01PI=",
"owner": "misterio77",
"repo": "nix-colors",
"rev": "7e459f1d88ac54fc2f4b308adb5064863006e4b1",
"type": "github"
},
"original": {
"owner": "misterio77",
"repo": "nix-colors",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1677676435,
@ -114,6 +191,21 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1655599917,
"narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1679865578,
@ -147,6 +239,22 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1680487167,
"narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "53dad94e874c9586e71decf82d972dfb640ef044",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1679878071,
"narHash": "sha256-7U5sTaebhjtlTYQI+q1FrbS2YXAhEsbLIcqirQ/kXJk=",
@ -167,7 +275,9 @@
"agenix": "agenix",
"deploy-rs": "deploy-rs",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_3",
"hyprland": "hyprland",
"nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
@ -200,6 +310,49 @@
"repo": "flake-utils",
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1680629978,
"narHash": "sha256-2iVx5zqU2CpMgmtVadsHSkhkAsoxAWKQp6RQqt2OgQY=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "835208db98a29431fa687c9506f4b43fe645ff65",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673116118,
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
}
},
"root": "root",

View File

@ -12,10 +12,12 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
deploy-rs.url = "github:serokell/deploy-rs";
hyprland.url = "github:hyprwm/Hyprland";
nix-colors.url = "github:misterio77/nix-colors";
};
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, agenix, deploy-rs
, ... }@inputs:
outputs = { self, nix-colors, nixpkgs, nixpkgs-unstable, home-manager, hyprland
, agenix, deploy-rs, ... }@inputs:
let
inherit (self) outputs;
lib = nixpkgs.lib;
@ -61,18 +63,34 @@
})
];
};
m3-nix = lib.nixosSystem {
specialArgs = { inherit inputs outputs; };
modules = [
allowUnfree
./hosts/m3-nix
agenix.nixosModules.default
({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-unstable ];
})
];
};
};
homeConfigurations = {
# Laptop
"m3tam3re@m3-nix" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages."x86_64-linux";
extraSpecialArgs = { # pass things to the home configuration
extraSpecialArgs = { inherit inputs nix-colors;
};
modules = [ ./home/users/m3tam3re/m3-nix.nix allowUnfree ];
modules = [
hyprland.homeManagerModules.default
./home/users/m3tam3re/m3-nix.nix
allowUnfree
];
};
# Company Root Servera
"m3tam3re@lkk-nix-1" = home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = { # pass things to the home configuration
extraSpecialArgs = { # pass things to t
};
modules = [ ./home/users/m3tam3re/lkk-nix-1.nix ];
};

View File

@ -1,55 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let cfg = config.features.cli.fish;
in {
options.features.cli.fish.enable = mkEnableOption "enable fish shell";
config = mkIf cfg.enable {
programs.fish = {
enable = true;
plugins = [{
name = "foreign-env";
src = pkgs.fetchFromGitHub {
owner = "oh-my-fish";
repo = "plugin-foreign-env";
rev = "dddd9213272a0ab848d474d0cbde12ad034e65bc";
sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs";
};
}];
loginShellInit = ''
set -x WEBKIT_DISABLE_COMPOSITING_MODE 1
set -x EDITOR emacsclient
set -x VISUAL emacsclient
set -x XDG_DATA_HOME $HOME/.local/share
'';
shellAbbrs = {
ls = "exa";
grep = "rg";
ps = "procs";
n = "nix";
nd = "nix develop -c $SHELL";
ns = "nix shell";
nsn = "nix shell nixpkgs#";
nb = "nix build";
nbn = "nix build nixpkgs#";
nf = "nix flake";
ncb nr = "nixos-rebuild --flake ."; nrs = "nixos-rebuild
--flake . switch"; snr = "sudo nixos-rebuild --flake ."; snrs
= "sudo nixos-rebuild --flake . switch"; hm = "home-manager
--flake ."; hms = "home-manager --flake . switch";
vi = "nvim";
vim = "nvim";
wgd = "sudo systemctl stop wg-quick-wg0.service";
wgu = "sudo systemctl start wg-quick-wg0.service";
};
};
};
}

View File

@ -25,6 +25,9 @@ in {
set -x EDITOR emacsclient
set -x VISUAL emacsclient
set -x XDG_DATA_HOME $HOME/.local/share
if test (tty) = "/dev/tty1"
exec Hyprland &> /dev/null
end
'';
shellAbbrs = {
ls = "exa";

View File

@ -3,6 +3,6 @@
home.packages = with pkgs;
[
python3
];
}

View File

@ -42,6 +42,7 @@
epkgs.evil-nerd-commenter
epkgs.exec-path-from-shell
epkgs.forge
epkgs.fontawesome
epkgs.general
epkgs.go-mode
epkgs.graphql-mode

View File

@ -1,65 +1,69 @@
{ pkgs, lib, outputs, ... }:
{
{ pkgs, ... }: {
imports = [
./crypto.nix
./design.nix
./espanso.nix
./i3-gaps.nix
./extrafonts.nix
#./hyprland
./media.nix
./office.nix
./polybar.nix
./qt.nix
./rofi.nix
./syncthing.nix
./waybar.nix
];
xdg.mimeApps.enable = true;
xdg.mimeApps = {
enable = true;
defaultApplications = {
"application/pdf" = ["okular.desktop"];
};
};
home.sessionVariables = {
WEBKIT_DISABLE_COMPOSITING_MODE = "1";
EDITOR = "emacs";
VISUAL = "emacs";
VISUAL = "emacs";
QT_QPA_PLATFORM = "wayland";
QT_QPA_PLATFORMTHEME = "qt5ct";
XDG_CONFIG_HOME = "\${HOME}/.config";
XDG_BIN_HOME = "\${HOME}/.local/bin";
XDG_DATA_HOME = "\${HOME}/.local/share";
};
home.sessionPath = [ "\${XDG_BIN_HOME}" "\${HOME}/.cargo/bin" ];
fonts.fontconfig.enable = true;
home.packages = with pkgs; [
alacritty
appimage-run
autotiling
blueberry
brave
brightnessctl
feh
clipman
distrobox
flameshot
fuzzel
gnome.file-roller
gnome.seahorse
gnome.vinagre
glib
gsettings-desktop-schemas
hyprpaper
libnotify
lxappearance
nyxt
pasystray
pavucontrol
pamixer
picom
libsForQt5.qtstyleplugins
qt5ct
rustdesk
unrar
unzip
usbutils
v4l-utils
variety
xclip
xdg-utils
xdotool
xfce.xfce4-clipman-plugin
xorg.xbacklight
xorg.xkill
xorg.xmodmap
xorg.xrandr
zip
];
}

View File

@ -16,6 +16,7 @@ in {
font-manager
font-awesome
font-awesome_4
font-awesome_5
noto-fonts
];
};

View File

@ -0,0 +1,196 @@
{ home, ... }:
let
inherit (home.sessionVariables) TERMINAL BROWSER EDITOR;
in ''
monitor=eDP-1,preferred, 2560x0, auto
monitor=eDP-2,preferred, 0x0, auto
exec-once = hyprpaper
exec-once = waybar
exec-once = wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json"
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# Some default env vars.
env = XCURSOR_SIZE,24
env = WLR_NO_HARDWARE_CURSORS,1
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input {
kb_layout = de
kb_variant =
kb_model =
kb_rules =
kb_options=ctrl:nocaps
follow_mouse = 1
touchpad {
natural_scroll = yes
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
col.active_border = rgb(44475a) rgb(bd93f9) 90deg
col.inactive_border = rgba(44475aaa)
col.group_border = rgba(282a36dd)
col.group_border_active = rgb(bd93f9) rgb(44475a) 90deg
gaps_in = 5
gaps_out = 5
border_size = 1
col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
col.inactive_border = rgba(595959aa)
layout = dwindle
}
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
col.shadow = rgba(1E202966)
drop_shadow = yes
shadow_range = 60
shadow_offset = 1 2
shadow_render_power = 3
shadow_scale = 0.97
rounding = 8
blur = yes
blur_size = 3
blur_passes = 3
blur_new_optimizations = on
active_opacity = 0.9
inactive_opacity = 0.5
drop_shadow = yes
shadow_range = 4
shadow_render_power = 3
}
animations {
enabled = yes
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
animation = windows, 1, 7, myBezier
animation = windowsOut, 1, 7, default, popin 80%
animation = border, 1, 10, default
animation = borderangle, 1, 8, default
animation = fade, 1, 7, default
animation = workspaces, 1, 6, default
}
dwindle {
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = yes # you probably want this
}
master {
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
new_is_master = true
}
gestures {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
workspace_swipe = off
}
# Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
device:epic-mouse-v1 {
sensitivity = -0.5
}
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
windowrule = float, file_progress
windowrule = float, confirm
windowrule = float, dialog
windowrule = float, download
windowrule = float, notification
windowrule = float, error
windowrule = float, splash
windowrule = float, confirmreset
windowrule = float, title:Open File
windowrule = float, title:branchdialog
windowrule = float, Lxappearance
windowrule = float, Wofi
windowrule = animation none,Wofi
windowrule = float,viewnior
windowrule = float,feh
windowrule = float, pavucontrol-qt
windowrule = float, pavucontrol
windowrule = float, file-roller
windowrule = fullscreen, wlogout
windowrule = float, title:wlogout
windowrule = fullscreen, title:wlogout
windowrule = idleinhibit focus, mpv
windowrule = idleinhibit fullscreen, firefox
windowrule = float, title:^(Media viewer)$
windowrule = float, title:^(Volume Control)$
windowrule = float, title:^(Picture-in-Picture)$
windowrule = size 800 600, title:^(Volume Control)$
windowrule = move 75 44%, title:^(Volume Control)$
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
$mainMod = SUPER
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, return, exec, alacritty -e tmux
bind = $mainMod control, t, exec, alacritty -e tmux attach
bind = $mainMod SHIFT, e, exec, emacsclient -n -c -e '(package-initialize)'
bind = $mainMod, Escape, exec, wlogout -p layer-shell
bind = $mainMod, Space, togglefloating
bind = $mainMod, q, killactive,
bind = $mainMod, M, exit,
bind= $mainMod, F, fullscreen
bind = $mainMod, E, exec, thunar
bind = $mainMod, V, togglefloating,
bind = $mainMod, D, exec, fuzzel
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
''

View File

@ -0,0 +1,36 @@
{ inputs, config, lib, pkgs, ... }: {
imports = [ inputs.hyprland.homeManagerModules.default ];
programs = {
fish.loginShellInit = ''
if test (tty) = "/dev/tty1"
exec Hyprland &> /dev/null
end
'';
};
# wayland.windowManager.hyprland = {
# enable = true;
# nvidiaPatches = true;
# extraConfig = (import ./config.nix { inherit (config) home; });
# };
programs.waybar.package = pkgs.waybar.overrideAttrs
(oa: { mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; });
programs.waybar.enable = true;
home.packages = with pkgs; [
grim
imv
mimeo
xwayland
pulseaudio
slurp
swayidle
swaylock
waypipe
wireplumber
wf-recorder
wl-clipboard
wl-mirror
ydotool
];
}

View File

@ -1,11 +1,22 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
nextcloud-client
libreoffice
neomutt
tutanota-desktop
okular
zathura
];
{ config, lib, pkgs, ... }:
with lib;
let cfg = config.features.desktop.office;
in {
options.features.desktop.office.enable =
mkEnableOption "enable office features";
config = mkIf cfg.enable {
home.packages = with pkgs; [
nextcloud-client
libreoffice
neomutt
tutanota-desktop
okular
zathura
];
};
}

View File

@ -1,6 +1,13 @@
{ pkgs, ...}:
{
qt = {
enable = true;
platformTheme = "gtk";
};
gtk = {
enable = true;
theme = {
name = "Dracula";
package = pkgs.dracula-theme;
};
};
}

View File

@ -1,6 +1,7 @@
{ pkgs, ... }: {
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
plugins = [ pkgs.rofi-calc pkgs.rofi-emoji ];
theme = "themes/dracula";
extraConfig = {

View File

@ -0,0 +1,35 @@
{ inputs, config, lib, pkgs, ... }: {
# programs = {
# fish.loginShellInit = ''
# if test (tty) = "/dev/tty1"
# exec Hyprland &> /dev/null
# end
# '';
# };
# wayland.windowManager.hyprland = {
# enable = true;
# nvidiaPatches = true;
# extraConfig = (import ./config.nix { inherit (config) home; });
# };
programs.waybar.package = pkgs.waybar.overrideAttrs
(oa: { mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; });
programs.waybar.enable = true;
home.packages = with pkgs; [
grim
imv
mimeo
xwayland
pulseaudio
slurp
swayidle
swaylock
waypipe
wireplumber
wf-recorder
wl-clipboard
wl-mirror
ydotool
];
}

View File

@ -3,7 +3,6 @@
imports = [
./sunshine.nix
];
home.packages = with pkgs; [
gamescope
goverlay

View File

@ -2,6 +2,20 @@
let
in {
nixpkgs = {
config = {
allowUnfree = true;
allowUnfreePredicate = (_: true);
};
};
nix = {
package = lib.mkDefault pkgs.nix;
settings = {
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
warn-dirty = false;
};
};
programs = {
home-manager.enable = true;
git.enable = true;

View File

@ -0,0 +1,7 @@
{
imports = [
hyprland.nix
];
}

View File

@ -0,0 +1,202 @@
{
home.file.".config/hypr/hyprland.conf".text = ''
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor=eDP-1,preferred, 2560x0, auto
monitor=DP-2,preferred, 0x0, auto
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch
# exec-once = waybar & hyprpaper & firefox
exec-once = waybar
exec-once = hyprpaper
exec-once = wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json"
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# Some default env vars.
env = XCURSOR_SIZE,24
env = WLR_NO_HARDWARE_CURSORS,1
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input {
kb_layout = de
kb_variant =
kb_model =
kb_rules =
kb_options=ctrl:nocaps
follow_mouse = 1
touchpad {
natural_scroll = yes
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
col.active_border = rgb(44475a) rgb(bd93f9) 90deg
col.inactive_border = rgba(44475aaa)
col.group_border = rgba(282a36dd)
col.group_border_active = rgb(bd93f9) rgb(44475a) 90deg
gaps_in = 5
gaps_out = 5
border_size = 1
col.active_border = rgba(9742b5ee) rgba(9742b5ee) 45deg
col.inactive_border = rgba(595959aa)
layout = dwindle
}
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
col.shadow = rgba(1E202966)
drop_shadow = yes
shadow_range = 60
shadow_offset = 1 2
shadow_render_power = 3
shadow_scale = 0.97
rounding = 8
blur = yes
blur_size = 3
blur_passes = 3
blur_new_optimizations = on
active_opacity = 0.9
inactive_opacity = 0.5
drop_shadow = yes
shadow_range = 4
shadow_render_power = 3
}
animations {
enabled = yes
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
animation = windows, 1, 7, myBezier
animation = windowsOut, 1, 7, default, popin 80%
animation = border, 1, 10, default
animation = borderangle, 1, 8, default
animation = fade, 1, 7, default
animation = workspaces, 1, 6, default
}
dwindle {
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = yes # you probably want this
}
master {
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
new_is_master = true
}
gestures {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
workspace_swipe = off
}
# Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
device:epic-mouse-v1 {
sensitivity = -0.5
}
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
windowrule = float, file_progress
windowrule = float, confirm
windowrule = float, dialog
windowrule = float, download
windowrule = float, notification
windowrule = float, error
windowrule = float, splash
windowrule = float, confirmreset
windowrule = float, title:Open File
windowrule = float, title:branchdialog
windowrule = float, Lxappearance
windowrule = float, Wofi
windowrule = animation none,Wofi
windowrule = float,viewnior
windowrule = float,feh
windowrule = float, pavucontrol-qt
windowrule = float, pavucontrol
windowrule = float, file-roller
windowrule = fullscreen, wlogout
windowrule = float, title:wlogout
windowrule = fullscreen, title:wlogout
windowrule = idleinhibit focus, mpv
windowrule = idleinhibit fullscreen, firefox
windowrule = float, title:^(Media viewer)$
windowrule = float, title:^(Volume Control)$
windowrule = float, title:^(Picture-in-Picture)$
windowrule = size 800 600, title:^(Volume Control)$
windowrule = move 75 44%, title:^(Volume Control)$
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
$mainMod = SUPER
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, return, exec, alacritty -e tmux
bind = $mainMod control, t, exec, alacritty -e tmux attach
bind = $mainMod SHIFT, e, exec, emacsclient -n -c -e '(package-initialize)'
bind = $mainMod, o, exec, emacsclient -n -c -e '(dired "~")'
bind = $mainMod, Escape, exec, wlogout -p layer-shell
bind = $mainMod, Space, togglefloating
bind = $mainMod, q, killactive,
bind = $mainMod, M, exit,
bind= $mainMod, F, fullscreen
bind = $mainMod, E, exec, thunar
bind = $mainMod, V, togglefloating,
bind = $mainMod, D, exec, rofi -modi drun emoji calc ssh -show drun -font 'Fira Code 13' -show-icons
bind = $mainMod, D, exec, rofi -modi drun emoji calc ssh -show drun -font 'Fira Code 13' -show-icons
bind = $mainMod SHIFT, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
'';
}

View File

@ -23,16 +23,13 @@
design.enable = true;
extrafonts.enable = true;
media.enable = true;
office.enable = true;
};
virtualization = {
podman.enable = true;
qemu.enable = true;
};
services = {
netbird.enable = true;
};
services = { netbird.enable = true; };
};
home.stateVersion = "22.11";
}

View File

@ -1,14 +1,14 @@
{ config, lib, inputs, pkgs, system, ... }:
{ lib, pkgs, inputs, outputs, ... }:
{
imports = [
inputs.home-manager.nixosModules.home-manager
];
home-manager = {
useUserPackages = true;
extraSpecialArgs = { inherit inputs outputs; };
};
users.defaultUserShell = pkgs.fish;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
environment.systemPackages = [
inputs.agenix.packages.x86_64-linux.default
pkgs.busybox

View File

@ -4,7 +4,7 @@
"$y$j9T$wOKc3kLsQVtmmyLIN7ljV.$NvdWzwn6p8JNByHoXQqf6/GF3C0JOPHW/D0HgFLQXy4";
isNormalUser = true;
description = "m3tam3re";
extraGroups = [ "wheel" "networkmanager" "libvirtd" "flatpak" ];
extraGroups = [ "wheel" "networkmanager" "libvirtd" "flatpak" "audio" "video" ];
openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix"
];

View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ config, inputs, pkgs, lib, ... }:
with pkgs;
@ -19,6 +19,7 @@ in {
../common/users/m3tam3re
../common/base
./services
inputs.hyprland.nixosModules.default
];
specialisation = {
@ -47,6 +48,10 @@ in {
boot.loader.grub.device = "nodev";
boot.loader.grub.useOSProber = true;
hardware.tuxedo-keyboard.enable = true;
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
boot.kernelModules = [ "v4l2loopback" ];
boot.kernelParams = [
"tuxedo_keyboard.mode=0" # https://github.com/tuxedocomputers/tuxedo-keyboard#kernelparam
"tuxedo_keyboard.brightness=255"
@ -58,6 +63,7 @@ in {
options kvm_intel nested=1
options kvm_intel emulate_invalid_guest_state=0
options kvm ignore_msrs=1
options v4l2loopback exclusive_caps=1 max_buffers=2
'';
boot.initrd.luks.devices."luks-a7b1ba69-0951-4347-886e-4c0c24c2b871".keyFile =
@ -74,25 +80,53 @@ in {
networking.networkmanager.enable = true;
networking.wg-quick.interfaces = {
wg0 = {
address = [ "10.13.13.4/24" ];
dns = [ "192.168.178.75" ];
privateKeyFile = "/root/wg/peer_m3arch/privatekey-peer_m3arch";
address = [ "10.8.0.3/24" ];
privateKeyFile = "/root/wg/peer_m3-nix/privatekey-peer_m3-nix";
dns = [ "10.88.0.1" ];
peers = [{
publicKey = "zA3c0S33ZsX5oRMRCrNDYg6pCMLdRurLV+7cU2Chbwk=";
publicKey = "Il/nVlX2qzmZMJQ8QAKN+uQdkcK66Wt7MWZn9Vku6Tg=";
presharedKey = "sOgKQCXs+WAEpVvnkqTHlK1ItWpmP/xiexhAJ6oMBJs=";
allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "45.132.245.244:51820";
endpoint = "wg.lanakk.com:51820";
persistentKeepalive = 25;
}];
};
};
services.avahi = {
enable = true;
nssmdns = true;
publish = {
addresses = true;
workstation = true;
userServices = true;
};
};
# xdg.portal = {
# enable = true;
# wlr.enable = true;
# extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ];
# };
programs.hyprland = {
enable = true;
nvidiaPatches = true;
};
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
};
time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "de_DE.utf8";
console.keyMap = "de";
environment.systemPackages = [ nvidia-offload nvim ];
environment.systemPackages = [ nvidia-offload neovim ];
nix.extraOptions = ''
experimental-features = nix-command
'';
nix = {
settings = { experimental-features = "nix-command flakes"; };
gc = {

View File

@ -56,4 +56,5 @@
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
hardware.bluetooth.enable = true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View File

@ -8,10 +8,10 @@
./xserver.nix
];
services.gvfs = {
enable = true;
package = pkgs.gnome3.gvfs;
};
# services.gvfs = {
# enable = true;
# package = pkgs.gnome3.gvfs;
# };
services.kubo = { enable = true; }; # IPFS
services.printing.enable = true;
services.netbird.enable = true;

View File

@ -1,3 +1,4 @@
{ pkgs, ... }:
{
services.flatpak.enable = true;
xdg.portal = { # xdg desktop intergration (required for flatpak)

View File

@ -1,4 +1,4 @@
{ pkgs }:
{ pkgs, ... }:
{
services.udev.extraRules = ''

View File

@ -1,33 +1,19 @@
{ pkgs }:
{
services.xserver = {
enable = true;
exportConfiguration = true;
videoDrivers = [ "nvidia" ];
displayManager = {
defaultSession = "xfce+i3";
lightdm = { enable = true; };
};
desktopManager = {
xterm.enable = false;
xfce = {
enable = true;
noDesktop = true;
enableXfwm = false;
};
};
libinput.enable = true; # touchpad support
windowManager.i3.package = pkgs.i3-gaps;
windowManager.i3.enable = true;
layout = "de";
xkbOptions = "ctrl:nocaps";
};
programs.thunar.plugins = [ pkgs.xfce.thunar-archive-plugin ];
services.xserver.screenSection = ''
Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
Option "AllowIndirectGLXProtocol" "off"
Option "TripleBuffer" "on"
'';
{ pkgs, ... }: {
services.xserver.videoDrivers = [ "nvidia" ];
# services.xserver = {
# enable = true;
# videoDrivers = [ "nvidia" ];
# displayManager = {
# defaultSession = "hyprland";
# sddm = { enable = true; };
# };
# libinput.enable = true; # touchpad support
# layout = "de";
# xkbOptions = "ctrl:nocaps";
# };
# services.xserver.screenSection = ''
# Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
# Option "AllowIndirectGLXProtocol" "off"
# Option "TripleBuffer" "on"
# '';
}