diff options
28 files changed, 1733 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6fe43c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.lock diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..f4054ad --- /dev/null +++ b/flake.nix @@ -0,0 +1,45 @@ +{ + description = "Jon's NixOS configuration"; + + inputs = { + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + + nurpkgs.url = "github:nix-community/NUR"; + }; + + outputs = { self, nixpkgs, nixos-hardware, home-manager, ... }@inputs: + let + inherit (self) outputs; + stateVersion = "23.05"; + + overlays = [ + inputs.nurpkgs.overlay + ]; + + housemaker = import ./housemaker.nix { inherit inputs outputs stateVersion overlays; }; + in { + nixosConfigurations = { + jontest = housemaker.newhost { nixpkgs = nixpkgs; overlays = overlays; hostname = "jontest"; username = "jon"; }; + }; + nixosConfigurations = { + jontop = housemaker.newhost { nixpkgs = nixpkgs; overlays = overlays; hostname = "jontop"; username = "jon"; }; + }; + nixosConfigurations = { + jonbox = housemaker.newhost { nixpkgs = nixpkgs; overlays = overlays; hostname = "jonbox"; username = "jon"; }; + }; + + homeConfigurations = { + "jon@jontest" = housemaker.newhome { nixpkgs = nixpkgs; overlays = overlays; hostname = "jontest"; username = "jon"; platform = "x86_64-linux"; }; + "jon@jontop" = housemaker.newhome { nixpkgs = nixpkgs; overlays = overlays; hostname = "jontop"; username = "jon"; platform = "x86_64-linux"; }; + "jon@jonbox" = housemaker.newhome { nixpkgs = nixpkgs; overlays = overlays; hostname = "jonbox"; username = "jon"; platform = "x86_64-linux"; }; + }; + }; +} diff --git a/home/jon/home.nix b/home/jon/home.nix new file mode 100644 index 0000000..7957beb --- /dev/null +++ b/home/jon/home.nix @@ -0,0 +1,54 @@ +{ inputs, config, lib, pkgs, ... }: +let + hm = inputs.home-manager.lib.hm; + username = "jon"; +in +{ + home.username = username; + home.homeDirectory = "/home/${username}"; + + imports = [ + ../../programs/picom.nix + + ../../programs/kitty.nix + ../../programs/zsh.nix + ../../programs/tmux.nix + ../../programs/neovim.nix + ../../programs/firefox.nix + ../../programs/newsboat.nix + ]; + + home.packages = with pkgs; [ + libreoffice + hunspell + hunspellDicts.en_US + + thefuck + mpc-cli + pavucontrol + ]; + + home.activation.installAwesomeWMConfig = '' + if [ ! -d "$HOME/.config/awesome" ]; then + ln -s "/etc/nixos/programs/dotfiles/awesome" "$HOME/.config/awesome" + chmod -R +w "$HOME/.config/awesome" + fi + ''; + + programs.home-manager.enable = true; + + #xdg.configFile."kitty/kitty.conf".source = ../dotfiles/kitty/kitty.conf; + programs.git = { + enable = true; + userName = "Jon Santmyer"; + userEmail = "jon@jonsantmyer.com"; + }; + + programs.ncmpcpp.enable = true; + + programs.mpv = { + enable = true; + }; + + home.stateVersion = "23.05"; +} diff --git a/housemaker.nix b/housemaker.nix new file mode 100644 index 0000000..973507c --- /dev/null +++ b/housemaker.nix @@ -0,0 +1,27 @@ +{ inputs, outputs, stateVersion, ... }: +{ + newhome = { nixpkgs, overlays, hostname, username, platform }: inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.${platform}; + extraSpecialArgs = { + inherit inputs outputs hostname platform username stateVersion overlays; + }; + modules = [ + { nixpkgs.overlays = overlays; } + ./home/${username}/home.nix + ]; + }; + + newhost = { nixpkgs, overlays, hostname, username }: inputs.nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs hostname username stateVersion overlays; + }; + modules = [ + { nixpkgs.overlays = overlays; } + ./systems + ]; + }; + + forAllSystems = inputs.nixpkgs.lib.genAttrs [ + "x86_64-linux" + ]; +} diff --git a/programs/dotfiles/awesome/rc.lua b/programs/dotfiles/awesome/rc.lua new file mode 100644 index 0000000..e2b8cb7 --- /dev/null +++ b/programs/dotfiles/awesome/rc.lua @@ -0,0 +1,679 @@ +-- 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") + +local xresources = require("beautiful.xresources") +local dpi = xresources.apply_dpi + +-- 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(os.getenv("HOME") .. "/.config/awesome/theme.lua") + +local update_taglist = function(item, tag, index) + if tag.selected then + item:get_children_by_id('shape_role')[1].bg = beautiful.tag_list_focused + elseif tag.urgent then + item:get_children_by_id('shape_role')[1].bg = beautiful.tag_list_urgent + elseif #tag:clients() > 0 then + item:get_children_by_id('shape_role')[1].bg = beautiful.tag_list_occupied + else + item:get_children_by_id('shape_role')[1].bg = beautiful.tag_list_empty + end +end + +-- This is used later as the default terminal and editor to run. +terminal = "kitty" +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.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.spiral, + -- awful.layout.suit.spiral.dwindle, + 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 }) + +-- Menubar configuration +menubar.utils.terminal = terminal -- Set the terminal for applications that require it +-- }}} + +-- {{{ 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, + style = { + shape = gears.shape.powerline + }, + widget_template = { + { + { + { + left = 8, + right = 8, + top = 8, + bottom = 8, + widget = wibox.container.margin + }, + id = "shape_role", + bg = beautiful.bg_normal, + shape = gears.shape.circle, + widget = wibox.container.background, + }, + left = 4, + right = 4, + widget = wibox.container.margin + }, + widget = wibox.container.background, + create_callback = function(self, tag, index, objects) + self.align = "left" + self.valign = "center" + self.font = beautiful.taglist_text_font + + update_taglist(self, tag, index) + + self:connect_signal('mouse:enter', function() + if self.bg ~= beautiful.bg_focused then + self.backup = self.bg + self.has_backup = true + end + self.bg = bg_focused + end) + + self:connect_signal('mouse::leave', function() + if self.has_backup then self.bg = self.backup end + end) + + end, + update_callback = function(self, tag, index, objects) + update_taglist(self, tag, index) + end, + }, + buttons = taglist_buttons + } + + -- Create a tasklist widget + s.mytasklist = awful.widget.tasklist { + screen = s, + filter = awful.widget.tasklist.filter.currenttags, + buttons = tasklist_buttons, + style = { + shape = gears.shape.rectangle + }, + layout = { + spacing = 4, + layout = wibox.layout.flex.horizontal + }, + widget_template = { + { + { + wibox.widget.base.make_widget(), + id = 'background_role', + forced_height = 4, + widget = wibox.container.background, + }, + { + { + { + { + id = 'icon_role', + widget = wibox.widget.imagebox, + }, + margins = 2, + widget = wibox.container.margin, + }, + { + id = 'text_role', + widget = wibox.widget.textbox + }, + layout = wibox.layout.fixed.horizontal + }, + left = 4, + right = 4, + bottom = 4, + widget = wibox.container.margin, + }, + layout = wibox.layout.fixed.vertical + }, + nil, + widget = wibox.container.background, + }, + } + + -- Create the wibox + s.mywibox = awful.wibar({ position = "top", screen = s, bg = "#00000000"}) + + s.systray = wibox.widget.systray() + s.systray.visible = true + + -- Add widgets to the wibox + s.mywibox:setup { + layout = wibox.layout.align.horizontal, + expand = "none", + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + wibox.container.margin(s.mytaglist, 5, 0, 0), + s.mypromptbox, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.container.margin(s.systray, 0, 0, 3, 3), + 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 }, "d", function() menubar.show() end, + {description = "show the menubar", group = "launcher"}) +) + +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 }, "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"}), + 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.maximizedbutton(c), + awful.titlebar.widget.closebutton (c), + layout = wibox.layout.fixed.horizontal() + }, + shape = gears.shape.rounded_rect, + widget = wibox.container.background, + layout = wibox.layout.align.horizontal + } +end) + +client.connect_signal("property::floating", function(c) + local tb = awful.titlebar(c) + + if c.floating then + awful.titlebar.show(c) + else + awful.titlebar.hide(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/programs/dotfiles/awesome/theme.lua b/programs/dotfiles/awesome/theme.lua new file mode 100644 index 0000000..241ea2e --- /dev/null +++ b/programs/dotfiles/awesome/theme.lua @@ -0,0 +1,143 @@ +--------------------------- +-- Default awesome theme -- +--------------------------- + +local theme_assets = require("beautiful.theme_assets") +local xresources = require("beautiful.xresources") +local dpi = xresources.apply_dpi + +local gfs = require("gears.filesystem") +local themes_path = gfs.get_themes_dir() + +local theme = {} + +theme.font = "FiraCode Nerd Font 10" + +theme.bg_normal = "#1e1e2e" +theme.bg_minimize = theme.bg_normal +theme.bg_focus = "#2e2e3e" +theme.bg_urgent = "#4e4e5e" +theme.bg_systray = theme.bg_normal + +theme.fg_minimize = "#45475A" +theme.fg_normal = "#cdd6f4" +theme.fg_focus = "#cdd6f4" +theme.fg_urgent = "#f38ba8" + +theme.tag_list_empty = "#45475A" +theme.tag_list_occupied = "#767d98" +theme.tag_list_focused = "#cdd6f4" +theme.tag_list_urgent = "#f38ba8" + +theme.useless_gap = dpi(8) +theme.border_width = dpi(3) +theme.border_normal = theme.bg_normal +theme.border_focus = theme.bg_focus +theme.border_marked = theme.fg_focus + +-- There are other variable sets +-- overriding the default one when +-- defined, the sets are: +-- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile] +-- tasklist_[bg|fg]_[focus|urgent] +-- titlebar_[bg|fg]_[normal|focus] +-- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color] +-- mouse_finder_[color|timeout|animate_timeout|radius|factor] +-- prompt_[fg|bg|fg_cursor|bg_cursor|font] +-- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font] +-- Example: +--theme.taglist_bg_focus = "#ff0000" + +-- Generate taglist squares: +local taglist_square_size = dpi(4) +theme.taglist_squares_sel = theme_assets.taglist_squares_sel( + taglist_square_size, theme.fg_normal +) +theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel( + taglist_square_size, theme.fg_normal +) + +-- Variables set for theming notifications: +-- notification_font +-- notification_[bg|fg] +-- notification_[width|height|margin] +-- notification_[border_color|border_width|shape|opacity] + +-- Variables set for theming the menu: +-- menu_[bg|fg]_[normal|focus] +-- menu_[border_color|border_width] +theme.menu_submenu_icon = themes_path.."zenburn/submenu.png" +theme.menu_height = dpi(15) +theme.menu_width = dpi(100) + +-- You can add as many variables as +-- you wish and access them by using +-- beautiful.variable in your rc.lua +--theme.bg_widget = "#cc0000" + +-- Define the image to load + +theme.titlebar_close_button_normal = themes_path.."zenburn/titlebar/close_normal.png" +theme.titlebar_close_button_focus = themes_path.."zenburn/titlebar/close_focus.png" + +theme.titlebar_minimize_button_normal = themes_path.."zenburn/titlebar/minimize_normal.png" +theme.titlebar_minimize_button_focus = themes_path.."zenburn/titlebar/minimize_focus.png" + +theme.titlebar_ontop_button_normal_inactive = themes_path.."zenburn/titlebar/ontop_normal_inactive.png" +theme.titlebar_ontop_button_focus_inactive = themes_path.."zenburn/titlebar/ontop_focus_inactive.png" +theme.titlebar_ontop_button_normal_active = themes_path.."zenburn/titlebar/ontop_normal_active.png" +theme.titlebar_ontop_button_focus_active = themes_path.."zenburn/titlebar/ontop_focus_active.png" + +theme.titlebar_sticky_button_normal_inactive = themes_path.."zenburn/titlebar/sticky_normal_inactive.png" +theme.titlebar_sticky_button_focus_inactive = themes_path.."zenburn/titlebar/sticky_focus_inactive.png" +theme.titlebar_sticky_button_normal_active = themes_path.."zenburn/titlebar/sticky_normal_active.png" +theme.titlebar_sticky_button_focus_active = themes_path.."zenburn/titlebar/sticky_focus_active.png" + +theme.titlebar_floating_button_normal_inactive = themes_path.."zenburn/titlebar/floating_normal_inactive.png" +theme.titlebar_floating_button_focus_inactive = themes_path.."zenburn/titlebar/floating_focus_inactive.png" +theme.titlebar_floating_button_normal_active = themes_path.."zenburn/titlebar/floating_normal_active.png" +theme.titlebar_floating_button_focus_active = themes_path.."zenburn/titlebar/floating_focus_active.png" + +theme.titlebar_maximized_button_normal_inactive = themes_path.."zenburn/titlebar/maximized_normal_inactive.png" +theme.titlebar_maximized_button_focus_inactive = themes_path.."zenburn/titlebar/maximized_focus_inactive.png" +theme.titlebar_maximized_button_normal_active = themes_path.."zenburn/titlebar/maximized_normal_active.png" +theme.titlebar_maximized_button_focus_active = themes_path.."zenburn/titlebar/maximized_focus_active.png" + +theme.wallpaper = themes_path.."zenburn/zenburn-background.png" + +-- You can use your own layout icons like this: +--theme.layout_fairh = themes_path.."zenburn/layouts/fairhw.png" +--theme.layout_fairv = themes_path.."zenburn/layouts/fairvw.png" +theme.layout_floating = themes_path.."default/layouts/floatingw.png" +--theme.layout_magnifier = themes_path.."zenburn/layouts/magnifierw.png" +theme.layout_max = themes_path.."default/layouts/maxw.png" +--theme.layout_fullscreen = themes_path.."zenburn/layouts/fullscreenw.png" +--theme.layout_tilebottom = themes_path.."zenburn/layouts/tilebottomw.png" +--theme.layout_tileleft = themes_path.."zenburn/layouts/tileleftw.png" +theme.layout_tile = themes_path.."default/layouts/tilew.png" +--theme.layout_tiletop = themes_path.."zenburn/layouts/tiletopw.png" +--theme.layout_spiral = themes_path.."zenburn/layouts/spiralw.png" +--theme.layout_dwindle = themes_path.."zenburn/layouts/dwindlew.png" +--theme.layout_cornernw = themes_path.."zenburn/layouts/cornernww.png" +--theme.layout_cornerne = themes_path.."zenburn/layouts/cornernew.png" +--theme.layout_cornersw = themes_path.."zenburn/layouts/cornersww.png" +--theme.layout_cornerse = themes_path.."zenburn/layouts/cornersew.png" + +-- Generate Awesome icon: +theme.awesome_icon = theme_assets.awesome_icon( + theme.menu_height, theme.bg_focus, theme.fg_focus +) + +-- Define the icon theme for application icons. If not set then the icons +-- from /usr/share/icons and /usr/share/icons/hicolor will be used. +theme.icon_theme = nil + +theme.taglist_text_font = "FiraCode Nerd Font" + +theme.taglist_text_empty = { "", "", "", "", "", "", "", "", "", "" } +theme.taglist_text_occupied = { "", "", "", "", "", "", "", "", "", "" } +theme.taglist_text_focused = { "", "", "", "", "", "", "", "", "", "" } + +return theme + +-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 diff --git a/programs/dotfiles/kitty/kitty.conf b/programs/dotfiles/kitty/kitty.conf new file mode 100644 index 0000000..006956a --- /dev/null +++ b/programs/dotfiles/kitty/kitty.conf @@ -0,0 +1,47 @@ +font_family FiraCode Nerd Font +bold_font auto +italic_font auto +bold_italic_font auto + +include ./theme.conf + +scrollback_lines 1000 +scrollback_pager less --chop-long-lines --RAW-CONTROL-CHARS +INPUT_LINE_NUMBER +scrollback_pager_history_size 0 +scrollback_fill_enlarged_window no +wheel_scroll_multiplier 5.0 + +mouse_hide_wait -1 +detect_urls no +copy_on_select no +strip_trailing_spaces never +select_by_word_characters @-./_~?&=%+# +click_interval -1 +focus_follows_mouse yes +default_pointer_shape beam +pointer_shape_when_dragging beam + +repaint_delay 10 +input_delay 3 +sync_to_monitor yes + +remember_window_size no +initial_window_width 640 +initial_window_height 480 +enabled_layouts * + +tab_bar_min_tabs 2 +tab_bar_edge bottom +tab_bar_style powerline +tab_powerline_style slanted +tab_title_template {title}{' :{}'.format(num_windows) if num_windows > 1 else ''} + +close_on_child_death no +allow_remote_control no +listen_on none +update_check_interval 24 +startup_session none +clipboard_control write-clipboard write-primary +allow_hyperlinks yes + + diff --git a/programs/dotfiles/kitty/themes/mocha.conf b/programs/dotfiles/kitty/themes/mocha.conf new file mode 100644 index 0000000..3ebc78f --- /dev/null +++ b/programs/dotfiles/kitty/themes/mocha.conf @@ -0,0 +1,80 @@ +# vim:ft=kitty + +## name: Catppuccin Kitty Mocha +## author: Catppuccin Org +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + + +# The basic colors +foreground #CDD6F4 +background #1E1E2E +selection_foreground #1E1E2E +selection_background #F5E0DC + +# Cursor colors +cursor #F5E0DC +cursor_text_color #1E1E2E + +# URL underline color when hovering with mouse +url_color #F5E0DC + +# Kitty window border colors +active_border_color #B4BEFE +inactive_border_color #6C7086 +bell_border_color #F9E2AF + +# OS Window titlebar colors +wayland_titlebar_color system +macos_titlebar_color system + +# Tab bar colors +active_tab_foreground #11111B +active_tab_background #CBA6F7 +inactive_tab_foreground #CDD6F4 +inactive_tab_background #181825 +tab_bar_background #11111B + +# Colors for marks (marked text in the terminal) +mark1_foreground #1E1E2E +mark1_background #B4BEFE +mark2_foreground #1E1E2E +mark2_background #CBA6F7 +mark3_foreground #1E1E2E +mark3_background #74C7EC + +# The 16 terminal colors + +# black +color0 #45475A +color8 #585B70 + +# red +color1 #F38BA8 +color9 #F38BA8 + +# green +color2 #A6E3A1 +color10 #A6E3A1 + +# yellow +color3 #F9E2AF +color11 #F9E2AF + +# blue +color4 #89B4FA +color12 #89B4FA + +# magenta +color5 #F5C2E7 +color13 #F5C2E7 + +# cyan +color6 #94E2D5 +color14 #94E2D5 + +# white +color7 #BAC2DE +color15 #A6ADC8 diff --git a/programs/dotfiles/neovim/init.lua b/programs/dotfiles/neovim/init.lua new file mode 100644 index 0000000..4a80830 --- /dev/null +++ b/programs/dotfiles/neovim/init.lua @@ -0,0 +1,14 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath + }) +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup("plugins") diff --git a/programs/dotfiles/neovim/init.vim b/programs/dotfiles/neovim/init.vim new file mode 100644 index 0000000..993ea88 --- /dev/null +++ b/programs/dotfiles/neovim/init.vim @@ -0,0 +1,71 @@ +set termguicolors + +filetype plugin indent on +set tabstop=4 softtabstop=4 shiftwidth=4 +set expandtab smarttab +set autoindent +set incsearch ignorecase smartcase hlsearch +set encoding=utf-8 +set textwidth=0 +set number + +set hidden +set title +set noshowmode +set noruler +set noshowcmd + +set nobackup +set nowritebackup + +set updatetime=300 +set signcolumn=yes + +let mapleader = "\<Space>" + +" Tab-trigger completion +inoremap <silent><expr> <Tab> + \ coc#pum#visible() ? coc#pum#next(1) : + \ CheckBackspace() ? "\<Tab>" : + \ coc#refresh() +inoremap <expr><S-Tab> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>" + +inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm() : + \ "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>" + +function! CheckBackspace() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +inoremap <silent><expr> <c-space> coc#refresh() + +nmap <silent> [g <Plug>(coc-diagnostic-prev) +nmap <silent> ]g <Plug>(coc-diagnostic-next) + +nmap <silent> gd <Plug>(coc-definition) +nmap <silent> gy <Plug>(coc-type-definition) +nmap <silent> gi <Plug>(coc-implementation) +nmap <silent> gr <Plug>(coc-references) + +nnoremap <silent> K :call ShowDocumentation()<CR> + +function! ShowDocumentation() + if CocAction('hasProvider', 'hover') + call CocActionAsync('doHover') + else + call feedkeys('K', 'in') + endif +endfunction + +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Telescope +nnoremap <leader>ff <cmd>Telescope find_files<cr> +nnoremap <leader>fg <cmd>Telescope live_grep<cr> +nnoremap <leader>fb <cmd>Telescope buffers<cr> +nnoremap <leader>fh help_tags<cr> + +lua require('init') + +color catppuccin diff --git a/programs/dotfiles/neovim/plugins.lua b/programs/dotfiles/neovim/plugins.lua new file mode 100644 index 0000000..83c74ad --- /dev/null +++ b/programs/dotfiles/neovim/plugins.lua @@ -0,0 +1,57 @@ +return +{ + { "neovim/nvim-lspconfig" }, + { "MordechaiHadad/nvim-lspmanager", + dependencies = { "neovim/nvim-lspconfig" }, + config = function() + require('lspmanager').setup({ + ensure_installed = { + "clangd" + } + }) + end + }, + { "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + require('nvim-treesitter.configs').setup{ + ensure_installed = { "c", "cpp" }, + auto_install = true, + highlight = { + enable = true + } + } + end + }, + { "neoclide/coc.nvim", branch="release" }, + { "nvim-lua/plenary.nvim" }, + { "nvim-telescope/telescope.nvim", tag = '0.1.3', + dependencies = { 'nvim-lua/plenary.nvim' } + }, + { "nvim-tree/nvim-web-devicons" }, + { "lewis6991/gitsigns.nvim", + config = function() + require('gitsigns').setup() + end + }, + { "tpope/vim-surround" }, + { "catppuccin/nvim", name="catppuccin", priority=1000 }, + { "feline-nvim/feline.nvim", + config = function() + local ctp_feline = require('catppuccin.groups.integrations.feline') + require('feline').setup({ + + }) + end + }, + { "romgrk/barbar.nvim", + dependencies = { + 'lewis6991/gitsigns.nvim', + 'nvim-tree/nvim-web-devicons' + }, + init = function() vim.g.barbar_auto_setup = false end, + config = function() + require('barbar').setup() + end + } +} diff --git a/programs/firefox.nix b/programs/firefox.nix new file mode 100644 index 0000000..79ca696 --- /dev/null +++ b/programs/firefox.nix @@ -0,0 +1,48 @@ +{ inputs, config, pkgs, username, ... }: +let + owner = "arkenfox"; + repo = "user.js"; + version = "117.0"; +in +{ + programs.firefox = { + enable = true; + + profiles."default" = { + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + multi-account-containers + ]; + extraConfig = builtins.readFile + ( builtins.fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/refs/tags/${version}.tar.gz"; + sha256="1pll4fbdn2390n05902l3pkg4rizxghkakpzi1r9z1b7blmk1x4s"; + } + "/user.js"); + search = { + force = true; + default = "DuckDuckGo"; + engines = { + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "type"; value = "packages"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@np" ]; + }; + "NixOS Wiki" = { + urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; + iconUpdateURL = "https://nixos.wiki/favicon.png"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = [ "@nw" ]; + }; + }; + }; + settings = { +"browser.download.dir" = "/home/${username}/dwn"; + }; + }; + }; +} diff --git a/programs/kitty.nix b/programs/kitty.nix new file mode 100644 index 0000000..ca535a7 --- /dev/null +++ b/programs/kitty.nix @@ -0,0 +1,32 @@ +{ pkgs, ... }: +{ + xdg.configFile."kitty/theme.conf".source = ./dotfiles/kitty/themes/mocha.conf; + + programs.kitty = { + enable = true; + font = { + name = "FiraCode Nerd Font"; + size = 12; + }; + settings = { + repaint_delay = 10; + input_delay = 3; + sync_to_monitor = true; + + remember_window_size = false; + initial_window_width = 640; + initial_window_height = 480; + enabled_layouts = "*"; + + tab_bar_min_tabs = 2; + tab_bar_edge = "bottom"; + tab_bar_style = "powerline"; + tab_powerline_style = "slanted"; + tab_title_template = "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}"; + }; + extraConfig = '' + include ./theme.conf + ''; + }; + +} diff --git a/programs/neovim.nix b/programs/neovim.nix new file mode 100644 index 0000000..fb32743 --- /dev/null +++ b/programs/neovim.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + xdg.configFile."nvim/init.vim".source = ./dotfiles/neovim/init.vim; + xdg.configFile."nvim/lua/init.lua".source = ./dotfiles/neovim/init.lua; + xdg.configFile."nvim/lua/plugins.lua".source = ./dotfiles/neovim/plugins.lua; + + programs.neovim = { + enable = true; + defaultEditor = true; + withNodeJs = true; + }; +} diff --git a/programs/newsboat.nix b/programs/newsboat.nix new file mode 100644 index 0000000..036f383 --- /dev/null +++ b/programs/newsboat.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + programs.newsboat = { + enable = true; + extraConfig = '' +macro y set browser "mpv %u" ; open-in-browser ; set browser "firefox %u" + ''; + }; +} diff --git a/programs/picom.nix b/programs/picom.nix new file mode 100644 index 0000000..87a43ed --- /dev/null +++ b/programs/picom.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: +{ + services.picom = { + enable = true; +# package = pkgs.picom.overrideAttrs(o: { +# src = pkgs.fetchFromGitHub { +# repo = "picom"; +# owner = "ibhagwan"; +# rev = "vNext"; +# hash = "sha256-JNbP8NZkHjlcQjSRfPbHdpTFrPO6GSZQ5qzDb0yi+pI="; +# }; +# }); + settings = { + backend = "glx"; + corner-radius = 10; + }; + }; +} diff --git a/programs/tmux.nix b/programs/tmux.nix new file mode 100644 index 0000000..6673b5d --- /dev/null +++ b/programs/tmux.nix @@ -0,0 +1,39 @@ +{ pkgs, ... }: +{ + programs.tmux = { + enable = true; + terminal = "tmux-256color"; + historyLimit = 10000; + plugins = with pkgs.tmuxPlugins; + [ + catppuccin + vim-tmux-navigator + sensible + yank + ]; + shell = "${pkgs.zsh}/bin/zsh"; + extraConfig = '' +set-option -sa terminal-overrides ",xterm*:Tc" +set -g mouse on + +unbind C-b +set -g prefix C-Space +bind C-Space send-prefix + +bind -n M-H previous-window +bind -n M-L next-window + +set -g base-index 1 +set -g pane-base-index 1 +set-window-option -g pane-base-index 1 +set-option -g renumber-windows on + +bind-key -T copy-mode-vi v send-keys -X begin-selection +bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle +bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel + +bind '"' split-window -v -c ''${pane_current_path}" +bind % split-window -h -c ''${pane_current_path}" + ''; + }; +} diff --git a/programs/zsh.nix b/programs/zsh.nix new file mode 100644 index 0000000..8d8fc91 --- /dev/null +++ b/programs/zsh.nix @@ -0,0 +1,23 @@ +{ config, pkgs, ... }: +{ + programs.zsh = { + enable = true; + shellAliases = { + ll = "ls -l"; + unixos = "sudo nixos-rebuild switch --flake /etc/nixos"; + uhome = "home-manager switch --flake /etc/nixos"; + }; + history = { + size = 10000; + path = "${config.xdg.dataHome}/zsh/history"; + ignoreDups = true; + }; + + oh-my-zsh = { + enable = true; + plugins = [ "git" "thefuck" "pass" ]; + theme = "dst"; + }; + syntaxHighlighting.enable = true; + }; +} diff --git a/systems/default.nix b/systems/default.nix new file mode 100644 index 0000000..eadf5c5 --- /dev/null +++ b/systems/default.nix @@ -0,0 +1,160 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ inputs, outputs, config, hostname, username, lib, pkgs, stateVersion, ... }: + +{ + imports = + [ + ./${hostname} + ../users/jon.nix + ]; + + boot = { + tmp.cleanOnBoot = true; + initrd.verbose = false; + }; + + nix = { + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + experimental-features = "nix-command flakes"; + auto-optimise-store = true; + }; + + gc = { + automatic = true; + dates = "Fri"; + }; + }; + + networking.hostName = hostname; # Define your hostname. + networking.useDHCP = lib.mkDefault true; + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "America/New_York"; + + i18n.defaultLocale = "en_US.UTF-8"; + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Configure X11 + services.xserver = { + enable = true; + layout = "us"; + xkbVariant = ""; + + displayManager = { + sddm.enable = true; + defaultSession = "none+awesome"; + }; + + windowManager.awesome = { + enable = true; + luaModules = with pkgs.luaPackages; [ + luarocks + luadbi-mysql + ]; + }; + }; + + sound.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + security.rtkit.enable = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + arandr + binutils + clang-tools + gcc + gnutar + gnumake + gdb + unzip + wget + ]; + + fonts.packages = with pkgs; [ + fira-code + fira-code-symbols + font-awesome + liberation_ttf + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + (nerdfonts.override { fonts = [ "FiraCode" ]; } ) + ]; + + programs.zsh.enable = true; + users.defaultUserShell = pkgs.zsh; + + programs.neovim = { + enable = true; + defaultEditor = true; + }; + + services.mpd = { + enable = true; + musicDirectory = "/var/mus"; + extraConfig = '' +audio_output { + type "alsa" + name "My ALSA" + mixer_type "hardware" + mixer_device "device" + mixer_control "PCM" +} + ''; + network.listenAddress = "any"; + }; + + # 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; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = stateVersion; # Did you read the comment? + +} diff --git a/systems/jonbox/default.nix b/systems/jonbox/default.nix new file mode 100644 index 0000000..4456e6e --- /dev/null +++ b/systems/jonbox/default.nix @@ -0,0 +1,49 @@ +{ inputs, config, lib, modulesPath, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + (modulesPath + "/installer/scan/not-detected.nix") + ./filesystem.nix + ]; + + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "nvidia-x11" + "nvidia-settings" + "nvidia-persistenced" + ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + services.xserver.videoDrivers = [ "nvidia" ]; + + hardware.nvidia = { + modesetting.enable = true; + powerManagment.enable = false; + powerManagment.finegrained = false; + open = true; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + + hardware.bluetooth.enable = true; + services.blueman.enable = true; + + programs.light.enable = true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/systems/jonbox/filesystem.nix b/systems/jonbox/filesystem.nix new file mode 100644 index 0000000..30dafc6 --- /dev/null +++ b/systems/jonbox/filesystem.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + fileSystems."/" = + { device = "/dev/disk/by-uuid/83cafaff-8be3-477f-b13c-c47dafdf969d"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/40EA-5550"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/acfc7ea5-0787-4e05-bcf1-20b7adb0f35c"; } + ]; +} diff --git a/systems/jontest/default.nix b/systems/jontest/default.nix new file mode 100644 index 0000000..b2a7f82 --- /dev/null +++ b/systems/jontest/default.nix @@ -0,0 +1,22 @@ +{ lib, modulesPath, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + (modulesPath + "/profiles/qemu-guest.nix") + ./filesystem.nix + ]; + + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ]; + boot.kernelPackages = pkgs.linuxPackages_latest; + + # Bootloader. + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/vda"; + boot.loader.grub.useOSProber = true; + + services.qemuGuest.enable = true; + services.spice-vdagentd.enable = true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/systems/jontest/filesystem.nix b/systems/jontest/filesystem.nix new file mode 100644 index 0000000..e247a9d --- /dev/null +++ b/systems/jontest/filesystem.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + fileSystems."/" = + { device = "/dev/disk/by-uuid/a6804a93-979a-4596-879d-8b2fe8332541"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/e6e941fe-f3a4-4b5e-960c-74d65e1e6257"; } + ]; +} diff --git a/systems/jontest/hardware-configuration.nix b/systems/jontest/hardware-configuration.nix new file mode 100644 index 0000000..62427e0 --- /dev/null +++ b/systems/jontest/hardware-configuration.nix @@ -0,0 +1,7 @@ +# 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, ... }: + +{ +} diff --git a/systems/jontop/default.nix b/systems/jontop/default.nix new file mode 100644 index 0000000..1ce9aaf --- /dev/null +++ b/systems/jontop/default.nix @@ -0,0 +1,30 @@ +{ inputs, config, lib, modulesPath, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + (modulesPath + "/installer/scan/not-detected.nix") + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220 + ./filesystem.nix + ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ "i915" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + hardware.opengl = { + enable = true; + }; + + hardware.bluetooth.enable = true; + services.blueman.enable = true; + + programs.light.enable = true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/systems/jontop/filesystem.nix b/systems/jontop/filesystem.nix new file mode 100644 index 0000000..5117680 --- /dev/null +++ b/systems/jontop/filesystem.nix @@ -0,0 +1,16 @@ +{ ... }: +{ + fileSystems."/" = + { device = "/dev/disk/by-uuid/72e455f9-4b10-4cb2-a8e4-cfe39c4a8d1f"; + fsType = "btrfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/27F7-4AFD"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/4133a381-ab7d-4a25-9013-3f4b2d31bc5a"; } + ]; +} diff --git a/systems/jontop/hardware-configuration.nix b/systems/jontop/hardware-configuration.nix new file mode 100644 index 0000000..62427e0 --- /dev/null +++ b/systems/jontop/hardware-configuration.nix @@ -0,0 +1,7 @@ +# 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, ... }: + +{ +} diff --git a/users/jon.nix b/users/jon.nix new file mode 100644 index 0000000..da8c84e --- /dev/null +++ b/users/jon.nix @@ -0,0 +1,14 @@ +{ inputs, pkgs, ... }: +{ + users.users.jon = { + isNormalUser = true; + description = "jon"; + extraGroups = [ + "networkmanager" + "wheel" + "video" + ]; + packages = with pkgs; []; + }; + +} |