8 Commits

Author SHA1 Message Date
5b58e02b97 Merge pull request 'test_launcher_minecraft' (#5) from test_launcher_minecraft into main
Reviewed-on: #5
2025-05-22 16:09:39 +00:00
installer
384092291c dodanie wrappera do scp. wywalenie crystala w pizdu. Próba dodania autosugestii do silnika wyszukiwania. Aktualizacja zależności. 2025-05-22 18:07:57 +02:00
installer
f4e6ec8144 zastąpienie kitty przez warp, zainstalowanie freetube, próba instalacji klienta minecraft. 2025-05-20 15:42:41 +02:00
installer
9a01abb83b Poprawa integracji z portalem XDG i wsparcie dla Ulaunchera
- Dodano `xdg-desktop-portal-hyprland` do konfiguracji systemowej, Hyprlanda oraz środowiska użytkownika.
- Włączono obsługę `dbus` w `initrd`, co może być wymagane przez `xdg-desktop-portal`.
- Rozszerzono konfigurację portali XDG o jawne ustawienia priorytetów (`gtk`, `hyprland`).
- Dodano `ulauncher` oraz `wmctrl` do listy narzędzi, a także nowe skróty klawiszowe do jego uruchamiania.
- Pomimo zmian, integracja portalu XDG nie działa jeszcze zgodnie z oczekiwaniami.
2025-05-07 20:11:04 +02:00
installer
e832b7fd33 aktualizacja zależności 2025-05-05 21:34:03 +02:00
installer
b0b071749b Zaktualizuj zależności i zastąp ms-python przez kylin-python
- Zaktualizowano wiele zależności w `flake.lock`, w tym `home-manager`, `nixpkgs`, `stylix` i inne.
- Usunięto rozszerzenia VSCode od `ms-python`: debugpy, flake8, python i vscode-pylance.
- Usunięto również `vscode-python-envs` z ręcznie zadeklarowanych rozszerzeń.
- Dodano alternatywne rozszerzenie `kylin-python` (v0.4.2) jako zamiennik obsługi Pythona w VSCode.
2025-04-30 00:34:59 +02:00
installer
cd42fbdd59 aktualizacja i małe poprawki 2025-04-24 01:32:50 +02:00
12240a9bc7 Merge pull request 'test_skrypty_dex' (#4) from test_skrypty_dex into main
Reviewed-on: #4
2025-04-20 14:47:43 +00:00
16 changed files with 149 additions and 129 deletions

3
.gitignore vendored
View File

@@ -1 +1,2 @@
git-diff.txt
git-diff.txt
packages/result

View File

@@ -10,16 +10,16 @@
};
};
logo = {
source = ./nixos.png;
type = "kitty-direct";
height = 15;
width = 30;
padding = {
top = 3;
left = 3;
};
};
# logo = {
# source = ./nixos.png;
# type = "kitty-direct";
# height = 15;
# width = 30;
# padding = {
# top = 3;
# left = 3;
# };
# };
modules = [
"break"

View File

@@ -1,5 +1,6 @@
{
lib,
pkgs,
username,
host,
config,
@@ -18,6 +19,7 @@ in
enable = true;
xwayland.enable = true;
systemd.enable = true;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
extraConfig = let
modifier = "SUPER";
in
@@ -95,6 +97,7 @@ in
windowrulev2 = opacity 0.9 0.7, class:^(chrome-dbipeoijaciefjfbfdkpfncmlbfinpge-Default)$
windowrulev2 = opacity 0.9 0.7, class:^(Bitwarden)$
windowrulev2 = opacity 0.9 0.7, class:^(chrome-akpamiohjfcnimfljfndmaldlcfphjmp-Default)$
windowrulev2 = opacity 0.9 0.7, class:^(dev.warp.Warp)$
gestures {
workspace_swipe = true
workspace_swipe_fingers = 3
@@ -212,7 +215,8 @@ in
bind = ${modifier},I,exec,dex-instagram
bind = ${modifier},R,exec,dex-portainer
bind = ${modifier},U,exec,dex-mastodon
bind = ${modifier},Y,exec,dex-dailydev
bind = ${modifier},Y,exec,freetube
bind = ${modifier}SHIFT,Y,exec,dex-dailydev
bind = ${modifier},V,exec,codium
bind = ${modifier},O,exec,onlyoffice-desktopeditors
bind = ${modifier}SHIFT,O,exec,obs

104
flake.lock generated
View File

@@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1744578060,
"narHash": "sha256-ApX5u3aXtmthemPSnZls/oxvqpNR7C9t4Ut57MTvces=",
"lastModified": 1746769778,
"narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=",
"owner": "AdnanHodzic",
"repo": "auto-cpufreq",
"rev": "b6493edc7033beac216b8836af4994e56c6682f4",
"rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad",
"type": "github"
},
"original": {
@@ -25,11 +25,11 @@
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1732200724,
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
"lastModified": 1746562888,
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "153d52373b0fb2d343592871009a286ec8837aec",
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
"type": "github"
},
"original": {
@@ -95,11 +95,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1744914542,
"narHash": "sha256-Q6EKVSHbtWqndGWHw5E+dAN4ds5p+SD5Gyiy3KGN8DM=",
"lastModified": 1747800214,
"narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "30303c2b08c30085a784abf5c1823bd62dd8d9d7",
"rev": "54be6f6687f510002f7a1e6c3583278d989f3833",
"type": "gitlab"
},
"original": {
@@ -112,11 +112,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1743774811,
"narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
"lastModified": 1744642301,
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
"type": "github"
},
"original": {
@@ -144,7 +144,6 @@
"inputs": {
"nixpkgs-lib": [
"stylix",
"nur",
"nixpkgs"
]
},
@@ -162,27 +161,6 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@@ -250,16 +228,16 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1732369855,
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
"lastModified": 1744584021,
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "dadd58f630eeea41d645ee225a63f719390829dc",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "47.2",
"ref": "48.1",
"repo": "gnome-shell",
"type": "github"
}
@@ -271,11 +249,11 @@
]
},
"locked": {
"lastModified": 1744919155,
"narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=",
"lastModified": 1747875884,
"narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70",
"rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b",
"type": "github"
},
"original": {
@@ -287,11 +265,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1744463964,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"lastModified": 1747744144,
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
"type": "github"
},
"original": {
@@ -303,7 +281,10 @@
},
"nur": {
"inputs": {
"flake-parts": "flake-parts",
"flake-parts": [
"stylix",
"flake-parts"
],
"nixpkgs": [
"stylix",
"nixpkgs"
@@ -311,11 +292,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1743884191,
"narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=",
"lastModified": 1746056780,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167",
"type": "github"
},
"original": {
@@ -341,7 +322,7 @@
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell",
"home-manager": [
@@ -359,11 +340,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1744910471,
"narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=",
"lastModified": 1747904607,
"narHash": "sha256-2JWxCVAb8qnssrn/4FeIgs+Gk0VZuAfDsF+rUBE7cZU=",
"owner": "danth",
"repo": "stylix",
"rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51",
"rev": "230705d5fb6c308402579b17e0261e9f15de6f46",
"type": "github"
},
"original": {
@@ -407,28 +388,27 @@
"tinted-kitty": {
"flake": false,
"locked": {
"lastModified": 1716423189,
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
"lastModified": 1735730497,
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
}
},
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1742851696,
"narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=",
"lastModified": 1744974599,
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77",
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
"type": "github"
},
"original": {
@@ -440,11 +420,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1743296873,
"narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
"lastModified": 1745111349,
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
"type": "github"
},
"original": {

View File

@@ -18,6 +18,7 @@
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd.systemd.dbus.enable = true;
# Make /tmp a tmpfs
tmp = {
useTmpfs = false;

View File

@@ -25,6 +25,11 @@
nixpkgs.config = {
allowUnfree = true;
pulseaudio = true;
# packageOverrides = pkgs: {
# ulauncher = pkgs.ulauncher.override {
# autoStart = true;
# };
# };
};
# Extra Portal Configuration
@@ -34,12 +39,19 @@
wlr.enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal
pkgs.xdg-desktop-portal-hyprland
];
config = {
common = {
default = [
"gtk"
"hyprland"
];
};
};
configPackages = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal
];
};

View File

@@ -12,5 +12,6 @@
docker-client
anki-bin
onlyoffice-bin
freetube
];
}

View File

@@ -23,10 +23,6 @@
jnoortheen.nix-ide
mechatroner.rainbow-csv
ms-azuretools.vscode-docker
ms-python.debugpy
ms-python.flake8
ms-python.python
ms-python.vscode-pylance
njpwerner.autodocstring
octref.vetur
oderwat.indent-rainbow
@@ -74,12 +70,6 @@
version = "0.1.0";
hash = "sha256-Aj87mxOGer24O24/4/bGQqgLpgoBvfwOCKQyJ8NLplU=";
}
{
name = "vscode-python-envs";
publisher = "ms-python";
version = "0.3.11081010";
hash = "sha256-Vs9Rkz/DAhNcC9e8fI8mlD8TljsFdU8+z7ztNkZozz0=";
}
{
name = "one-dark-pro-monokai-darker";
publisher = "eserozvataf";
@@ -236,6 +226,12 @@
version = "0.0.2";
hash = "sha256-OXHUwynWm4RqJYjcv5qXt5DyjFDxtNjZFNpnd22gUgg=";
}
{
name = "kylin-python";
publisher = "kylinideteam";
version = "0.4.2";
hash = "sha256-LhOsIvECrxLCnRjUVffS4G4fFsdP70iP/twoNoto354=";
}
];
})
];

View File

@@ -1,6 +1,7 @@
# Fundamentalne programy dla systemu
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
warp-terminal
wget
killall
eza

View File

@@ -69,6 +69,11 @@
};
};
};
hyprland = {
enable = true;
withUWSM = true;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
};
dconf.enable = true;
seahorse.enable = true;
fuse.userAllowOther = true;

View File

@@ -1,10 +1,31 @@
{...}: {
{pkgs, ...}: {
# Create XDG Dirs
xdg = {
enable = true;
userDirs = {
enable = true;
createDirectories = true;
};
portal = {
enable = true;
xdgOpenUsePortal = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-hyprland
];
config = {
common = {
default = [
"gtk"
"hyprland"
];
};
};
configPackages = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-hyprland
];
};
};
dconf.settings = {

View File

@@ -59,6 +59,7 @@
"garand's-search" = {
definedAliases = ["@g"];
urls = [{template = "https://search.garandplg.com/search?q={searchTerms}";}];
suggestUrl = "https://search.garandplg.com/autocompleter?q={searchTerms}";
};
"youtube" = {
definedAliases = ["@yt"];

View File

@@ -60,7 +60,6 @@ in {
if [ -f $HOME/.bashrc-personal ]; then
source $HOME/.bashrc-personal
fi
fc
'';
shellAliases = {
os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos";
@@ -86,10 +85,11 @@ in {
ll = "eza -lh --icons --grid --group-directories-first";
la = "eza -lah --icons --grid --group-directories-first";
ssh-server = "ssh garand_plg@192.168.1.156 -p 556 -i ~/.ssh/hp-t640-homeserver";
scp-to-server = "function scp-to-server() { scp -i ~/.ssh/hp-t640-homeserver -P 556 $1 garand_plg@192.168.1.156:$2; }; scp-to-server";
fc = "fortune | cowsay";
terminal = "cat /home/garand_plg/Documents/terminal.txt";
e-terminal = "nano /home/garand_plg/Documents/terminal.txt";
mkgidf = "git diff > git-diff.txt";
mkgidf = "git add --intent-to-add . && git diff > git-diff.txt";
".." = "cd ..";
kys = "shutdown now";
pasjans = "ttysolitaire -p 10 --no-background-color";

View File

@@ -1,16 +1,12 @@
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "GarandPLG";
gitEmail = "garandplg@garandplg.com";
# Hyprland Settings
extraMonitorSettings = "";
# Waybar Settings
clock24h = true;
# Program Options
browser = "librewolf"; # Set Default Browser (google-chrome-stable for google-chrome)
terminal = "kitty"; # Set Default System Terminal
browser = "librewolf";
terminal = "warp-terminal";
keyboardLayout = "pl";
}

View File

@@ -69,7 +69,8 @@ in
" + I" "Uruchom Instagram" "dex-instagram" \
" + R" "Uruchom Portainer" "dex-portainer" \
" + U" "Uruchom Mastodon" "dex-mastodon" \
" + Y" "Uruchom Daily.dev" "dex-dailydev" \
" + Y" "Uruchom FreeTube" "freetube" \
" + SHIFT + Y" "Uruchom Daily.dev" "dex-dailydev" \
" + V" "Uruchom Visual Studio Codium" "codium" \
" + O" "Uruchom ONLYOFFICE" "onlyoffice-desktopeditors" \
" + SHIFT + O" "Uruchom OBS" "obs" \

View File

@@ -1,43 +1,43 @@
{pkgs}:
pkgs.writeShellScriptBin "web-search" ''
declare -A URLS
declare -A URLS
URLS=(
["🌎 Search"]="https://search.garandplg.com/search?q="
[" Unstable Packages"]="https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query="
["🎞 YouTube"]="https://www.youtube.com/results?search_query="
[" NixOS Wiki"]="https://nixos.wiki/index.php?search="
["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
["👨💻 StackOverflow"]="https://stackoverflow.com/search?q="
)
URLS=(
["🌎 Search"]="https://search.garandplg.com/search?q="
[" Unstable Packages"]="https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query="
["🎞 YouTube"]="https://www.youtube.com/results?search_query="
[" NixOS Wiki"]="https://nixos.wiki/index.php?search="
["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
["👨💻 StackOverflow"]="https://stackoverflow.com/search?q="
)
# List for rofi
gen_list() {
for i in "''${!URLS[@]}"
do
echo "$i"
done
}
# List for rofi
gen_list() {
for i in "''${!URLS[@]}"
do
echo "$i"
done
}
main() {
# Pass the list to rofi
platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
main() {
# Pass the list to rofi
platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
if [[ -n "$platform" ]]; then
query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
if [[ -n "$platform" ]]; then
query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
if [[ -n "$query" ]]; then
url=''${URLS[$platform]}$query
xdg-open "$url"
else
exit
fi
else
exit
fi
}
if [[ -n "$query" ]]; then
url=''${URLS[$platform]}$query
xdg-open "$url"
else
exit
fi
else
exit
fi
}
main
main
exit 0
exit 0
''