Compare commits
No commits in common. "364945f5f6751cd9505dd5954f5ee2a2e37468e5" and "4593f2dd952febcceb97bcbe90b709ea133e1153" have entirely different histories.
364945f5f6
...
4593f2dd95
22
flake.lock
22
flake.lock
@ -226,10 +226,10 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1639347265,
|
||||
"narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
|
||||
"path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source",
|
||||
"rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
|
||||
"lastModified": 1638698569,
|
||||
"narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
|
||||
"path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
|
||||
"rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
@ -255,10 +255,10 @@
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1639347265,
|
||||
"narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
|
||||
"path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source",
|
||||
"rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
|
||||
"lastModified": 1638698569,
|
||||
"narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
|
||||
"path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
|
||||
"rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
@ -268,11 +268,11 @@
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1641734288,
|
||||
"narHash": "sha256-/7YwWbvkjinc4uu5aUQMRw3xAthhOVH/esm4tCXPzIQ=",
|
||||
"lastModified": 1640929225,
|
||||
"narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "df123677560db3b0db7c19d71981b11091fbeaf6",
|
||||
"rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = with inputs.nixos-hardware.nixosModules; [
|
||||
@ -20,8 +20,7 @@
|
||||
initrd = {
|
||||
availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci"
|
||||
# NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/common/pc/laptop/acpi_call.nix
|
||||
#"acpi_call" ];
|
||||
];
|
||||
"acpi_call" ];
|
||||
kernelModules = [ "dm-snapshot" ];
|
||||
luks.devices = {
|
||||
cryptroot = {
|
||||
@ -30,7 +29,6 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
kernelPackages = pkgs.linuxPackages_xanmod;
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
extraModulePackages = [ ];
|
||||
# NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/lenovo/thinkpad/e495/default.nix#L12
|
||||
@ -53,7 +51,6 @@
|
||||
office.enable = true;
|
||||
};
|
||||
services = {
|
||||
gnome.enable = true;
|
||||
kanshi = let
|
||||
horizontal = "Samsung Electric Company C27F398 H4ZR101145";
|
||||
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
./programs/zsh
|
||||
./programs/xournalpp
|
||||
./programs/plasma
|
||||
./programs/office
|
||||
|
||||
# Services
|
||||
./services/kanshi
|
||||
|
||||
@ -22,7 +22,6 @@ in {
|
||||
gnomeExtensions.tray-icons-reloaded
|
||||
gnomeExtensions.gsconnect
|
||||
gnomeExtensions.blur-my-shell
|
||||
gnomeExtensions.forge
|
||||
gnome.eog
|
||||
gnome.nautilus
|
||||
gnome.evince
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.ptw.programs.office;
|
||||
cfg = config.ptw.programs;
|
||||
in {
|
||||
options.ptw.programs.office.enable = lib.mkEnableOption "Install and configure office software";
|
||||
options.ptw.programs.office = {
|
||||
enable = lib.mkEnableOption "Install Office software";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
libreoffice texlive.combined.scheme-basic
|
||||
libreoffice
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,6 @@ in {
|
||||
libsForQt5.okular
|
||||
libsForQt5.kdeconnect-kde
|
||||
libsForQt5.breeze-gtk
|
||||
libsForQt5.bismuth
|
||||
index-fm
|
||||
#kasts-git
|
||||
rsibreak
|
||||
|
||||
@ -22,7 +22,7 @@ in {
|
||||
{
|
||||
output = [ "${cfg.output}" ];
|
||||
layer = "bottom";
|
||||
position = "top";
|
||||
position = "left";
|
||||
gtk-layer-shell = true;
|
||||
|
||||
modules-left = [ "custom/applauncher" "sway/workspaces" "sway/mode" ];
|
||||
|
||||
@ -1,151 +1,133 @@
|
||||
/*
|
||||
Based on https://github.com/indicozy/wmtm/blob/main/configs/Flower/config/waybar/style.css
|
||||
*/
|
||||
@define-color background #323732;
|
||||
@define-color foreground #deddda;
|
||||
@define-color selection #44475a;
|
||||
@define-color unfocused #6272a4;
|
||||
@define-color cyan #5d7380;
|
||||
@define-color green #fff6f6;
|
||||
@define-color orange #d65d0e;
|
||||
@define-color pink #ff5370;
|
||||
@define-color purple #b16286;
|
||||
@define-color red #bf6374;
|
||||
@define-color yellow #d79921;
|
||||
@define-color fore #d1c29d;
|
||||
|
||||
|
||||
* {
|
||||
border: none;
|
||||
font-family: Iosevka Nerd Font, sans-serif;
|
||||
font-size: 13px;
|
||||
font-size: 14px;
|
||||
font-family: "Hack";
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
/* text-shadow:1px 1px 2px rgba(0,0,0,.6); */
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
/* background-color: rgba(18, 21, 29, 0.98); */
|
||||
background-color: #12151d;
|
||||
/* background-color: rgba(0, 0, 0, 0); */
|
||||
border-bottom: 3px solid #1e222a;
|
||||
color: #abb2bf;
|
||||
transition-property: background-color;
|
||||
transition-duration: .5s;
|
||||
color: @foreground;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
window#waybar.hidden {
|
||||
opacity: 0.2;
|
||||
window#waybar.left {
|
||||
background: rgba(43, 48, 59, .85);
|
||||
border-top-left-radius: 0px;
|
||||
border-top-right-radius: 0px;
|
||||
border-top: none;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
window#waybar.bottom {
|
||||
padding-top: 0px;
|
||||
background: @green;
|
||||
border-bottom-left-radius: 0px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.modules-left,
|
||||
.modules-center,
|
||||
.modules-right {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* Base styling for modules */
|
||||
#workspaces,
|
||||
#mode,
|
||||
#cpu,
|
||||
#memory,
|
||||
#temperature,
|
||||
#custom-media,
|
||||
#custom-fans,
|
||||
#clock,
|
||||
#window,
|
||||
#idle_inhibitor,
|
||||
#language,
|
||||
#pulseaudio,
|
||||
#backlight,
|
||||
#battery,
|
||||
#network,
|
||||
#tray {
|
||||
background-color: #1e222a;
|
||||
padding: 0 10px;
|
||||
margin: 2px 4px 5px 4px;
|
||||
border: 3px solid rgba(0, 0, 0, 0);
|
||||
border-radius: 90px;
|
||||
background-clip: padding-box;
|
||||
#taskbar,
|
||||
#tray,
|
||||
#custom-menu {
|
||||
padding: 1px 0px 1px 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 0 5px;
|
||||
min-width: 20px;
|
||||
color: #61afef;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background-color: rgba(0, 0, 0, 0.2)
|
||||
}
|
||||
|
||||
#workspaces button.focused {
|
||||
color: #c678dd;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
color: #e06c75;
|
||||
}
|
||||
|
||||
#cpu {
|
||||
color: #61afef;
|
||||
}
|
||||
|
||||
#memory {
|
||||
color: #c678dd;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
color: #d19a66;
|
||||
}
|
||||
|
||||
#temperature.critical {
|
||||
background-color: #e06c75;
|
||||
color: #1e222a;
|
||||
}
|
||||
|
||||
#custom-media {
|
||||
background-color: #c678dd;
|
||||
color: #1e222a;
|
||||
}
|
||||
|
||||
#custom-fans {
|
||||
color: #98c379;
|
||||
}
|
||||
|
||||
#clock {
|
||||
color: #61afef;
|
||||
}
|
||||
|
||||
#idle_inhibitor {
|
||||
color: #abb2bf;
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
background-color: #abb2bf;
|
||||
color: #1e222a;
|
||||
}
|
||||
|
||||
#language {
|
||||
color: #56b6c2;
|
||||
#pulseaudio, #idle_inhibitor {
|
||||
font-size: 30px;
|
||||
margin: 0px 2px;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: #d19a66;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
background-color: #e06c75;
|
||||
color: #1e222a;
|
||||
#taskbar,
|
||||
#tray,
|
||||
#window {
|
||||
padding: 0;
|
||||
margin: 0 0px 0 0px;
|
||||
}
|
||||
#taskbar {
|
||||
margin-top: 0px;
|
||||
}
|
||||
#taskbar button {
|
||||
color: @foreground;
|
||||
border-radius: 0px;
|
||||
padding: 3px 0px 3px 0px;
|
||||
}
|
||||
#taskbar button.active {
|
||||
icon-shadow: 0px 0px 3px alpha(#111131, .9);
|
||||
border-style: dashed;
|
||||
border-width: 0 0 0 0;
|
||||
border-color: @foreground;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
#backlight {
|
||||
color: #61afef;
|
||||
#tray {
|
||||
color: black;
|
||||
icon-shadow: 0px 1px 2px alpha(#020000, .9);
|
||||
padding: 2px 0px 2px 0px;
|
||||
}
|
||||
|
||||
#battery {
|
||||
color: #98c379;
|
||||
#custom-menu,
|
||||
#custom-applauncher,
|
||||
#custom-notifications {
|
||||
font-size: 30px;
|
||||
}
|
||||
|
||||
#battery.charging, #battery.plugged {
|
||||
background-color: #98c379;
|
||||
color: #1e222a;
|
||||
#clock {
|
||||
font-size: 16px;
|
||||
margin-left: 2px;
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
to {
|
||||
background-color: #1e222a;
|
||||
color: #e06c75;
|
||||
#workspaces {
|
||||
padding: 0px 0px 0px 0px;
|
||||
margin-left: 0px;
|
||||
}
|
||||
#workspaces button {
|
||||
margin: 0;
|
||||
padding: 0px 0px 0px 0px;
|
||||
border-radius: 0px;
|
||||
color: @foreground;
|
||||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
background-color: #e06c75;
|
||||
color: #1e222a;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: linear;
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: #c678dd
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
background-color: #e06c75;
|
||||
color: #1e222a;
|
||||
#workspaces button.focused {
|
||||
color: @foreground;
|
||||
background-color: @purple;
|
||||
border-style: solid;
|
||||
border-width: 0 0 0 0;
|
||||
border-color: @foreground;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
# TODO: Maybe move this somewhere else
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentryFlavor = "gnome3";
|
||||
pinentryFlavor = "qt";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user