From f819e30b03dffcf9e74af4b8552e4a8ab8f54c58 Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Fri, 29 Sep 2023 14:22:24 -0400 Subject: major reorganizing to seperate modules --- flake.lock | 18 +- flake.nix | 64 +-- home/jon/home.nix | 61 --- hosts/config.nix | 128 +++++ hosts/default.nix | 32 ++ hosts/jonbox/default.nix | 43 ++ hosts/jonbox/filesystem.nix | 4 + hosts/jonbox/hardware.nix | 65 +++ modules/desktop/awesome/default.nix | 51 ++ modules/desktop/awesome/rc.lua | 729 +++++++++++++++++++++++++ modules/desktop/awesome/scratch.lua | 54 ++ modules/desktop/awesome/theme.lua | 137 +++++ modules/desktop/awesome/widgets/calendar.lua | 115 ++++ modules/desktop/awesome/widgets/volume.lua | 60 ++ modules/desktop/default.nix | 6 + modules/desktop/picom.nix | 13 + modules/desktop/rofi.nix | 18 + modules/desktop/xserver/default.nix | 39 ++ modules/editor/default.nix | 3 + modules/editor/neovim/default.nix | 14 + modules/editor/neovim/init.lua | 14 + modules/editor/neovim/init.vim | 71 +++ modules/editor/neovim/plugins.lua | 57 ++ modules/hardware/bluetooth.nix | 16 + modules/programs/default.nix | 5 + modules/programs/newsboat.nix | 12 + modules/programs/programs.nix | 18 + modules/programs/tmux/default.nix | 42 ++ modules/shell/default.nix | 3 + modules/shell/zsh/default.nix | 32 ++ modules/terminal/default.nix | 3 + modules/terminal/kitty/default.nix | 35 ++ modules/terminal/kitty/themes/mocha.conf | 80 +++ modules/virt/default.nix | 27 + modules/vpn/default.nix | 3 + modules/vpn/mullvad/default.nix | 49 ++ modules/web/default.nix | 3 + modules/web/firefox/default.nix | 52 ++ programs/dotfiles/awesome/rc.lua | 729 ------------------------- programs/dotfiles/awesome/scratch.lua | 54 -- programs/dotfiles/awesome/theme.lua | 137 ----- programs/dotfiles/awesome/widgets/calendar.lua | 115 ---- programs/dotfiles/awesome/widgets/volume.lua | 60 -- programs/dotfiles/kitty/kitty.conf | 47 -- programs/dotfiles/kitty/themes/mocha.conf | 80 --- programs/dotfiles/neovim/init.lua | 14 - programs/dotfiles/neovim/init.vim | 71 --- programs/dotfiles/neovim/plugins.lua | 57 -- programs/firefox.nix | 48 -- programs/kitty.nix | 32 -- programs/neovim.nix | 12 - programs/newsboat.nix | 9 - programs/openvpn.nix | 36 -- programs/picom.nix | 18 - programs/rofi.nix | 6 - programs/scripts/watchfile.sh | 2 - programs/tmux.nix | 39 -- programs/virt-manager.nix | 16 - programs/zsh.nix | 28 - systems/default.nix | 68 --- users/jon.nix | 15 - 61 files changed, 2066 insertions(+), 1803 deletions(-) delete mode 100644 home/jon/home.nix create mode 100644 hosts/config.nix create mode 100644 hosts/default.nix create mode 100644 hosts/jonbox/default.nix create mode 100644 hosts/jonbox/filesystem.nix create mode 100644 hosts/jonbox/hardware.nix create mode 100644 modules/desktop/awesome/default.nix create mode 100644 modules/desktop/awesome/rc.lua create mode 100644 modules/desktop/awesome/scratch.lua create mode 100644 modules/desktop/awesome/theme.lua create mode 100644 modules/desktop/awesome/widgets/calendar.lua create mode 100644 modules/desktop/awesome/widgets/volume.lua create mode 100644 modules/desktop/default.nix create mode 100644 modules/desktop/picom.nix create mode 100644 modules/desktop/rofi.nix create mode 100644 modules/desktop/xserver/default.nix create mode 100644 modules/editor/default.nix create mode 100644 modules/editor/neovim/default.nix create mode 100644 modules/editor/neovim/init.lua create mode 100644 modules/editor/neovim/init.vim create mode 100644 modules/editor/neovim/plugins.lua create mode 100644 modules/hardware/bluetooth.nix create mode 100644 modules/programs/default.nix create mode 100644 modules/programs/newsboat.nix create mode 100644 modules/programs/programs.nix create mode 100644 modules/programs/tmux/default.nix create mode 100644 modules/shell/default.nix create mode 100644 modules/shell/zsh/default.nix create mode 100644 modules/terminal/default.nix create mode 100644 modules/terminal/kitty/default.nix create mode 100644 modules/terminal/kitty/themes/mocha.conf create mode 100644 modules/virt/default.nix create mode 100644 modules/vpn/default.nix create mode 100644 modules/vpn/mullvad/default.nix create mode 100644 modules/web/default.nix create mode 100644 modules/web/firefox/default.nix delete mode 100644 programs/dotfiles/awesome/rc.lua delete mode 100644 programs/dotfiles/awesome/scratch.lua delete mode 100644 programs/dotfiles/awesome/theme.lua delete mode 100644 programs/dotfiles/awesome/widgets/calendar.lua delete mode 100644 programs/dotfiles/awesome/widgets/volume.lua delete mode 100644 programs/dotfiles/kitty/kitty.conf delete mode 100644 programs/dotfiles/kitty/themes/mocha.conf delete mode 100644 programs/dotfiles/neovim/init.lua delete mode 100644 programs/dotfiles/neovim/init.vim delete mode 100644 programs/dotfiles/neovim/plugins.lua delete mode 100644 programs/firefox.nix delete mode 100644 programs/kitty.nix delete mode 100644 programs/neovim.nix delete mode 100644 programs/newsboat.nix delete mode 100644 programs/openvpn.nix delete mode 100644 programs/picom.nix delete mode 100644 programs/rofi.nix delete mode 100755 programs/scripts/watchfile.sh delete mode 100644 programs/tmux.nix delete mode 100644 programs/virt-manager.nix delete mode 100644 programs/zsh.nix delete mode 100644 users/jon.nix diff --git a/flake.lock b/flake.lock index 77903bc..96770ed 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { @@ -52,18 +52,18 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1695346609, - "narHash": "sha256-jur+AjgRvablLA2oBvC4FD89zCXttVQDwi6OXk5x/14=", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9b4b56e5a20ac322c0c01ccab7ec697ab076ea0", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -88,7 +88,7 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", "nurpkgs": "nurpkgs" } } diff --git a/flake.nix b/flake.nix index f4054ad..976e590 100644 --- a/flake.nix +++ b/flake.nix @@ -1,45 +1,29 @@ { - 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"; - }; + description = "Jon's NixOS configuration"; - 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"; }; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nurpkgs.url = "github:nix-community/NUR"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - 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"; }; + + outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nurpkgs, home-manager, ... }@inputs: + let + inherit (self) outputs; + stateVersion = "23.05"; + in { + nixosConfigurations = ( + import ./hosts { + inherit (nixpkgs) lib; + inherit inputs nixpkgs nixpkgs-unstable nurpkgs home-manager stateVersion; + } + ); }; - }; } diff --git a/home/jon/home.nix b/home/jon/home.nix deleted file mode 100644 index d418e34..0000000 --- a/home/jon/home.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ inputs, config, lib, pkgs, ... }: -let - hm = inputs.home-manager.lib.hm; - username = "jon"; -in -{ - programs.home-manager.enable = true; - - home.username = username; - home.homeDirectory = "/home/${username}"; - - #Userspace programs - imports = [ - ../../programs/picom.nix - ../../programs/rofi.nix - - ../../programs/kitty.nix - ../../programs/zsh.nix - ../../programs/tmux.nix - ../../programs/neovim.nix - ../../programs/firefox.nix - ../../programs/newsboat.nix - - ../../programs/virt-manager.nix - ]; - - home.packages = with pkgs; [ - libreoffice - hunspell - hunspellDicts.en_US - - (pass.withExtensions (exts: [ exts.pass-otp ])) - thefuck - mpc-cli - pavucontrol - qbittorrent - ffmpeg - ]; - - programs.ncmpcpp.enable = true; - programs.zathura.enable = true; - programs.bashmount.enable = true; - programs.mpv.enable = true; - - #Awesome - 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 - ''; - - #Git - programs.git = { - enable = true; - userName = "Jon Santmyer"; - userEmail = "jon@jonsantmyer.com"; - }; - - home.stateVersion = "23.05"; -} diff --git a/hosts/config.nix b/hosts/config.nix new file mode 100644 index 0000000..de49a45 --- /dev/null +++ b/hosts/config.nix @@ -0,0 +1,128 @@ +{ inputs, config, lib, pkgs, nurpkgs, user, stateVersion, ... }: +{ + imports = ( + import ../modules/desktop ++ + import ../modules/editor ++ + import ../modules/web ++ + import ../modules/shell ++ + import ../modules/terminal ++ + import ../modules/programs ++ + import ../modules/vpn + ); + + users.users.${user} = { + isNormalUser = true; + extraGroups = [ + "wheel" + "video" + "audio" + "camera" + "networkmanager" + "libvirtd" + ]; + }; + + #Timezone + time.timeZone = "America/New_York"; + + #Locale + 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"; + }; + + #Fonts + 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" ]; } ) + ]; + + #Security + security.rtkit.enable = true; + security.polkit.enable = true; + + #Default Packages + environment.systemPackages = with pkgs; [ + #Terminal utils + btop #Resource monitor + coreutils #GNU Utils + git #VC + pciutils #PCI + usbutils #USB + gnutar + unzip + zip + wget + + #Devtools + binutils + clang-tools + gcc + gnumake + gdb + ]; + + programs = { + dconf.enable = true; + neovim.enable = true; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + }; + + services = { + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + }; + + #SSH + services.openssh.enable = true; + environment.shellInit = '' +gpg-connect-agent /bye +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + ''; + + #Nix package manager configs. + 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 = "weekly"; + options = "--delete-older-than 7d"; + }; + }; + + system.stateVersion = stateVersion; + home-manager.users.${user} = { + home.username = user; + home.homeDirectory = "/home/${user}"; + home.stateVersion = stateVersion; + }; +} diff --git a/hosts/default.nix b/hosts/default.nix new file mode 100644 index 0000000..a5aace9 --- /dev/null +++ b/hosts/default.nix @@ -0,0 +1,32 @@ +{ inputs, lib, nixpkgs, nixpkgs-unstable, nurpkgs, home-manager, stateVersion }: +let + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + }; + + pkgs-unstable = import nixpkgs-unstable { + inherit system; + }; + + lib = nixpkgs.lib; +in +{ + jonbox = lib.nixosSystem { + inherit system; + specialArgs = { + inherit inputs system pkgs-unstable nurpkgs stateVersion; + user = "jon"; + }; + modules = [ + { nixpkgs.overlays = [ nurpkgs.overlay ]; } + ./config.nix + ./jonbox + + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + } + ]; + }; +} diff --git a/hosts/jonbox/default.nix b/hosts/jonbox/default.nix new file mode 100644 index 0000000..ce5f4a3 --- /dev/null +++ b/hosts/jonbox/default.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, stateVersion, ... }: + +{ + imports = [ + ./hardware.nix + ../../modules/hardware/bluetooth.nix + ../../modules/virt + ]; + + #Boot options + boot = { + loader = { + systemd-boot = { + enable = true; + configurationLimit = 8; + }; + efi.canTouchEfiVariables = true; + timeout = 5; + }; + kernelPackages = pkgs.linuxPackages_latest; + }; + + #Unfree-packages. + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "nvidia-x11" + "nvidia-settings" + "nvidia-persistenced" + ]; + + #OpenGL + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + #X11 Server + services.xserver.videoDrivers = [ "nvidia" ]; + + awesome.enable = true; + mullvad-vpn.enable = true; +} diff --git a/hosts/jonbox/filesystem.nix b/hosts/jonbox/filesystem.nix new file mode 100644 index 0000000..5b8ec2b --- /dev/null +++ b/hosts/jonbox/filesystem.nix @@ -0,0 +1,4 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ +} diff --git a/hosts/jonbox/hardware.nix b/hosts/jonbox/hardware.nix new file mode 100644 index 0000000..ce734fe --- /dev/null +++ b/hosts/jonbox/hardware.nix @@ -0,0 +1,65 @@ +{ config, lib, pkgs, modulesPath, ... }: +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") ]; + + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + #Filesystems + 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"; + }; + + fileSystems."/mnt/jonshare" = { + device = "homenas:/var/data/jon"; + fsType = "nfs"; + }; + + fileSystems."/mnt/plexshare" = { + device = "homenas:/var/data/plex"; + fsType = "nfs"; + }; + + fileSystems."/mnt/share" = { + device = "homenas:/var/data/shared"; + fsType = "nfs"; + }; + + swapDevices = + [ + { device = "/dev/disk/by-uuid/acfc7ea5-0787-4e05-bcf1-20b7adb0f35c"; } + ]; + + #SSD-optimization + services.fstrim.enable = true; + + #Hardware + hardware.nvidia = { + modesetting.enable = true; + powerManagement.enable = false; + powerManagement.finegrained = false; + open = true; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + + #Firmware + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + #Networking + networking.hostName = "jonbox"; + networking.useDHCP = lib.mkDefault true; + networking.networkmanager.enable = true; +} diff --git a/modules/desktop/awesome/default.nix b/modules/desktop/awesome/default.nix new file mode 100644 index 0000000..1959770 --- /dev/null +++ b/modules/desktop/awesome/default.nix @@ -0,0 +1,51 @@ +{ config, lib, pkgs, user, ... }: +with lib; +let + awesomeLuaModules = with pkgs.luaPackages; [ + luarocks + luadbi-mysql + ]; +in +{ + options = { + awesome = { + enable = mkOption { + type = types.bool; + default = false; + }; + }; + }; + + config = mkIf (config.awesome.enable) + { + xserver.enable = true; + rofi.enable = true; + + services.xserver = { + displayManager = { + sddm.enable = true; + defaultSession = "none+awesome"; + }; + windowManager.awesome = { + enable = true; + luaModules = awesomeLuaModules; + }; + }; + + home-manager.users.${user} = { + xsession.windowManager = { + awesome = { + enable = true; + luaModules = awesomeLuaModules; + }; + }; + + home.activation.installAwesomeWMConfig = '' +if [ ! -d "$HOME/.config/awesome" ]; then + ln -s "/etc/nixos/modules/desktop/awesome" "$HOME/.config/awesome" + chmod -R +w "$HOME/.config/awesome" +fi + ''; + }; + }; +} diff --git a/modules/desktop/awesome/rc.lua b/modules/desktop/awesome/rc.lua new file mode 100644 index 0000000..3d2de6d --- /dev/null +++ b/modules/desktop/awesome/rc.lua @@ -0,0 +1,729 @@ +-- 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") + +-- Scratch pad +local scratch = require("scratch") + +-- 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" +webbrowser = "firefox" +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 +toptextclock = wibox.widget.textclock() +--toptextclock = wibox.widget { +-- { +-- widget = wibox.widget.textclock +-- }, +-- bg = beautiful.bg_normal, +-- widget = wibox.container.background, +-- shape = gears.shape.rounded_rect +--} + +local calendar_widget = require("widgets.calendar") +local topcalendar = calendar_widget() + +local volume_widget = require("widgets.volume") +local volumebar = volume_widget() + +toptextclock:connect_signal("button::press", +function(_, _, _, button) + if button == 1 then topcalendar.toggle() end +end) + +-- 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_border_width = 1, + shape_border_color = beautiful.fg_minimize, + 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 = + { + { + layout = wibox.layout.fixed.horizontal, + { + { + id = "clienticon", + widget = awful.widget.clienticon, + }, + widget = wibox.container.margin, + margins = 4 + }, + { + { + id = "text_role", + widget = wibox.widget.textbox + }, + widget = wibox.container.margin, + margins = 4, + }, + }, + id = "background_role", + widget = wibox.container.background, + create_callback = function(self, c, index, objects) + self:get_children_by_id("clienticon")[1].client = c + end, + } + } + + -- Create the wibox + s.mywibox = awful.wibar({ position = "top", screen = s, bg = "#00000000", border_width = 8,}) + + 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, + s.mytaglist, + s.mypromptbox, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + volumebar, + toptextclock, + wibox.container.margin(s.mylayoutbox, 4, 4, 4, 4), + wibox.container.margin(s.systray, 4, 4, 4, 4), + layout = wibox.layout.fixed.horizontal + }, + } +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"} + ), + + -- 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, }, "w", function () awful.spawn(webbrowser) end, + {description = "open the web browser", group = "launcher"}), + awful.key({ modkey, }, "`", function() scratch.toggle("kitty --name scratch-terminal", + { instance = "scratch-terminal" }) end, + {description = "spawn a terminal scratch-pad", group = "launcher"}), + awful.key({ modkey }, "d", function() awful.spawn("rofi -show drun") end, + {description = "show the menubar", 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"}) +) + +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", + "scratch-terminal", + }, + 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, {size = 20}) : 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 + { + { + { + widget = awful.titlebar.widget.maximizedbutton(c), + }, + widget = wibox.container.background, + shape = gears.shape.circle, + shape_border_width = 1, + shape_border_color = "#12ac28", + bg = "#28c940", + }, + width = 16, + strategy = "min", + layout = wibox.layout.constraint + }, + { + { + { + widget = awful.titlebar.widget.closebutton(c), + }, + widget = wibox.container.background, + shape = gears.shape.circle, + shape_border_width = 1, + shape_border_color = "#ad3934", + bg = "#bf4943", + }, + width = 16, + strategy = "min", + layout = wibox.layout.constraint + }, + spacing = dpi(6), + layout = wibox.layout.fixed.horizontal + }, + 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/modules/desktop/awesome/scratch.lua b/modules/desktop/awesome/scratch.lua new file mode 100644 index 0000000..aa1fd1e --- /dev/null +++ b/modules/desktop/awesome/scratch.lua @@ -0,0 +1,54 @@ +local client = client + +local awful = require("awful") +local util = require("awful.util") + +local scratch = {} + +local function activate(c) + local ctag = awful.tag.selected(c.screen) + ctags = {ctag} + for k,tag in pairs(c:tags()) do + if tag ~= ctag then table.insert(ctags, tag) end + end + c:tags(ctags) + c:raise() + client.focus = c +end + +local function deactivate(c) + local ctag = awful.tag.selected(c.screen) + ctags = {} + for k,tag in pairs(c:tags()) do + if tag ~= ctag then table.insert(ctags, tag) end + end + c:tags(ctags) +end + +function scratch.raise(cmd, rule) + local rule = rule or { instance = "scratch" } + local function match(c) return awful.rules.match(c, rule) end + + local clients = client.get() + local findex = util.table.hasitem(clients, client.focus) or 1 + local start = util.cycle(#clients, findex + 1) + + for c in awful.client.iterate(match, start) do + activate(c) + return + end + + util.spawn(cmd) +end + +function scratch.toggle(cmd, rule) + local rule = rule or { instance = "scratch" } + + if client.focus and awful.rules.match(client.focus, rule) then + deactivate(client.focus) + else + scratch.raise(cmd) + end +end + +return scratch diff --git a/modules/desktop/awesome/theme.lua b/modules/desktop/awesome/theme.lua new file mode 100644 index 0000000..49fe840 --- /dev/null +++ b/modules/desktop/awesome/theme.lua @@ -0,0 +1,137 @@ +--------------------------- +-- 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(4) +theme.border_width = dpi(4) +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 + +return theme + +-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 diff --git a/modules/desktop/awesome/widgets/calendar.lua b/modules/desktop/awesome/widgets/calendar.lua new file mode 100644 index 0000000..6e791b3 --- /dev/null +++ b/modules/desktop/awesome/widgets/calendar.lua @@ -0,0 +1,115 @@ +local awful = require("awful") +local beautiful = require("beautiful") +local wibox = require("wibox") +local gears = require("gears") + +local calendar_widget = {} + +local function worker(user_args) + local args = user_args or {} + + local style = {} + + style.month = { + padding = 4, + bg_color = beautiful.bg_normal, + border_width = 0 + } + + style.normal = { + markup = function(t) return t end, + shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 4) end, + } + + style.focused = { + bg_color = beautiful.bg_focus, + fg_color = beautiful.fg_focus, + markup = function(t) return '' .. t .. '' end, + shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 4) end, + } + + style.header = { + bg_color = beautiful.bg_focus, + fg_color = beautiful.fg_focus, + markup = function(t) return ''..t..'' end, + } + + style.weekday = { + bg_color = beautiful.bg_focus, + fg_color = beautiful.fg_focus, + markup = function(t) return ''..t..'' end, + } + + local function decorate(widget, flag, date) + if flag == 'monthheader' then flag = 'header' end + if flag == 'focus' then + local today = os.date('*t') + if not today.month == date.month and today.year == date.year then + flag = 'normal' + end + end + local properties = style[flag] or {} + if properties.markup and widget.get_text and widget.set_markup then + widget:set_markup(properties.markup(widget:get_text())) + end + local thisdate = { year = date.year, month = (date.month or 1), day = (date.day or 1) } + local weekday = tonumber(os.date('%w', os.time(d))) + local default_bg = (weekday == 0 or weekday == 6) + and beautiful.bg_focused + or beautiful.bg_normal + return wibox.widget { + { + { + widget, + halign = 'center', + widget = wibox.container.place + }, + margins = (properties.padding or 2) + (properties.border_width or 0), + widget = wibox.container.margin + }, + shape = properties.shape, + shape_border_color = properties.border_color or '#00000000', + shape_border_width = properties.border_width or 0, + fg = properties.fg_color or beautiful.fg_normal, + bg = properties.bg_color or beautiful.bg_normal, + widget = wibox.container.background + } + end + + local cal = wibox.widget { + date = os.date('*t'), + font = beautiful.get_font(), + fn_embed = decorate, + long_weekdays = true, + start_sunday = true, + widget = wibox.widget.calendar.month + } + + local popup = awful.popup { + ontop = true, + visible = false, + shape = gears.shape.rounded_rect, + offset = { y = 5 }, + border_width = 2, + border_color = beautiful.fg_minimize, + widget = cal + } + + function calendar_widget.toggle() + if popup.visible then + cal:set_date(nil) + cal:set_date(os.date('*t')) + popup:set_widget(nil) + popup:set_widget(cal) + popup.visible = not popup.visible + else + awful.placement.top_right(popup, { margins = { top = 30, right = 10 }, parent = awful.screen.focused() }) + popup.visible = true + end + end + return calendar_widget +end + +return setmetatable(calendar_widget, { __call = function(_, ...) + return worker(...) +end}) diff --git a/modules/desktop/awesome/widgets/volume.lua b/modules/desktop/awesome/widgets/volume.lua new file mode 100644 index 0000000..21c200b --- /dev/null +++ b/modules/desktop/awesome/widgets/volume.lua @@ -0,0 +1,60 @@ +local awful = require("awful") +local spawn = require("awful.spawn") +local watch = require("awful.widget.watch") +local beautiful = require("beautiful") +local wibox = require("wibox") +local gears = require("gears") +local naughty = require("naughty") + +local volume_widget = {} + +local get_volume_cmd = "bash -c 'wpctl get-volume @DEFAULT_AUDIO_SINK@'" + +local function worker(user_args) + local volume_bar = wibox.widget { + bar_shape = gears.shape.rounded_rect, + bar_height = 4, + bar_color = beautiful.fg_focus, + handle_color = beautiful.fg_focus, + handle_shape = gears.shape.circle, + handle_border_width = 0, + value = 0, + forced_width = 50, + widget = wibox.widget.slider, + } + + volume_widget = wibox.widget { + { + layout = wibox.layout.fixed.horizontal, + { + text = "󰕾 ", + widget = wibox.widget.textbox + }, + volume_bar, + spacing = 4 + }, + widget = wibox.container.margin, + left = 8, + } + + local function percentage(value) + return math.floor(value) + end + + watch(get_volume_cmd, 1, + function(widget, stdout) + volume = stdout:match('0.%d+') + widget.value = tonumber(volume) * 100 + end, volume_bar) + + volume_bar:connect_signal("property::value", + function(self) + spawn.easy_async("bash -c 'wpctl set-volume @DEFAULT_AUDIO_SINK@ " .. self.value .. "%'", function() end) + end) + + return volume_widget +end + +return setmetatable(volume_widget, { __call = function(_, ...) + return worker(...) +end}) diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix new file mode 100644 index 0000000..18f184e --- /dev/null +++ b/modules/desktop/default.nix @@ -0,0 +1,6 @@ +[ + ./xserver + ./awesome + ./picom.nix + ./rofi.nix +] diff --git a/modules/desktop/picom.nix b/modules/desktop/picom.nix new file mode 100644 index 0000000..7afe2f0 --- /dev/null +++ b/modules/desktop/picom.nix @@ -0,0 +1,13 @@ +{ config, lib, pkgs, user, ... }: +with lib; +{ + config = mkIf (config.xserver.enable) { + services.picom = { + enable = true; + settings = { + backend = "glx"; + corner-radius = 10; + }; + }; + }; +} diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix new file mode 100644 index 0000000..d5aba06 --- /dev/null +++ b/modules/desktop/rofi.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, user, ...}: +with lib; +{ + options = { + rofi = { + enable = mkOption { + type = types.bool; + default = false; + }; + }; + }; + + config.home-manager.users.${user} = mkIf (config.rofi.enable) { + programs.rofi = { + enable = true; + }; + }; +} diff --git a/modules/desktop/xserver/default.nix b/modules/desktop/xserver/default.nix new file mode 100644 index 0000000..471c9ce --- /dev/null +++ b/modules/desktop/xserver/default.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, user, ... }: +with lib; +let + +in +{ + options = { + xserver = { + enable = mkOption { + type = types.bool; + default = false; + }; + }; + }; + + config = mkIf (config.xserver.enable) + { + services.xserver = { + enable = true; + layout = "us"; + xkbVariant = ""; + }; + + environment.systemPackages = with pkgs; [ + xclip + xorg.xev + xorg.xkill + xorg.xrandr + arandr + ]; + + home-manager.users.${user} = { + xsession = { + enable = true; + numlock.enable = true; + }; + }; + }; +} diff --git a/modules/editor/default.nix b/modules/editor/default.nix new file mode 100644 index 0000000..f8cdc22 --- /dev/null +++ b/modules/editor/default.nix @@ -0,0 +1,3 @@ +[ + ./neovim +] diff --git a/modules/editor/neovim/default.nix b/modules/editor/neovim/default.nix new file mode 100644 index 0000000..c5cf990 --- /dev/null +++ b/modules/editor/neovim/default.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, user, ... }: +{ + config.home-manager.users.${user} = { + xdg.configFile."nvim/init.vim".source = ./init.vim; + xdg.configFile."nvim/lua/init.lua".source = ./init.lua; + xdg.configFile."nvim/lua/plugins.lua".source = ./plugins.lua; + + programs.neovim = { + enable = true; + defaultEditor = true; + withNodeJs = true; + }; + }; +} diff --git a/modules/editor/neovim/init.lua b/modules/editor/neovim/init.lua new file mode 100644 index 0000000..4a80830 --- /dev/null +++ b/modules/editor/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/modules/editor/neovim/init.vim b/modules/editor/neovim/init.vim new file mode 100644 index 0000000..993ea88 --- /dev/null +++ b/modules/editor/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 = "\" + +" Tab-trigger completion +inoremap + \ coc#pum#visible() ? coc#pum#next(1) : + \ CheckBackspace() ? "\" : + \ coc#refresh() +inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" + +inoremap coc#pum#visible() ? coc#pum#confirm() : + \ "\u\\=coc#on_enter()\" + +function! CheckBackspace() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +inoremap coc#refresh() + +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) + +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +nnoremap K :call ShowDocumentation() + +function! ShowDocumentation() + if CocAction('hasProvider', 'hover') + call CocActionAsync('doHover') + else + call feedkeys('K', 'in') + endif +endfunction + +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Telescope +nnoremap ff Telescope find_files +nnoremap fg Telescope live_grep +nnoremap fb Telescope buffers +nnoremap fh help_tags + +lua require('init') + +color catppuccin diff --git a/modules/editor/neovim/plugins.lua b/modules/editor/neovim/plugins.lua new file mode 100644 index 0000000..83c74ad --- /dev/null +++ b/modules/editor/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/modules/hardware/bluetooth.nix b/modules/hardware/bluetooth.nix new file mode 100644 index 0000000..1465d68 --- /dev/null +++ b/modules/hardware/bluetooth.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: +{ + hardware.bluetooth.enable = true; + services.blueman.enable = true; + + environment.etc = { + "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' +bluez_monitor.properties = { + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-hw-volume"] = true, + ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" +} + ''; + }; +} diff --git a/modules/programs/default.nix b/modules/programs/default.nix new file mode 100644 index 0000000..b90ff8f --- /dev/null +++ b/modules/programs/default.nix @@ -0,0 +1,5 @@ +[ + ./tmux + ./newsboat.nix + ./programs.nix +] diff --git a/modules/programs/newsboat.nix b/modules/programs/newsboat.nix new file mode 100644 index 0000000..b37d765 --- /dev/null +++ b/modules/programs/newsboat.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, user, ... }: +with lib; +{ + config.home-manager.users.${user} = { + programs.newsboat = { + enable = true; + extraConfig = mkIf (config.xserver.enable) '' +macro y set browser "mpv %u" ; open-in-browser ; set browser "firefox %u" + ''; + }; + }; +} diff --git a/modules/programs/programs.nix b/modules/programs/programs.nix new file mode 100644 index 0000000..b9d46c1 --- /dev/null +++ b/modules/programs/programs.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, user, ... }: +with lib; +{ + config.home-manager.users.${user} = mkIf (config.xserver.enable) { + home.packages = with pkgs; [ + libreoffice + hunspell + hunspellDicts.en_US + + (pass.withExtensions (exts: [exts.pass-otp ])) + thefuck + mpc-cli + pavucontrol + qbittorrent + ffmpeg + ]; + }; +} diff --git a/modules/programs/tmux/default.nix b/modules/programs/tmux/default.nix new file mode 100644 index 0000000..b141af6 --- /dev/null +++ b/modules/programs/tmux/default.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, user, ... }: +with lib; +{ + config.home-manager.users.${user} = { + 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/modules/shell/default.nix b/modules/shell/default.nix new file mode 100644 index 0000000..03028ee --- /dev/null +++ b/modules/shell/default.nix @@ -0,0 +1,3 @@ +[ + ./zsh +] diff --git a/modules/shell/zsh/default.nix b/modules/shell/zsh/default.nix new file mode 100644 index 0000000..471bc57 --- /dev/null +++ b/modules/shell/zsh/default.nix @@ -0,0 +1,32 @@ +{ config, pkgs, user, ... }: +{ + config = { + programs.zsh.enable = true; + users.defaultUserShell = pkgs.zsh; + }; + + config.home-manager.users.${user} = { + home.packages = with pkgs; [ + inotify-tools + ]; + + programs.zsh = { + enable = true; + shellAliases = { + ll = "ls -l"; + unixos = "sudo nixos-rebuild switch --flake /etc/nixos"; + }; + history = { + size = 10000; + ignoreDups = true; + }; + + oh-my-zsh = { + enable = true; + plugins = [ "git" "thefuck" "pass" ]; + theme = "dst"; + }; + syntaxHighlighting.enable = true; + }; + }; +} diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix new file mode 100644 index 0000000..dff50b7 --- /dev/null +++ b/modules/terminal/default.nix @@ -0,0 +1,3 @@ +[ + ./kitty +] diff --git a/modules/terminal/kitty/default.nix b/modules/terminal/kitty/default.nix new file mode 100644 index 0000000..1ff0b78 --- /dev/null +++ b/modules/terminal/kitty/default.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, user, ... }: +with lib; +{ + config.home-manager.users.${user} = mkIf (config.xserver.enable) + { + xdg.configFile."kitty/theme.conf".source = ./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/modules/terminal/kitty/themes/mocha.conf b/modules/terminal/kitty/themes/mocha.conf new file mode 100644 index 0000000..3ebc78f --- /dev/null +++ b/modules/terminal/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/modules/virt/default.nix b/modules/virt/default.nix new file mode 100644 index 0000000..2b6e8f7 --- /dev/null +++ b/modules/virt/default.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, user, ... }: +{ + config = { + virtualisation.libvirtd.enable = true; + environment.systemPackages = with pkgs; [ + virt-manager + libguestfs + guestfs-tools + ]; + }; + + config.home-manager.users.${user} = { + dconf.settings = { + "org/virt-manager/virt-manager/connections" = { + autoconnect = ["qemu:///system"]; + uris = ["qemu:///system"]; + }; + }; + + xdg.configFile."libvirt/qemu.conf".text = '' +nvram = [ + "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", + "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd" +] + ''; + }; +} diff --git a/modules/vpn/default.nix b/modules/vpn/default.nix new file mode 100644 index 0000000..6640ba6 --- /dev/null +++ b/modules/vpn/default.nix @@ -0,0 +1,3 @@ +[ + ./mullvad +] diff --git a/modules/vpn/mullvad/default.nix b/modules/vpn/mullvad/default.nix new file mode 100644 index 0000000..c6c9038 --- /dev/null +++ b/modules/vpn/mullvad/default.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, user, ... }: +with lib; +{ + options = { + mullvad-vpn = { + enable = mkOption { + type = types.bool; + default = false; + }; + }; + }; + + config = mkIf (config.mullvad-vpn.enable) + { + services.openvpn = { + servers = { + MullvadVPN-US-Miami = { + config = '' +client +dev tun +resolv-retry infinite +nobind +persist-key +persist-tun +verb 3 +remote-cert-tls server +ping 10 +ping-restart 60 +sndbuf 524288 +rcvbuf 524288 +cipher AES-256-GCM +tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384 +proto udp +auth-user-pass /etc/nixos/secrets/mullvad_us_mia/mullvad_userpass.txt +ca /etc/nixos/secrets/mullvad_us_mia/mullvad_ca.crt +tun-ipv6 +script-security 2 +up /etc/nixos/secrets/mullvad_us_mia/update-resolv-conf +down /etc/nixos/secrets/mullvad_us_mia/update-resolv-conf +fast-io +remote-random +remote 146.70.187.194 1302 # us-mia-ovpn-101 +remote 146.70.183.66 1302 # us-mia-ovpn-102 + ''; + }; + }; + }; + }; +} diff --git a/modules/web/default.nix b/modules/web/default.nix new file mode 100644 index 0000000..04b267a --- /dev/null +++ b/modules/web/default.nix @@ -0,0 +1,3 @@ +[ + ./firefox +] diff --git a/modules/web/firefox/default.nix b/modules/web/firefox/default.nix new file mode 100644 index 0000000..0a01090 --- /dev/null +++ b/modules/web/firefox/default.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, user, ... }: +with lib; +let + arkenfox = { + owner = "arkenfox"; + repo = "user.js"; + version = "117.0"; + }; +in +{ + config.home-manager.users.${user} = mkIf (config.xserver.enable) { + 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/${arkenfox.owner}/${arkenfox.repo}/archive/refs/tags/${arkenfox.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/${user}/dwn"; + }; + }; + };}; +} diff --git a/programs/dotfiles/awesome/rc.lua b/programs/dotfiles/awesome/rc.lua deleted file mode 100644 index 3d2de6d..0000000 --- a/programs/dotfiles/awesome/rc.lua +++ /dev/null @@ -1,729 +0,0 @@ --- If LuaRocks is installed, make sure that packages installed through it are --- found (e.g. lgi). If LuaRocks is not installed, do nothing. -pcall(require, "luarocks.loader") - -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") - --- Scratch pad -local scratch = require("scratch") - --- 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" -webbrowser = "firefox" -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 -toptextclock = wibox.widget.textclock() ---toptextclock = wibox.widget { --- { --- widget = wibox.widget.textclock --- }, --- bg = beautiful.bg_normal, --- widget = wibox.container.background, --- shape = gears.shape.rounded_rect ---} - -local calendar_widget = require("widgets.calendar") -local topcalendar = calendar_widget() - -local volume_widget = require("widgets.volume") -local volumebar = volume_widget() - -toptextclock:connect_signal("button::press", -function(_, _, _, button) - if button == 1 then topcalendar.toggle() end -end) - --- 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_border_width = 1, - shape_border_color = beautiful.fg_minimize, - 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 = - { - { - layout = wibox.layout.fixed.horizontal, - { - { - id = "clienticon", - widget = awful.widget.clienticon, - }, - widget = wibox.container.margin, - margins = 4 - }, - { - { - id = "text_role", - widget = wibox.widget.textbox - }, - widget = wibox.container.margin, - margins = 4, - }, - }, - id = "background_role", - widget = wibox.container.background, - create_callback = function(self, c, index, objects) - self:get_children_by_id("clienticon")[1].client = c - end, - } - } - - -- Create the wibox - s.mywibox = awful.wibar({ position = "top", screen = s, bg = "#00000000", border_width = 8,}) - - 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, - s.mytaglist, - s.mypromptbox, - }, - s.mytasklist, -- Middle widget - { -- Right widgets - volumebar, - toptextclock, - wibox.container.margin(s.mylayoutbox, 4, 4, 4, 4), - wibox.container.margin(s.systray, 4, 4, 4, 4), - layout = wibox.layout.fixed.horizontal - }, - } -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"} - ), - - -- 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, }, "w", function () awful.spawn(webbrowser) end, - {description = "open the web browser", group = "launcher"}), - awful.key({ modkey, }, "`", function() scratch.toggle("kitty --name scratch-terminal", - { instance = "scratch-terminal" }) end, - {description = "spawn a terminal scratch-pad", group = "launcher"}), - awful.key({ modkey }, "d", function() awful.spawn("rofi -show drun") end, - {description = "show the menubar", 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"}) -) - -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", - "scratch-terminal", - }, - 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, {size = 20}) : 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 - { - { - { - widget = awful.titlebar.widget.maximizedbutton(c), - }, - widget = wibox.container.background, - shape = gears.shape.circle, - shape_border_width = 1, - shape_border_color = "#12ac28", - bg = "#28c940", - }, - width = 16, - strategy = "min", - layout = wibox.layout.constraint - }, - { - { - { - widget = awful.titlebar.widget.closebutton(c), - }, - widget = wibox.container.background, - shape = gears.shape.circle, - shape_border_width = 1, - shape_border_color = "#ad3934", - bg = "#bf4943", - }, - width = 16, - strategy = "min", - layout = wibox.layout.constraint - }, - spacing = dpi(6), - layout = wibox.layout.fixed.horizontal - }, - 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/scratch.lua b/programs/dotfiles/awesome/scratch.lua deleted file mode 100644 index aa1fd1e..0000000 --- a/programs/dotfiles/awesome/scratch.lua +++ /dev/null @@ -1,54 +0,0 @@ -local client = client - -local awful = require("awful") -local util = require("awful.util") - -local scratch = {} - -local function activate(c) - local ctag = awful.tag.selected(c.screen) - ctags = {ctag} - for k,tag in pairs(c:tags()) do - if tag ~= ctag then table.insert(ctags, tag) end - end - c:tags(ctags) - c:raise() - client.focus = c -end - -local function deactivate(c) - local ctag = awful.tag.selected(c.screen) - ctags = {} - for k,tag in pairs(c:tags()) do - if tag ~= ctag then table.insert(ctags, tag) end - end - c:tags(ctags) -end - -function scratch.raise(cmd, rule) - local rule = rule or { instance = "scratch" } - local function match(c) return awful.rules.match(c, rule) end - - local clients = client.get() - local findex = util.table.hasitem(clients, client.focus) or 1 - local start = util.cycle(#clients, findex + 1) - - for c in awful.client.iterate(match, start) do - activate(c) - return - end - - util.spawn(cmd) -end - -function scratch.toggle(cmd, rule) - local rule = rule or { instance = "scratch" } - - if client.focus and awful.rules.match(client.focus, rule) then - deactivate(client.focus) - else - scratch.raise(cmd) - end -end - -return scratch diff --git a/programs/dotfiles/awesome/theme.lua b/programs/dotfiles/awesome/theme.lua deleted file mode 100644 index 49fe840..0000000 --- a/programs/dotfiles/awesome/theme.lua +++ /dev/null @@ -1,137 +0,0 @@ ---------------------------- --- 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(4) -theme.border_width = dpi(4) -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 - -return theme - --- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 diff --git a/programs/dotfiles/awesome/widgets/calendar.lua b/programs/dotfiles/awesome/widgets/calendar.lua deleted file mode 100644 index 6e791b3..0000000 --- a/programs/dotfiles/awesome/widgets/calendar.lua +++ /dev/null @@ -1,115 +0,0 @@ -local awful = require("awful") -local beautiful = require("beautiful") -local wibox = require("wibox") -local gears = require("gears") - -local calendar_widget = {} - -local function worker(user_args) - local args = user_args or {} - - local style = {} - - style.month = { - padding = 4, - bg_color = beautiful.bg_normal, - border_width = 0 - } - - style.normal = { - markup = function(t) return t end, - shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 4) end, - } - - style.focused = { - bg_color = beautiful.bg_focus, - fg_color = beautiful.fg_focus, - markup = function(t) return '' .. t .. '' end, - shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 4) end, - } - - style.header = { - bg_color = beautiful.bg_focus, - fg_color = beautiful.fg_focus, - markup = function(t) return ''..t..'' end, - } - - style.weekday = { - bg_color = beautiful.bg_focus, - fg_color = beautiful.fg_focus, - markup = function(t) return ''..t..'' end, - } - - local function decorate(widget, flag, date) - if flag == 'monthheader' then flag = 'header' end - if flag == 'focus' then - local today = os.date('*t') - if not today.month == date.month and today.year == date.year then - flag = 'normal' - end - end - local properties = style[flag] or {} - if properties.markup and widget.get_text and widget.set_markup then - widget:set_markup(properties.markup(widget:get_text())) - end - local thisdate = { year = date.year, month = (date.month or 1), day = (date.day or 1) } - local weekday = tonumber(os.date('%w', os.time(d))) - local default_bg = (weekday == 0 or weekday == 6) - and beautiful.bg_focused - or beautiful.bg_normal - return wibox.widget { - { - { - widget, - halign = 'center', - widget = wibox.container.place - }, - margins = (properties.padding or 2) + (properties.border_width or 0), - widget = wibox.container.margin - }, - shape = properties.shape, - shape_border_color = properties.border_color or '#00000000', - shape_border_width = properties.border_width or 0, - fg = properties.fg_color or beautiful.fg_normal, - bg = properties.bg_color or beautiful.bg_normal, - widget = wibox.container.background - } - end - - local cal = wibox.widget { - date = os.date('*t'), - font = beautiful.get_font(), - fn_embed = decorate, - long_weekdays = true, - start_sunday = true, - widget = wibox.widget.calendar.month - } - - local popup = awful.popup { - ontop = true, - visible = false, - shape = gears.shape.rounded_rect, - offset = { y = 5 }, - border_width = 2, - border_color = beautiful.fg_minimize, - widget = cal - } - - function calendar_widget.toggle() - if popup.visible then - cal:set_date(nil) - cal:set_date(os.date('*t')) - popup:set_widget(nil) - popup:set_widget(cal) - popup.visible = not popup.visible - else - awful.placement.top_right(popup, { margins = { top = 30, right = 10 }, parent = awful.screen.focused() }) - popup.visible = true - end - end - return calendar_widget -end - -return setmetatable(calendar_widget, { __call = function(_, ...) - return worker(...) -end}) diff --git a/programs/dotfiles/awesome/widgets/volume.lua b/programs/dotfiles/awesome/widgets/volume.lua deleted file mode 100644 index 21c200b..0000000 --- a/programs/dotfiles/awesome/widgets/volume.lua +++ /dev/null @@ -1,60 +0,0 @@ -local awful = require("awful") -local spawn = require("awful.spawn") -local watch = require("awful.widget.watch") -local beautiful = require("beautiful") -local wibox = require("wibox") -local gears = require("gears") -local naughty = require("naughty") - -local volume_widget = {} - -local get_volume_cmd = "bash -c 'wpctl get-volume @DEFAULT_AUDIO_SINK@'" - -local function worker(user_args) - local volume_bar = wibox.widget { - bar_shape = gears.shape.rounded_rect, - bar_height = 4, - bar_color = beautiful.fg_focus, - handle_color = beautiful.fg_focus, - handle_shape = gears.shape.circle, - handle_border_width = 0, - value = 0, - forced_width = 50, - widget = wibox.widget.slider, - } - - volume_widget = wibox.widget { - { - layout = wibox.layout.fixed.horizontal, - { - text = "󰕾 ", - widget = wibox.widget.textbox - }, - volume_bar, - spacing = 4 - }, - widget = wibox.container.margin, - left = 8, - } - - local function percentage(value) - return math.floor(value) - end - - watch(get_volume_cmd, 1, - function(widget, stdout) - volume = stdout:match('0.%d+') - widget.value = tonumber(volume) * 100 - end, volume_bar) - - volume_bar:connect_signal("property::value", - function(self) - spawn.easy_async("bash -c 'wpctl set-volume @DEFAULT_AUDIO_SINK@ " .. self.value .. "%'", function() end) - end) - - return volume_widget -end - -return setmetatable(volume_widget, { __call = function(_, ...) - return worker(...) -end}) diff --git a/programs/dotfiles/kitty/kitty.conf b/programs/dotfiles/kitty/kitty.conf deleted file mode 100644 index 006956a..0000000 --- a/programs/dotfiles/kitty/kitty.conf +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 3ebc78f..0000000 --- a/programs/dotfiles/kitty/themes/mocha.conf +++ /dev/null @@ -1,80 +0,0 @@ -# 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 deleted file mode 100644 index 4a80830..0000000 --- a/programs/dotfiles/neovim/init.lua +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 993ea88..0000000 --- a/programs/dotfiles/neovim/init.vim +++ /dev/null @@ -1,71 +0,0 @@ -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 = "\" - -" Tab-trigger completion -inoremap - \ coc#pum#visible() ? coc#pum#next(1) : - \ CheckBackspace() ? "\" : - \ coc#refresh() -inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" - -inoremap coc#pum#visible() ? coc#pum#confirm() : - \ "\u\\=coc#on_enter()\" - -function! CheckBackspace() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -inoremap coc#refresh() - -nmap [g (coc-diagnostic-prev) -nmap ]g (coc-diagnostic-next) - -nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) -nmap gr (coc-references) - -nnoremap K :call ShowDocumentation() - -function! ShowDocumentation() - if CocAction('hasProvider', 'hover') - call CocActionAsync('doHover') - else - call feedkeys('K', 'in') - endif -endfunction - -autocmd CursorHold * silent call CocActionAsync('highlight') - -" Telescope -nnoremap ff Telescope find_files -nnoremap fg Telescope live_grep -nnoremap fb Telescope buffers -nnoremap fh help_tags - -lua require('init') - -color catppuccin diff --git a/programs/dotfiles/neovim/plugins.lua b/programs/dotfiles/neovim/plugins.lua deleted file mode 100644 index 83c74ad..0000000 --- a/programs/dotfiles/neovim/plugins.lua +++ /dev/null @@ -1,57 +0,0 @@ -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 deleted file mode 100644 index 79ca696..0000000 --- a/programs/firefox.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ 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 deleted file mode 100644 index ca535a7..0000000 --- a/programs/kitty.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ 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 deleted file mode 100644 index fb32743..0000000 --- a/programs/neovim.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ 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 deleted file mode 100644 index 036f383..0000000 --- a/programs/newsboat.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - programs.newsboat = { - enable = true; - extraConfig = '' -macro y set browser "mpv %u" ; open-in-browser ; set browser "firefox %u" - ''; - }; -} diff --git a/programs/openvpn.nix b/programs/openvpn.nix deleted file mode 100644 index 7bb8f9b..0000000 --- a/programs/openvpn.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs, ... }: -{ - services.openvpn = { - servers = { - MullvadVPN-US-Miami = { - config = '' -client -dev tun -resolv-retry infinite -nobind -persist-key -persist-tun -verb 3 -remote-cert-tls server -ping 10 -ping-restart 60 -sndbuf 524288 -rcvbuf 524288 -cipher AES-256-GCM -tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384 -proto udp -auth-user-pass /etc/nixos/secrets/mullvad_us_mia/mullvad_userpass.txt -ca /etc/nixos/secrets/mullvad_us_mia/mullvad_ca.crt -tun-ipv6 -script-security 2 -up /etc/nixos/secrets/mullvad_us_mia/update-resolv-conf -down /etc/nixos/secrets/mullvad_us_mia/update-resolv-conf -fast-io -remote-random -remote 146.70.187.194 1302 # us-mia-ovpn-101 -remote 146.70.183.66 1302 # us-mia-ovpn-102 - ''; - }; - }; - }; -} diff --git a/programs/picom.nix b/programs/picom.nix deleted file mode 100644 index 87a43ed..0000000 --- a/programs/picom.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ 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/rofi.nix b/programs/rofi.nix deleted file mode 100644 index 72a40d5..0000000 --- a/programs/rofi.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ...}: -{ - programs.rofi = { - enable = true; - }; -} diff --git a/programs/scripts/watchfile.sh b/programs/scripts/watchfile.sh deleted file mode 100755 index 064a226..0000000 --- a/programs/scripts/watchfile.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -while inotifywait -e close_write $1; do $2; done diff --git a/programs/tmux.nix b/programs/tmux.nix deleted file mode 100644 index 6673b5d..0000000 --- a/programs/tmux.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ 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/virt-manager.nix b/programs/virt-manager.nix deleted file mode 100644 index b2f3de5..0000000 --- a/programs/virt-manager.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, username, ... }: -{ - dconf.settings = { - "org/virt-manager/virt-manager/connections" = { - autoconnect = ["qemu:///system"]; - uris = ["qemu:///system"]; - }; - }; - - xdg.configFile."libvirt/qemu.conf".text = '' -nvram = [ - "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", - "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd" -] - ''; -} diff --git a/programs/zsh.nix b/programs/zsh.nix deleted file mode 100644 index 03a096f..0000000 --- a/programs/zsh.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, ... }: -{ - home.packages = with pkgs; [ - inotify-tools - ]; - - programs.zsh = { - enable = true; - shellAliases = { - ll = "ls -l"; - unixos = "sudo nixos-rebuild switch --flake /etc/nixos"; - uhome = "home-manager switch --flake /etc/nixos"; - watchfile = "/etc/nixos/programs/scripts/watchfile.sh "; - }; - 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 index 94bb592..4f796dd 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -11,62 +11,6 @@ ../users/jon.nix ../programs/openvpn.nix ]; - - #Default boot parameters. - boot = { - tmp.cleanOnBoot = true; - initrd.verbose = false; - }; - - #Nix package manager configs. - 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 = "weekly"; - options = "--delete-older-than 7d"; - }; - }; - - #Networking - networking.hostName = hostname; # Define your hostname. - networking.useDHCP = lib.mkDefault true; - networking.networkmanager.enable = true; - - #Timezone - time.timeZone = "America/New_York"; - - #Locale & Fonts - 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"; - }; - 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" ]; } ) - ]; services.pipewire = { enable = true; @@ -75,10 +19,6 @@ pulse.enable = true; }; - #Security - security.rtkit.enable = true; - security.polkit.enable = true; - #Default packages for QOL environment.systemPackages = with pkgs; [ binutils @@ -119,13 +59,6 @@ audio_output { enableSSHSupport = true; }; - #SSH - services.openssh.enable = true; - environment.shellInit = '' -gpg-connect-agent /bye -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - ''; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; @@ -138,6 +71,5 @@ export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) # 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/users/jon.nix b/users/jon.nix deleted file mode 100644 index 92c4bd1..0000000 --- a/users/jon.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ inputs, pkgs, ... }: -{ - users.users.jon = { - isNormalUser = true; - description = "jon"; - extraGroups = [ - "networkmanager" - "wheel" - "video" - "libvirtd" - ]; - packages = with pkgs; []; - }; - -} -- cgit v1.2.1