Compare commits
4 Commits
0ce69398e3
...
56459a0285
Author | SHA1 | Date |
---|---|---|
Adrian Gunnar Lauterer | 56459a0285 | |
Adrian Gunnar Lauterer | 69da90215f | |
Adrian Gunnar Lauterer | d5ad688d40 | |
Adrian Gunnar Lauterer | b40c6e13ee |
|
@ -68,6 +68,7 @@
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.users."gunalx" = import ./home/full.nix;
|
home-manager.users."gunalx" = import ./home/full.nix;
|
||||||
|
home-manager.backupFileExtension = "bac";
|
||||||
home-manager.extraSpecialArgs = {inherit nix-colors inputs;};
|
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.
|
#need to choose one. The nixos one has bootloader and display manager in addition to the home manager one.
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
{ stdenv, lib }:
|
{ lib, stdenv, pkgs }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wallpapers";
|
pname = "wallpapers";
|
||||||
version = "1.0";
|
version = "1.0";
|
||||||
|
|
||||||
src = ./;
|
src = pkgs.fetchurl {
|
||||||
|
url = "file://./";
|
||||||
|
sha256 = lib.fakeSha256;
|
||||||
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/wallpapers
|
mkdir -p $out/share/wallpapers
|
||||||
|
@ -17,3 +20,4 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = with maintainers; [ adriangl ];
|
maintainers = with maintainers; [ adriangl ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 3.3 MiB |
|
@ -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";
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,32 +15,34 @@
|
||||||
compression = true;
|
compression = true;
|
||||||
|
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
|
"*.pvv.ntnu.no" = {
|
||||||
|
user="adriangl";
|
||||||
|
};
|
||||||
"*.ntnu.no !*.pvv.ntnu.no" = {
|
"*.ntnu.no !*.pvv.ntnu.no" = {
|
||||||
user="adriangl";
|
user="adriangl";
|
||||||
proxyJump="isvegg.pvv.ntnu.no";
|
proxyJump="isvegg.pvv.ntnu.no";
|
||||||
};
|
};
|
||||||
"snotra" = {
|
"snotra" = {
|
||||||
user="adriangl";
|
user="adriangl";
|
||||||
proxyJump="isvegg.pvv.ntnu.no";
|
proxyJump="adriangl@isvegg.pvv.ntnu.no";
|
||||||
host="snotra.idi.ntnu.no";
|
hostname="snotra.idi.ntnu.no";
|
||||||
};
|
};
|
||||||
|
|
||||||
#pvv
|
#pvv
|
||||||
"pvv" = {
|
"pvv" = {
|
||||||
user="adriangl";
|
user="adriangl";
|
||||||
host="login.pvv.ntnu.no";
|
hostname="login.pvv.ntnu.no";
|
||||||
match="pvv";
|
|
||||||
};
|
};
|
||||||
"isvegg" = {
|
"isvegg" = {
|
||||||
user="adriangl";
|
user="adriangl";
|
||||||
host="isvegg.pvv.ntnu.no";
|
hostname="isvegg.pvv.ntnu.no";
|
||||||
};
|
};
|
||||||
|
|
||||||
#home
|
#home
|
||||||
"aragon" = {
|
"aragon" = {
|
||||||
port = 6969;
|
port = 6969;
|
||||||
user="gunalx";
|
user="gunalx";
|
||||||
host = "100.74.34.149";
|
hostname="100.74.34.149";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
let
|
let
|
||||||
wallpapers = import ./wallpaper.nix { inherit pkgs; };
|
#wallpapers = import ./wallpapers { inherit lib pkgs; };
|
||||||
|
|
||||||
palette = config.colorScheme.palette;
|
palette = config.colorScheme.palette;
|
||||||
|
|
||||||
|
|
||||||
|
idlelock = "brightnessctl -d intel_backlight s 10% && swaylock && brightnessctl -d intel_backlight s 50% ";
|
||||||
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -9,14 +15,20 @@ in
|
||||||
./foot.nix
|
./foot.nix
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./kanshi.nix
|
./kanshi.nix
|
||||||
|
./swaylock.nix
|
||||||
|
#./assets/wallpapers
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
#home.packages = [
|
||||||
|
# wallpapers
|
||||||
|
#];
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
libsForQt5.qt5ct
|
libsForQt5.qt5ct
|
||||||
qt6Packages.qt6ct
|
qt6Packages.qt6ct
|
||||||
pass-wayland
|
pass-wayland
|
||||||
|
wev
|
||||||
|
|
||||||
#term
|
#term
|
||||||
foot
|
foot
|
||||||
|
@ -42,7 +54,7 @@ in
|
||||||
#lockscreen and related
|
#lockscreen and related
|
||||||
wleave
|
wleave
|
||||||
swayidle
|
swayidle
|
||||||
swaylock-effects
|
#swaylock-effects
|
||||||
#swaylock-fancy #migth change to this default may look prettier.
|
#swaylock-fancy #migth change to this default may look prettier.
|
||||||
|
|
||||||
#ligth and sound
|
#ligth and sound
|
||||||
|
@ -82,9 +94,6 @@ in
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
qt.enable = true;
|
|
||||||
qt.style.name = "adwaita-dark";
|
|
||||||
|
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
MOZ_ENABLE_WAYLAND = "1";
|
MOZ_ENABLE_WAYLAND = "1";
|
||||||
|
@ -103,18 +112,23 @@ in
|
||||||
_JAVA_AWT_WM_NONREPARENTING = 1;
|
_JAVA_AWT_WM_NONREPARENTING = 1;
|
||||||
|
|
||||||
# gtk applications on wayland
|
# 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
|
wayland.windowManager.sway = let
|
||||||
cfg = config.wayland.windowManager.sway;
|
cfg = config.wayland.windowManager.sway;
|
||||||
in {
|
in {
|
||||||
wrapperFeatures.gtk = true;
|
wrapperFeatures.gtk = true;
|
||||||
enable = true;
|
enable = true;
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
|
|
||||||
|
|
||||||
config = rec {
|
config = rec {
|
||||||
|
|
||||||
modifier = "Mod4";
|
modifier = "Mod4";
|
||||||
|
@ -128,8 +142,18 @@ in {
|
||||||
}];
|
}];
|
||||||
startup = [
|
startup = [
|
||||||
{command = "foot --server";}
|
{command = "foot --server";}
|
||||||
|
|
||||||
|
#wallpaper
|
||||||
{command = "swww-daemon";}
|
{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 = "firefox";}
|
||||||
{command = "nm-applet";}
|
{command = "nm-applet";}
|
||||||
|
@ -233,14 +257,24 @@ in {
|
||||||
"${cfg.config.modifier}+Shift+c" = "exec code";
|
"${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}+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}+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";
|
"${cfg.config.modifier}+tab" = "workspace next";
|
||||||
"Alt+tab" = "workspace back_and_forth";
|
"Alt+tab" = "workspace back_and_forth";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
input type:keyboard xkb_capslock disabled
|
input type:keyboard {
|
||||||
input type:keyboard xkb_numlock enabled
|
xkb_capslock disabled
|
||||||
|
xkb_numlock enabled
|
||||||
|
|
||||||
|
xkb_layout us,no
|
||||||
|
xkb_options :
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
xwayland enable
|
xwayland enable
|
||||||
|
|
||||||
smart_borders no_gaps
|
smart_borders no_gaps
|
||||||
|
|
|
@ -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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
wallpapers = pkgs.callPackage ./assets {};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
wallpapers
|
|
||||||
];
|
|
||||||
|
|
||||||
home.packages = [
|
|
||||||
wallpapers
|
|
||||||
];
|
|
||||||
|
|
||||||
home.sessionVariables = {
|
|
||||||
WALLPAPER_DIR = "${wallpapers}/share/wallpapers";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -46,7 +46,7 @@
|
||||||
users.users.gunalx = {
|
users.users.gunalx = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Adrian Gunnar Lauterer";
|
description = "Adrian Gunnar Lauterer";
|
||||||
extraGroups = [ "networkmanager" "wheel" "video" ];
|
extraGroups = [ "networkmanager" "wheel" "video" "input" "audio"];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -40,10 +40,13 @@ imports =
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
services.printing.enable = true;
|
services.printing.enable = false; #temp off because of CVE
|
||||||
|
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
|
||||||
|
security.pam.services.swaylock = {};
|
||||||
|
security.pam.services.swaylock-effects = {};
|
||||||
|
|
||||||
services.displayManager = {
|
services.displayManager = {
|
||||||
enable = true;
|
enable = true;
|
||||||
sessionPackages = with pkgs; [ sway ];
|
sessionPackages = with pkgs; [ sway ];
|
||||||
|
@ -60,7 +63,24 @@ imports =
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
services.desktopManager.plasma6.enableQt5Integration = 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
|
# Configure keymap in X11
|
||||||
services.xserver.xkb = {
|
services.xserver.xkb = {
|
||||||
|
|
|
@ -29,7 +29,8 @@ imports =
|
||||||
rustup
|
rustup
|
||||||
|
|
||||||
|
|
||||||
|
mpi
|
||||||
|
gnuplot
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ imports =
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
hardware.pulseaudio.enable = false;
|
hardware.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
|
@ -19,6 +19,7 @@ imports =
|
||||||
wireplumber.enable = true;
|
wireplumber.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
pavucontrol
|
pavucontrol
|
||||||
wireplumber
|
wireplumber
|
||||||
|
@ -33,7 +34,7 @@ imports =
|
||||||
synthesia
|
synthesia
|
||||||
vital
|
vital
|
||||||
picoloop
|
picoloop
|
||||||
bespokesynth-with-vst2
|
#bespokesynth-with-vst2 #always takes ages compiling
|
||||||
fmsynth
|
fmsynth
|
||||||
polyphone #soundfont editor
|
polyphone #soundfont editor
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ imports =
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
qt.platformTheme = "qt5ct";
|
#qt.platformTheme = "qt5ct";
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue