diff --git a/flake.lock b/flake.lock index 7a6b88f..1b4bff4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "awesome-config": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673817186, - "narHash": "sha256-lgM53vY3W/9i1PNByO6UC/qp24mRKb4cLQwElqGGYAU=", - "owner": "therealr5", - "repo": "awesome-config", - "rev": "151afc549364e723639b7ab40d27dee6961cc0d1", - "type": "github" - }, - "original": { - "owner": "therealr5", - "repo": "awesome-config", - "type": "github" - } - }, "base16-schemes": { "flake": false, "locked": { @@ -44,11 +24,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674041176, - "narHash": "sha256-cMf1BQzI39nHQ0H/mOatthbbI3392qLmJ9gU0u520P4=", + "lastModified": 1674082145, + "narHash": "sha256-4IpEt5Jc6VrNcpIcrKMCZAyeJMLXaaHk+yOV9HusO/A=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c29ae48f9a149151bdd82f429ac61d4412c312a", + "rev": "7026e1a934abfa02623c9870378dbcdac3cd7f80", "type": "github" }, "original": { @@ -125,7 +105,6 @@ }, "root": { "inputs": { - "awesome-config": "awesome-config", "home-manager": "home-manager", "nix-colors": "nix-colors", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 4ee2150..fdefd39 100644 --- a/flake.nix +++ b/flake.nix @@ -6,12 +6,10 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = github:Mic92/sops-nix; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; - awesome-config.url = github:therealr5/awesome-config; - awesome-config.inputs.nixpkgs.follows = "nixpkgs"; nix-colors.url = github:Misterio77/nix-colors; }; - outputs = { self, nixpkgs, home-manager, sops-nix, awesome-config, nix-colors }: { + outputs = { self, nixpkgs, home-manager, sops-nix, nix-colors }: { formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; nixosConfigurations = { thinkpad = nixpkgs.lib.nixosSystem { @@ -24,7 +22,6 @@ { home-manager.users.rouven = { imports = [ - awesome-config.nixosModules.awesome nix-colors.homeManagerModule ]; config.colorScheme = nix-colors.colorSchemes.dracula; diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 9adf109..fd80443 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -10,7 +10,6 @@ ./modules/networks ./modules/lightdm ../../shared/vim.nix - ../../shared/ausweisapp.nix ../../shared/input.nix ../../shared/sops.nix ../../shared/gpg.nix @@ -88,6 +87,7 @@ dig traceroute killall + python3 ]; system.stateVersion = "22.11"; diff --git a/images/wallpaper.png b/images/wallpaper.png new file mode 100644 index 0000000..b2db624 Binary files /dev/null and b/images/wallpaper.png differ diff --git a/users/rouven/modules/awesome/default.nix b/users/rouven/modules/awesome/default.nix new file mode 100644 index 0000000..eabacd4 --- /dev/null +++ b/users/rouven/modules/awesome/default.nix @@ -0,0 +1,5 @@ +{ config, ... }: +{ + xdg.configFile."awesome/rc.lua".source = ./rc.lua; + xdg.configFile."awesome/wallpaper.png".source = ../../../../images/wallpaper.png; +} diff --git a/users/rouven/modules/awesome/rc.lua b/users/rouven/modules/awesome/rc.lua new file mode 100644 index 0000000..3b0fc25 --- /dev/null +++ b/users/rouven/modules/awesome/rc.lua @@ -0,0 +1,505 @@ +-- 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) diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix index 23cafbb..2a97049 100644 --- a/users/rouven/modules/default.nix +++ b/users/rouven/modules/default.nix @@ -3,6 +3,7 @@ imports = [ ./accounts + ./awesome ./alacritty ./flameshot ./fzf