refactoring!
This commit is contained in:
Don Harper
parent
db485e8d3e
commit
04eb69dbc8
21 changed files with 0 additions and 0 deletions
|
|
@ -1,28 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
<home-manager/nixos>
|
||||
];
|
||||
users.users.don.isNormalUser = true;
|
||||
home-manager = {
|
||||
users.don = {
|
||||
home.username = "don";
|
||||
home.homeDirectory = "/home/don";
|
||||
home.stateVersion = "22.11";
|
||||
programs.go.enable = true;
|
||||
# services = {
|
||||
# nextcloud-client = {
|
||||
# enable = true;
|
||||
# startInBackground = true;
|
||||
# };
|
||||
# };
|
||||
imports = [
|
||||
./services.nix
|
||||
./mpv.nix
|
||||
./neovim.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
# config = {
|
||||
# cache-dir = "\${HOME}/.cache";
|
||||
# cache-on-disk = "yes";
|
||||
# cache = "yes";
|
||||
# demuxer-max-back-bytes = "100M";
|
||||
# demuxer-max-bytes = "500M";
|
||||
# demuxer-readahead-secs = "20";
|
||||
# pause = "no";
|
||||
# save-position-on-quit = "yes";
|
||||
# slang = "en";
|
||||
# user-agent = "Mozilla/5.0";
|
||||
# ytdl-format = "bestvideo+bestaudio";
|
||||
# ytdl-raw-options = "no-playlist=";
|
||||
# ytdl = "yes";
|
||||
# script-opts = "ytdl_hook-ytdl_path=yt-dlp";
|
||||
# };
|
||||
scripts = [ pkgs.mpvScripts.autoload ];
|
||||
#scripts = [ pkgs.mpvScripts.autoload pkgs.mpvScripts.sponsorblock ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
extraConfig =
|
||||
''
|
||||
colorscheme dracula
|
||||
set backspace="indent,eol,start"
|
||||
set autoindent
|
||||
set expandtab
|
||||
set tabstop=2
|
||||
set shiftwidth=2
|
||||
set history=50
|
||||
set ruler
|
||||
set showcmd
|
||||
set incsearch
|
||||
set hlsearch
|
||||
set nospell
|
||||
set modeline
|
||||
set wildmode=longest:full
|
||||
set wildmenu
|
||||
set scrolloff=2
|
||||
set number
|
||||
set list
|
||||
"set listchars="eol:⏎,tab:␉·,trail:␠,nbsp:⎵"
|
||||
set background=dark
|
||||
set laststatus=2
|
||||
set t_Co=256
|
||||
let g:ale_linters = { 'nix': ['statix']}
|
||||
'';
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
CheckAttach
|
||||
Recover-vim
|
||||
Shade-nvim # color
|
||||
SpaceCamp # color
|
||||
YouCompleteMe
|
||||
ale
|
||||
ansible-vim
|
||||
aurora # color
|
||||
dracula-nvim
|
||||
gitv
|
||||
tabular
|
||||
vim-airline
|
||||
vim-airline-themes
|
||||
vim-bufferline
|
||||
vim-fugitive
|
||||
vim-gitgutter
|
||||
vim-github-dashboard
|
||||
vim-markdown
|
||||
vim-misc
|
||||
vim-nix
|
||||
vim-tmux
|
||||
vim-tmux-navigator
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
services = {
|
||||
kanshi = {
|
||||
enable = true;
|
||||
profiles = {
|
||||
undocked = {
|
||||
outputs = [
|
||||
{
|
||||
criteria = "Sharp Corporation 0x14F9 0x00000000";
|
||||
status = "enable";
|
||||
scale = 1.2;
|
||||
}
|
||||
];
|
||||
};
|
||||
docked = {
|
||||
outputs = [
|
||||
{
|
||||
criteria = "eDP-1";
|
||||
status = "disable";
|
||||
}
|
||||
{
|
||||
criteria = "Samsung Electric Company C24F390 H4ZN519488";
|
||||
status = "enable";
|
||||
position = "0,0";
|
||||
}
|
||||
{
|
||||
criteria = "Stargate Technology HDMI Unknown";
|
||||
status = "enable";
|
||||
position = "0,1080";
|
||||
}
|
||||
];
|
||||
exec = [
|
||||
"swaymsg workspace 1, move workspace to output \"Samsung Electric Company C24F390 H4ZN519488\""
|
||||
"swaymsg workspace 5, move workspace to output \"Stargate Technology HDMI Unknown\""
|
||||
"swaymsg workspace 6, move workspace to output \"Samsung Electric Company C24F390 H4ZN519488\""
|
||||
"swaymsg workspace 9, move workspace to output \"Stargate Technology HDMI Unknown\""
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
alacritty
|
||||
bemenu
|
||||
dracula-theme # gtk theme
|
||||
glib
|
||||
grim
|
||||
kaddressbook
|
||||
kalendar
|
||||
kdeconnect
|
||||
#kmail-account-wizard
|
||||
kmail
|
||||
#kdepim-runtime
|
||||
#kdepim
|
||||
#kdepim-addons
|
||||
kitinerary
|
||||
mako
|
||||
plasma-desktop
|
||||
slurp
|
||||
wl-clipboard
|
||||
];
|
||||
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
|
||||
services.xserver.enable = true;
|
||||
services.xserver.displayManager.sddm.enable = true;
|
||||
services.xserver.desktopManager.plasma5.enable = true;
|
||||
|
||||
}
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
# bash script to let dbus know about important env variables and
|
||||
# propogate them to relevent services run at the end of sway config
|
||||
# see
|
||||
# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
|
||||
# note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts
|
||||
# some user services to make sure they have the correct environment variables
|
||||
dbus-sway-environment = pkgs.writeTextFile {
|
||||
name = "dbus-sway-environment";
|
||||
destination = "/bin/dbus-sway-environment";
|
||||
executable = true;
|
||||
|
||||
text = ''
|
||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
||||
systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
'';
|
||||
};
|
||||
|
||||
# currently, there is some friction between sway and gtk:
|
||||
# https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
|
||||
# the suggested way to set gtk settings is with gsettings
|
||||
# for gsettings to work, we need to tell it where the schemas are
|
||||
# using the XDG_DATA_DIR environment variable
|
||||
# run at the end of sway config
|
||||
configure-gtk = pkgs.writeTextFile {
|
||||
name = "configure-gtk";
|
||||
destination = "/bin/configure-gtk";
|
||||
executable = true;
|
||||
text = let
|
||||
schema = pkgs.gsettings-desktop-schemas;
|
||||
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
|
||||
in ''
|
||||
export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
|
||||
gnome_schema=org.gnome.desktop.interface
|
||||
gsettings set $gnome_schema gtk-theme 'Dracula'
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
in
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
alacritty
|
||||
bemenu
|
||||
configure-gtk
|
||||
dbus-sway-environment
|
||||
dracula-theme # gtk theme
|
||||
glib
|
||||
gnome.adwaita-icon-theme
|
||||
grim
|
||||
mako
|
||||
slurp
|
||||
sway
|
||||
swayidle
|
||||
swayimg
|
||||
swaylock-effects
|
||||
swaynotificationcenter
|
||||
waybar
|
||||
wayland
|
||||
wl-clipboard
|
||||
];
|
||||
|
||||
|
||||
# xdg-desktop-portal works by exposing a series of D-Bus interfaces
|
||||
# known as portals under a well-known name
|
||||
# (org.freedesktop.portal.Desktop) and object path
|
||||
# (/org/freedesktop/portal/desktop).
|
||||
# The portal interfaces include APIs for file access, opening URIs,
|
||||
# printing and others.
|
||||
services.dbus.enable = true;
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
# gtk portal needed to make gtk apps happy
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
#gtkUsePortal = true;
|
||||
};
|
||||
|
||||
# enable sway window manager
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
};
|
||||
services.greetd.package = "greetd.wlgreet";
|
||||
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{ config, pkgs, callPackage, ... }:
|
||||
{
|
||||
|
||||
users.users.vicky = {
|
||||
isNormalUser = true;
|
||||
description = "Vicky Harper";
|
||||
extraGroups = [ "networkmanager" "wheel" "scanner" "lp" "video" "mlocate" ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
|
||||
];
|
||||
};
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
desktopManager = {
|
||||
xterm.enable = false;
|
||||
xfce.enable = true;
|
||||
};
|
||||
displayManager.defaultSession = "xfce";
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue