varris
/
nixos-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Varris 2023-08-26 11:32:53 +02:00
parent ef42835893
commit 3aea9ee067
19 changed files with 115 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -120,23 +120,6 @@
"type": "gitlab"
}
},
"eww-git": {
"flake": false,
"locked": {
"lastModified": 1692622179,
"narHash": "sha256-vxMGAa/RTsMADPK4dM/28SV2ktCT0DenYvGsHZ4IJ8c=",
"owner": "ralismark",
"repo": "eww",
"rev": "a82ed62c25ba50f28dc8c3d57efe440d51d6136b",
"type": "github"
},
"original": {
"owner": "ralismark",
"ref": "tray-3",
"repo": "eww",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
@ -569,7 +552,6 @@
"root": {
"inputs": {
"chaotic-nyx": "chaotic-nyx",
"eww-git": "eww-git",
"fenix": "fenix",
"fish-plugin-bobthefish": "fish-plugin-bobthefish",
"fish-plugin-gruvbox-theme": "fish-plugin-gruvbox-theme",

6
flake.nix
View File

@ -64,12 +64,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
eww-git = {
# url = "github:elkowar/eww";
url = "github:ralismark/eww/tray-3";
flake = false;
};
openmw-git = {
url = "gitlab:OpenMW/openmw";
flake = false;

1
overlay.nix
View File

@ -2,7 +2,6 @@
{
default = final: prev: {
eww-git = prev.callPackage ./pkgs/eww-systray { inherit inputs; withWayland = true; };
eww-hyprland-activewindow = prev.callPackage ./pkgs/eww-hyprland-activewindow { inherit inputs; };
gruvbox-plus-icon-pack = final.callPackage ./pkgs/gruvbox-plus-icon-pack { };

50
pkgs/eww-systray/default.nix
View File

@ -1,50 +0,0 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, gtk3
, gdk-pixbuf
, libdbusmenu-gtk3
, withWayland ? false
, gtk-layer-shell
, stdenv
, inputs
, makeRustPlatform
, system
}:
(makeRustPlatform {
cargo = inputs.fenix.packages.${system}.minimal.toolchain;
rustc = inputs.fenix.packages.${system}.minimal.toolchain;
}).buildRustPackage rec {
pname = "eww";
version = "unstable-2023-08-19";
src = inputs.eww-git;
cargoLock.lockFile = "${inputs.eww-git}/Cargo.lock";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3 gdk-pixbuf libdbusmenu-gtk3 ] ++ lib.optional withWayland gtk-layer-shell;
buildNoDefaultFeatures = true;
buildFeatures = [
(if withWayland then "wayland" else "x11")
];
cargoBuildFlags = [ "--bin" "eww" ];
cargoTestFlags = cargoBuildFlags;
# requires unstable rust features
RUSTC_BOOTSTRAP = 1;
meta = with lib; {
description = "ElKowars wacky widgets";
homepage = "https://github.com/elkowar/eww";
license = licenses.mit;
maintainers = with maintainers; [ figsoda lom ];
mainProgram = "eww";
broken = stdenv.isDarwin;
};
}

76
system/configuration.nix
View File

@ -2,6 +2,8 @@
{
imports = [
./hardware-configuration.nix
./services
./programs
];
boot = {
@ -76,9 +78,7 @@
};
hardware.steam-hardware.enable = true;
programs.steam.enable = true;
chaotic.steam.extraCompatPackages = with pkgs; [ luxtorpeda proton-ge-custom ];
hardware.bluetooth.enable = true;
hardware.sane = {
enable = true;
@ -138,76 +138,6 @@
];
};
programs = {
dconf.enable = true;
hyprland.enable = true;
fish.enable = true;
kdeconnect.enable = true;
ssh.startAgent = true;
};
services = {
blueman.enable = true;
flatpak.enable = true;
fwupd.enable = true;
gnome.gnome-keyring.enable = true;
gvfs.enable = true;
openssh.enable = true;
udisks2.enable = true;
udev = {
packages = [ pkgs.openrgb ];
};
printing = {
enable = true;
drivers = [ pkgs.cnijfilter2 ];
};
avahi = {
enable = true;
nssmdns = true;
};
mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
locate = {
enable = true;
locate = pkgs.plocate;
localuser = null;
prunePaths = lib.mkOptionDefault [ ];
interval = "hourly";
};
fstrim = {
enable = true;
interval = "weekly";
};
};
virtualisation = {
podman.enable = true;
};
xdg.portal = {
enable = true;
xdgOpenUsePortal = true;
wlr.enable = false; #conflict with XDPH if enabled
extraPortals = [
pkgs.xdg-desktop-portal-gtk
];
};
systemd.extraConfig = ''
DefaultTimeoutStopSec=10s
'';

13
system/programs/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ pkgs, ... }:
{
programs.steam.enable = true;
chaotic.steam.extraCompatPackages = with pkgs; [ luxtorpeda proton-ge-custom ];
programs = {
dconf.enable = true;
hyprland.enable = true;
fish.enable = true;
kdeconnect.enable = true;
ssh.startAgent = true;
};
}

6
system/services/avahi/default.nix Normal file
View File

@ -0,0 +1,6 @@
{
services.avahi = {
enable = true;
nssmdns = true;
};
}

31
system/services/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ pkgs, ... }:
{
imports = [
./avahi
./locate
./pipewire
./printing
./udev
./xdg-portal
];
services = {
blueman.enable = true;
flatpak.enable = true;
fwupd.enable = true;
gnome.gnome-keyring.enable = true;
gvfs.enable = true;
openssh.enable = true;
udisks2.enable = true;
mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
fstrim = {
enable = true;
interval = "weekly";
};
};
}

10
system/services/locate/default.nix Normal file
View File

@ -0,0 +1,10 @@
{ pkgs, lib, ... }:
{
services.locate = {
enable = true;
locate = pkgs.plocate;
localuser = null;
prunePaths = lib.mkOptionDefault [ ];
interval = "hourly";
};
}

8
system/services/pipewire/default.nix Normal file
View File

@ -0,0 +1,8 @@
{
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
}

7
system/services/printing/default.nix Normal file
View File

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
services.printing = {
enable = true;
drivers = [ pkgs.cnijfilter2 ];
};
}

6
system/services/udev/default.nix Normal file
View File

@ -0,0 +1,6 @@
{ pkgs, ... }:
{
services.udev = {
packages = [ pkgs.openrgb ];
};
}

9
system/services/xdg-portal/default.nix Normal file
View File

@ -0,0 +1,9 @@
{ pkgs, ... }:
{
xdg.portal = {
enable = true;
xdgOpenUsePortal = true;
wlr.enable = false; #conflict with XDPH if enabled
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
};
}

19
user/configs/wayland/eww/config.nix
View File

@ -77,10 +77,11 @@ in
:class "volume"
volume))
(box
:space-evenly false
:class "mpd"
mpd)
(eventbox
:onclick "${pkgs.mpc-cli}/bin/mpc toggle"
(box
:class "mpd"
mpd))
)
)
@ -90,10 +91,6 @@ in
:spacing 5
:halign "end"
;; (box
;; :class "tray"
;; (tray))
(box
:space-evenly false
:orientation "h"
@ -142,12 +139,6 @@ in
:interval "1s"
"date '+%a %d, %B %H:%M'")
(defwidget tray []
(systray
:pack-direction "ltr"
:icon-size 22
))
(defwindow bar0
:monitor 0
:windowtype "dock"

3
user/configs/wayland/eww/default.nix
View File

@ -6,8 +6,9 @@ let
in
{
home.packages = [ pkgs.eww-wayland ];
xdg.configFile."eww/eww.yuck".text = "${eww-config}";
xdg.configFile."eww/eww.scss".text = "${eww-stylesheet}";
home.packages = [ pkgs.eww-git ];
}

5
user/configs/wayland/eww/stylesheet.nix
View File

@ -12,14 +12,15 @@
* {
all: unset; //Unsets everything so you can style everything from scratch
font-family: "JetBrainsMono Nerd Font";
font-size: 12px;
}
//Global Styles
.bar {
background-color: $bg;
color: $fg;
font-family: "JetBrainsMono Nerd Font";
font-size: 12px;
}
.window {

4
user/configs/wayland/hyprland/default.nix
View File

@ -145,7 +145,7 @@ in
exec = ${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary
exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh;
exec = ${pkgs.eww-git}/bin/eww kill; ${pkgs.eww-git}/bin/eww open-many bar0 bar1
exec = ${pkgs.eww-wayland}/bin/eww kill; ${pkgs.eww-wayland}/bin/eww open-many bar0 bar1
exec = pkill swww; sleep 2 && ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img $(cat ~/.cache/swww/wallpaper.txt)
#Set cursor
@ -208,6 +208,8 @@ in
bind = ${modKey} SHIFT, C, exec, hyprctl reload
layerrule = blur, notifications
layerrule = ignorezero, notifications
layerrule = blur, gtk-layer-shell

8
user/configs/xdg-mime.nix
View File

@ -6,9 +6,11 @@
"inode/directory" = "org.kde.dolphin.desktop";
"text/plain" = "nvim.desktop";
"image/jpeg" = "sxiv.desktop";
"image/png" = "sxiv.desktop";
"image/svg" = "sxiv.desktop";
"image/jpeg" = "imv.desktop";
"image/png" = "imv.desktop";
"image/svg" = "imv.desktop";
"x-scheme-handler/nxm" = "modorganizer2-nxm-handler.desktop";
};
};
}

8
user/home.nix
View File

@ -25,14 +25,16 @@
bottles
bottom
calcurse
discord
gamescope_git
gimp
gnome.gnome-boxes
gnome.gnome-settings-daemon
gnome.gvfs
gnome.seahorse
gnome.gnome-settings-daemon
gnome.simple-scan
heroic
imv
jq
libsForQt5.ark
libsForQt5.dolphin
@ -50,20 +52,18 @@
protontricks
qbittorrent
qt5ct
sc-im
samba
sc-im
signal-desktop
sshfs
steam-run
steamtinkerlaunch
sxiv
thunderbird
tldr
twemoji-color-font
vimv
vulkan-tools
vulkan-validation-layers
discord
xdg-utils
];