a lot of changes, and spotify thats important too
This commit is contained in:
Doloro1978
0
nix/modules/hg
Normal file
0
nix/modules/hg
Normal file
@@ -6,6 +6,7 @@ in
|
||||
imports = [
|
||||
./settings.nix
|
||||
./runner.nix
|
||||
./screenshot.nix
|
||||
];
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
@@ -22,7 +23,7 @@ in
|
||||
main = {
|
||||
term = "xterm-256color";
|
||||
|
||||
#font = "CaskaydiaCove Nerd Font Mono:size=11";
|
||||
font = "CaskaydiaCove Nerd Font Mono:size=12";
|
||||
};
|
||||
|
||||
mouse = {
|
||||
|
||||
19
nix/modules/hyprland/nixos.nix
Normal file
19
nix/modules/hyprland/nixos.nix
Normal file
@@ -0,0 +1,19 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
config = {
|
||||
programs.xwayland.enable = true;
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
# set the flake package
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
# make sure to also set the portal package, so that they are in sync
|
||||
portalPackage =
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
};
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
nix.settings = {
|
||||
substituters = [ "https://hyprland.cachix.org" ];
|
||||
trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,5 @@
|
||||
let
|
||||
|
||||
in {
|
||||
home.packages = with pkgs; [
|
||||
wofi
|
||||
];
|
||||
programs.wofi.enable = true;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,10 @@
|
||||
let
|
||||
|
||||
in {
|
||||
home.packages = with pkgs; [
|
||||
wofi
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
wayfreeze
|
||||
grim
|
||||
slurp
|
||||
];
|
||||
}
|
||||
|
||||
@@ -99,12 +99,12 @@
|
||||
"$mainMod, right, movefocus, r"
|
||||
"$mainMod, up, movefocus, u"
|
||||
"$mainMod, down, movefocus, d"
|
||||
"$mainMod, S, exec, $screenShot"
|
||||
("$mainMod, S, exec, " + ''wayfreeze --after-freeze-cmd 'grim -g "$(slurp -d)" - | wl-copy -t image/png;killall wayfreeze' --hide-cursor'')
|
||||
"$mainMod, F, fullscreen"
|
||||
"$mainMod, mouse_down, workspace, e+1"
|
||||
"$mainMod, mouse_up, workspace, e-1"
|
||||
", home, exec, $toggleSpeaker"
|
||||
", end, exec, $toggleMic"
|
||||
", home, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
", end, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
|
||||
", F8, sendshortcut, , F8, class:^(com\.obsproject\.Studio)$"
|
||||
"$mainMod, 0, workspace, 10"
|
||||
"$mainMod SHIFT, 0, movetoworkspace, 10"
|
||||
@@ -132,6 +132,7 @@
|
||||
"workspace 8 silent, class:^(vesktop)$"
|
||||
"workspace 8 silent, class:^(org.telegram.desktop)$"
|
||||
"workspace 10 silent, class:^(com\.obsproject\.Studio)$"
|
||||
"workspace 1 silent, initialTitle:^(Discord Popout)$"
|
||||
];
|
||||
windowrulev2 = [
|
||||
"noinitialfocus, class:.*"
|
||||
|
||||
66
nix/modules/nixvim/home.nix
Normal file
66
nix/modules/nixvim/home.nix
Normal file
@@ -0,0 +1,66 @@
|
||||
{ inputs, pkgs, ... }:{
|
||||
imports = [
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
];
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
plugins = {
|
||||
notify.enable = true;
|
||||
mini-cursorword.enable = true;
|
||||
mini-statusline.enable = true;
|
||||
web-devicons.enable = true;
|
||||
vim-dadbod-completion.enable = true;
|
||||
telescope.enable = true;
|
||||
lazygit.enable = true;
|
||||
persisted.enable = true;
|
||||
wakatime.enable = true;
|
||||
};
|
||||
extraPlugins = with pkgs; [
|
||||
vimPlugins.mini-completion
|
||||
vimPlugins.mini-comment
|
||||
vimPlugins.melange-nvim
|
||||
vimPlugins.telescope-file-browser-nvim
|
||||
];
|
||||
opts = {
|
||||
number = true;
|
||||
bg = "dark";
|
||||
tabstop = 2;
|
||||
shiftwidth = 2;
|
||||
termguicolors = true;
|
||||
};
|
||||
globals = {
|
||||
mapleader = " ";
|
||||
};
|
||||
keymaps = [
|
||||
{
|
||||
action = "<cmd>Telescope persisted<cr>";
|
||||
key = "<leader>fs";
|
||||
options = {
|
||||
silent = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
action = "<cmd>Telescope file_browser<cr>";
|
||||
key = "<leader>fv";
|
||||
options = {
|
||||
silent = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
action = "<cmd>LazyGit<cr>";
|
||||
key = "<leader>lg";
|
||||
options = {
|
||||
silent = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
action = "<cmd>Telescope buffers<cr>";
|
||||
key = "<leader>fb";
|
||||
options = {
|
||||
silent = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
5
nix/modules/nixvim/plugins/default.nix
Normal file
5
nix/modules/nixvim/plugins/default.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
_: {
|
||||
imports = [
|
||||
./
|
||||
]
|
||||
}
|
||||
3
nix/modules/nixvim/plugins/mini/default.nix
Normal file
3
nix/modules/nixvim/plugins/mini/default.nix
Normal file
@@ -0,0 +1,3 @@
|
||||
_: {
|
||||
notify: ./notify.nix
|
||||
}
|
||||
3
nix/modules/nixvim/plugins/mini/notify.nix
Normal file
3
nix/modules/nixvim/plugins/mini/notify.nix
Normal file
@@ -0,0 +1,3 @@
|
||||
{ inputs, ... }: {
|
||||
|
||||
}
|
||||
28
nix/modules/spicetify/home.nix
Normal file
28
nix/modules/spicetify/home.nix
Normal file
@@ -0,0 +1,28 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
let
|
||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
in {
|
||||
imports = [
|
||||
inputs.spicetify-nix.homeManagerModules.default
|
||||
];
|
||||
programs.spicetify = {
|
||||
enable = true;
|
||||
|
||||
enabledExtensions = with spicePkgs.extensions; [
|
||||
adblock
|
||||
hidePodcasts
|
||||
shuffle # shuffle+ (special characters are sanitized out of extension names)
|
||||
];
|
||||
enabledCustomApps = with spicePkgs.apps; [
|
||||
newReleases
|
||||
# ncsVisualizer
|
||||
];
|
||||
enabledSnippets = with spicePkgs.snippets; [
|
||||
# rotatingCoverart
|
||||
pointer
|
||||
];
|
||||
|
||||
theme = spicePkgs.themes.catppuccin;
|
||||
colorScheme = "mocha";
|
||||
};
|
||||
}
|
||||
@@ -11,12 +11,13 @@ in
|
||||
{
|
||||
|
||||
imports = [
|
||||
#./shared.nix
|
||||
./shared.nix
|
||||
inputs.stylix.homeModules.stylix
|
||||
];
|
||||
config = {
|
||||
stylix.enable = true;
|
||||
stylix.targets.hyprland.enable = true;
|
||||
stylix.autoEnable = false; # honestly, fuck stylix;
|
||||
stylix.targets.gtk.enable = true;
|
||||
stylix.targets.qt.enable = true;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ in
|
||||
];
|
||||
config = {
|
||||
stylix.enable = true;
|
||||
#stylix.targets.tmux.enable = false;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -9,24 +9,7 @@
|
||||
];
|
||||
stylix = {
|
||||
enable = true;
|
||||
# image = ./wp.jpg;
|
||||
# image = lib.mkDefault ./wp.jpg;
|
||||
polarity = "dark";
|
||||
|
||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-mirage.yaml";
|
||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/horizon-dark.yaml";
|
||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/darkviolet.yaml";
|
||||
# base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/bright.yaml";
|
||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/eris.yaml";
|
||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/framer.yaml";
|
||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/uwunicorn.yaml";
|
||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/tarot.yaml";
|
||||
|
||||
# base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/framer.yaml";
|
||||
|
||||
# base16Scheme = lib.mkDefault "${pkgs.base24-schemes}/share/themes/tokyodark-terminal.yaml";
|
||||
|
||||
# base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/tokyodark-terminal.yaml";
|
||||
base16Scheme = ./theme.yml;
|
||||
};
|
||||
# stylix.override = {
|
||||
|
||||
3
nix/modules/theme/default.nix
Normal file
3
nix/modules/theme/default.nix
Normal file
@@ -0,0 +1,3 @@
|
||||
_: {
|
||||
home: ./home.nix
|
||||
}
|
||||
9
nix/modules/theme/home.nix
Normal file
9
nix/modules/theme/home.nix
Normal file
@@ -0,0 +1,9 @@
|
||||
{ inputs, ... }: {
|
||||
services.dunst = {
|
||||
settings = {
|
||||
global = {
|
||||
font = "Noto Nerd Font 8";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
15
nix/modules/tmux/home.nix
Normal file
15
nix/modules/tmux/home.nix
Normal file
@@ -0,0 +1,15 @@
|
||||
{ inputs, pkgs, fetchFromGitHub, ... }:
|
||||
{
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
plugins = with pkgs.tmuxPlugins; [
|
||||
sensible
|
||||
minimal-tmux-status
|
||||
];
|
||||
extraConfig = ''
|
||||
set-option -g default-terminal "tmux-256color"
|
||||
set -g status-bg black
|
||||
set -g status-fg white
|
||||
'';
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user