PapaTutuWawa/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: PapaTutuWawa:364945f5f6751cd9505dd5954f5ee2a2e37468e5
Branches Tags
PapaTutuWawa:master
..
compare: PapaTutuWawa:4593f2dd952febcceb97bcbe90b709ea133e1153
Branches Tags
PapaTutuWawa:master

No commits in common. "364945f5f6751cd9505dd5954f5ee2a2e37468e5" and "4593f2dd952febcceb97bcbe90b709ea133e1153" have entirely different histories.
364945f5f6 ... 4593f2dd95

9 changed files with 125 additions and 147 deletions
Show Stats Expand all files Collapse all files

22
flake.lock
View File

@ -226,10 +226,10 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1639347265, "lastModified": 1638698569,
"narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=", "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
"path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source", "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
"rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada", "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -255,10 +255,10 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1639347265, "lastModified": 1638698569,
"narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=", "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
"path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source", "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
"rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada", "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -268,11 +268,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1641734288, "lastModified": 1640929225,
"narHash": "sha256-/7YwWbvkjinc4uu5aUQMRw3xAthhOVH/esm4tCXPzIQ=", "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "df123677560db3b0db7c19d71981b11091fbeaf6", "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
hosts/nishimiya.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, ... }:
{ {
imports = with inputs.nixos-hardware.nixosModules; [ imports = with inputs.nixos-hardware.nixosModules; [
@ -20,8 +20,7 @@
initrd = { initrd = {
availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" 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 # NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/common/pc/laptop/acpi_call.nix
#"acpi_call" ]; "acpi_call" ];
];
kernelModules = [ "dm-snapshot" ]; kernelModules = [ "dm-snapshot" ];
luks.devices = { luks.devices = {
cryptroot = { cryptroot = {
@ -30,7 +29,6 @@
}; };
}; };
}; };
kernelPackages = pkgs.linuxPackages_xanmod;
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
# NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/lenovo/thinkpad/e495/default.nix#L12 # NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/lenovo/thinkpad/e495/default.nix#L12
@ -53,7 +51,6 @@
office.enable = true; office.enable = true;
}; };
services = { services = {
gnome.enable = true;
kanshi = let kanshi = let
horizontal = "Samsung Electric Company C27F398 H4ZR101145"; horizontal = "Samsung Electric Company C27F398 H4ZR101145";

1
modules/default.nix
View File

@ -20,7 +20,6 @@
./programs/zsh ./programs/zsh
./programs/xournalpp ./programs/xournalpp
./programs/plasma ./programs/plasma
./programs/office
# Services # Services
./services/kanshi ./services/kanshi

1
modules/programs/gnome/default.nix
View File

@ -22,7 +22,6 @@ in {
gnomeExtensions.tray-icons-reloaded gnomeExtensions.tray-icons-reloaded
gnomeExtensions.gsconnect gnomeExtensions.gsconnect
gnomeExtensions.blur-my-shell gnomeExtensions.blur-my-shell
gnomeExtensions.forge
gnome.eog gnome.eog
gnome.nautilus gnome.nautilus
gnome.evince gnome.evince

10
modules/programs/office/default.nix
View File

@ -1,13 +1,15 @@
{ config, lib, pkgs, ... }: { pkgs, config, lib, ... }:
let let
cfg = config.ptw.programs.office; cfg = config.ptw.programs;
in { 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 { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
libreoffice texlive.combined.scheme-basic libreoffice
]; ];
}; };
} }

1
modules/programs/plasma/default.nix
View File

@ -26,7 +26,6 @@ in {
libsForQt5.okular libsForQt5.okular
libsForQt5.kdeconnect-kde libsForQt5.kdeconnect-kde
libsForQt5.breeze-gtk libsForQt5.breeze-gtk
libsForQt5.bismuth
index-fm index-fm
#kasts-git #kasts-git
rsibreak rsibreak

2
modules/programs/waybar/default.nix
View File

@ -22,7 +22,7 @@ in {
{ {
output = [ "${cfg.output}" ]; output = [ "${cfg.output}" ];
layer = "bottom"; layer = "bottom";
position = "top"; position = "left";
gtk-layer-shell = true; gtk-layer-shell = true;
modules-left = [ "custom/applauncher" "sway/workspaces" "sway/mode" ]; modules-left = [ "custom/applauncher" "sway/workspaces" "sway/mode" ];

224
modules/programs/waybar/style.css
View File

@ -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-size: 14px;
font-family: Iosevka Nerd Font, sans-serif; font-family: "Hack";
font-size: 13px; padding: 0px;
margin: 0px;
/* text-shadow:1px 1px 2px rgba(0,0,0,.6); */
} }
window#waybar { window#waybar {
/* background-color: rgba(18, 21, 29, 0.98); */ color: @foreground;
background-color: #12151d; border-radius: 0;
/* background-color: rgba(0, 0, 0, 0); */
border-bottom: 3px solid #1e222a;
color: #abb2bf;
transition-property: background-color;
transition-duration: .5s;
} }
window#waybar.hidden { window#waybar.left {
opacity: 0.2; 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, #workspaces,
#mode, #mode,
#cpu, #window,
#memory,
#temperature,
#custom-media,
#custom-fans,
#clock,
#idle_inhibitor, #idle_inhibitor,
#language,
#pulseaudio, #pulseaudio,
#backlight, #taskbar,
#battery, #tray,
#network, #custom-menu {
#tray { padding: 1px 0px 1px 0px;
background-color: #1e222a; margin: 0px;
padding: 0 10px;
margin: 2px 4px 5px 4px;
border: 3px solid rgba(0, 0, 0, 0);
border-radius: 90px;
background-clip: padding-box;
} }
#workspaces button { #pulseaudio, #idle_inhibitor {
padding: 0 5px; font-size: 30px;
min-width: 20px; margin: 0px 2px;
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 { #pulseaudio {
color: #d19a66; font-size: 16px;
} }
#pulseaudio.muted { #taskbar,
background-color: #e06c75; #tray,
color: #1e222a; #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 { #tray {
color: #61afef; color: black;
icon-shadow: 0px 1px 2px alpha(#020000, .9);
padding: 2px 0px 2px 0px;
} }
#battery { #custom-menu,
color: #98c379; #custom-applauncher,
#custom-notifications {
font-size: 30px;
} }
#battery.charging, #battery.plugged { #clock {
background-color: #98c379; font-size: 16px;
color: #1e222a; margin-left: 2px;
margin-right: 2px;
} }
@keyframes blink { #workspaces {
to { padding: 0px 0px 0px 0px;
background-color: #1e222a; margin-left: 0px;
color: #e06c75; }
} #workspaces button {
margin: 0;
padding: 0px 0px 0px 0px;
border-radius: 0px;
color: @foreground;
} }
#battery.critical:not(.charging) { #workspaces button.focused {
background-color: #e06c75; color: @foreground;
color: #1e222a; background-color: @purple;
animation-name: blink; border-style: solid;
animation-duration: 0.5s; border-width: 0 0 0 0;
animation-timing-function: linear; border-color: @foreground;
animation-iteration-count: infinite; border-radius: 0;
animation-direction: alternate;
}
#network {
color: #c678dd
}
#network.disconnected {
background-color: #e06c75;
color: #1e222a;
} }

2
modules/users/alexander.nix
View File

@ -54,7 +54,7 @@
# TODO: Maybe move this somewhere else # TODO: Maybe move this somewhere else
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
pinentryFlavor = "gnome3"; pinentryFlavor = "qt";
}; };
}; };
}; };