wizardlink/linuxware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'desktop' into laptop

Browse source
This commit is contained in:
Alexandre Cavalheiro S. Tiago da Silva 2024-06-05 01:11:17 -03:00
parent 8fe2383e7d dc7acf7a43
commit f56c582a13
Signed by: wizardlink
GPG key ID: A5767B54367CFBDF
8 changed files with 37 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

210
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715930644, "lastModified": 1717316182,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,145 +20,13 @@
"type": "github" "type": "github"
} }
}, },
"hyprcursor": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1713612213,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1714837352,
"narHash": "sha256-QzzJTb+0CBqgAT0wKZsOt1rky5+u2zMUlNxbZcGj2VM=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "cba1ade848feac44b2eda677503900639581c3f4",
"type": "github"
},
"original": {
"owner": "hyprwm",
"ref": "v0.40.0",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1714755542,
"narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1717196966,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,74 +39,8 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"lastModified": 1713731601,
"narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1714060055,
"narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

10
flake.nix
View file

@ -8,14 +8,9 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland = {
url = "github:hyprwm/Hyprland/v0.40.0";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, home-manager, hyprland, nixpkgs, ... }@inputs: outputs = { self, home-manager, nixpkgs, ... }@inputs:
let system = "x86_64-linux"; let system = "x86_64-linux";
in { in {
nixosConfigurations."nixos" = nixosConfigurations."nixos" =
@ -24,9 +19,6 @@
modules = [ modules = [
./nixos.nix ./nixos.nix
hyprland.nixosModules.default
{ programs.hyprland.enable = true; }
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

17
home-manager.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, custom-neovim, ... }: { pkgs, ... }:
{ {
# #
@ -14,6 +14,7 @@
./programs/neovim ./programs/neovim
./programs/obs-studio.nix ./programs/obs-studio.nix
./programs/rofi ./programs/rofi
./programs/tmux
./programs/waybar.nix ./programs/waybar.nix
./programs/wezterm ./programs/wezterm
]; ];
@ -72,13 +73,11 @@
# Utilities # Utilities
brightnessctl brightnessctl
discord discord
element-desktop
fastfetch fastfetch
firefox firefox
pavucontrol pavucontrol
pulseaudio
qbittorrent qbittorrent
tigervnc qdirstat
vesktop vesktop
vlc vlc
yt-dlp yt-dlp
@ -95,10 +94,7 @@
spotify spotify
# Gaming # Gaming
airshipper
dolphin-emu
protontricks protontricks
r2modman
wineWowPackages.stagingFull wineWowPackages.stagingFull
winetricks winetricks
xonotic xonotic
@ -241,13 +237,10 @@
## Theming ## Theming
home.pointerCursor = { home.pointerCursor = {
package = pkgs.catppuccin-cursors.frappeLavender; package = pkgs.catppuccin-cursors.frappeLavender;
name = "Catppuccin-Frappe-Lavender-Cursors"; name = "catppuccin-frappe-lavender-cursors";
gtk.enable = true; gtk.enable = true;
x11 = { x11.enable = true;
enable = true;
defaultCursor = "Catppuccin-Frappe-Lavender-Cursors";
};
}; };
# Configure GTK. # Configure GTK.

4
kernel/zenergy.nix
View file

@ -8,8 +8,8 @@ in stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BoukeHaarsma23"; owner = "BoukeHaarsma23";
repo = "zenergy"; repo = "zenergy";
rev = "a3e124477ee8197015481156b90100d49fa3cd84"; rev = "d65592b3c9d171ba70e6017e0827191214d81937";
hash = "sha256-s1aoipSsLKO23kTd2uGxVUpqYSeitiz3UIoDIxg/Dj8="; hash = "sha256-10hiUHJvLTG3WGrr4WXMo/mCoJGFqWk2l5PryjNhcHg=";
}; };
hardeningDisable = [ "format" "pic" ]; hardeningDisable = [ "format" "pic" ];

8
nixos.nix
View file

@ -26,6 +26,7 @@
}; };
# Optimize storage # Optimize storage
nix.optimise.automatic = true;
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
@ -41,12 +42,12 @@
## ##
# Kernel # Kernel
boot.kernelPackages = pkgs.linuxPackages_zen; boot.kernelPackages = pkgs.linuxPackages_latest;
# TODO: FIX IT BEING BEING OVERWRITTEN # TODO: FIX IT BEING BEING OVERWRITTEN
boot.extraModulePackages = [ boot.extraModulePackages = [
config.boot.kernelPackages.v4l2loopback config.boot.kernelPackages.v4l2loopback
(pkgs.callPackage ./kernel/zenergy.nix { kernel = pkgs.linux_zen; }) (pkgs.callPackage ./kernel/zenergy.nix { kernel = pkgs.linux_latest; })
]; ];
# Bootloader. # Bootloader.
@ -175,6 +176,9 @@
theme = "${import ./theming/sddm.nix { inherit pkgs; }}"; theme = "${import ./theming/sddm.nix { inherit pkgs; }}";
}; };
# Enable Hyprland
programs.hyprland.enable = true;
# Enable OpenGL. # Enable OpenGL.
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;

4
programs/hyprland/default.nix
View file

@ -1,8 +1,4 @@
{ hyprland, ... }:
{ {
imports = [ hyprland.homeManagerModules.default ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;

1
programs/neovim/lua/plugins/astrolsp.lua
View file

@ -29,6 +29,7 @@ return {
"rust", "rust",
"tsx", "tsx",
"typescript", "typescript",
"svelte",
}, },
ignore_filetypes = { -- disable format on save for specified filetypes ignore_filetypes = { -- disable format on save for specified filetypes
-- "python", -- "python",

16
programs/tmux/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ pkgs, ... }:
{
programs.tmux = {
enable = true;
clock24 = true;
plugins = with pkgs.tmuxPlugins; [
{
plugin = catppuccin;
extraConfig = ''
set -g @catppuccin_flavour 'frappe'
'';
}
];
};
}