diff --git a/.tmux.conf b/.tmux.conf index 90d4c0b..5b65a64 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -6,7 +6,7 @@ # set -ga terminal-overrides ",*256col*:Tc" set -ga terminal-overrides ",xterm-256color:Tc" set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' -set-option -g default-shell "/usr/bin/zsh" +set-option -g default-shell "/home/user/.nix-profile/bin/zsh" setw -g mode-keys vi # underscore colours - needs tmux-3.0 diff --git a/awesome.rc.lua b/awesome.rc.lua new file mode 100644 index 0000000..085cb13 --- /dev/null +++ b/awesome.rc.lua @@ -0,0 +1,602 @@ +-- 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") +-- 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") + +-- {{{ Error handling +-- Check if awesome encountered an error during startup and fell back to +-- another config (This code will only ever execute for the fallback config) +if awesome.startup_errors then + naughty.notify({ preset = naughty.config.presets.critical, + title = "Oops, there were errors during startup!", + text = awesome.startup_errors }) +end + +-- 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 = "contour" +editor = os.getenv("EDITOR") or "nvim" +editor_cmd = terminal .. " -e " .. editor + +-- Default modkey. +-- Usually, Mod4 is the key with a logo between Control and Alt. +-- If you do not like this or do not have such a key, +-- I suggest you to remap Mod4 to another key using xmodmap or other tools. +-- However, you can use another modifier like Mod1, but it may interact with others. +modkey = "Mod4" + +-- Table of layouts to cover with awful.layout.inc, order matters. +awful.layout.layouts = { + awful.layout.suit.spiral, + awful.layout.suit.spiral.dwindle, + awful.layout.suit.floating, + awful.layout.suit.tile, + awful.layout.suit.tile.left, + awful.layout.suit.tile.bottom, + awful.layout.suit.tile.top, + awful.layout.suit.fair, + awful.layout.suit.fair.horizontal, + awful.layout.suit.max, + awful.layout.suit.max.fullscreen, + awful.layout.suit.magnifier, + awful.layout.suit.corner.nw, + -- awful.layout.suit.corner.ne, + -- awful.layout.suit.corner.sw, + -- awful.layout.suit.corner.se, +} +-- }}} + +-- {{{ 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 }, +} + +mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal } + } + }) + +mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, + menu = mymainmenu }) + +mylock = wibox.widget.textbox() +mylock:set_text("Lock") +mylock:connect_signal("button::press", function() + awful.spawn("i3lock -n -c 000000 -f") + end +) + +-- Menubar configuration +menubar.utils.terminal = terminal -- Set the terminal for applications that require it +-- }}} + +-- Keyboard map indicator and switcher +mykeyboardlayout = awful.widget.keyboardlayout() + +-- {{{ Wibar +-- Create a textclock widget +mytextclock = wibox.widget.textclock() + +-- 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 + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) + end + gears.wallpaper.maximized(wallpaper, s, true) + end +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.fixed.horizontal, + mylauncher, + s.mytaglist, + s.mypromptbox, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + mykeyboardlayout, + wibox.widget.systray(), + mylock, + mytextclock, + s.mylayoutbox, + }, + } +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"}), + + 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, }, "w", function () mymainmenu:show() end, + {description = "show main menu", group = "awesome"}), + + -- Layout manipulation + awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end, + {description = "swap with next client by index", group = "client"}), + awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end, + {description = "swap with previous client by index", group = "client"}), + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, + {description = "focus the next screen", group = "screen"}), + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end, + {description = "focus the previous screen", group = "screen"}), + 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" }, "q", awesome.quit, + {description = "quit awesome", group = "awesome"}), + + awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, + {description = "increase master width factor", group = "layout"}), + awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end, + {description = "decrease master width factor", group = "layout"}), + awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end, + {description = "increase the number of master clients", group = "layout"}), + awful.key({ modkey, "Shift" }, "l", 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({ modkey }, "p", function() menubar.show() end, + {description = "show the menubar", group = "launcher"}), + awful.key({}, "Print", function() + awful.spawn("flameshot gui") + end) +) + +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" }, "c", 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"}), + awful.key({ modkey, "Control" }, "m", + function (c) + c.maximized_vertical = not c.maximized_vertical + c:raise() + end , + {description = "(un)maximize vertically", group = "client"}), + awful.key({ modkey, "Shift" }, "m", + function (c) + c.maximized_horizontal = not c.maximized_horizontal + c:raise() + end , + {description = "(un)maximize horizontally", 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 + } + }, + + -- Floating clients. + { rule_any = { + instance = { + "DTA", -- Firefox addon DownThemAll. + "copyq", -- Includes session name in class. + "pinentry", + }, + class = { + "Arandr", + "Blueman-manager", + "Gpick", + "Kruler", + "MessageWin", -- kalarm. + "Sxiv", + "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size. + "Wpa_gui", + "veromix", + "xtightvncviewer"}, + + -- Note that the name property shown in xprop might be set slightly after creation of the client + -- and the name shown there might not match defined rules here. + name = { + "Event Tester", -- xev. + }, + role = { + "AlarmWindow", -- Thunderbird's calendar. + "ConfigManager", -- Thunderbird's about:config. + "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. + } + }, properties = { floating = true }}, + + -- Add titlebars to normal clients and dialogs + { rule_any = {type = { "normal", "dialog" } + }, properties = { titlebars_enabled = true } + }, + + -- Set Firefox to always map on the tag named "2" on screen 1. + -- { rule = { class = "Firefox" }, + -- properties = { screen = 1, tag = "2" } }, +} +-- }}} + +-- {{{ 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) + +-- Add a titlebar if titlebars_enabled is set to true in the rules. +client.connect_signal("request::titlebars", function(c) + -- buttons for the titlebar + local buttons = gears.table.join( + awful.button({ }, 1, function() + c:emit_signal("request::activate", "titlebar", {raise = true}) + awful.mouse.client.move(c) + end), + awful.button({ }, 3, function() + c:emit_signal("request::activate", "titlebar", {raise = true}) + awful.mouse.client.resize(c) + end) + ) + + awful.titlebar(c) : setup { + { -- Left + awful.titlebar.widget.iconwidget(c), + buttons = buttons, + layout = wibox.layout.fixed.horizontal + }, + { -- Middle + { -- Title + align = "center", + widget = awful.titlebar.widget.titlewidget(c) + }, + buttons = buttons, + layout = wibox.layout.flex.horizontal + }, + { -- Right + awful.titlebar.widget.floatingbutton (c), + awful.titlebar.widget.maximizedbutton(c), + awful.titlebar.widget.stickybutton (c), + awful.titlebar.widget.ontopbutton (c), + awful.titlebar.widget.closebutton (c), + layout = wibox.layout.fixed.horizontal() + }, + layout = wibox.layout.align.horizontal + } +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) +-- }}} + +awful.spawn.with_shell("dropbox") +awful.spawn.with_shell("clash-verge") +awful.spawn.with_shell("fcitx5") +awful.spawn.with_shell("ulauncher") +awful.spawn.with_shell("nm-applet") +awful.spawn.with_shell("cbatticon") +awful.spawn.with_shell("pasystray") +awful.spawn.with_shell("1password --silent") +-- We should manually trigger screenshot. +-- awful.spawn.with_shell("flameshot") + +-- Key repeat rate +os.execute("xset r rate 200 30") + +-- Enable natural scrolling +xinput = io.popen("xinput list --short") +for line in xinput:lines() do + if (line:match(".*Touchpad.*")) then + id = line:match(".*id=([0-9]*).*slave.*") + -- os.execute(string.format("xinput set-prop %d 'libinput Tapping Enabled' 1", id)) + os.execute(string.format("xinput set-prop %d 'libinput Natural Scrolling Enabled' 1", id)) + -- os.execute(string.format("xinput set-prop %d 'Synaptics Edge Scrolling' 0 0 0", id)) + -- os.execute(string.format("xinput set-prop %d 'Synaptics Tap Time' 0", id)) + end +end +xinput:close() diff --git a/contour.yml b/contour.yml index f241373..4b5c915 100644 --- a/contour.yml +++ b/contour.yml @@ -554,7 +554,7 @@ profiles: # When this profile is *activated*, this flag decides # whether or not to put the window into maximized mode. - maximized: false + maximized: true bell: sound: "default" @@ -644,7 +644,7 @@ profiles: # Font related configuration (font face, styles, size, rendering mode). font: # Initial font size in pixels. - size: 9 + size: 18 # Font Locator API # Selects an engine to use for locating font files on the system. diff --git a/dotback b/dotback index ac6a388..3c95f4c 100755 --- a/dotback +++ b/dotback @@ -1,32 +1,40 @@ -#!/bin/bash +#!/usr/bin/env bash # Neovim -cp $HOME/.vimrc . +# cp $HOME/.vimrc . cp $HOME/.config/nvim . -r # Hyprland -cp $HOME/.config/hypr . -r -cp $HOME/.config/waybar . -r -cp $HOME/.config/wlogout . -r +# cp $HOME/.config/hypr . -r +# cp $HOME/.config/waybar . -r +# cp $HOME/.config/wlogout . -r + +# AwesomeWM +cp $HOME/.config/awesome/rc.lua ./awesome.rc.lua # Terminal Emulators -cp $HOME/.config/kitty/kitty.conf . -cp $HOME/.config/alacritty/alacritty.toml . -cp $HOME/.var/app/org.contourterminal.Contour/config/contour/contour.yml . +# cp $HOME/.config/kitty/kitty.conf . +# cp $HOME/.config/alacritty/alacritty.toml . +# Flatpak version +# cp $HOME/.var/app/org.contourterminal.Contour/config/contour/contour.yml . +cp $HOME/.config/contour/contour.yml . # Zsh -cp $HOME/.zshrc . -cp $HOME/.p10k.zsh . +# cp $HOME/.zshrc . +# cp $HOME/.p10k.zsh . # Tmux +# Tmux currently does not run well under home-manager. +# Please place the configuration files manually. cp $HOME/.tmux.conf . cp $HOME/.config/tmux-powerline . -r # Nix cp $HOME/.config/home-manager . -r +cp /etc/nixos . -r # NPM -cp $HOME/.npmrc . +# cp $HOME/.npmrc . # LF cp $HOME/.config/lf . -r diff --git a/home-manager/home.nix b/home-manager/home.nix index 40a7ba8..1210726 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -2,7 +2,10 @@ { config, pkgs, ... }: -{ +let + unstable = import { config = { allowUnfree = true; }; }; +in { + nixpkgs.config.allowUnfree = true; # Home Manager needs a bit of information about you and the paths it should # manage. home.username = "user"; @@ -11,6 +14,18 @@ targets.genericLinux.enable = true; xdg.mime.enable = true; + xdg.desktopEntries = { + # Don't forget to change its permissions. + cider = { + name = "Cider"; + genericName = "Apple Music Player"; + type = "Application"; + exec = "${pkgs.appimage-run}/bin/appimage-run ${config.home.homeDirectory}/Dropbox/arch/cider/Cider-linux-appimage-x64.AppImage"; + terminal = false; + categories = [ "AudioVideo" "Audio" ]; + }; + }; + # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release # introduces backwards incompatible changes. @@ -23,25 +38,44 @@ # The home.packages option allows you to install Nix packages into your # environment. home.packages = [ - # Install contour through Flatpak instead. + # Terminal # pkgs.contour + pkgs.tmux + pkgs.kitty + pkgs.alacritty # Networking - pkgs.clash-verge-rev + # pkgs.clash-verge-rev # Editor - pkgs.neovim + unstable.neovim pkgs.lua-language-server pkgs.cmake-language-server + pkgs.nil # Nix language server + pkgs.nodePackages.prettier pkgs.helix pkgs.zed-editor # Tools + pkgs.pkg-config + pkgs.appimage-run + pkgs.gnumake + pkgs.gcc + pkgs.autoconf + pkgs.automake pkgs.btop pkgs.fx pkgs.mtr pkgs.htop pkgs.gdb + pkgs.dropbox + pkgs.brightnessctl + pkgs.psmisc + pkgs.xclip # Clipboard support + pkgs.vulkan-tools + pkgs.lshw + unstable._1password + unstable._1password-gui # Python (pkgs.python312.withPackages (ps: with ps; [ @@ -53,14 +87,42 @@ pkgs.nodejs_22 # Waybar - pkgs.waybar - pkgs.waybar-mpris + # pkgs.waybar + # pkgs.waybar-mpris + + # Desktop management + pkgs.xfce.thunar + pkgs.baobab + pkgs.i3lock + pkgs.flameshot + + # Multimedia + pkgs.kdePackages.gwenview + pkgs.vlc + pkgs.playerctl + + # Streaming + pkgs.obs-studio + + # Telegram + pkgs.telegram-desktop # Misc - pkgs.lf # Terminal file manager - # pkgs.smassh # Typing test - pkgs.you-get # YouTube video downloader - pkgs.asciinema # Record terminal sessions + pkgs.fastfetch + pkgs.onefetch + pkgs.lf # Terminal file manager + # pkgs.smassh # Typing test + pkgs.you-get # YouTube video downloader + pkgs.asciinema # Record terminal sessions + pkgs.ulauncher # application launcher + pkgs.networkmanagerapplet # Network manager tray icon + pkgs.cbatticon # Battery tray icon + pkgs.pavucontrol # Volume control + pkgs.pasystray # Volume tray icon + pkgs.yaru-theme + unstable.adwaita-icon-theme + pkgs.adwaita-qt + pkgs.adwaita-qt6 # # It is sometimes useful to fine-tune packages, for example, by applying # # overrides. You can do that directly here, just don't forget the @@ -111,6 +173,69 @@ # EDITOR = "emacs"; }; + programs.zsh = { + enable = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "tmux" + ]; + }; + plugins = [ + { + name = "p10k-config"; + src = "${config.home.homeDirectory}/.config/p10k"; + file = "p10k.zsh"; + } + ]; + initExtraFirst = '' + ZSH_TMUX_AUTOSTART=true + ZSH_TMUX_AUTOCONNECT=false + ''; + initExtra = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + }; + + programs.git = { + enable = true; + userName = "arielherself"; + userEmail = "arielherself@duck.com"; + extraConfig = { + commit.gpgsign = true; + gpg.format = "ssh"; + gpg."ssh".program = "${unstable._1password-gui}/bin/op-ssh-sign"; + push.autoSetupRemote = true; + core.editor = "nvim"; + }; + }; + + gtk = { + enable = true; + theme.name = "Adwaita-dark"; + }; + + # programs.tmux = { + # enable = true; + # sensibleOnTop = false; + # shell = "${pkgs.zsh}/bin/zsh"; + # extraConfig = '' + # # set-option -g default-shell "${pkgs.zsh}/bin/zsh" + # # set -g default-command "${pkgs.zsh}/bin/zsh" + # # setw -g mode-keys vi + # # set -g @plugin 'tmux-plugins/tpm' + # # set -g @plugin 'tmux-plugins/tmux-sensible' + # # set -g @plugin 'erikw/tmux-powerline' + # # run '~/.tmux/plugins/tpm/tpm' + # ''; + # }; + + services.mpris-proxy.enable = true; + # Let Home Manager install and manage itself. - programs.home-manager.enable = true; + programs.home-manager = { + enable = true; + }; } + diff --git a/nixos/configuration.nix b/nixos/configuration.nix new file mode 100644 index 0000000..45baec6 --- /dev/null +++ b/nixos/configuration.nix @@ -0,0 +1,229 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +let berkeley-mono = pkgs.stdenv.mkDerivation { + name = "berkeley-mono"; + version = "1.007"; + src = /home/user/Dropbox/berkeley-fonts; + + installPhase = '' + mkdir -p $out/share/fonts/truetype/berkeley-mono + cp -r $src/* $out/share/fonts/truetype/berkeley-mono + ''; +}; + +in { + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "zbook"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + time.timeZone = "Asia/Shanghai"; + + # Configure network proxy if necessary + networking.nameservers = [ + "8.8.8.8" + "1.1.1.1" + ]; + networking.proxy.default = "http://127.0.0.1:7897/"; + networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + fonts = { + packages = with pkgs; [ + noto-fonts + noto-fonts-emoji + source-han-sans + source-han-serif + (nerdfonts.override { + fonts = [ + "JetBrainsMono" + ]; + }) + berkeley-mono + ]; + }; + i18n.inputMethod = { + enabled = "fcitx5"; + fcitx5.addons = with pkgs; [ + fcitx5-mozc + fcitx5-gtk + fcitx5-chinese-addons + fcitx5-rime + ]; + }; + + # Enable the X11 windowing system. + services.xserver = { + enable = true; + dpi = 160; + windowManager.awesome = { + enable = true; + luaModules = with pkgs.luaPackages; [ + luarocks + luadbi-mysql + ]; + }; + }; + services.displayManager = { + sddm.enable = true; + defaultSession = "none+awesome"; + }; + # services.networking.wireless.userControlled = true; + services.blueman.enable = true; + + + + + # Configure keymap in X11 + services.xserver.xkb.layout = "us"; + services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + hardware.enableAllFirmware = true; + + services.xserver.videoDrivers = ["nvidia"]; + + hardware.opengl.enable = true; + hardware.nvidia = { + modesetting.enable = true; + powerManagement.finegrained = false; + open = false; # Do not use open-source kernel module + nvidiaSettings = true; + prime = { + offload = { + enable = true; + enableOffloadCmd = true; + }; + amdgpuBusId = "PCI:101:0:0"; + nvidiaBusId = "PCI:1:0:0"; + }; + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "535.154.05"; + sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg="; + sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k="; + openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo="; + settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10="; + persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; + }; + }; + # Enable sound. + hardware.pulseaudio = { + enable = true; + package = pkgs.pulseaudioFull; + extraConfig = '' + load-module module-switch-on-connect + ''; + }; + hardware.bluetooth = { + enable = true; + settings = { + General = { + Enable = "Source,Sink,Media,Socket"; + Experimental = true; + }; + }; + }; + hardware.bluetooth.powerOnBoot = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + services.libinput.enable = true; + + nixpkgs.config.allowUnfree = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.user = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + home-manager + contour + vivaldi + # firefox + # tree + ]; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + sqlite + clash-verge-rev + bind + pciutils + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + programs.mtr.enable = true; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.05"; # Did you read the comment? + + +} + diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix new file mode 100644 index 0000000..b258b7e --- /dev/null +++ b/nixos/hardware-configuration.nix @@ -0,0 +1,39 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/72c0a468-0443-4a68-bfa3-452d2e6467ea"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3AC4-DA1A"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index b8b04f9..420b5ea 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -74,12 +74,8 @@ "render-markdown": { "branch": "main", "commit": "b75f681d675e21b5a09909997e9fffa6313c946e" }, "search.nvim": { "branch": "main", "commit": "27191f6c10a13c8018136b2490342d35960ed0ab" }, "sg.nvim": { "branch": "master", "commit": "8bdd4d19da2268072708d5fe18fda9c23e16509d" }, - "smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" }, - "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, "telescope-git-file-history.nvim": { "branch": "master", "commit": "f94fab1d5a51fa28dd95b1a6bd377505dc1a8e82" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, @@ -87,6 +83,7 @@ "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, + "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "0a501a22b587cc98531fcb617bf8cda29cb2dc11" }, "vim-cursorword": { "branch": "master", "commit": "34852083276c1fd9ff4cccaf052111e7d5a2472e" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-markdown": { "branch": "master", "commit": "a657e697376909c41475a686eeef7fc7a4972d94" }, diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua index 7a31928..7403719 100644 --- a/nvim/lua/config.lua +++ b/nvim/lua/config.lua @@ -354,28 +354,28 @@ local plugins = { { "AckslD/nvim-neoclip.lua", -- `p` }, - { - "danielfalk/smart-open.nvim", -- sort file search results by frequency - branch = "0.2.x", - config = function() - require("telescope").load_extension("smart_open") - end, - dependencies = { - "kkharji/sqlite.lua", - -- Only required if using match_algorithm fzf - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, - -- Optional. If installed, native fzy will be used when match_algorithm is fzy - { "nvim-telescope/telescope-fzy-native.nvim" }, - }, - }, + -- { + -- "danielfalk/smart-open.nvim", -- sort file search results by frequency + -- branch = "0.2.x", + -- config = function() + -- require("telescope").load_extension("smart_open") + -- end, + -- dependencies = { + -- "kkharji/sqlite.lua", + -- -- Only required if using match_algorithm fzf + -- { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + -- -- Optional. If installed, native fzy will be used when match_algorithm is fzy + -- { "nvim-telescope/telescope-fzy-native.nvim" }, + -- }, + -- }, { "chrisgrieser/nvim-origami", -- Fold keymap event = "BufReadPost", -- later or on keypress would prevent saving folds opts = true, -- needed even when using default config }, { - dir = '/home/user/Documents/ultimate-autopair.nvim', - -- 'altermo/ultimate-autopair.nvim', + -- dir = '/home/user/Documents/ultimate-autopair.nvim', + 'altermo/ultimate-autopair.nvim', event={'InsertEnter','CmdlineEnter'}, branch='v0.6', --recommended as each new version will have breaking changes opts={ @@ -515,10 +515,10 @@ require('search').setup { return vim.fn.isdirectory('.git') == 1 end }, - { - 'Smart Open', - ext.smart_open.smart_open, - }, + -- { + -- 'Smart Open', + -- ext.smart_open.smart_open, + -- }, { 'Buffers', builtin.buffers, @@ -1140,9 +1140,10 @@ require("telescope").setup { }, } -vim.env.SRC_ENDPOINT = 'https://sourcegraph.com/' -vim.env.SRC_ACCESS_TOKEN = '' -- TODO: fill in the token before using it - -require('sg').setup {} +-- NixOS cannot run this lsp +-- vim.env.SRC_ENDPOINT = 'https://sourcegraph.com/' +-- vim.env.SRC_ACCESS_TOKEN = '' -- TODO: fill in the token before using it +-- +-- require('sg').setup {} -- vim.diagnostic.config({ virtual_text = false })