Merge pull request #1 from therealr5/wayland

Switch to Wayland
This commit is contained in:
Rouven Seifert 2023-01-22 00:00:14 +01:00 committed by GitHub
commit 8383eda53f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 585 additions and 684 deletions

View file

@ -24,11 +24,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1674082145, "lastModified": 1674250603,
"narHash": "sha256-4IpEt5Jc6VrNcpIcrKMCZAyeJMLXaaHk+yOV9HusO/A=", "narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7026e1a934abfa02623c9870378dbcdac3cd7f80", "rev": "275ab728912006eecb549338a50f24f294a7cfb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,6 +37,70 @@
"type": "github" "type": "github"
} }
}, },
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": [
"nixpkgs"
],
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1674296335,
"narHash": "sha256-jUvjOqKGuEk1XfZNPXU3hcPtIJKkSNzwUm5yN1EFYZA=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "fcbfd193930dd146b141531a9cf5301d55f26907",
"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"
}
},
"hyprpaper": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1673799209,
"narHash": "sha256-GMRM1IyIuDEzjEw5E4zWI/TCg3zWs65v86NuR+BAtW0=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "f77a664e9d168fb7b332ede9db4a3e35a46dd6c5",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprpaper",
"type": "github"
}
},
"nix-colors": { "nix-colors": {
"inputs": { "inputs": {
"base16-schemes": "base16-schemes", "base16-schemes": "base16-schemes",
@ -58,11 +122,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1673796341, "lastModified": 1674120619,
"narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", "narHash": "sha256-xLT1FQl7/jNPOEq5q/vmc3AExt1V9LtcjM+QY2+MUpA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dccdc458512abce8d19f74195bb20fdb067df50", "rev": "d7705c01ef0a39c8ef532d1033bace8845a07d35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,6 +170,8 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland",
"hyprpaper": "hyprpaper",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -146,6 +212,49 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1672824257,
"narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5f264a7d6c8af27d41ff440c05262b022c055593",
"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", "root": "root",

View file

@ -4,25 +4,34 @@
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
home-manager.url = github:nix-community/home-manager; home-manager.url = github:nix-community/home-manager;
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = github:hyprwm/Hyprland;
hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprpaper.url = github:hyprwm/hyprpaper;
hyprpaper.inputs.nixpkgs.follows = "nixpkgs";
#xdph.url = github:hyprwm/xdg-desktop-portal-hyprland;
#xdph.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = github:Mic92/sops-nix;
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
nix-colors.url = github:Misterio77/nix-colors; nix-colors.url = github:Misterio77/nix-colors;
}; };
outputs = { self, nixpkgs, home-manager, sops-nix, nix-colors }: { outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, sops-nix, nix-colors }@attrs: {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = { nixosConfigurations = {
thinkpad = nixpkgs.lib.nixosSystem { thinkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs.inputs = attrs;
modules = [ modules = [
./hosts/thinkpad ./hosts/thinkpad
./users/rouven ./users/rouven
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
{ {
home-manager.extraSpecialArgs = attrs;
home-manager.users.rouven = { home-manager.users.rouven = {
imports = [ imports = [
nix-colors.homeManagerModule nix-colors.homeManagerModule
hyprland.homeManagerModules.default
]; ];
config.colorScheme = nix-colors.colorSchemes.dracula; config.colorScheme = nix-colors.colorSchemes.dracula;
}; };

View file

@ -1,19 +1,14 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
./modules/autorandr
./modules/networks ./modules/networks
./modules/lightdm
../../shared/vim.nix ../../shared/vim.nix
../../shared/input.nix
../../shared/sops.nix ../../shared/sops.nix
../../shared/gpg.nix ../../shared/gpg.nix
../../shared/zsh-fix.nix
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@ -23,30 +18,30 @@
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
console = { console = {
keyMap = "dvorak";
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
useXkbConfig = true; # use xkbOptions in tty.
}; };
services.xserver = { fonts.fonts = with pkgs; [
enable = true; noto-fonts
displayManager = { noto-fonts-cjk
defaultSession = "none+awesome"; noto-fonts-emoji
}; dejavu_fonts
windowManager.awesome = {
enable = true;
luaModules = with pkgs.luaPackages; [
luarocks
vicious
]; ];
};
libinput.enable = true;
};
# Enable sound. # Enable sound.
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; #hardware.pulseaudio.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
xdg.portal.wlr.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
# control display backlight # control display backlight
@ -64,6 +59,7 @@
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
virtualisation.spiceUSBRedirection.enable = true; virtualisation.spiceUSBRedirection.enable = true;
# fix to enable secure boot in vms # fix to enable secure boot in vms
environment.etc = { environment.etc = {
"ovmf/edk2-x86_64-secure-code.fd" = { "ovmf/edk2-x86_64-secure-code.fd" = {
@ -77,9 +73,7 @@
}; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# essentials
wget wget
gcc gcc
git git

View file

@ -1,45 +0,0 @@
{ config, pkgs, ... }:
let
fp_eDP-1 = "00ffffffffffff0009e5c608000000001f1d0104a522137803dae5955d59942924505400000001010101010101010101010101010101963b803671383c403020360058c21000001a000000000000000000000000000000000000000000fe00424f452043510a202020202020000000fe004e5631353646484d2d4e34380a0043";
fp_HDMI-1 = "00ffffffffffff00410ccfc0fb0100001f19010380301b782a3935a25952a1270c5054bd4b00d1c09500950fb30081c0818001010101023a801871382d40582c4500dd0c1100001e000000ff005a564331353331303030353037000000fc0050484c2032323356350a202020000000fd00384c1e5311000a202020202020017a020322f14f010203050607101112131415161f04230917078301000065030c001000023a801871382d40582c4500dd0c1100001e8c0ad08a20e02d10103e9600dd0c11000018011d007251d01e206e285500dd0c1100001e8c0ad090204031200c405500dd0c110000180000000000000000000000000000000000000000004d";
in
{
services.autorandr = {
enable = true;
profiles = {
default = {
fingerprint = {
eDP-1 = fp_eDP-1;
};
config = {
eDP-1 = {
enable = true;
primary = true;
position = "0x0";
mode = "1920x1080";
};
HDMI-1.enable = false;
};
};
home = {
fingerprint = {
eDP-1 = fp_eDP-1;
HDMI-1 = fp_HDMI-1;
};
config = {
eDP-1 = {
enable = true;
primary = true;
position = "0x0";
mode = "1920x1080";
};
HDMI-1 = {
enable = true;
position = "1920x0";
mode = "1920x1080";
};
};
};
};
};
}

View file

@ -1,15 +0,0 @@
{ config, pkgs, ... }:
{
services.xserver.displayManager.lightdm = {
enable = true;
background = ../../../../images/lockscreen.png;
greeters.slick = {
enable = true;
extraConfig = ''
logo = ${../../../../images/nixos-logo.png}
show-a11y=false
show-hostname=false
'';
};
};
}

View file

@ -1,7 +0,0 @@
{ config, ... }:
{
programs.ausweisapp = {
enable = true;
openFirewall = true;
};
}

View file

@ -3,6 +3,7 @@
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
pinentryFlavor = "gnome3";
}; };
services.pcscd.enable = true; services.pcscd.enable = true;
} }

View file

@ -1,18 +0,0 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
xorg.xmodmap
];
# Configure keymap in X11
services.xserver.layout = "us";
services.xserver.xkbVariant = "dvorak-alt-intl";
services.xserver.displayManager.sessionCommands =
"${pkgs.xorg.xmodmap}/bin/xmodmap ${pkgs.writeText "xkb-layout" ''
keycode 108 = Mode_switch
keycode 94 = Shift_L NoSymbol Shift_L
keysym a = a A adiaeresis Adiaeresis
keysym o = o O odiaeresis Odiaeresis
keysym u = u U udiaeresis Udiaeresis
keysym s = s S ssharp
''}";
}

View file

@ -1,6 +0,0 @@
{ config, ... }:
{
# This is a fix for zsh in the home manager
# If you only enable it in home manager, some important files for completion are missing
programs.zsh.enable = true;
}

View file

@ -1,5 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ./fixes.nix ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
users.users.rouven = { users.users.rouven = {
isNormalUser = true; isNormalUser = true;

24
users/rouven/fixes.nix Normal file
View file

@ -0,0 +1,24 @@
{ config, pkgs, ... }:
{
# generate system completions
programs.zsh.enable = true;
# fixes pam entries for swaylock
security.pam.services.swaylock.text = ''
# Account management.
account required pam_unix.so
# Authentication management.
auth sufficient pam_unix.so nullok likeauth try_first_pass
auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth required pam_deny.so
# Password management.
password sufficient pam_unix.so nullok sha512
# Session management.
session required pam_env.so conffile=/etc/pam/environment readenv=0
session required pam_unix.so
'';
}

View file

@ -7,7 +7,7 @@
TERM = "xterm-256color"; TERM = "xterm-256color";
}; };
font = { font = {
size = 8; size = 10;
}; };
shell.program = "${pkgs.zsh}/bin/zsh"; shell.program = "${pkgs.zsh}/bin/zsh";
window.opacity = 0.7; window.opacity = 0.7;
@ -25,20 +25,6 @@
text = "CellBackground"; text = "CellBackground";
cursor = "CellForeground"; cursor = "CellForeground";
}; };
#search = {
#matches = {
#foreground = "#44475a";
#background = "#50fa7b";
#};
#focused_match = {
#foreground = "#44475a";
#background = "#ffb86c";
#};
#footer_bar = {
#background = "#282a36";
#foreground = "#f8f8f2";
#};
#};
selection = { selection = {
text = "CellForeground"; text = "CellForeground";
background = "#${config.colorScheme.colors.base03}"; background = "#${config.colorScheme.colors.base03}";

View file

@ -1,5 +0,0 @@
{ config, ... }:
{
xdg.configFile."awesome/rc.lua".source = ./rc.lua;
xdg.configFile."awesome/wallpaper.png".source = ../../../../images/wallpaper.png;
}

View file

@ -1,505 +0,0 @@
-- If LuaRocks is installed, make sure that packages installed through it are
-- found (e.g. lgi). If LuaRocks is not installed, do nothing.
pcall(require, "luarocks.loader")
-- Standard awesome library
local gears = require("gears")
local awful = require("awful")
require("awful.autofocus")
-- Widget and layout library
local wibox = require("wibox")
local vicious = require("vicious")
-- Theme handling library
local beautiful = require("beautiful")
-- Notification library
local naughty = require("naughty")
local menubar = require("menubar")
local hotkeys_popup = require("awful.hotkeys_popup")
-- Enable hotkeys help widget for VIM and other apps
-- when client with a matching name is opened:
require("awful.hotkeys_popup.keys")
-- Autstart some stuff
awful.spawn.with_shell("light-locker --lock-on-lid")
awful.spawn.with_shell("wpa_gui -t")
-- Handle runtime errors after startup
do
local in_error = false
awesome.connect_signal("debug::error", function(err)
-- Make sure we don't go into an endless error loop
if in_error then
return
end
in_error = true
naughty.notify({
preset = naughty.config.presets.critical,
title = "Oops, an error happened!",
text = tostring(err),
})
in_error = false
end)
end
-- Variable definitions
-- Themes define colours, icons, font and wallpapers.
beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
-- This is used later as the default terminal and editor to run.
terminal = "alacritty"
editor = os.getenv("EDITOR") or "nvim"
editor_cmd = terminal .. " -e " .. editor
-- Default modkey.
modkey = "Mod4"
-- Table of layouts to cover with awful.layout.inc, order matters.
awful.layout.layouts = {
awful.layout.suit.tile,
awful.layout.suit.tile.top,
awful.layout.suit.tile.left,
awful.layout.suit.fair,
awful.layout.suit.spiral,
}
-- Enable gaps
beautiful.useless_gap = 5
-- Background color for wibar
beautiful.wibar_bg = "#282a36"
-- Notifications
naughty.config.defaults.position = "top_right"
naughty.config.defaults.timeout = 5
naughty.config.defaults.margin = 8
naughty.config.defaults.ontop = true
naughty.config.defaults.icon_size = 64
naughty.config.defaults.fg = beautiful.fg_focus
naughty.config.defaults.bg = beautiful.bg_focus
naughty.config.defaults.border_color = beautiful.border_focus
naughty.config.defaults.border_width = 2
-- Menu
-- Create a launcher widget and a main menu
myawesomemenu = {
{
"hotkeys",
function()
hotkeys_popup.show_help(nil, awful.screen.focused())
end,
},
{ "manual", terminal .. " -e man awesome" },
{ "edit config", editor_cmd .. " " .. awesome.conffile },
{ "restart", awesome.restart },
{
"quit",
function()
awesome.quit()
end,
},
}
local menu_awesome = { "awesome", myawesomemenu, beautiful.awesome_icon }
local menu_terminal = { "open terminal", terminal }
mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu })
-- Menubar configuration
menubar.utils.terminal = terminal -- Set the terminal for applications that require it
-- Wibar
-- Create a textclock widget
mytextclock = wibox.widget.textclock()
-- logout
--local logout_menu_widget = require("awesome-wm-widgets.logout-menu-widget.logout-menu")
-- Simple cpu widget
--local cpu_widget = require("awesome-wm-widgets.cpu-widget.cpu-widget")
-- Simle network widget
--local net_widget = require("awesome-wm-widgets.net-speed-widget.net-speed")
-- battery
--local battery_widget = require("awesome-wm-widgets.battery-widget.battery")
-- Create a wibox for each screen and add it
local taglist_buttons = gears.table.join(
awful.button({}, 1, function(t)
t:view_only()
end),
awful.button({ modkey }, 1, function(t)
if client.focus then
client.focus:move_to_tag(t)
end
end),
awful.button({}, 3, awful.tag.viewtoggle),
awful.button({ modkey }, 3, function(t)
if client.focus then
client.focus:toggle_tag(t)
end
end),
awful.button({}, 4, function(t)
awful.tag.viewnext(t.screen)
end),
awful.button({}, 5, function(t)
awful.tag.viewprev(t.screen)
end)
)
local tasklist_buttons = gears.table.join(
awful.button({}, 1, function(c)
if c == client.focus then
c.minimized = true
else
c:emit_signal("request::activate", "tasklist", { raise = true })
end
end),
awful.button({}, 3, function()
awful.menu.client_list({ theme = { width = 250 } })
end),
awful.button({}, 4, function()
awful.client.focus.byidx(1)
end),
awful.button({}, 5, function()
awful.client.focus.byidx(-1)
end)
)
local function set_wallpaper(s)
-- Wallpaper
awful.spawn.easy_async_with_shell("feh --no-fehbg --bg-scale $HOME/.config/awesome/wallpaper.png")
end
-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
screen.connect_signal("property::geometry", set_wallpaper)
awful.screen.connect_for_each_screen(function(s)
-- Wallpaper
set_wallpaper(s)
-- Each screen has its own tag table.
awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
-- Create a promptbox for each screen
s.mypromptbox = awful.widget.prompt()
-- Create an imagebox widget which will contain an icon indicating which layout we're using.
-- We need one layoutbox per screen.
s.mylayoutbox = awful.widget.layoutbox(s)
s.mylayoutbox:buttons(gears.table.join(
awful.button({}, 1, function()
awful.layout.inc(1)
end),
awful.button({}, 3, function()
awful.layout.inc(-1)
end),
awful.button({}, 4, function()
awful.layout.inc(1)
end),
awful.button({}, 5, function()
awful.layout.inc(-1)
end)
))
-- Create a taglist widget
s.mytaglist = awful.widget.taglist({
screen = s,
filter = awful.widget.taglist.filter.all,
buttons = taglist_buttons,
})
-- Create a tasklist widget
s.mytasklist = awful.widget.tasklist({
screen = s,
filter = awful.widget.tasklist.filter.currenttags,
buttons = tasklist_buttons,
})
-- Create the wibox
s.mywibox = awful.wibar({ position = "top", screen = s })
-- Add widgets to the wibox
s.mywibox:setup({
layout = wibox.layout.align.horizontal,
{ -- Left widgets
layout = wibox.layout.align.horizontal,
mylauncher,
s.mytaglist,
s.mypromptbox,
},
s.mytasklist, -- Middle widget
{ -- Right widgets
layout = wibox.layout.fixed.horizontal,
mytextclock,
--cpu_widget(),
--net_widget(),
--battery_widget(),
wibox.widget.systray(),
s.mylayoutbox,
--logout_menu_widget()
},
})
end)
-- }}}
-- {{{ Mouse bindings
root.buttons(gears.table.join(
--awful.button({ }, 3, function () mymainmenu:toggle() end),
awful.button({}, 4, awful.tag.viewnext),
awful.button({}, 5, awful.tag.viewprev)
))
-- }}}
-- {{{ Key bindings
globalkeys = gears.table.join(
awful.key({ modkey }, "s", hotkeys_popup.show_help, { description = "show help", group = "awesome" }),
awful.key({ modkey }, "Left", awful.tag.viewprev, { description = "view previous", group = "tag" }),
awful.key({ modkey }, "Right", awful.tag.viewnext, { description = "view next", group = "tag" }),
awful.key({ modkey }, "Escape", awful.tag.history.restore, { description = "go back", group = "tag" }),
-- Movement
awful.key({ modkey }, "j", function()
awful.client.focus.byidx(1)
end, { description = "focus next by index", group = "client" }),
awful.key({ modkey }, "k", function()
awful.client.focus.byidx(-1)
end, { description = "focus previous by index", group = "client" }),
awful.key({ modkey }, "h", function()
awful.screen.focus_relative(1)
end, { description = "focus the next screen", group = "screen" }),
awful.key({ modkey }, "l", function()
awful.screen.focus_relative(-1)
end, { description = "focus the previous screen", group = "screen" }),
-- Layout manipulation
awful.key({ modkey, "Shift" }, "h", function()
awful.client.swap.byidx(1)
end, { description = "swap with next client by index", group = "client" }),
awful.key({ modkey, "Shift" }, "l", function()
awful.client.swap.byidx(-1)
end, { description = "swap with previous client by index", group = "client" }),
awful.key({ modkey }, "u", awful.client.urgent.jumpto, { description = "jump to urgent client", group = "client" }),
awful.key({ modkey }, "Tab", function()
awful.client.focus.history.previous()
if client.focus then
client.focus:raise()
end
end, { description = "go back", group = "client" }),
-- Standard program
awful.key({ modkey }, "Return", function()
awful.spawn(terminal)
end, { description = "open a terminal", group = "launcher" }),
awful.key({ modkey, "Control" }, "r", awesome.restart, { description = "reload awesome", group = "awesome" }),
awful.key({ modkey, "Shift" }, "k", function()
awful.tag.incmwfact(0.05)
end, { description = "increase master width factor", group = "layout" }),
awful.key({ modkey, "Shift" }, "j", function()
awful.tag.incmwfact(-0.05)
end, { description = "decrease master width factor", group = "layout" }),
awful.key({ modkey, "Control" }, "j", function()
awful.tag.incnmaster(1, nil, true)
end, { description = "increase the number of master clients", group = "layout" }),
awful.key({ modkey, "Control" }, "k", function()
awful.tag.incnmaster(-1, nil, true)
end, { description = "decrease the number of master clients", group = "layout" }),
awful.key({ modkey, "Control" }, "h", function()
awful.tag.incncol(1, nil, true)
end, { description = "increase the number of columns", group = "layout" }),
awful.key({ modkey, "Control" }, "l", function()
awful.tag.incncol(-1, nil, true)
end, { description = "decrease the number of columns", group = "layout" }),
awful.key({ modkey }, "space", function()
awful.layout.inc(1)
end, { description = "select next", group = "layout" }),
awful.key({ modkey, "Shift" }, "space", function()
awful.layout.inc(-1)
end, { description = "select previous", group = "layout" }),
awful.key({ modkey, "Control" }, "n", function()
local c = awful.client.restore()
-- Focus restored client
if c then
c:emit_signal("request::activate", "key.unminimize", { raise = true })
end
end, { description = "restore minimized", group = "client" }),
-- Prompt
awful.key({ modkey }, "r", function()
awful.screen.focused().mypromptbox:run()
end, { description = "run prompt", group = "launcher" }),
awful.key({ modkey }, "x", function()
awful.prompt.run({
prompt = "Run Lua code: ",
textbox = awful.screen.focused().mypromptbox.widget,
exe_callback = awful.util.eval,
history_path = awful.util.get_cache_dir() .. "/history_eval",
})
end, { description = "lua execute prompt", group = "awesome" }),
-- Menubar
awful.key({ "Mod1" }, "space", function()
menubar.show()
end, { description = "show the menubar", group = "launcher" }),
-- XF86 functions
awful.key({}, "Print", function()
awful.util.spawn("flameshot gui")
end, { description = "take a screenshot", group = "xf86" }),
awful.key({}, "XF86MonBrightnessDown", function()
awful.util.spawn("light -U 10")
end, { description = "decrease backlight brightness", group = "xf86" }),
awful.key({}, "XF86MonBrightnessUp", function()
awful.util.spawn("light -A 10")
end, { description = "increase backlight brightness", group = "xf86" })
)
clientkeys = gears.table.join(
awful.key({ modkey }, "f", function(c)
c.fullscreen = not c.fullscreen
c:raise()
end, { description = "toggle fullscreen", group = "client" }),
awful.key({ modkey, "Shift" }, "q", function(c)
c:kill()
end, { description = "close", group = "client" }),
awful.key(
{ modkey, "Control" },
"space",
awful.client.floating.toggle,
{ description = "toggle floating", group = "client" }
),
awful.key({ modkey, "Control" }, "Return", function(c)
c:swap(awful.client.getmaster())
end, { description = "move to master", group = "client" }),
awful.key({ modkey }, "o", function(c)
c:move_to_screen()
end, { description = "move to screen", group = "client" }),
awful.key({ modkey }, "t", function(c)
c.ontop = not c.ontop
end, { description = "toggle keep on top", group = "client" }),
awful.key({ modkey }, "n", function(c)
-- The client currently has the input focus, so it cannot be
-- minimized, since minimized clients can't have the focus.
c.minimized = true
end, { description = "minimize", group = "client" }),
awful.key({ modkey }, "m", function(c)
c.maximized = not c.maximized
c:raise()
end, { description = "(un)maximize", group = "client" })
)
-- Bind all key numbers to tags.
-- Be careful: we use keycodes to make it work on any keyboard layout.
-- This should map on the top row of your keyboard, usually 1 to 9.
for i = 1, 9 do
globalkeys = gears.table.join(
globalkeys,
-- View tag only.
awful.key({ modkey }, "#" .. i + 9, function()
local screen = awful.screen.focused()
local tag = screen.tags[i]
if tag then
tag:view_only()
end
end, { description = "view tag #" .. i, group = "tag" }),
-- Toggle tag display.
awful.key({ modkey, "Control" }, "#" .. i + 9, function()
local screen = awful.screen.focused()
local tag = screen.tags[i]
if tag then
awful.tag.viewtoggle(tag)
end
end, { description = "toggle tag #" .. i, group = "tag" }),
-- Move client to tag.
awful.key({ modkey, "Shift" }, "#" .. i + 9, function()
if client.focus then
local tag = client.focus.screen.tags[i]
if tag then
client.focus:move_to_tag(tag)
end
end
end, { description = "move focused client to tag #" .. i, group = "tag" }),
-- Toggle tag on focused client.
awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function()
if client.focus then
local tag = client.focus.screen.tags[i]
if tag then
client.focus:toggle_tag(tag)
end
end
end, { description = "toggle focused client on tag #" .. i, group = "tag" })
)
end
clientbuttons = gears.table.join(
awful.button({}, 1, function(c)
c:emit_signal("request::activate", "mouse_click", { raise = true })
end),
awful.button({ modkey }, 1, function(c)
c:emit_signal("request::activate", "mouse_click", { raise = true })
awful.mouse.client.move(c)
end),
awful.button({ modkey }, 3, function(c)
c:emit_signal("request::activate", "mouse_click", { raise = true })
awful.mouse.client.resize(c)
end)
)
-- Set keys
root.keys(globalkeys)
-- Rules
-- Rules to apply to new clients (through the "manage" signal).
awful.rules.rules = {
-- All clients will match this rule.
{
rule = {},
properties = {
border_width = beautiful.border_width,
border_color = beautiful.border_normal,
focus = awful.client.focus.filter,
raise = true,
keys = clientkeys,
buttons = clientbuttons,
screen = awful.screen.preferred,
placement = awful.placement.no_overlap + awful.placement.no_offscreen,
},
},
}
-- Signals
-- Signal function to execute when a new client appears.
client.connect_signal("manage", function(c)
-- Set the windows at the slave,
-- i.e. put it at the end of others instead of setting it master.
-- if not awesome.startup then awful.client.setslave(c) end
if awesome.startup and not c.size_hints.user_position and not c.size_hints.program_position then
-- Prevent clients from being unreachable after screen count changes.
awful.placement.no_offscreen(c)
end
end)
-- Enable sloppy focus, so that focus follows mouse.
client.connect_signal("mouse::enter", function(c)
c:emit_signal("request::activate", "mouse_enter", { raise = false })
end)
client.connect_signal("focus", function(c)
c.border_color = beautiful.border_focus
end)
client.connect_signal("unfocus", function(c)
c.border_color = beautiful.border_normal
end)

View file

@ -3,15 +3,12 @@
imports = imports =
[ [
./accounts ./accounts
./awesome
./alacritty ./alacritty
./flameshot
./fzf ./fzf
./git ./git
./gpg ./gpg
./kdeconnect ./hyprland
./neovim ./neovim
./picom
./ssh ./ssh
./tmux ./tmux
./vifm ./vifm

View file

@ -1,15 +0,0 @@
{ config, ... }:
{
services.flameshot = {
enable = true;
settings = {
General = {
contrastOpacity = 188;
disabledTrayIcon = true;
};
Shortcuts = {
TYPE_COPY = "Return";
};
};
};
}

View file

@ -0,0 +1,90 @@
{ config, pkgs, hyprpaper, ... }:
{
imports = [ ./waybar.nix ];
wayland.windowManager.hyprland.enable = true;
home.sessionVariables = {
GRIM_DEFAULT_DIR = "~/Pictures/Screenshots/";
};
home.packages = with pkgs; [
pulseaudio # installed to have pactl
wofi
wl-clipboard
grim
slurp
font-awesome
hyprpaper.packages.x86_64-linux.default
swaylock-effects
];
xdg.configFile = {
"hypr/hyprland.conf".source = ./hyprland.conf;
"hypr/hyprpaper.conf".text = ''
preload = ${../../../../images/wallpaper.png}
wallpaper =eDP-1, ${../../../../images/wallpaper.png}
wallpaper =HDMI-A-1, ${../../../../images/wallpaper.png}
'';
"swaylock/config".text = ''
indicator-radius=200
indicator-thickness=3
inside-color=00000000
inside-ver-color=${config.colorScheme.colors.base0D}
inside-clear-color=${config.colorScheme.colors.base0B}
ring-color=${config.colorScheme.colors.base03}
ring-wrong-color=${config.colorScheme.colors.base08}
screenshot
effect-blur=7x5
'';
"wofi/config".text = ''
allow_images = true
term = alacritty
'';
"wofi/style.css".text = ''
window {
margin: 0px;
border: 1px solid #${config.colorScheme.colors.base0D};
background-color: #${config.colorScheme.colors.base00};
}
#input {
margin: 5px;
border: none;
color: #${config.colorScheme.colors.base05};
background-color: #${config.colorScheme.colors.base02};
}
#inner-box,
#outer-box {
margin: 5px;
border: none;
background-color: #${config.colorScheme.colors.base00};
}
#text {
margin: 5px;
border: none;
color: #${config.colorScheme.colors.base05};
}
#entry {
background-color: #${config.colorScheme.colors.base00};
}
#entry:selected {
background-color: #${config.colorScheme.colors.base03};
}
'';
};
programs.mako = {
enable = true;
backgroundColor = "#${config.colorScheme.colors.base02}FF";
borderRadius = 20;
textColor = "#${config.colorScheme.colors.base05}FF";
layer = "overlay";
defaultTimeout = 10000;
extraConfig = ''
[urgency=high]
background-color=#${config.colorScheme.colors.base08}
default-timeout=0
'';
};
}

View file

@ -0,0 +1,156 @@
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor=eDP-1, 1920x1080, 0x0, 1
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch
exec-once = waybar & hyprpaper
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input {
kb_layout = us
kb_variant = dvorak-alt-intl
follow_mouse = 1
touchpad {
natural_scroll = no
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
gaps_in = 5
gaps_out = 20
border_size = 2
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
rounding = 10
blur = yes
blur_size = 3
blur_passes = 1
blur_new_optimizations = on
drop_shadow = yes
shadow_range = 4
shadow_render_power = 3
col.shadow = rgba(1a1a1aee)
}
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 = 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 # doesn't really work
}
# 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
# 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
bind = $mainMod SHIFT, Q, killactive,
bind = $mainMod, M, exit,
bind = $mainMod, F, togglefloating,
bind = ALT, Space, exec, wofi --show drun
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, S, togglesplit, # dwindlr
# Move focus with mainMod + arrow keys
bind = $mainMod, H, movefocus, l
bind = $mainMod, L, movefocus, r
bind = $mainMod, K, movefocus, u
bind = $mainMod, J, 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 wiswaylockth 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
# All the fancy XF86 Keys
bind = ,Print, exec, grim -g "$(slurp)" - | wl-copy -t image/png
bind = SHIFT, Print, exec, grim -g "$(slurp)"
bind = ,XF86MonBrightnessUp, exec, light -A 10
bind = ,XF86MonBrightnessDown, exec, light -U 10
bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
bind = ,XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
bind = ,XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
bind = ,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
# even more fancy stuff (aka abusing XF86 keys)
bind = ,XF86WLAN, exec, wpa_gui
bind = ,XF86Messenger, exec, makoctl dismiss
bind = SHIFT ,XF86Messenger, exec, makoctl restore
bind = ,XF86Go, exec, makoctl invoke
bind = ,XF86Display, exec, hyprpaper
bind = ,Cancel, exec, swaylock

View file

@ -0,0 +1,167 @@
{ config, pkgs, ... }:
{
programs.waybar = {
enable = true;
package = pkgs.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
});
settings = {
mainBar = {
layer = "top";
position = "top";
height = 26;
modules-left = [ "wlr/workspaces" ];
modules-right = [ "network" "cpu" "temperature" "pulseaudio" "battery" "tray" "clock" ];
network = {
format-wifi = " {essid} ({signalStrength}%)";
format-ethernet = " {ipaddr}/{cidr}";
tooltip-format = " {ifname} via {gwaddr}";
format-linked = " {ifname} (No IP)";
format-disconnected = "Disconnected ";
format-alt = "{ifname}: {ipaddr}/{cidr}";
};
cpu = {
format = "{usage}% ";
};
temperature = {
hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
critical-threshold = 80;
format = "{temperatureC}°C {icon}";
format-icons = [ "" ];
};
pulseaudio = {
format = "{volume}% {icon} {format_source}";
format-bluetooth = "{volume}% {icon} {format_source}";
format-bluetooth-muted = " {icon} {format_source}";
format-muted = " {format_source}";
format-source = "{volume}% ";
format-source-muted = "";
format-icons = {
headphone = "";
headset = "";
default = [ "" "" "" ];
};
on-click = "pavucontrol";
};
battery = {
states = {
warning = 30;
critical = 15;
};
format = "{capacity}% {icon}";
format-charging = "{capacity}% ";
format-plugged = "{capacity}% ";
format-icons = [ "" "" "" "" "" ];
};
tray = {
spacing = 10;
};
};
};
};
xdg.configFile."waybar/style.css".text = ''
* {
font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
font-size: 13px;
}
window#waybar {
background-color: transparent;
color: #${config.colorScheme.colors.base05};
transition-property: background-color;
transition-duration: .5s;
}
window#waybar.hidden {
background-color: transparent;
}
#workspaces button {
padding: 0 5px;
background-color: transparent;
color: #${config.colorScheme.colors.base05};
}
#workspaces button.active {
background-color: #${config.colorScheme.colors.base04};
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
}
#workspaces button.urgent {
background-color: #eb4d4b;
}
#clock,
#battery,
#cpu,
#memory,
#temperature,
#network,
#pulseaudio,
#tray{
border-radius: 30px;
padding: 0 10px;
color: #${config.colorScheme.colors.base05};
}
#window,
#workspaces {
margin: 0 4px;
}
#clock {
background-color: #${config.colorScheme.colors.base00};
}
#battery {
background-color: #${config.colorScheme.colors.base02};
color: #${config.colorScheme.colors.base05};
}
#battery.charging, #battery.plugged {
color: #${config.colorScheme.colors.base05};
background-color: #${config.colorScheme.colors.base02};
}
#battery.critical:not(.charging) {
background-color: #${config.colorScheme.colors.base08};
color: #${config.colorScheme.colors.base01};
}
#cpu {
background-color: #${config.colorScheme.colors.base06};
color: #${config.colorScheme.colors.base01};
}
#network {
background-color: #${config.colorScheme.colors.base07};
color: #${config.colorScheme.colors.base01};
}
#network.disconnected {
background-color: #${config.colorScheme.colors.base08};
}
#pulseaudio {
background-color: #${config.colorScheme.colors.base03};
color: #${config.colorScheme.colors.base05};
}
#temperature {
background-color: #${config.colorScheme.colors.base05};
color: #${config.colorScheme.colors.base01};
}
#temperature.critical {
background-color: #${config.colorScheme.colors.base08};
color: #${config.colorScheme.colors.base01};
}
#tray {
background-color: #${config.colorScheme.colors.base01};
color: #${config.colorScheme.colors.base05};
}
'';
}

View file

@ -1,7 +0,0 @@
{ config, pkgs, ... }:
{
services.kdeconnect = {
enable = true;
indicator = true;
};
}

View file

@ -5,11 +5,9 @@
wpa_supplicant_gui wpa_supplicant_gui
pcmanfm pcmanfm
xsel xsel
lightlocker
vlc vlc
# graphics # graphics
feh
okular okular
gimp gimp
@ -45,10 +43,10 @@
neofetch neofetch
trash-cli trash-cli
spotify spotify
nixpkgs-fmt
virt-manager virt-manager
powerline-fonts powerline-fonts
ventoy-bin ventoy-bin
ripgrep
# libs # libs
libyubikey libyubikey

View file

@ -1,7 +0,0 @@
{ config, ... }:
{
services.picom = {
enable = true;
# more configuration can go here, but I have no need for it yet
};
}

View file

@ -14,8 +14,7 @@
{ {
plugin = dracula; plugin = dracula;
extraConfig = '' extraConfig = ''
set -g @dracula-show-fahrenheit false set -g @dracula-plugins "time"
set -g @dracula-plugins "weather time"
set -g @dracula-show-left-icon session set -g @dracula-show-left-icon session
set -g @dracula-show-powerline true set -g @dracula-show-powerline true
''; '';