Compare commits

..

No commits in common. "6679483fb84022d5cec90f7e825f2834bac8ca0b" and "faba8b6abe339f3af0114b3301e7607e924d8044" have entirely different histories.

15 changed files with 139 additions and 266 deletions

41
config/dolphinrc Normal file
View File

@ -0,0 +1,41 @@
MenuBar=Disabled
[$Version]
update_info=dolphin_detailsmodesettings.upd:rename-leading-padding
[General]
ShowSelectionToggle=false
ShowStatusBar=false
Version=202
ViewPropsTimestamp=2023,4,26,16,58,48.324
[IconsMode]
MaximumTextLines=1
PreviewSize=112
[InformationPanel]
dateFormat=ShortFormat
[KFileDialog Settings]
Places Icons Auto-resize=false
Places Icons Static Size=16
[KPropertiesDialog]
1920x1080 screen: Window-Maximized=true
[MainWindow]
MenuBar=Disabled
ToolBarsMovable=Disabled
[MainWindow][Toolbar mainToolBar]
IconSize=16
ToolButtonStyle=IconOnly
[PlacesPanel]
IconSize=16
[PreviewSettings]
Plugins=appimagethumbnail,audiothumbnail,comicbookthumbnail,cursorthumbnail,djvuthumbnail,ebookthumbnail,exrthumbnail,imagethumbnail,jpegthumbnail,kraorathumbnail,windowsexethumbnail,windowsimagethumbnail,opendocumentthumbnail,svgthumbnail,ffmpegthumbs
[Toolbar mainToolBar]
ToolButtonStyle=IconOnly

View File

@ -54,13 +54,13 @@
... ...
} @ inputs: let } @ inputs: let
userSettings = { userSettings = {
username = "foglar"; # konsta or foglar (else defaulting to foglar or none) username = "foglar";
hostname = "laptop"; hostname = "laptop";
shell = "bash"; # bash, zsh shell = "bash"; # bash, zsh
terminal = "kitty"; # kitty, alacritty terminal = "kitty";
browser = "librewolf"; # firefox, librewolf, qutebrowser browser = "librewolf";
editor = "neovim"; # neovim, vscode editor = "neovim";
# List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes # List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
theme = "catppuccin-mocha"; #tokyo-night-dark, one-dark theme = "catppuccin-mocha"; #tokyo-night-dark, one-dark

View File

@ -16,7 +16,6 @@
qutebrowser qutebrowser
ferdium ferdium
file-roller
stellarium stellarium
libreoffice libreoffice
localsend localsend

View File

@ -46,11 +46,5 @@
'') '')
]; ];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"steam"
"steam-unwrapped"
];
}; };
} }

View File

@ -21,11 +21,5 @@
nodejs nodejs
pnpm pnpm
]; ];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"pycharm"
"pycharm-professional"
];
}; };
} }

View File

@ -10,6 +10,7 @@
}; };
config = lib.mkIf config.app_list.terminal_tools.enable { config = lib.mkIf config.app_list.terminal_tools.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
btop btop
cmatrix cmatrix
@ -26,33 +27,5 @@
ranger ranger
unzip unzip
]; ];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
# NVTOP
"nvtopPackages.full"
"cuda-merged"
"cuda_cuobjdump"
"cuda_gdb"
"cuda_nvcc"
"cuda_nvdisasm"
"cuda_nvprune"
"cuda_cccl"
"cuda_cudart"
"cuda_cupti"
"cuda_cuxxfilt"
"cuda_nvml_dev"
"cuda_nvrtc"
"cuda_nvtx"
"cuda_profiler_api"
"cuda_sanitizer_api"
"libcublas"
"libcusolver"
"libnvjitlink"
"libcusparse"
"libnpp"
"libcufft"
"libcurand"
];
}; };
} }

View File

@ -15,7 +15,9 @@
wl-clipboard wl-clipboard
cliphist cliphist
#dunst
#swww #swww
#hyprshade
(writeShellScriptBin "dontkillsteam" '' (writeShellScriptBin "dontkillsteam" ''
if [[ $(hyprctl activewindow -j | ${pkgs.jq}/bin/jq -r ".class") == "Steam" ]]; then if [[ $(hyprctl activewindow -j | ${pkgs.jq}/bin/jq -r ".class") == "Steam" ]]; then

View File

@ -25,7 +25,7 @@
xdg.portal.enable = true; xdg.portal.enable = true;
xdg.portal.config = { xdg.portal.config = {
common = { common = {
default = ["hyprland"]; default = ["gtk"];
}; };
}; };
xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-hyprland]; xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-hyprland];
@ -136,9 +136,9 @@
"${pkgs.blueman}/bin/blueman-applet" "${pkgs.blueman}/bin/blueman-applet"
"${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store # clipboard store text data" "${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store # clipboard store text data"
"${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store # clipboard store image data" "${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store # clipboard store image data"
"${pkgs.swayosd}/bin/swayosd-server"
"systemctl --user start hyprpolkitagent" "systemctl --user start hyprpolkitagent"
"swayosd-server"
#"swww-daemon --format xrgb" #"swww-daemon --format xrgb"
#"swww ../../aurora_borealis.png" #"swww ../../aurora_borealis.png"
@ -173,9 +173,12 @@
bindr = [ bindr = [
"ALTSHIFT, Shift_L, exec, keyboardswitch" "ALTSHIFT, Shift_L, exec, keyboardswitch"
"CAPS,Caps_Lock, exec, ${pkgs.swayosd}/bin/swayosd-client --caps-lock" "CAPS,Caps_Lock, exec, swayosd-client --caps-lock"
]; ];
#bindsr = [
#];
bindd = [ bindd = [
"$mod SHIFT, P, Color Picker, exec, ${pkgs.hyprpicker}/bin/hyprpicker -a" "$mod SHIFT, P, Color Picker, exec, ${pkgs.hyprpicker}/bin/hyprpicker -a"
"$mod SHIFT, R, Random Background, exec, background-switch-random" "$mod SHIFT, R, Random Background, exec, background-switch-random"
@ -183,8 +186,8 @@
bindl = [ bindl = [
# Audio # Audio
",XF86AudioMute, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle" ",XF86AudioMute, exec, swayosd-client --output-volume mute-toggle"
",XF86AudioMicMute, exec, ${pkgs.swayosd}/bin/swayosd-client --input-volume mute-toggle" ",XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle"
# Media # Media
"Alt, P, exec, ${pkgs.playerctl}/bin/playerctl play-pause" "Alt, P, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
@ -193,11 +196,11 @@
]; ];
bindel = [ bindel = [
",XF86AudioLowerVolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume -5" ",XF86AudioLowerVolume, exec, swayosd-client --output-volume -5"
",XF86AudioRaiseVolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume 5" ",XF86AudioRaiseVolume, exec, swayosd-client --output-volume 5"
# Brightness # Brightness
",XF86MonBrightnessUp, exec,${pkgs.swayosd}/bin/swayosd-client --brightness raise" ",XF86MonBrightnessUp, exec, swayosd-client --brightness raise"
",XF86MonBrightnessDown, exec, ${pkgs.swayosd}/bin/swayosd-client --brightness lower" ",XF86MonBrightnessDown, exec, swayosd-client --brightness lower"
]; ];
binde = [ binde = [

View File

@ -2,8 +2,6 @@
config, config,
lib, lib,
inputs, inputs,
pkgs,
userSettings,
... ...
}: { }: {
options = { options = {
@ -15,137 +13,15 @@
enable = true; enable = true;
profiles.default = { profiles.default = {
search.engines = {
"Nix Packages" = {
urls = [
{
template = "https://search.nixos.org/packages";
params = [
{
name = "type";
value = "packages";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; extensions = with inputs.firefox-addons.packages."x86_64-linux"; [
definedAliases = ["@np"]; #enhancer-for-youtube
}; ublock-origin
"Phind" = { simple-translate
urls = [ duckduckgo-privacy-essentials
{ return-youtube-dislikes
template = "https://www.phind.com/search"; user-agent-string-switcher
params = [
{
name = "q";
value = "{searchTerms}";
}
{
name = "searchMode";
value = "always";
}
{
name = "allowMultiSearch";
value = "false";
}
];
}
];
icon = "https://www.phind.com/favicon.ico";
definedAliases = ["@phind"];
};
};
search.force = true;
settings = {
"dom.security.https_only_mode" = true;
"privacy.clearOnShutdown.history" = true;
#"identity.fxaccounts.enabled" = false;
#"signon.rememberSignons" = false;
};
bookmarks = [
{
name = "Toolbar";
toolbar = true;
bookmarks = [
{
name = "Server";
bookmarks = [
{
name = "AudioBookshelf";
tags = ["audiobookshelf"];
keyword = "audio";
url = "http://foglar.local:8080";
}
{
name = "Photos";
tags = ["photoprism"];
keyword = "photos";
url = "http://foglar.local:2342";
}
{
name = "E-books";
tags = ["Kavita"];
keyword = "kavita";
url = "http://foglar.local:5000";
}
{
name = "Films";
tags = ["jellyfin"];
keyword = "films";
url = "http://foglar.local:8097";
}
{
name = "CasaOS";
tags = ["casaos"];
keyword = "casa";
url = "http://foglar.local:7788";
}
{
name = "Torrent";
tags = ["qbittorrent"];
keyword = "torrent";
url = "http://foglar.local:8181/";
}
{
name = "Syncthing";
tags = ["syncthing"];
keyword = "sync";
url = "https://foglar.local:8384/";
}
{
name = "Git";
tags = ["gitea"];
keyword = "git";
url = "https://git.foglar.tech";
}
];
}
];
}
]; ];
extensions = with inputs.firefox-addons.packages."x86_64-linux";
[
ublock-origin
]
++ (
if (userSettings.username == "foglar")
then [
inputs.firefox-addons.packages."x86_64-linux".simple-translate
inputs.firefox-addons.packages."x86_64-linux".duckduckgo-privacy-essentials
inputs.firefox-addons.packages."x86_64-linux".return-youtube-dislikes
inputs.firefox-addons.packages."x86_64-linux".user-agent-string-switcher
]
else []
);
}; };
}; };
}; };

View File

@ -26,10 +26,5 @@
#theme = spicePkgs.themes.catppuccin; #theme = spicePkgs.themes.catppuccin;
#colorScheme = "mocha"; #colorScheme = "mocha";
}; };
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"spotify"
];
}; };
} }

View File

@ -1,7 +1,6 @@
{ {
pkgs, pkgs,
lib, lib,
userSettings,
... ...
}: { }: {
imports = [ imports = [
@ -31,33 +30,27 @@
}; };
program = { program = {
kitty.enable = kitty.enable = lib.mkDefault true;
if userSettings.terminal == "kitty"
then lib.mkDefault true
else lib.mkDefault false;
tmux.enable = lib.mkDefault true; tmux.enable = lib.mkDefault true;
zoxide.enable = lib.mkDefault true; zoxide.enable = lib.mkDefault true;
firefox.enable = firefox.enable = lib.mkDefault true;
if userSettings.browser == "firefox"
then lib.mkDefault true
else lib.mkDefault false;
spotify.enable = lib.mkDefault true; spotify.enable = lib.mkDefault true;
vscode = { vscode = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
ide = { ide = {
python.enable = lib.mkDefault false; python.enable = lib.mkDefault true;
go.enable = lib.mkDefault false; go.enable = lib.mkDefault true;
csharp.enable = lib.mkDefault false; csharp.enable = lib.mkDefault true;
cpp.enable = lib.mkDefault false; cpp.enable = lib.mkDefault false;
web.enable = lib.mkDefault false; web.enable = lib.mkDefault true;
}; };
nix.enable = lib.mkDefault false; nix.enable = lib.mkDefault true;
markdown.enable = lib.mkDefault false; markdown.enable = lib.mkDefault true;
ai.enable = lib.mkDefault false; ai.enable = lib.mkDefault true;
git.enable = lib.mkDefault false; git.enable = lib.mkDefault true;
themes.enable = lib.mkDefault false; themes.enable = lib.mkDefault false;
}; };
git.enable = lib.mkDefault true; git.enable = lib.mkDefault true;
@ -90,4 +83,54 @@
nh nh
nixd nixd
]; ];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"discord"
"spotify"
"pycharm"
"pycharm-professional"
"steam"
"steam-unwrapped"
"gitkraken"
# VSCODE
"vscode"
"vscode-extension-github-codespaces"
"vscode-extension-ms-vscode-remote-remote-ssh"
"vscode-extension-ms-vscode-remote-remote-ssh-edit"
"vscode-extension-github-copilot"
"vscode-extension-github-copilot-chat"
"vscode-extension-MS-python-vscode-pylance"
"vscode-extension-ms-dotnettools-csdevkit"
"vscode-extension-ms-dotnettools-vscodeintellicode-csharp"
# NVTOP
"nvtopPackages.full"
"cuda-merged"
"cuda_cuobjdump"
"cuda_gdb"
"cuda_nvcc"
"cuda_nvdisasm"
"cuda_nvprune"
"cuda_cccl"
"cuda_cudart"
"cuda_cupti"
"cuda_cuxxfilt"
"cuda_nvml_dev"
"cuda_nvrtc"
"cuda_nvtx"
"cuda_profiler_api"
"cuda_sanitizer_api"
"libcublas"
"libcusolver"
"libnvjitlink"
"libcusparse"
"libnpp"
"libcufft"
"libcurand"
];
} }

View File

@ -27,20 +27,6 @@
vscode vscode
]; ];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
# VSCODE
"vscode"
"vscode-extension-github-codespaces"
"vscode-extension-ms-vscode-remote-remote-ssh"
"vscode-extension-ms-vscode-remote-remote-ssh-edit"
"vscode-extension-github-copilot"
"vscode-extension-github-copilot-chat"
"vscode-extension-MS-python-vscode-pylance"
"vscode-extension-ms-dotnettools-csdevkit"
"vscode-extension-ms-dotnettools-vscodeintellicode-csharp"
];
programs.vscode = { programs.vscode = {
enable = true; enable = true;

View File

@ -21,10 +21,5 @@
github-cli github-cli
gitkraken gitkraken
]; ];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"gitkraken"
];
}; };
} }

View File

@ -6,15 +6,10 @@
... ...
}: { }: {
options = { options = {
sys.default-applications.enable = lib.mkEnableOption "Enable default applications"; default-applications.enable = lib.mkEnableOption "Enable default applications";
xdg.da.browser = lib.mkOption {
type = lib.types.str;
default = "firefox";
description = "Default browser";
};
}; };
config = lib.mkIf config.sys.default-applications.enable { config = lib.mkIf config.default-applications.enable {
environment.sessionVariables = { environment.sessionVariables = {
DEFAULT_BROWSER = "${pkgs."${userSettings.browser}"}/bin/${userSettings.browser}"; DEFAULT_BROWSER = "${pkgs."${userSettings.browser}"}/bin/${userSettings.browser}";
TERMINAL = "${pkgs."${userSettings.terminal}"}/bin/${userSettings.terminal}"; TERMINAL = "${pkgs."${userSettings.terminal}"}/bin/${userSettings.terminal}";
@ -23,25 +18,14 @@
# Default applications configuration # Default applications configuration
xdg.mime.enable = true; xdg.mime.enable = true;
xdg.da.browser =
if userSettings.browser == "qutebrowser"
then "org.qutebrowser.qutebrowser"
else
(
if userSettings.browser == "librewolf"
then "librewolf"
else "firefox"
);
xdg.mime.defaultApplications = { xdg.mime.defaultApplications = {
"text/html" = "${config.xdg.da.browser}.desktop"; "text/html" = "librewolf.desktop";
"x-scheme-handler/http" = "${config.xdg.da.browser}.desktop"; "x-scheme-handler/http" = "librewolf.desktop";
"x-scheme-handler/https" = "${config.xdg.da.browser}.desktop"; "x-scheme-handler/https" = "librewolf.desktop";
"x-scheme-handler/about" = "${config.xdg.da.browser}.desktop"; "x-scheme-handler/about" = "librewolf.desktop";
"x-scheme-handler/unknown" = "${config.xdg.da.browser}.desktop"; "x-scheme-handler/unknown" = "librewolf.desktop";
"text/plain" = "${userSettings.editor}.desktop"; "text/plain" = "nvim.desktop";
"application/pdf" = "org.gnome.Evince.desktop"; "application/pdf" = "evince";
}; };
}; };
} }

View File

@ -34,24 +34,11 @@
kitty.enable = true; kitty.enable = true;
tmux.enable = true; tmux.enable = true;
zoxide.enable = true; zoxide.enable = true;
vscode = { vscode = {
enable = true; enable = true;
ide = {
python.enable = true;
go.enable = true;
csharp.enable = true;
cpp.enable = false;
web.enable = true;
};
nix.enable = true; nix.enable = true;
markdown.enable = true;
ai.enable = true;
git.enable = true;
themes.enable = false;
}; };
git.enable = true; git.enable = true;
neovim.enable = true; neovim.enable = true;
@ -70,6 +57,7 @@
".config/hypr/hyprlock.conf".source = ../config/hyprlock.conf; ".config/hypr/hyprlock.conf".source = ../config/hyprlock.conf;
".config/hypr/mocha.conf".source = ../config/mocha.conf; ".config/hypr/mocha.conf".source = ../config/mocha.conf;
".config/hypr/hypridle.conf".source = ../config/hypridle.conf; ".config/hypr/hypridle.conf".source = ../config/hypridle.conf;
#".config/dolphinrc".source = ../config/dolphinrc;
".prettierrc".text = '' ".prettierrc".text = ''
{ {
"tabWidth": 4, "tabWidth": 4,