Compare commits

...

4 Commits

14 changed files with 140 additions and 45 deletions

View File

@ -68,6 +68,7 @@
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users."gunalx" = import ./home/full.nix;
home-manager.backupFileExtension = "bac";
home-manager.extraSpecialArgs = {inherit nix-colors inputs;};
}
#need to choose one. The nixos one has bootloader and display manager in addition to the home manager one.

View File

@ -1,10 +1,13 @@
{ stdenv, lib }:
{ lib, stdenv, pkgs }:
stdenv.mkDerivation rec {
pname = "wallpapers";
version = "1.0";
src = ./;
src = pkgs.fetchurl {
url = "file://./";
sha256 = lib.fakeSha256;
};
installPhase = ''
mkdir -p $out/share/wallpapers
@ -17,3 +20,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ adriangl ];
};
}

View File

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

View File

@ -57,5 +57,20 @@ in{
};
gtk = {
enable = true;
theme = {
name = "Adwaita-dark";
package = pkgs.gnome.gnome-themes-extra;
};
};
qt = {
enable = true;
platformTheme.name = "adwaita";
style.name = "adwaita-dark";
};
}

View File

@ -15,32 +15,34 @@
compression = true;
matchBlocks = {
"*.pvv.ntnu.no" = {
user="adriangl";
};
"*.ntnu.no !*.pvv.ntnu.no" = {
user="adriangl";
proxyJump="isvegg.pvv.ntnu.no";
};
"snotra" = {
user="adriangl";
proxyJump="isvegg.pvv.ntnu.no";
host="snotra.idi.ntnu.no";
proxyJump="adriangl@isvegg.pvv.ntnu.no";
hostname="snotra.idi.ntnu.no";
};
#pvv
"pvv" = {
user="adriangl";
host="login.pvv.ntnu.no";
match="pvv";
hostname="login.pvv.ntnu.no";
};
"isvegg" = {
user="adriangl";
host="isvegg.pvv.ntnu.no";
hostname="isvegg.pvv.ntnu.no";
};
#home
"aragon" = {
port = 6969;
user="gunalx";
host = "100.74.34.149";
hostname="100.74.34.149";
};

View File

@ -1,7 +1,13 @@
{ pkgs, config, lib, ... }:
let
wallpapers = import ./wallpaper.nix { inherit pkgs; };
#wallpapers = import ./wallpapers { inherit lib pkgs; };
palette = config.colorScheme.palette;
idlelock = "brightnessctl -d intel_backlight s 10% && swaylock && brightnessctl -d intel_backlight s 50% ";
in
{
imports = [
@ -9,14 +15,20 @@ in
./foot.nix
./fonts.nix
./kanshi.nix
./swaylock.nix
#./assets/wallpapers
];
#home.packages = [
# wallpapers
#];
home.packages = with pkgs; [
wl-clipboard
libsForQt5.qt5ct
qt6Packages.qt6ct
pass-wayland
wev
#term
foot
@ -42,7 +54,7 @@ in
#lockscreen and related
wleave
swayidle
swaylock-effects
#swaylock-effects
#swaylock-fancy #migth change to this default may look prettier.
#ligth and sound
@ -82,9 +94,6 @@ in
];
qt.enable = true;
qt.style.name = "adwaita-dark";
home.sessionVariables = {
MOZ_ENABLE_WAYLAND = "1";
@ -103,10 +112,16 @@ in
_JAVA_AWT_WM_NONREPARENTING = 1;
# gtk applications on wayland
#GTK_BACKEND="wayland";
GTK_BACKEND="wayland";
#WALLPAPER_DIR="${wallpapers}/share/wallpapers";
WALLPAPER_DIR="/home/gunalx/Pictures/wallpapers";
};
wayland.windowManager.sway = let
cfg = config.wayland.windowManager.sway;
in {
@ -114,7 +129,6 @@ in {
enable = true;
systemd.enable = true;
config = rec {
modifier = "Mod4";
@ -128,8 +142,18 @@ in {
}];
startup = [
{command = "foot --server";}
#wallpaper
{command = "swww-daemon";}
{command = ''while true; do for wallpaper in $WALLPAPER_DIR/*; do swww img "$wallpaper"; sleep 300; done; done'';}
{command = "while true; do for wallpaper in $WALLPAPER_DIR/*; do swww img \"$wallpaper\"; sleep 15; done; done;";}
#idlelock
{command = ''swayidle \
timeout 120 ${idlelock} \
timeout 180 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \
before-sleep ${idlelock}
'';}
{command = "firefox";}
{command = "nm-applet";}
@ -233,14 +257,24 @@ in {
"${cfg.config.modifier}+Shift+c" = "exec code";
"${cfg.config.modifier}+f11" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
"${cfg.config.modifier}+Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
"${cfg.config.modifier}+m" = "exec ${idlelock}";
"ctrl+space" = "exec xkb_switch_layout next"; #TODO:verify
"${cfg.config.modifier}+tab" = "workspace next";
"Alt+tab" = "workspace back_and_forth";
};
};
extraConfig = ''
input type:keyboard xkb_capslock disabled
input type:keyboard xkb_numlock enabled
input type:keyboard {
xkb_capslock disabled
xkb_numlock enabled
xkb_layout us,no
xkb_options :
}
xwayland enable
smart_borders no_gaps

35
home/swaylock.nix Normal file
View File

@ -0,0 +1,35 @@
{ pkgs, inputs, lib, config, nix-colors, ... }:
let
palette = config.colorScheme.palette;
in
{
imports = [
];
programs.swaylock = {
enable = true;
package = pkgs.swaylock-effects;
settings = {
color = palette.base00;
screenshots = true;
grace = 15;
clock = true;
submit-on-touch = true;
indicator-idle-visible = true;
indicator-radius = 100;
indicator-thickness = 7;
ring-color = palette.base05;
key-hl-color = palette.base03;
tect-color = palette.base00;
line-colot = palette.base00;
innside-color = palette.base04;
seperator-color = palette.base00;
fade-in = 0.1;
effect-scale = 0.6;
effect-blur = "7x3";
};
};
}

View File

@ -1,18 +0,0 @@
{ pkgs, ... }:
let
wallpapers = pkgs.callPackage ./assets {};
in
{
environment.systemPackages = [
wallpapers
];
home.packages = [
wallpapers
];
home.sessionVariables = {
WALLPAPER_DIR = "${wallpapers}/share/wallpapers";
};
}

View File

@ -46,7 +46,7 @@
users.users.gunalx = {
isNormalUser = true;
description = "Adrian Gunnar Lauterer";
extraGroups = [ "networkmanager" "wheel" "video" ];
extraGroups = [ "networkmanager" "wheel" "video" "input" "audio"];
packages = with pkgs; [
];
};

View File

@ -40,10 +40,13 @@ imports =
];
# Enable CUPS to print documents.
services.printing.enable = true;
services.printing.enable = false; #temp off because of CVE
security.polkit.enable = true;
security.pam.services.swaylock = {};
security.pam.services.swaylock-effects = {};
services.displayManager = {
enable = true;
sessionPackages = with pkgs; [ sway ];
@ -60,7 +63,24 @@ imports =
services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true;
qt.platformTheme = "kde";
#bluetooth
services.blueman.enable = true;
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
hardware.bluetooth = {
enable = true; # enables support for Bluetooth
settings = {
General = {
Enable = "Source,Sink,Media,Socket";
Experimental = true;
};
};
};
#automount
services.udisks2.enable = true;
#qt.platformTheme = "kde";
# Configure keymap in X11
services.xserver.xkb = {

View File

@ -29,7 +29,8 @@ imports =
rustup
mpi
gnuplot

View File

@ -6,7 +6,7 @@ imports =
];
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
@ -19,6 +19,7 @@ imports =
wireplumber.enable = true;
};
environment.systemPackages = with pkgs; [
pavucontrol
wireplumber
@ -33,7 +34,7 @@ imports =
synthesia
vital
picoloop
bespokesynth-with-vst2
#bespokesynth-with-vst2 #always takes ages compiling
fmsynth
polyphone #soundfont editor

View File

@ -67,7 +67,7 @@ imports =
];
qt.platformTheme = "qt5ct";
#qt.platformTheme = "qt5ct";
}