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

update, reformatted with alejandra

This commit is contained in:
Varris 2023-10-08 11:51:15 +02:00
parent 9b931aed52
commit 23f622a378
35 changed files with 272 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.lock
View File

@ -302,22 +302,6 @@
"type": "github" "type": "github"
} }
}, },
"mpd-discord-rpc": {
"flake": false,
"locked": {
"lastModified": 1696275938,
"narHash": "sha256-hIbODswDa50BoAysXXT2HEoJJIp4d28NAQBm3DzYILg=",
"owner": "JakeStanger",
"repo": "mpd-discord-rpc",
"rev": "f887d05794a6dffb1cc4e143e8155d6b318e0e1a",
"type": "github"
},
"original": {
"owner": "JakeStanger",
"repo": "mpd-discord-rpc",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -437,7 +421,6 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"hyprpicker": "hyprpicker", "hyprpicker": "hyprpicker",
"mpd-discord-rpc": "mpd-discord-rpc",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixd": "nixd", "nixd": "nixd",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

88
flake.nix
View File

@ -80,49 +80,55 @@
}; };
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: outputs = {
let self,
system = "x86_64-linux"; nixpkgs,
home-manager,
...
} @ inputs: let
system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
allowUnsupportedSystem = true;
};
overlays = [
self.overlays.default
inputs.chaotic-nyx.overlays.default
inputs.hyprland-contrib.overlays.default
inputs.hyprpicker.overlays.default
inputs.nixd.overlays.default
];
};
in {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
overlays = import ./overlay.nix {inherit inputs;};
nixosConfigurations.terra =
nixpkgs.lib.nixosSystem
{
inherit system; inherit system;
inherit pkgs;
config = { specialArgs = {inherit inputs;};
allowUnfree = true; modules = [
allowUnsupportedSystem = true; ./system/configuration.nix
}; home-manager.nixosModules.home-manager
{
overlays = [ home-manager = {
self.overlays.default useUserPackages = true;
inputs.chaotic-nyx.overlays.default users.manuel = import ./user/home.nix;
inputs.hyprland-contrib.overlays.default extraSpecialArgs = {inherit inputs;};
inputs.hyprpicker.overlays.default useGlobalPkgs = true;
inputs.nixd.overlays.default };
}
inputs.grub2-themes.nixosModules.default
inputs.chaotic-nyx.nixosModules.default
inputs.hyprland.nixosModules.default
]; ];
}; };
in };
{
overlays = (import ./overlay.nix { inherit inputs; });
nixosConfigurations.terra = nixpkgs.lib.nixosSystem
{
inherit system;
inherit pkgs;
specialArgs = { inherit inputs; };
modules = [
./system/configuration.nix
home-manager.nixosModules.home-manager {
home-manager = {
useUserPackages = true;
users.manuel = import ./user/home.nix;
extraSpecialArgs = { inherit inputs; };
useGlobalPkgs = true;
};
}
inputs.grub2-themes.nixosModules.default
inputs.chaotic-nyx.nixosModules.default
inputs.hyprland.nixosModules.default
];
};
};
} }

16
overlay.nix
View File

@ -1,24 +1,22 @@
{ inputs, ... }: {inputs, ...}: {
{
default = final: prev: { default = final: prev: {
gruvbox-plus-icon-pack = final.callPackage ./pkgs/gruvbox-plus-icon-pack {inherit inputs;};
gruvbox-plus-icon-pack = final.callPackage ./pkgs/gruvbox-plus-icon-pack { inherit inputs; };
ncmpcpp = prev.ncmpcpp.override { ncmpcpp = prev.ncmpcpp.override {
visualizerSupport = true; visualizerSupport = true;
}; };
nerdfonts = prev.nerdfonts.override { nerdfonts = prev.nerdfonts.override {
fonts = [ "JetBrainsMono" ]; fonts = ["JetBrainsMono"];
}; };
openmw = prev.openmw.overrideAttrs (old: { openmw = prev.openmw.overrideAttrs (old: {
version = "9999"; version = "9999";
src = inputs.openmw-git; src = inputs.openmw-git;
buildInputs = old.buildInputs ++ [ prev.libyamlcpp prev.luajit ]; buildInputs = old.buildInputs ++ [prev.libyamlcpp prev.luajit];
patches = [ ]; patches = [];
dontWrapQtApps = false; dontWrapQtApps = false;
}); });
@ -29,10 +27,10 @@
prev.gnome.zenity prev.gnome.zenity
prev.xdg-user-dirs prev.xdg-user-dirs
]; ];
extraLibraries = prev: [ ]; extraLibraries = prev: [];
}; };
nvim-hmts = prev.vimUtils.buildVimPluginFrom2Nix { nvim-hmts = prev.vimUtils.buildVimPlugin {
pname = "nvim-hmts"; pname = "nvim-hmts";
version = "1"; version = "1";
src = inputs.nvim-hmts; src = inputs.nvim-hmts;

17
pkgs/gruvbox-plus-icon-pack/default.nix
View File

@ -1,14 +1,21 @@
{ stdenvNoCC, fetchFromGitHub, inputs, gtk3, fd, gnome-icon-theme, hicolor-icon-theme }: {
stdenvNoCC,
fetchFromGitHub,
inputs,
gtk3,
fd,
gnome-icon-theme,
hicolor-icon-theme,
}:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "gruvbox-plus-icon-pack"; pname = "gruvbox-plus-icon-pack";
version = "9999"; version = "9999";
src = inputs.gruvbox-plus-icon-pack; src = inputs.gruvbox-plus-icon-pack;
nativeBuildInputs = [ gtk3 fd ]; nativeBuildInputs = [gtk3 fd];
propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; propagatedBuildInputs = [gnome-icon-theme hicolor-icon-theme];
installPhase = '' installPhase = ''
cd Gruvbox-Plus-Dark cd Gruvbox-Plus-Dark

48
system/configuration.nix
View File

@ -1,5 +1,10 @@
{ pkgs, lib, config, inputs, ... }:
{ {
pkgs,
lib,
config,
inputs,
...
}: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./hardware ./hardware
@ -12,21 +17,19 @@
kernel.sysctl."vm.max_map_count" = 16777216; #Star Citizen crash fix kernel.sysctl."vm.max_map_count" = 16777216; #Star Citizen crash fix
#kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
supportedFilesystems = [ "bcachefs" ]; kernelModules = ["i2c-dev" "i2c-piix4"];
kernelModules = [ "i2c-dev" "i2c-piix4" ]; kernelParams = [
kernelParams = "amdgpu.ppfeaturemask=0xffffffff"
[ "net.ifnames=0"
"amdgpu.ppfeaturemask=0xffffffff" "amd_pstate.shared_mem=1"
"net.ifnames=0" "amd_pstate=active"
"amd_pstate.shared_mem=1" ];
"amd_pstate=active"
];
loader = { loader = {
efi = { efi = {
canTouchEfiVariables = true; canTouchEfiVariables = true;
efiSysMountPoint = "/boot"; efiSysMountPoint = "/boot/efi";
}; };
grub = { grub = {
@ -76,7 +79,6 @@
keyMap = "us-acentos"; keyMap = "us-acentos";
}; };
# Enable sound. # Enable sound.
sound.enable = true; sound.enable = true;
@ -89,17 +91,19 @@
doas = { doas = {
enable = true; enable = true;
extraRules = [{ extraRules = [
users = [ "manuel" ]; {
keepEnv = true; users = ["manuel"];
persist = true; keepEnv = true;
}]; persist = true;
}
];
}; };
}; };
users.users.manuel = { users.users.manuel = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "audio" "games" "input" "lp" "networkmanager" "scanner" "users" "vboxusers" "video" "wheel" ]; extraGroups = ["audio" "games" "input" "lp" "networkmanager" "scanner" "users" "vboxusers" "video" "wheel"];
shell = pkgs.fish; shell = pkgs.fish;
}; };
@ -150,8 +154,8 @@
warn-dirty = false warn-dirty = false
''; '';
registry = lib.mapAttrs (_: value: { flake = value; }) inputs; registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
gc = { gc = {
persistent = true; persistent = true;
@ -167,7 +171,6 @@
"https://nyx.chaotic.cx" "https://nyx.chaotic.cx"
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
@ -181,4 +184,3 @@
system.stateVersion = "23.05"; system.stateVersion = "23.05";
} }

61
system/hardware-configuration.nix
View File

@ -1,39 +1,48 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "bcache" ]; boot.initrd.availableKernelModules = ["nvme"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/nvme1n1p2"; device = "/dev/disk/by-uuid/cc08e6a4-46ef-4207-a2d9-195e36e06179";
fsType = "bcachefs"; fsType = "xfs";
}; };
fileSystems."/boot" = fileSystems."/boot/efi" = {
{ device = "/dev/disk/by-uuid/BE4D-EFA9"; device = "/dev/disk/by-uuid/BE4D-EFA9";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/hdd" = fileSystems."/mnt/hdd" = {
{ device = "/dev/disk/by-uuid/ecbbfb05-ada8-4044-81a6-9a280f93802f"; device = "/dev/disk/by-uuid/ecbbfb05-ada8-4044-81a6-9a280f93802f";
fsType = "xfs"; fsType = "xfs";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/nvme0n1p1"; device = "/dev/disk/by-uuid/9d1be271-ca41-43cc-a334-016103bfde1a";
fsType = "bcachefs"; fsType = "xfs";
}; };
swapDevices = [ ]; swapDevices = [
{
device = "/var/swapfile";
size = 8 * 1024;
}
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

11
system/hardware/default.nix
View File

@ -1,19 +1,16 @@
{ pkgs, ... }: {pkgs, ...}: {
{
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
extraPackages = [ pkgs.libvdpau-va-gl ]; extraPackages = [pkgs.libvdpau-va-gl];
driSupport32Bit = true; driSupport32Bit = true;
}; };
chaotic.mesa-git.enable = true; chaotic.mesa-git.enable = true;
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.sane = { hardware.sane = {
enable = true; enable = true;
extraBackends = [ pkgs.sane-airscan ]; extraBackends = [pkgs.sane-airscan];
}; };
} }

5
system/programs/default.nix
View File

@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
programs = { programs = {
dconf.enable = true; dconf.enable = true;
fish.enable = true; fish.enable = true;
@ -8,5 +7,5 @@
ssh.startAgent = true; ssh.startAgent = true;
steam.enable = true; steam.enable = true;
}; };
chaotic.steam.extraCompatPackages = with pkgs; [ luxtorpeda proton-ge-custom ]; chaotic.steam.extraCompatPackages = with pkgs; [luxtorpeda proton-ge-custom];
} }

13
system/services/default.nix
View File

@ -1,12 +1,11 @@
{ pkgs, ... }: {pkgs, ...}: {
{
imports = [ imports = [
./avahi ./avahi
./locate ./locate
./pipewire ./pipewire
./printing ./printing
./udev ./udev
./xdg-portal ./xdg-portal
]; ];
services = { services = {

19
system/services/locate/default.nix
View File

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

5
system/services/printing/default.nix
View File

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

5
system/services/udev/default.nix
View File

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

5
system/services/xdg-portal/default.nix
View File

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

2
user/configs/beets/default.nix
View File

@ -1,4 +1,4 @@
{ ... }: { {...}: {
programs.beets = { programs.beets = {
enable = true; enable = true;

10
user/configs/cava/default.nix
View File

@ -1,8 +1,11 @@
{ pkgs, lib, ... }:
{ {
home.packages = [ pkgs.cava ]; pkgs,
lib,
...
}: {
home.packages = [pkgs.cava];
xdg.configFile."cava/config".text = lib.generators.toINI { } { xdg.configFile."cava/config".text = lib.generators.toINI {} {
general = { general = {
bars = "0"; bars = "0";
bar_width = "2"; bar_width = "2";
@ -16,4 +19,3 @@
}; };
}; };
} }

9
user/configs/dircolors.nix
View File

@ -1,4 +1,8 @@
{ config, pkgs, ... }: { {
config,
pkgs,
...
}: {
programs.dircolors = { programs.dircolors = {
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;
@ -68,7 +72,6 @@
".zip" = "01;31"; ".zip" = "01;31";
".zoo" = "01;31"; ".zoo" = "01;31";
".anx" = "01;35"; ".anx" = "01;35";
".asf" = "01;35"; ".asf" = "01;35";
".avi" = "01;35"; ".avi" = "01;35";
@ -155,8 +158,6 @@
".xls" = "38;5;109"; ".xls" = "38;5;109";
".xlsx" = "38;5;109"; ".xlsx" = "38;5;109";
".xml" = "38;5;109"; ".xml" = "38;5;109";
}; };
}; };
} }

5
user/configs/firefox/default.nix
View File

@ -1,8 +1,7 @@
{ ... }: {...}: {
{
programs.browserpass = { programs.browserpass = {
enable = true; enable = true;
browsers = [ "firefox" ]; browsers = ["firefox"];
}; };
programs.firefox = { programs.firefox = {

16
user/configs/fish/default.nix
View File

@ -1,11 +1,21 @@
{ config, pkgs, inputs, ... }:
{ {
config,
pkgs,
inputs,
...
}: {
programs.fish = { programs.fish = {
enable = true; enable = true;
plugins = [ plugins = [
{ name = "gruvbox-theme"; src = inputs.fish-plugin-gruvbox-theme; } {
{ name = "bobthefish"; src = inputs.fish-plugin-bobthefish; } name = "gruvbox-theme";
src = inputs.fish-plugin-gruvbox-theme;
}
{
name = "bobthefish";
src = inputs.fish-plugin-bobthefish;
}
]; ];
interactiveShellInit = '' interactiveShellInit = ''

5
user/configs/kvantum/default.nix
View File

@ -1,5 +1,8 @@
{ pkgs, inputs, ... }:
{ {
pkgs,
inputs,
...
}: {
home.packages = [ home.packages = [
pkgs.libsForQt5.qtstyleplugin-kvantum pkgs.libsForQt5.qtstyleplugin-kvantum
]; ];

7
user/configs/mpd/default.nix
View File

@ -1,4 +1,4 @@
{ ... }: { {...}: {
services.mpd = { services.mpd = {
enable = true; enable = true;
musicDirectory = "/mnt/hdd/Music"; musicDirectory = "/mnt/hdd/Music";
@ -36,7 +36,7 @@
enable = true; enable = true;
settings = { settings = {
id = 474605546457137157; id = 474605546457137157;
hosts = [ "localhost:6600" ]; hosts = ["localhost:6600"];
format = { format = {
details = "$title ($album)"; details = "$title ($album)";
state = "by $artist"; state = "by $artist";
@ -68,8 +68,7 @@
alternative_header_second_line_format = "$7{%t}|{%f}$0"; alternative_header_second_line_format = "$7{%t}|{%f}$0";
progressbar_look = "─╼ "; progressbar_look = "─╼ ";
song_columns_list_format = song_columns_list_format = "(25)[5]{a:artist} (3f)[5]{n: } (50)[cyan]{t|f:title} (5)[cyan]{lr:duration}";
"(25)[5]{a:artist} (3f)[5]{n: } (50)[cyan]{t|f:title} (5)[cyan]{lr:duration}";
playlist_display_mode = "columns"; playlist_display_mode = "columns";
browser_display_mode = "columns"; browser_display_mode = "columns";
search_engine_display_mode = "columns"; search_engine_display_mode = "columns";

2
user/configs/mpv/default.nix
View File

@ -1,4 +1,4 @@
{ ... }: { {...}: {
programs.mpv = { programs.mpv = {
enable = true; enable = true;
config = { config = {

2
user/configs/neovim/config/lua/plugins/indent-blankline.lua → user/configs/neovim/config/lua/plugins/ibl.lua
View File

@ -1,6 +1,6 @@
vim.opt.list = true vim.opt.list = true
vim.opt.listchars:append "eol:↴" vim.opt.listchars:append "eol:↴"
require("indent_blankline").setup { require("ibl").setup {
show_end_of_line = true, show_end_of_line = true,
} }

2
user/configs/neovim/config/lua/plugins/init.lua
View File

@ -5,7 +5,7 @@ require("plugins.colorizer")
require("plugins.colorscheme") require("plugins.colorscheme")
require("plugins.comment") require("plugins.comment")
require("plugins.dressing") require("plugins.dressing")
require("plugins.indent-blankline") require("plugins.ibl")
require("plugins.lspconfig") require("plugins.lspconfig")
require("plugins.lualine") require("plugins.lualine")
require("plugins.smartsplits") require("plugins.smartsplits")

35
user/configs/neovim/default.nix
View File

@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
programs.neovim = { programs.neovim = {
enable = true; enable = true;
@ -45,21 +44,23 @@
lspkind-nvim lspkind-nvim
]; ];
extraPackages = with pkgs; [ extraPackages = with pkgs;
nodePackages.bash-language-server [
clang-tools nodePackages.bash-language-server
lua-language-server clang-tools
python3Packages.jedi-language-server lua-language-server
nixpkgs-fmt python3Packages.jedi-language-server
nixd nixpkgs-fmt
rust-analyzer nixd
stylua rust-analyzer
nodePackages.typescript-language-server stylua
nodePackages.vscode-css-languageserver-bin nodePackages.typescript-language-server
zls nodePackages.vscode-css-languageserver-bin
] ++ [ zls
pkgs.nvim-hmts ]
]; ++ [
pkgs.nvim-hmts
];
}; };
xdg.configFile.nvim = { xdg.configFile.nvim = {

3
user/configs/rofi/default.nix
View File

@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;

5
user/configs/tmux/default.nix
View File

@ -1,5 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
}; };

19
user/configs/wayland/ags/ags-config/config.js
View File

@ -8,16 +8,16 @@ const Workspaces = (monitor) => Box({
if (monitor == 0) { if (monitor == 0) {
box.children = [1,2,3].map(i => Button({ box.children = [1,2,3].map(i => Button({
onClicked: () => execAsync(`hyprctl dispatch workspace ${i}`), onClicked: () => execAsync(`hyprctl dispatch workspace ${i}`),
onScrollUp: () => execAsync(`hyprctl dispatch workspace +1`), onScrollDown: () => execAsync(`hyprctl dispatch workspace +1`),
onScrollDown: () => execAsync(`hyprctl dispatch workspace -1`), onScrollUp: () => execAsync(`hyprctl dispatch workspace -1`),
child: Label({ label: `${i}` }), child: Label({ label: `${i}` }),
className: Hyprland.active.workspace.id == i ? 'focused' : '', className: Hyprland.active.workspace.id == i ? 'focused' : '',
})); }));
} else if (monitor == 1) { } else if (monitor == 1) {
box.children = [4,5,6].map(i => Button({ box.children = [4,5,6].map(i => Button({
onClicked: () => execAsync(`hyprctl dispatch workspace ${i}`), onClicked: () => execAsync(`hyprctl dispatch workspace ${i}`),
onScrollUp: () => execAsync(`hyprctl dispatch workspace +1`), onScrollDown: () => execAsync(`hyprctl dispatch workspace +1`),
onScrollDown: () => execAsync(`hyprctl dispatch workspace -1`), onScrollUp: () => execAsync(`hyprctl dispatch workspace -1`),
child: Label({ label: `${i}` }), child: Label({ label: `${i}` }),
className: Hyprland.active.workspace.id == i ? 'focused' : '', className: Hyprland.active.workspace.id == i ? 'focused' : '',
})); }));
@ -25,7 +25,6 @@ const Workspaces = (monitor) => Box({
}]], }]],
}); });
const WindowTitle = () => Label({ const WindowTitle = () => Label({
connections: [[Hyprland, label => { connections: [[Hyprland, label => {
label.label = Hyprland.active.client.title || ''; label.label = Hyprland.active.client.title || '';
@ -78,9 +77,9 @@ const Volume = () => Button({
const Media = () => Button({ const Media = () => Button({
className: 'media', className: 'media',
onPrimaryClick: () => Mpris.getPlayer('mpd')?.playPause(), onPrimaryClick: () => Mpris.getPlayer('')?.playPause(),
onScrollUp: () => Mpris.getPlayer('mpd')?.previous(), onScrollUp: () => Mpris.getPlayer('')?.previous(),
onScrollDown: () => Mpris.getPlayer('mpd')?.next(), onScrollDown: () => Mpris.getPlayer('')?.next(),
child: Box({ child: Box({
children: [ children: [
@ -92,7 +91,7 @@ const Media = () => Button({
], ],
connections: [[Mpris, stack => { connections: [[Mpris, stack => {
const mpris = Mpris.getPlayer('mpd'); const mpris = Mpris.getPlayer('');
switch (mpris.playBackStatus) { switch (mpris.playBackStatus) {
case "Playing": case "Playing":
@ -109,7 +108,7 @@ const Media = () => Button({
Label({ Label({
connections: [[Mpris, label => { connections: [[Mpris, label => {
const mpris = Mpris.getPlayer('mpd'); const mpris = Mpris.getPlayer('');
if (!mpris || mpris.playBackStatus == "Stopped") if (!mpris || mpris.playBackStatus == "Stopped")
label.label = ' Stopped'; label.label = ' Stopped';
else else

20
user/configs/wayland/ags/ags-config/style.scss
View File

@ -7,6 +7,8 @@ $activewsbg: rgb(102,92,84);
$box-bg: rgb(80,73,69); $box-bg: rgb(80,73,69);
$box-border-radius: 10px;
* { * {
min-height: unset; min-height: unset;
} }
@ -21,13 +23,13 @@ $box-bg: rgb(80,73,69);
.workspaces { .workspaces {
background-color: $box-bg; background-color: $box-bg;
border-radius: 10px; border-radius: $box-border-radius;
margin: 5px 0px 5px 10px; margin: 5px 0px 5px 10px;
font-size: 0px; font-size: 0px;
} }
.workspaces button { .workspaces button {
border-radius: 0px; border-radius: 0;
background-color: $wsbg; background-color: $wsbg;
font-size: 10px; font-size: 10px;
} }
@ -38,30 +40,30 @@ $box-bg: rgb(80,73,69);
} }
.workspaces button:first-child { .workspaces button:first-child {
border-radius: 10px 0px 0px 10px; border-radius: $box-border-radius 0px 0px $box-border-radius;
} }
.workspaces button:last-child { .workspaces button:last-child {
border-radius: 0px 10px 10px 0px; border-radius: 0px $box-border-radius $box-border-radius 0px;
} }
.windowTitle { .windowTitle {
background-color: $box-bg; background-color: $box-bg;
border-radius: 10px; border-radius: $box-border-radius;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
margin: 5px 0px 5px 10px; margin: 5px 0px 5px 10px;
} }
.volume { .volume {
background-color: $box-bg; background-color: $box-bg;
border-radius: 10px 0px 0px 10px; border-radius: $box-border-radius;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
margin: 5px 5px 5px 0px; margin: 5px 5px 5px 0px;
} }
.media { .media {
background-color: $box-bg; background-color: $box-bg;
border-radius: 0px 10px 10px 0px; border-radius: $box-border-radius;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
margin: 5px 10px 5px 0px; margin: 5px 10px 5px 0px;
} }
@ -69,14 +71,14 @@ $box-bg: rgb(80,73,69);
.date { .date {
background-color: $box-bg; background-color: $box-bg;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
border-radius: 10px; border-radius: $box-border-radius;
margin: 5px 10px 5px 0px; margin: 5px 10px 5px 0px;
}; };
.tray { .tray {
background-color: $box-bg; background-color: $box-bg;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
border-radius: 10px; border-radius: $box-border-radius;
margin: 5px 10px 5px 0px; margin: 5px 10px 5px 0px;
} }

8
user/configs/wayland/ags/default.nix
View File

@ -1,6 +1,10 @@
{ pkgs, lib, inputs, ...}:
{ {
imports = [ inputs.ags.homeManagerModules.default]; pkgs,
lib,
inputs,
...
}: {
imports = [inputs.ags.homeManagerModules.default];
programs.ags = { programs.ags = {
enable = true; enable = true;

7
user/configs/wayland/foot/default.nix
View File

@ -1,5 +1,9 @@
{ config, pkgs, inputs, ... }:
{ {
config,
pkgs,
inputs,
...
}: {
programs.foot = { programs.foot = {
enable = true; enable = true;
settings = { settings = {
@ -34,4 +38,3 @@
}; };
}; };
} }

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

@ -1,5 +1,9 @@
{ config, pkgs, inputs, ... }: {
let config,
pkgs,
inputs,
...
}: let
leftMonitor = { leftMonitor = {
display = "DP-2"; display = "DP-2";
res = "2560x1440"; res = "2560x1440";
@ -50,10 +54,7 @@ let
pass show -c "$password" 2>/dev/null pass show -c "$password" 2>/dev/null
''; '';
in {
in
{
imports = [ imports = [
inputs.hyprland.homeManagerModules.default inputs.hyprland.homeManagerModules.default
../ags ../ags
@ -102,8 +103,7 @@ in
} }
misc { misc {
disable_hyprland_logo = true force_default_wallpaper = 0
disable_splash_rendering = true
vfr = true vfr = true
vrr = 2 vrr = 2
# enable_swallow = true # enable_swallow = true
@ -163,7 +163,7 @@ in
bind = ${modKey}, 4, workspace, 4 bind = ${modKey}, 4, workspace, 4
bind = ${modKey}, 5, workspace, 5 bind = ${modKey}, 5, workspace, 5
bind = ${modKey}, 6, workspace, 6 bind = ${modKey}, 6, workspace, 6
bind = ${modKey} SHIFT, 1, movetoworkspace, 1 bind = ${modKey} SHIFT, 1, movetoworkspace, 1
bind = ${modKey} SHIFT, 2, movetoworkspace, 2 bind = ${modKey} SHIFT, 2, movetoworkspace, 2
bind = ${modKey} SHIFT, 3, movetoworkspace, 3 bind = ${modKey} SHIFT, 3, movetoworkspace, 3
@ -190,7 +190,7 @@ in
bind = , XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 10 --get-volume > ${wobsock} bind = , XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 10 --get-volume > ${wobsock}
bind = , XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 10 --get-volume > ${wobsock} bind = , XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 10 --get-volume > ${wobsock}
bind = CTRL, Space, exec, ${pkgs.mako}/bin/makoctl dismiss bind = SHIFT CTRL, Space, exec, ${pkgs.mako}/bin/makoctl dismiss
bind = CTRL, grave, exec, ${pkgs.mako}/bin/makoctl restore bind = CTRL, grave, exec, ${pkgs.mako}/bin/makoctl restore
bind = ${modKey} SHIFT, O, exec, ${killprocess}/bin/killprocess.sh bind = ${modKey} SHIFT, O, exec, ${killprocess}/bin/killprocess.sh
bind = ${modKey} SHIFT, P, exec, ${passmenu}/bin/passmenu.sh bind = ${modKey} SHIFT, P, exec, ${passmenu}/bin/passmenu.sh
@ -233,6 +233,5 @@ in
Exec=swww img "%f" && echo "%f" > ~/.cache/swww/wallpaper.txt Exec=swww img "%f" && echo "%f" > ~/.cache/swww/wallpaper.txt
''; '';
home.packages = [ pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.swww pkgs.hyprprop ]; home.packages = [pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.swww pkgs.hyprprop];
} }

6
user/configs/wayland/mako/default.nix
View File

@ -1,5 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
services.mako = { services.mako = {
enable = true; enable = true;
anchor = "top-right"; anchor = "top-right";
@ -18,4 +21,3 @@
font = "JetBrainsMono Nerd Font Regular 10"; font = "JetBrainsMono Nerd Font Regular 10";
}; };
} }

9
user/configs/wayland/wob/default.nix
View File

@ -1,6 +1,5 @@
{ lib, ... }: {lib, ...}: {
{ xdg.configFile."wob/wob.ini".text = lib.generators.toINIWithGlobalSection {} {
xdg.configFile."wob/wob.ini".text = lib.generators.toINIWithGlobalSection { } {
globalSection = { globalSection = {
height = "40"; height = "40";
@ -9,9 +8,7 @@
background_color = "282828FF"; background_color = "282828FF";
bar_color = "665C54FF"; bar_color = "665C54FF";
}; };
sections = { }; sections = {};
}; };
} }

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

@ -14,4 +14,3 @@
}; };
}; };
} }

14
user/home.nix
View File

@ -1,5 +1,9 @@
{ config, pkgs, inputs, ... }:
{ {
config,
pkgs,
inputs,
...
}: {
imports = [ imports = [
./configs/beets ./configs/beets
./configs/cava ./configs/cava
@ -122,8 +126,8 @@
}; };
iconTheme = { iconTheme = {
package = pkgs.gruvbox-plus-icon-pack; package = pkgs.gruvbox-plus-icon-pack;
name = "Gruvbox-Plus-Dark"; name = "Gruvbox-Plus-Dark";
}; };
cursorTheme = { cursorTheme = {
@ -158,7 +162,7 @@
obs-studio = { obs-studio = {
enable = true; enable = true;
plugins = [ pkgs.obs-studio-plugins.obs-vkcapture ]; plugins = [pkgs.obs-studio-plugins.obs-vkcapture];
}; };
}; };
@ -169,7 +173,6 @@
preset = "DT770"; preset = "DT770";
}; };
xdg.userDirs = { xdg.userDirs = {
enable = true; enable = true;
createDirectories = true; createDirectories = true;
@ -180,4 +183,3 @@
home.stateVersion = "23.05"; home.stateVersion = "23.05";
} }