- Changed jetbrains ides to jetbrains toolbox to get more up to date versions
- Create a new Stylix module with wallpaper and font configuration - Integrate Waybar into Niri - Changed Discord application to Vesktop - Enable Waydroid virtualization
This commit is contained in:
@ -153,7 +153,7 @@
|
||||
meslo-lgs-nf
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
inter
|
||||
];
|
||||
|
||||
|
||||
@ -9,9 +9,9 @@
|
||||
#./packages.nix
|
||||
|
||||
#./hardware-configuration.nix
|
||||
#../plasma/plasma.nix
|
||||
#../hyprland/hyprland.nix
|
||||
#../niri/niri.nix
|
||||
../plasma/plasma.nix
|
||||
../hyprland/hyprland.nix
|
||||
../niri/niri.nix
|
||||
];
|
||||
|
||||
specialisation = {
|
||||
@ -41,16 +41,16 @@
|
||||
};
|
||||
};
|
||||
|
||||
"minimal" = {
|
||||
inheritParentConfig = false;
|
||||
configuration = {
|
||||
imports = [
|
||||
./minimal.nix
|
||||
];
|
||||
|
||||
environment.etc."nixos-tags".text = "minimal";
|
||||
};
|
||||
};
|
||||
# "minimal" = {
|
||||
# inheritParentConfig = false;
|
||||
# configuration = {
|
||||
# imports = [
|
||||
# ./minimal.nix
|
||||
# ];
|
||||
#
|
||||
# environment.etc."nixos-tags".text = "minimal";
|
||||
# };
|
||||
# };
|
||||
|
||||
"niri" = {
|
||||
inheritParentConfig = false;
|
||||
|
||||
@ -14,6 +14,24 @@
|
||||
name = "Konsole";
|
||||
noDisplay = true;
|
||||
};
|
||||
|
||||
desktopEntries."discord" = {
|
||||
categories = [ "Network" "InstantMessaging" "Chat" ];
|
||||
exec = "vesktop %U";
|
||||
genericName = "Internet Messenger";
|
||||
icon = "/home/${username}/NixOS/other/discord.app.png";
|
||||
name = "Discord";
|
||||
type = "Application";
|
||||
};
|
||||
|
||||
desktopEntries."vesktop" = {
|
||||
noDisplay = true;
|
||||
categories = [ "Network" "InstantMessaging" "Chat" ];
|
||||
exec = "vesktop %U";
|
||||
genericName = "Internet Messenger";
|
||||
name = "Vesktop";
|
||||
type = "Application";
|
||||
};
|
||||
|
||||
desktopEntries.kitty = {
|
||||
name = "kitty";
|
||||
|
||||
@ -5,7 +5,14 @@
|
||||
home.username = username;
|
||||
home.homeDirectory = "/home/${username}";
|
||||
home.packages = [
|
||||
(import ./ncli.nix { inherit pkgs host; backupFiles = [ ".config/mimeapps.list.backup" ]; })
|
||||
(import ./ncli.nix { inherit pkgs host; backupFiles = [
|
||||
".gtkrc-2.0.backup"
|
||||
".config/gtk-3.0/gtk.css.backup"
|
||||
".config/gtk-3.0/settings.ini.backup"
|
||||
".config/gtk-4.0/gtk.css.backup"
|
||||
".config/gtk-4.0/settings.ini.backup"
|
||||
".config/niri/config.kdl"
|
||||
]; })
|
||||
];
|
||||
|
||||
imports = [
|
||||
@ -44,14 +51,15 @@
|
||||
|
||||
git = {
|
||||
enable = true;
|
||||
userName = "Cookiez";
|
||||
userEmail = "jaden-puerkenauer@web.de";
|
||||
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
credentials.helper = "store";
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
user = {
|
||||
name = "Cookiez";
|
||||
email = "jaden-puerkenauer@web.de";
|
||||
init.defaultBranch = "main";
|
||||
credentials.helper = "store";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
zen-browser = {
|
||||
enable = true;
|
||||
|
||||
@ -9,5 +9,6 @@
|
||||
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
hyprlock
|
||||
];
|
||||
}
|
||||
|
||||
@ -9,5 +9,6 @@
|
||||
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
hyprpaper
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
pkgs,
|
||||
host,
|
||||
backupFiles ? [".config/mimeapps.list.backup"],
|
||||
backupFiles ? [ ".config/mimeapps.list.backup" ],
|
||||
...
|
||||
}: let
|
||||
backupFilesString = pkgs.lib.strings.concatStringsSep " " backupFiles;
|
||||
|
||||
@ -83,9 +83,9 @@
|
||||
spec = {
|
||||
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
||||
{ "nvim-telescope/telescope-fzf-native.nvim", enabled = true },
|
||||
{ "williamboman/mason-lspconfig.nvim", enabled = false },
|
||||
{ "williamboman/mason.nvim", enabled = false },
|
||||
{ import = "plugins" },
|
||||
{ "mason-org/mason-lspconfig.nvim", enabled = false },
|
||||
{ "mason-org/mason.nvim", enabled = false },
|
||||
--{ import = "plugins" },
|
||||
{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
|
||||
},
|
||||
})
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
programs = {
|
||||
noctalia-shell = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
systemd.enable = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
#Essentials (CLI Only)
|
||||
wget #A tool for quickly downloading things from the Web
|
||||
micro-with-xclip #Micro text editor with xclip for clipboard
|
||||
thefuck #Error correction in case commands are wrong. Type: 'fuck'
|
||||
jdk23 #Java Development Kit 23
|
||||
javaPackages.compiler.openjdk25 #Java Development Kit 23
|
||||
python312 #Python 3.12
|
||||
python312Packages.pip #Pip for Python 3.12
|
||||
python312Packages.cmake #The CMake tool to manage project build configurations
|
||||
@ -38,8 +37,9 @@
|
||||
|
||||
#Programming
|
||||
#jetbrains.pycharm-community #The PyCharm IDE to edit Python code
|
||||
jetbrains.idea-community #The IntelliJ IDE to edit Java code
|
||||
#jetbrains.idea-community #The IntelliJ IDE to edit Java code
|
||||
#jetbrains.clion #The CLion IDE to edit and compile c/c++ code
|
||||
jetbrains-toolbox
|
||||
#racket #The racket Programming language, with DrRacket IDE, for University (*Not* because it's my favourite)
|
||||
rustup #Rust Programming Toolchain
|
||||
#go #Go Programming Language
|
||||
@ -55,7 +55,7 @@
|
||||
|
||||
#Desktop Applications
|
||||
drawio
|
||||
jetbrains.datagrip
|
||||
#jetbrains.datagrip
|
||||
ryubing
|
||||
vlc
|
||||
#steam
|
||||
@ -68,10 +68,11 @@
|
||||
rpi-imager
|
||||
kdePackages.yakuake
|
||||
#atlauncher
|
||||
discord
|
||||
#discord
|
||||
vesktop
|
||||
wineWowPackages.stagingFull
|
||||
winetricks
|
||||
#whatsapp-for-linux
|
||||
wasistlos #Whatsapp
|
||||
#obs-studio
|
||||
#i2p
|
||||
gparted #Disk partition Manager
|
||||
@ -88,6 +89,8 @@
|
||||
libreoffice-still
|
||||
kdePackages.kservice
|
||||
qbittorrent
|
||||
waydroid #Android
|
||||
grim
|
||||
|
||||
#CLI tools
|
||||
pdftk
|
||||
@ -110,21 +113,21 @@
|
||||
"dotnet-runtime-6.0.36"
|
||||
];
|
||||
|
||||
# services.flatpak = {
|
||||
# enable = false;
|
||||
#
|
||||
# remotes = [
|
||||
# {
|
||||
# name = "flathub";
|
||||
# location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
||||
# }
|
||||
# ];
|
||||
# packages = [
|
||||
# {
|
||||
# appId = "org.vinegarhq.Sober";
|
||||
# origin = "flathub";
|
||||
# #commit = "e28fd81675b0871614ccdc8fc66c6da6761dd11333a65900a0451edf07ef0ea6";
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
services.flatpak = {
|
||||
enable = true;
|
||||
|
||||
remotes = [
|
||||
{
|
||||
name = "flathub";
|
||||
location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
||||
}
|
||||
];
|
||||
packages = [
|
||||
{
|
||||
appId = "org.vinegarhq.Sober";
|
||||
origin = "flathub";
|
||||
#commit = "e28fd81675b0871614ccdc8fc66c6da6761dd11333a65900a0451edf07ef0ea6";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, inputs, ... }:
|
||||
{ pkgs, inputs, username, ... }:
|
||||
{
|
||||
|
||||
imports =
|
||||
@ -6,11 +6,15 @@
|
||||
inputs.stylix.nixosModules.stylix
|
||||
];
|
||||
|
||||
home-manager.sharedModules = [
|
||||
./home.nix
|
||||
];
|
||||
|
||||
stylix = {
|
||||
enable = true;
|
||||
image = ../other/wallpaper2.png;
|
||||
image = ../../other/wallpaper2.png;
|
||||
#autoEnable = true; #Auto generate theme based on wallpaper
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-moon.yaml";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
|
||||
opacity = {
|
||||
desktop = 0.5;
|
||||
terminal = 0.9;
|
||||
@ -31,6 +35,9 @@
|
||||
name = "Noto Serif";
|
||||
};
|
||||
};
|
||||
targets.grub.enable = false;
|
||||
targets = {
|
||||
grub.enable = false;
|
||||
qt.enable = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
17
modules/stylix/home.nix
Normal file
17
modules/stylix/home.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{pkgs, inputs, username, ...}:
|
||||
{
|
||||
|
||||
imports = [
|
||||
];
|
||||
|
||||
services = {
|
||||
};
|
||||
|
||||
stylix = {
|
||||
targets = {
|
||||
kitty.enable = false;
|
||||
kde.enable = false;
|
||||
zen-browser.profileNames = [ "${username}" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
181
modules/waybar/config.jsonc
Normal file
181
modules/waybar/config.jsonc
Normal file
@ -0,0 +1,181 @@
|
||||
// -*- mode: jsonc -*-
|
||||
{
|
||||
"layer": "top",
|
||||
"mode": "dock",
|
||||
"position": "top", // (top|bottom|left|right)
|
||||
"height": 40, // (to be removed for auto height)
|
||||
"width": "auto",
|
||||
"spacing": 3, // Gaps between modules
|
||||
"margin": 0,
|
||||
"fixed-center": true,
|
||||
"reload_style_on_change": true,
|
||||
"modules-left": [
|
||||
"sway/workspaces",
|
||||
"sway/mode",
|
||||
"sway/scratchpad"
|
||||
],
|
||||
"modules-center": [
|
||||
"clock"
|
||||
],
|
||||
"modules-right": [
|
||||
"custom/weather",
|
||||
"pulseaudio",
|
||||
"temperature",
|
||||
"network",
|
||||
"backlight",
|
||||
"battery",
|
||||
"tray"
|
||||
],
|
||||
"keyboard-state": {
|
||||
"numlock": true,
|
||||
"capslock": true,
|
||||
"format": "{icon} {name}",
|
||||
"format-icons": {
|
||||
"locked": "",
|
||||
"unlocked": ""
|
||||
}
|
||||
},
|
||||
"sway/mode": {
|
||||
"format": "<span style=\"italic\">{}</span>"
|
||||
},
|
||||
"sway/scratchpad": {
|
||||
"format": "{icon} {count}",
|
||||
"show-empty": false,
|
||||
"format-icons": [
|
||||
"",
|
||||
""
|
||||
],
|
||||
"tooltip": true,
|
||||
"tooltip-format": "{title}",
|
||||
"rewrite": {
|
||||
"(.*) - Mozilla Firefox": "🌎 $1"
|
||||
}
|
||||
},
|
||||
"tray": {
|
||||
"icon-size": 24,
|
||||
"show-passive-items": true,
|
||||
"spacing": 10
|
||||
},
|
||||
"clock": {
|
||||
"interval": 1,
|
||||
"format": "{:%A %d. %b %T}",
|
||||
"tooltip-format": "<tt><small>{calendar}</small></tt>",
|
||||
"calendar": {
|
||||
"format": {
|
||||
"today": "<span color='#ff5555'><b><u>{}</u></b></span>"
|
||||
}
|
||||
}
|
||||
},
|
||||
"temperature": {
|
||||
// "thermal-zone": 2,
|
||||
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
||||
"interval": 1000,
|
||||
"critical-threshold": 80,
|
||||
// "format-critical": "{temperatureC}°C {icon}",
|
||||
"format": "{temperatureC}°C"
|
||||
//"format-icons": ["", "", ""]
|
||||
},
|
||||
"backlight": {
|
||||
// "device": "acpi_video1",
|
||||
"format": "{icon}",
|
||||
"tooltip-format": "{icon} {percent}",
|
||||
"format-icons": [
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
},
|
||||
"battery": {
|
||||
"states": {
|
||||
// "good": 95,
|
||||
"warning": 30,
|
||||
"critical": 15
|
||||
},
|
||||
"format": "{icon}",
|
||||
"format-full": "{icon}",
|
||||
"format-charging": "{icon} ",
|
||||
"format-plugged": "{icon} ",
|
||||
"format-alt": "{icon}",
|
||||
"format-icons": [
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
},
|
||||
"power-profiles-daemon": {
|
||||
"format": "{icon}",
|
||||
"tooltip-format": "Power profile: {profile}\nDriver: {driver}",
|
||||
"tooltip": true,
|
||||
"format-icons": {
|
||||
"default": "",
|
||||
"performance": "",
|
||||
"balanced": "",
|
||||
"power-saver": ""
|
||||
}
|
||||
},
|
||||
"network": {
|
||||
"interval": 1000,
|
||||
"format-wifi": "{icon}",
|
||||
"format-ethernet": "{ipaddr}/{cidr} ",
|
||||
"tooltip-format": "{essid}\n{ifname} via {gwaddr}\n{ipaddr}/{cidr}",
|
||||
"format-linked": "{ifname} (No IP) ",
|
||||
"format-disconnected": "",
|
||||
"format-alt": "{essid}",
|
||||
"format-icons": [
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
},
|
||||
"pulseaudio": {
|
||||
"format": "{icon} {format_source}",
|
||||
"format-muted": " {format_source}",
|
||||
"format-source": "",
|
||||
"format-source-muted": " ",
|
||||
"format-bluetooth": "{icon} {format_source}",
|
||||
"format-bluetooth-muted": "{icon} {format_source}",
|
||||
"format-icons": {
|
||||
"headphone": "",
|
||||
"hands-free": "",
|
||||
"headset": "",
|
||||
"phone": " ",
|
||||
"portable": " ",
|
||||
"car": "",
|
||||
"default": [
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
},
|
||||
"tooltip-format": "{icon} {volume}%\n{format_source}",
|
||||
"ignored-sinks": [
|
||||
"Easy Effects Sink"
|
||||
]
|
||||
},
|
||||
"sway/window": {
|
||||
"format": "{app_id}",
|
||||
"max-length": 50,
|
||||
"rewrite": {
|
||||
"(?:.*\\.)+(?!.*\\.)([^.]+)": "$1"
|
||||
}
|
||||
},
|
||||
"custom/weather": {
|
||||
"format": "{}°C",
|
||||
"tooltip": true,
|
||||
"interval": 3600,
|
||||
"exec": "wttrbar --date-format \"%d.%m.%Y\" -l de",
|
||||
"return-type": "json"
|
||||
}
|
||||
}
|
||||
5
modules/waybar/home.nix
Normal file
5
modules/waybar/home.nix
Normal file
@ -0,0 +1,5 @@
|
||||
{ ... }:
|
||||
{
|
||||
# xdg.configFile."waybar/config.jsonc".source = ./config.jsonc;
|
||||
# xdg.configFile."waybar/style.css".source = ./style.css;
|
||||
}
|
||||
130
modules/waybar/style.css
Normal file
130
modules/waybar/style.css
Normal file
@ -0,0 +1,130 @@
|
||||
* {
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
font-family: JetBrainsMono NF ExtraBold, Roboto, Helvetica, Arial, sans-serif;
|
||||
font-size: 21px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background: rgba(0, 0, 0, 0.6);
|
||||
color: white;
|
||||
}
|
||||
|
||||
button {
|
||||
margin: 3px;
|
||||
padding: 3px;
|
||||
}
|
||||
|
||||
tooltip {
|
||||
background: rgba(0, 0, 0, 0.202);/*rgba(43, 48, 59, 0.5);*/
|
||||
border: 4px solid white;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
tooltip label {
|
||||
color: white;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
background: transparent;
|
||||
color: #888888;
|
||||
}
|
||||
|
||||
#workspaces button.focused {
|
||||
color: white;
|
||||
}
|
||||
|
||||
#mode,
|
||||
#clock,
|
||||
#battery,
|
||||
#pulseaudio,
|
||||
#temperature,
|
||||
#language,
|
||||
#backlight,
|
||||
#network,
|
||||
#tray,
|
||||
#custom-weather {
|
||||
padding: 0 10px;
|
||||
}
|
||||
|
||||
#scratchpad,
|
||||
#window {
|
||||
margin-left: 6px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
||||
#custom-weather.sunny {
|
||||
color: rgb(215, 215, 0);
|
||||
}
|
||||
|
||||
#custom-weather.lightrain {
|
||||
color: lightblue;
|
||||
}
|
||||
|
||||
#custom-weather.rain,
|
||||
#custom-weather.heavyrain {
|
||||
color: blue;
|
||||
}
|
||||
|
||||
#custom-weather.cloudy,
|
||||
#custom-weather.fog {
|
||||
color: gray;
|
||||
}
|
||||
|
||||
#window {
|
||||
color: darkred;
|
||||
}
|
||||
|
||||
#language {
|
||||
color: cadetblue;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: darkcyan;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: coral;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
color: rgb(91, 191, 225);
|
||||
}
|
||||
|
||||
#backlight {
|
||||
color: rgb(255, 255, 61);
|
||||
}
|
||||
|
||||
#clock {
|
||||
color: aqua;
|
||||
}
|
||||
|
||||
#battery {
|
||||
color: rgb(147, 63, 225);
|
||||
}
|
||||
|
||||
#battery.charging {
|
||||
color: #26A65B;
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
to {
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
|
||||
#battery.warning:not(.charging),
|
||||
#temperature.critical,
|
||||
#workspaces button.urgent,
|
||||
#mode {
|
||||
color: #ff0000;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: steps(2);
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
Reference in New Issue
Block a user