Compare commits
No commits in common. "c3c61929e5cc26d62328fbebfb448f686d26bccf" and "c5a8e93ccce1f91ebc26bf7adb53a740eb23913e" have entirely different histories.
c3c61929e5
...
c5a8e93ccc
|
@ -3,48 +3,6 @@
|
||||||
imports = [ ./laptop.nix ];
|
imports = [ ./laptop.nix ];
|
||||||
home-manager.users.${username} = {
|
home-manager.users.${username} = {
|
||||||
imports = [ ./home/work.nix ];
|
imports = [ ./home/work.nix ];
|
||||||
wayland.windowManager.sway.config = {
|
|
||||||
output."eDP-1".scale = "1.25";
|
|
||||||
workspaceOutputAssign = [
|
|
||||||
{
|
|
||||||
output = "eDP-1";
|
|
||||||
workspace = "1";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
services.kanshi = {
|
|
||||||
enable = true;
|
|
||||||
settings =
|
|
||||||
let
|
|
||||||
laptopScreen = {
|
|
||||||
criteria = "eDP-1";
|
|
||||||
scale = 1.25;
|
|
||||||
position = "2560,576";
|
|
||||||
};
|
|
||||||
monitor = {
|
|
||||||
criteria = "Dell Inc. DELL P3223QE CCG8YN3";
|
|
||||||
scale = 1.5;
|
|
||||||
position = "0,0";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
[
|
|
||||||
{
|
|
||||||
profile = {
|
|
||||||
name = "undocked";
|
|
||||||
outputs = [ laptopScreen ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
profile = {
|
|
||||||
name = "docked";
|
|
||||||
outputs = [
|
|
||||||
laptopScreen
|
|
||||||
monitor
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
boot.initrd = {
|
boot.initrd = {
|
||||||
secrets = {
|
secrets = {
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
system.autoUpgrade.operation = "boot";
|
system.autoUpgrade.operation = "boot";
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
environment = {
|
environment = {
|
||||||
|
plasma6.excludePackages = [ pkgs.kdePackages.plasma-browser-integration ];
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
NIXOS_OZONE_WL = "1";
|
NIXOS_OZONE_WL = "1";
|
||||||
QT_QPA_PLATFORM = "wayland";
|
QT_QPA_PLATFORM = "wayland";
|
||||||
GRIM_DEFAULT_DIR = "$HOME/Pictures/Screenshots";
|
|
||||||
};
|
};
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
libsecret
|
libsecret
|
||||||
|
@ -33,12 +33,14 @@
|
||||||
dconf.enable = true;
|
dconf.enable = true;
|
||||||
noisetorch.enable = true;
|
noisetorch.enable = true;
|
||||||
kdeconnect.enable = true;
|
kdeconnect.enable = true;
|
||||||
sway.enable = true;
|
gamescope = {
|
||||||
|
enable = true;
|
||||||
|
capSysNice = true;
|
||||||
|
};
|
||||||
xwayland.enable = true;
|
xwayland.enable = true;
|
||||||
};
|
};
|
||||||
gtk.iconCache.enable = true;
|
gtk.iconCache.enable = true;
|
||||||
services = {
|
services = {
|
||||||
gnome.gnome-keyring.enable = true;
|
|
||||||
flatpak.enable = true;
|
flatpak.enable = true;
|
||||||
printing.enable = true;
|
printing.enable = true;
|
||||||
pipewire = {
|
pipewire = {
|
||||||
|
@ -49,19 +51,13 @@
|
||||||
support32Bit = true;
|
support32Bit = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
greetd = {
|
displayManager.sddm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings =
|
wayland.enable = true;
|
||||||
let
|
|
||||||
default_session.command = "sway";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
inherit default_session;
|
|
||||||
initial_session = {
|
|
||||||
inherit (default_session) command;
|
|
||||||
user = username;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
desktopManager.plasma6 = {
|
||||||
|
enable = true;
|
||||||
|
enableQt5Integration = true;
|
||||||
};
|
};
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
{ config, accentColourName, ... }:
|
|
||||||
{
|
|
||||||
services.avizo = {
|
|
||||||
enable = true;
|
|
||||||
settings.default =
|
|
||||||
let
|
|
||||||
sc = config.scheme;
|
|
||||||
rgba =
|
|
||||||
colourName: "${sc."${colourName}-rgb-r"}, ${sc."${colourName}-rgb-g"}, ${sc."${colourName}-rgb-b"}";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
background = "rgba(${rgba "base00"}, 0.9)";
|
|
||||||
bar-bg-color = "rgba(${rgba "base00"}, 0.9)";
|
|
||||||
bar-fg-color = "rgba(${rgba "base05"}, 1.0)";
|
|
||||||
border-color = "rgba(${rgba accentColourName}, 1.0)";
|
|
||||||
image-opacity = "1.0";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,15 +1,14 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./sway/default.nix
|
./plasma/default.nix
|
||||||
./alacritty/default.nix
|
|
||||||
./emacs/default.nix
|
./emacs/default.nix
|
||||||
./browser/default.nix
|
./browser/default.nix
|
||||||
./services/email/default.nix
|
./services/email/default.nix
|
||||||
];
|
];
|
||||||
home = {
|
home = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
libreoffice-fresh
|
libreoffice-qt-fresh
|
||||||
webcord
|
webcord
|
||||||
signal-desktop
|
signal-desktop
|
||||||
teams-for-linux
|
teams-for-linux
|
||||||
|
|
|
@ -49,7 +49,6 @@
|
||||||
custom-theme-hash = builtins.hashFile "sha256" "${custom-theme}/${custom-theme-name}-theme.el";
|
custom-theme-hash = builtins.hashFile "sha256" "${custom-theme}/${custom-theme-name}-theme.el";
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
(add-to-list 'default-frame-alist '(alpha-background . 85))
|
|
||||||
(add-to-list 'custom-theme-load-path "${custom-theme}")
|
(add-to-list 'custom-theme-load-path "${custom-theme}")
|
||||||
(add-to-list 'custom-safe-themes "${custom-theme-hash}")
|
(add-to-list 'custom-safe-themes "${custom-theme-hash}")
|
||||||
(load-theme '${custom-theme-name})
|
(load-theme '${custom-theme-name})
|
||||||
|
@ -87,7 +86,6 @@
|
||||||
ulem
|
ulem
|
||||||
hyperref
|
hyperref
|
||||||
capt-of
|
capt-of
|
||||||
listings
|
|
||||||
;
|
;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
{ config, fonts, ... }:
|
|
||||||
{
|
|
||||||
programs.foot = {
|
|
||||||
enable = true;
|
|
||||||
server.enable = true;
|
|
||||||
settings = {
|
|
||||||
main = {
|
|
||||||
term = "xterm-256color";
|
|
||||||
locked-title = false;
|
|
||||||
font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}";
|
|
||||||
dpi-aware = false;
|
|
||||||
pad = "10x10";
|
|
||||||
};
|
|
||||||
bell = {
|
|
||||||
urgent = false;
|
|
||||||
notify = false;
|
|
||||||
visual = false;
|
|
||||||
};
|
|
||||||
cursor = {
|
|
||||||
blink = true;
|
|
||||||
};
|
|
||||||
mouse = {
|
|
||||||
hide-when-typing = true;
|
|
||||||
};
|
|
||||||
colors = with config.scheme; rec {
|
|
||||||
alpha = 0.85;
|
|
||||||
background = base00;
|
|
||||||
foreground = base05;
|
|
||||||
regular0 = base02;
|
|
||||||
regular1 = red;
|
|
||||||
regular2 = green;
|
|
||||||
regular3 = yellow;
|
|
||||||
regular4 = blue;
|
|
||||||
regular5 = magenta;
|
|
||||||
regular6 = cyan;
|
|
||||||
regular7 = base05;
|
|
||||||
bright0 = base04;
|
|
||||||
bright1 = regular1;
|
|
||||||
bright2 = regular2;
|
|
||||||
bright3 = regular3;
|
|
||||||
bright4 = regular4;
|
|
||||||
bright5 = regular5;
|
|
||||||
bright6 = regular6;
|
|
||||||
bright7 = base05;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,47 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
fonts,
|
|
||||||
accentColourName,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
programs.fuzzel = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
main = {
|
|
||||||
dpi-aware = false;
|
|
||||||
font = "${fonts.monospace.name}:size=${toString fonts.sizes.popups}";
|
|
||||||
icon-theme = config.gtk.iconTheme.name;
|
|
||||||
icons-enabled = true;
|
|
||||||
fields = "filename,name,generic,categories";
|
|
||||||
fuzzy = true;
|
|
||||||
filter-desktop = true;
|
|
||||||
terminal =
|
|
||||||
with config.programs;
|
|
||||||
"${if alacritty.enable then alacritty.package else pkgs.alacritty}/bin/alacritty -e";
|
|
||||||
lines = 24;
|
|
||||||
width = 80;
|
|
||||||
tabs = 4;
|
|
||||||
layer = "overlay";
|
|
||||||
};
|
|
||||||
colors =
|
|
||||||
let
|
|
||||||
sc = config.scheme;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
background = "${sc.base00}cc"; # 80% Opacity
|
|
||||||
text = "${sc.base05}ff";
|
|
||||||
match = "${sc.red}ff";
|
|
||||||
selection = "${sc.base01}ff";
|
|
||||||
selection-text = "${sc.base05}ff";
|
|
||||||
selection-match = "${sc.red}ff";
|
|
||||||
border = "${sc.${accentColourName}}ff";
|
|
||||||
};
|
|
||||||
border = {
|
|
||||||
width = 1;
|
|
||||||
radius = 5;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
fonts,
|
|
||||||
accentColourName,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
services.mako =
|
|
||||||
let
|
|
||||||
sc = config.scheme.withHashtag;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
enable = true;
|
|
||||||
anchor = "top-right";
|
|
||||||
font = "${fonts.monospace.name} ${toString fonts.sizes.popups}";
|
|
||||||
layer = "top";
|
|
||||||
markup = true;
|
|
||||||
maxVisible = 10;
|
|
||||||
icons = true;
|
|
||||||
iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
|
|
||||||
textColor = "${sc.base05}ff";
|
|
||||||
progressColor = "over ${sc.red}ff";
|
|
||||||
backgroundColor = "${sc.base00}cc";
|
|
||||||
borderColor = "${sc.${accentColourName}}ff";
|
|
||||||
borderRadius = 5;
|
|
||||||
borderSize = 1;
|
|
||||||
defaultTimeout = 0;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -35,7 +35,7 @@
|
||||||
inherit (config.home.pointerCursor) size;
|
inherit (config.home.pointerCursor) size;
|
||||||
theme = config.home.pointerCursor.name;
|
theme = config.home.pointerCursor.name;
|
||||||
};
|
};
|
||||||
wallpaper = "${../wallpapers/landscapes/tropic_island_day.jpg}";
|
wallpaper = "${./wallpapers/landscapes/tropic_island_day.jpg}";
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts =
|
fonts =
|
||||||
|
|
Before Width: | Height: | Size: 562 KiB After Width: | Height: | Size: 562 KiB |
Before Width: | Height: | Size: 642 KiB After Width: | Height: | Size: 642 KiB |
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 86 KiB |
Before Width: | Height: | Size: 103 KiB After Width: | Height: | Size: 103 KiB |
Before Width: | Height: | Size: 140 KiB After Width: | Height: | Size: 140 KiB |
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 133 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 202 KiB After Width: | Height: | Size: 202 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 125 KiB After Width: | Height: | Size: 125 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 146 KiB |
Before Width: | Height: | Size: 167 KiB After Width: | Height: | Size: 167 KiB |
Before Width: | Height: | Size: 111 KiB After Width: | Height: | Size: 111 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 112 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 108 KiB |
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 14 MiB After Width: | Height: | Size: 14 MiB |
Before Width: | Height: | Size: 183 KiB After Width: | Height: | Size: 183 KiB |
Before Width: | Height: | Size: 528 KiB After Width: | Height: | Size: 528 KiB |
Before Width: | Height: | Size: 27 MiB After Width: | Height: | Size: 27 MiB |
Before Width: | Height: | Size: 20 MiB After Width: | Height: | Size: 20 MiB |
Before Width: | Height: | Size: 286 KiB After Width: | Height: | Size: 286 KiB |
Before Width: | Height: | Size: 747 KiB After Width: | Height: | Size: 747 KiB |
Before Width: | Height: | Size: 7 MiB After Width: | Height: | Size: 7 MiB |
Before Width: | Height: | Size: 5.3 MiB After Width: | Height: | Size: 5.3 MiB |
Before Width: | Height: | Size: 7.8 MiB After Width: | Height: | Size: 7.8 MiB |
Before Width: | Height: | Size: 3.6 MiB After Width: | Height: | Size: 3.6 MiB |
Before Width: | Height: | Size: 4.3 MiB After Width: | Height: | Size: 4.3 MiB |
Before Width: | Height: | Size: 3.7 MiB After Width: | Height: | Size: 3.7 MiB |
Before Width: | Height: | Size: 1,000 KiB After Width: | Height: | Size: 1,000 KiB |
Before Width: | Height: | Size: 3.9 MiB After Width: | Height: | Size: 3.9 MiB |
Before Width: | Height: | Size: 4.8 MiB After Width: | Height: | Size: 4.8 MiB |
Before Width: | Height: | Size: 4 MiB After Width: | Height: | Size: 4 MiB |
Before Width: | Height: | Size: 4.3 MiB After Width: | Height: | Size: 4.3 MiB |
Before Width: | Height: | Size: 4 MiB After Width: | Height: | Size: 4 MiB |
Before Width: | Height: | Size: 5.1 MiB After Width: | Height: | Size: 5.1 MiB |
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 252 KiB |
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 254 KiB |
Before Width: | Height: | Size: 250 KiB After Width: | Height: | Size: 250 KiB |
Before Width: | Height: | Size: 255 KiB After Width: | Height: | Size: 255 KiB |
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 252 KiB |
Before Width: | Height: | Size: 249 KiB After Width: | Height: | Size: 249 KiB |
Before Width: | Height: | Size: 253 KiB After Width: | Height: | Size: 253 KiB |
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 254 KiB |
Before Width: | Height: | Size: 247 KiB After Width: | Height: | Size: 247 KiB |
Before Width: | Height: | Size: 255 KiB After Width: | Height: | Size: 255 KiB |
Before Width: | Height: | Size: 253 KiB After Width: | Height: | Size: 253 KiB |
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 254 KiB |
Before Width: | Height: | Size: 253 KiB After Width: | Height: | Size: 253 KiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 1 MiB After Width: | Height: | Size: 1 MiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 1 MiB After Width: | Height: | Size: 1 MiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 1 MiB After Width: | Height: | Size: 1 MiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 1 MiB After Width: | Height: | Size: 1 MiB |
Before Width: | Height: | Size: 1 MiB After Width: | Height: | Size: 1 MiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 1 MiB After Width: | Height: | Size: 1 MiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |