Compare commits
28 Commits
6c48caaea8
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| b9f8bbfb9c | |||
| b91eb30fa9 | |||
| 1c80038c08 | |||
| 789879c6eb | |||
| add12d2958 | |||
| ad1408ebfd | |||
| ac6e0d98b8 | |||
| 7213a861ae | |||
| 873e9fd4e7 | |||
| efb8dcda36 | |||
| 148481fa52 | |||
| 1739679b25 | |||
| 3dbb31caf7 | |||
| e60623f0bc | |||
| 121fccf135 | |||
| 41d0fd2075 | |||
| 9e59f925b5 | |||
| 233029c316 | |||
| 75bf262cea | |||
| fe19fa616e | |||
| a8ebaf2dd6 | |||
| 7ae2f26c8a | |||
| 4133d74d85 | |||
| 61651d2bc0 | |||
| 09ba4ccbf0 | |||
| 4458732589 | |||
| 7600f9da0c | |||
| a46850ebfb |
@@ -1,10 +1,10 @@
|
|||||||
# 📜 License
|
# 📜 License
|
||||||
|
|
||||||
### GarandOS is licensed under the MIT License.
|
### ZaneyOS is licensed under the MIT License.
|
||||||
|
|
||||||
## MIT License
|
## MIT License
|
||||||
|
|
||||||
**Copyright (c) 2025 Garand_PLG**
|
**Copyright (c) 2025 Tyler Kelley**
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the <strong> "Software" </strong>), to deal
|
of this software and associated documentation files (the <strong> "Software" </strong>), to deal
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ sudo vgcreate vg0 /dev/mapper/cryptroot
|
|||||||
# Create Logical Volumes
|
# Create Logical Volumes
|
||||||
# (Up to max 16GB)
|
# (Up to max 16GB)
|
||||||
sudo lvcreate -L 12G -n swap vg0 # 12GB SWAP
|
sudo lvcreate -L 12G -n swap vg0 # 12GB SWAP
|
||||||
# (For ROOT partition it's best to give at least 1/4 of the disk, but from experience I recommend roughly 100-200GB. System takes about 70GB, but it's worth leaving some extra space)
|
# (For ROOT partition it's best to give at least 1/4 of the disk. System takes about 45GB, but around 1,5x more is necessary)
|
||||||
sudo lvcreate -L 175G -n root vg0 # 175GB ROOT
|
sudo lvcreate -L 75GB -n root vg0 # 75GB ROOT
|
||||||
sudo lvcreate -l 100%FREE -n home vg0 # rest HOME
|
sudo lvcreate -l 100%FREE -n home vg0 # rest HOME
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -215,5 +215,5 @@ sudo nixos-rebuild switch --flake .#your-system-hostname
|
|||||||
- `upd-ts` - rebuild system and switch to it, but won't be added to bootloader.
|
- `upd-ts` - rebuild system and switch to it, but won't be added to bootloader.
|
||||||
- `upd-bd` - only builds new configuration.
|
- `upd-bd` - only builds new configuration.
|
||||||
|
|
||||||
## TODO:
|
## Winboat
|
||||||
- Add instruction for needed PWA
|
I highly recommend using [Ghost Spectre 11](https://tech-latest.com/ghost-spectre-windows-11/#Download_Ghost_Spectre_Windows_11_Superlite_Version) as windows ISO for **winboat**.
|
||||||
|
|||||||
86
flake.lock
generated
86
flake.lock
generated
@@ -41,16 +41,17 @@
|
|||||||
"base16-fish": {
|
"base16-fish": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1622559957,
|
"lastModified": 1754405784,
|
||||||
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
|
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
|
||||||
"owner": "tomyun",
|
"owner": "tomyun",
|
||||||
"repo": "base16-fish",
|
"repo": "base16-fish",
|
||||||
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
|
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "tomyun",
|
"owner": "tomyun",
|
||||||
"repo": "base16-fish",
|
"repo": "base16-fish",
|
||||||
|
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -95,11 +96,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1758798674,
|
"lastModified": 1761105810,
|
||||||
"narHash": "sha256-9ocRdyGIr67hgrfG8TWv8M6EuIGYUi3256JVHxXaD6s=",
|
"narHash": "sha256-h1hNPjW3DLrIbT4cTv/27mN0DfsrSSU9mJa4xRmtGeE=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "810a33a4d21060a52a7babd8af7672485954b3ad",
|
"rev": "4e0b79686a41e34e76aa72aef7f834a4daf8b6c3",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -112,11 +113,11 @@
|
|||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756083905,
|
"lastModified": 1758112371,
|
||||||
"narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=",
|
"narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808",
|
"rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -128,7 +129,6 @@
|
|||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
"stylix",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -186,11 +186,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758810399,
|
"lastModified": 1761081701,
|
||||||
"narHash": "sha256-bpWoE1tiFX5T1tr5EudkpW9Kk02XR+6olkoSkf3nHZU=",
|
"narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "39d26c16866260eee6d0487fe9c102ba1c1bf7b2",
|
"rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -234,11 +234,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758690382,
|
"lastModified": 1760878510,
|
||||||
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
|
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e643668fd71b949c53f8626614b21ff71a07379d",
|
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -255,16 +255,15 @@
|
|||||||
"flake-parts"
|
"flake-parts"
|
||||||
],
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756961635,
|
"lastModified": 1758998580,
|
||||||
"narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=",
|
"narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370",
|
"rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -302,7 +301,8 @@
|
|||||||
"nix-flatpak": "nix-flatpak",
|
"nix-flatpak": "nix-flatpak",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"prismlauncher-cracked": "prismlauncher-cracked",
|
"prismlauncher-cracked": "prismlauncher-cracked",
|
||||||
"stylix": "stylix"
|
"stylix": "stylix",
|
||||||
|
"winboat": "winboat"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"stylix": {
|
"stylix": {
|
||||||
@@ -326,11 +326,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758757969,
|
"lastModified": 1761028816,
|
||||||
"narHash": "sha256-2zC4aHoDsR12Jyd6WvSxmQbAKT4V93frnHHDjA8o3r8=",
|
"narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "484819a16fdc1c76cdd62d8e94018db44e5e1a8b",
|
"rev": "b81dc0a385443099e7d231fe6275189e32c3b760",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -390,11 +390,11 @@
|
|||||||
"tinted-schemes": {
|
"tinted-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754779259,
|
"lastModified": 1757716333,
|
||||||
"narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=",
|
"narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "schemes",
|
"repo": "schemes",
|
||||||
"rev": "097d751b9e3c8b97ce158e7d141e5a292545b502",
|
"rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -406,11 +406,11 @@
|
|||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754788770,
|
"lastModified": 1757811970,
|
||||||
"narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=",
|
"narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "fb2175accef8935f6955503ec9dd3c973eec385c",
|
"rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -422,11 +422,11 @@
|
|||||||
"tinted-zed": {
|
"tinted-zed": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755613540,
|
"lastModified": 1757811247,
|
||||||
"narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=",
|
"narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-zed",
|
"repo": "base16-zed",
|
||||||
"rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0",
|
"rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -434,6 +434,26 @@
|
|||||||
"repo": "base16-zed",
|
"repo": "base16-zed",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"winboat": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1761401704,
|
||||||
|
"narHash": "sha256-zIaF3MEMNR17uiLLb+9bFjxar7EkOI6QyaOIxAhs/gQ=",
|
||||||
|
"owner": "TibixDev",
|
||||||
|
"repo": "winboat",
|
||||||
|
"rev": "aa868ea63512ab984c70c8a9e60ffe841a194167",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "TibixDev",
|
||||||
|
"repo": "winboat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
15
flake.nix
15
flake.nix
@@ -11,7 +11,14 @@
|
|||||||
|
|
||||||
stylix = {
|
stylix = {
|
||||||
url = "github:danth/stylix";
|
url = "github:danth/stylix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs = {
|
||||||
|
nixpkgs.follows = "nixpkgs";
|
||||||
|
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||||
|
nur.inputs = {
|
||||||
|
nixpkgs.follows = "nixpkgs";
|
||||||
|
flake-parts.follows = "stylix/flake-parts";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
auto-cpufreq = {
|
auto-cpufreq = {
|
||||||
@@ -29,13 +36,17 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
winboat = {
|
||||||
|
url = "github:TibixDev/winboat";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
|
nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{
|
{
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
home-manager,
|
|
||||||
nix-flatpak,
|
nix-flatpak,
|
||||||
auto-cpufreq,
|
auto-cpufreq,
|
||||||
...
|
...
|
||||||
|
|||||||
@@ -53,17 +53,19 @@
|
|||||||
# This will set your color palette
|
# This will set your color palette
|
||||||
# Default background
|
# Default background
|
||||||
# Add new images to ~/garandos/wallpapers
|
# Add new images to ~/garandos/wallpapers
|
||||||
stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
|
#stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
|
||||||
#stylixImage = ../../wallpapers/DW_Pacts.jpg;
|
#stylixImage = ../../wallpapers/DW_Pacts.jpg;
|
||||||
#stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
|
#stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
|
||||||
#stylixImage = ../../wallpapers/fire-nation.jpg;
|
#stylixImage = ../../wallpapers/fire-nation.jpg;
|
||||||
#stylixImage = ../../wallpapers/four-elements.jpg;
|
#stylixImage = ../../wallpapers/four-elements.jpg;
|
||||||
|
#stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
|
||||||
#stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
|
#stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
|
||||||
#stylixImage = ../../wallpapers/jablon.jpg;
|
#stylixImage = ../../wallpapers/jablon.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-two.jpg;
|
#stylixImage = ../../wallpapers/rammstein-log-two.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-one.jpg;
|
#stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-three.jpg;
|
#stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-one.jpg;
|
#stylixImage = ../../wallpapers/rammstein-one.jpg;
|
||||||
|
stylixImage = ../../wallpapers/1346530.jpeg;
|
||||||
|
|
||||||
# Set Waybar
|
# Set Waybar
|
||||||
# Available Options:
|
# Available Options:
|
||||||
|
|||||||
@@ -4,34 +4,54 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
modulesPath,
|
modulesPath,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci"];
|
boot = {
|
||||||
boot.initrd.kernelModules = [];
|
initrd = {
|
||||||
boot.kernelModules = ["kvm-amd"];
|
availableKernelModules = [
|
||||||
boot.extraModulePackages = [];
|
"nvme"
|
||||||
|
"xhci_pci"
|
||||||
fileSystems."/" = {
|
"usb_storage"
|
||||||
device = "/dev/disk/by-uuid/a96dc5a2-e2bf-4725-a7be-6b9d2b020fa6";
|
"sd_mod"
|
||||||
fsType = "ext4";
|
];
|
||||||
|
kernelModules = [ "dm-snapshot" ];
|
||||||
|
luks.devices.cryptroot = {
|
||||||
|
device = "/dev/disk/by-uuid/6abc2228-823e-42b0-94c7-48fda757732c";
|
||||||
|
preLVM = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
kernelModules = [ "kvm-amd" ];
|
||||||
|
extraModulePackages = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-9b24a6b5-14e7-4e50-bd1d-c1af7382027c".device = "/dev/disk/by-uuid/9b24a6b5-14e7-4e50-bd1d-c1af7382027c";
|
fileSystems = {
|
||||||
|
"/" = {
|
||||||
fileSystems."/boot" = {
|
device = "/dev/disk/by-uuid/d30939d0-53ed-4728-9190-6a5b9dec8fb4";
|
||||||
device = "/dev/disk/by-uuid/3D12-F697";
|
fsType = "ext4";
|
||||||
fsType = "vfat";
|
};
|
||||||
options = ["fmask=0077" "dmask=0077"];
|
"/home" = {
|
||||||
|
device = "/dev/disk/by-uuid/3df34a25-7e42-433d-b723-be80f1738ba5";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
"/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/0E68-9A34";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [
|
||||||
|
"fmask=0022"
|
||||||
|
"dmask=0022"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [
|
swapDevices = [
|
||||||
{device = "/dev/disk/by-uuid/f1c0ee39-01a9-4508-916a-978650d6c514";}
|
{ device = "/dev/disk/by-uuid/5da7c845-7dd3-4882-93af-2d679cdb5e7a"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
# 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
|
||||||
|
|||||||
@@ -57,17 +57,19 @@
|
|||||||
# This will set your color palette
|
# This will set your color palette
|
||||||
# Default background
|
# Default background
|
||||||
# Add new images to ~/garandos/wallpapers
|
# Add new images to ~/garandos/wallpapers
|
||||||
stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
|
#stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
|
||||||
#stylixImage = ../../wallpapers/DW_Pacts.jpg;
|
#stylixImage = ../../wallpapers/DW_Pacts.jpg;
|
||||||
#stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
|
#stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
|
||||||
#stylixImage = ../../wallpapers/fire-nation.jpg;
|
#stylixImage = ../../wallpapers/fire-nation.jpg;
|
||||||
#stylixImage = ../../wallpapers/four-elements.jpg;
|
#stylixImage = ../../wallpapers/four-elements.jpg;
|
||||||
|
#stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
|
||||||
#stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
|
#stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
|
||||||
#stylixImage = ../../wallpapers/jablon.jpg;
|
#stylixImage = ../../wallpapers/jablon.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-two.jpg;
|
#stylixImage = ../../wallpapers/rammstein-log-two.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-one.jpg;
|
#stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-three.jpg;
|
#stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-one.jpg;
|
#stylixImage = ../../wallpapers/rammstein-one.jpg;
|
||||||
|
stylixImage = ../../wallpapers/1346530.jpeg;
|
||||||
|
|
||||||
# Set Waybar
|
# Set Waybar
|
||||||
# Available Options:
|
# Available Options:
|
||||||
@@ -88,8 +90,8 @@
|
|||||||
# animations-end4.nix (end-4 project very fluid)
|
# animations-end4.nix (end-4 project very fluid)
|
||||||
# animations-dynamic.nix (ml4w project)
|
# animations-dynamic.nix (ml4w project)
|
||||||
# animations-moving.nix (ml4w project)
|
# animations-moving.nix (ml4w project)
|
||||||
animChoice = ../../modules/home/hyprland/animations-def.nix;
|
# animChoice = ../../modules/home/hyprland/animations-def.nix;
|
||||||
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||||
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||||
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
|
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
|
||||||
|
|
||||||
|
|||||||
@@ -59,17 +59,19 @@
|
|||||||
# This will set your color palette
|
# This will set your color palette
|
||||||
# Default background
|
# Default background
|
||||||
# Add new images to ~/garandos/wallpapers
|
# Add new images to ~/garandos/wallpapers
|
||||||
stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
|
#stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
|
||||||
#stylixImage = ../../wallpapers/DW_Pacts.jpg;
|
#stylixImage = ../../wallpapers/DW_Pacts.jpg;
|
||||||
#stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
|
#stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
|
||||||
#stylixImage = ../../wallpapers/fire-nation.jpg;
|
#stylixImage = ../../wallpapers/fire-nation.jpg;
|
||||||
#stylixImage = ../../wallpapers/four-elements.jpg;
|
#stylixImage = ../../wallpapers/four-elements.jpg;
|
||||||
|
#stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
|
||||||
#stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
|
#stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
|
||||||
#stylixImage = ../../wallpapers/jablon.jpg;
|
#stylixImage = ../../wallpapers/jablon.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-two.jpg;
|
#stylixImage = ../../wallpapers/rammstein-log-two.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-one.jpg;
|
#stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-log-three.jpg;
|
#stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
|
||||||
#stylixImage = ../../wallpapers/rammstein-one.jpg;
|
#stylixImage = ../../wallpapers/rammstein-one.jpg;
|
||||||
|
stylixImage = ../../wallpapers/1346530.jpeg;
|
||||||
|
|
||||||
# Set Waybar
|
# Set Waybar
|
||||||
# Available Options:
|
# Available Options:
|
||||||
|
|||||||
@@ -8,8 +8,23 @@
|
|||||||
kernel.sysctl = {
|
kernel.sysctl = {
|
||||||
"vm.max_map_count" = 2147483642;
|
"vm.max_map_count" = 2147483642;
|
||||||
};
|
};
|
||||||
loader.systemd-boot.enable = true;
|
loader = {
|
||||||
loader.efi.canTouchEfiVariables = true;
|
efi.canTouchEfiVariables = true;
|
||||||
|
limine = {
|
||||||
|
enable = true;
|
||||||
|
style = {
|
||||||
|
wallpapers = [
|
||||||
|
./../../wallpapers/attack-on-titan-mikasa-ackerman.jpg
|
||||||
|
];
|
||||||
|
wallpaperStyle = "centered";
|
||||||
|
backdrop = "${config.stylix.base16Scheme.base00}";
|
||||||
|
interface = {
|
||||||
|
branding = "GarandOS Bootloader";
|
||||||
|
resolution = "1920x1080";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
# Appimage Support
|
# Appimage Support
|
||||||
binfmt.registrations.appimage = {
|
binfmt.registrations.appimage = {
|
||||||
wrapInterpreterInShell = false;
|
wrapInterpreterInShell = false;
|
||||||
|
|||||||
@@ -6,13 +6,17 @@
|
|||||||
extraBackends = [ pkgs.sane-airscan ];
|
extraBackends = [ pkgs.sane-airscan ];
|
||||||
disabledDefaultBackends = [ "escl" ];
|
disabledDefaultBackends = [ "escl" ];
|
||||||
};
|
};
|
||||||
logitech.wireless.enable = false;
|
logitech.wireless = {
|
||||||
logitech.wireless.enableGraphical = false;
|
enable = false;
|
||||||
|
enableGraphical = false;
|
||||||
|
};
|
||||||
graphics.enable = true;
|
graphics.enable = true;
|
||||||
enableRedistributableFirmware = true;
|
enableRedistributableFirmware = true;
|
||||||
keyboard.qmk.enable = true;
|
keyboard.qmk.enable = true;
|
||||||
bluetooth.enable = true;
|
bluetooth = {
|
||||||
bluetooth.powerOnBoot = true;
|
enable = true;
|
||||||
|
powerOnBoot = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
local.hardware-clock.enable = false;
|
local.hardware-clock.enable = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,18 +2,13 @@
|
|||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Communication
|
# Communication
|
||||||
discord
|
|
||||||
slack
|
slack
|
||||||
mattermost-desktop
|
mattermost-desktop
|
||||||
# Productivity & Office
|
# Productivity & Office
|
||||||
bitwarden-desktop
|
bitwarden-desktop
|
||||||
tutanota-desktop
|
tutanota-desktop
|
||||||
anki-bin
|
iotas
|
||||||
onlyoffice-bin
|
logseq
|
||||||
# Cloud
|
|
||||||
nextcloud-client
|
|
||||||
# Browsers
|
|
||||||
ungoogled-chromium
|
|
||||||
# Utilities
|
# Utilities
|
||||||
galculator
|
galculator
|
||||||
gedit
|
gedit
|
||||||
|
|||||||
@@ -5,8 +5,6 @@
|
|||||||
nixd
|
nixd
|
||||||
nil
|
nil
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
# Editors & IDEs
|
|
||||||
zed-editor
|
|
||||||
# Learning & practice
|
# Learning & practice
|
||||||
exercism
|
exercism
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -6,11 +6,7 @@
|
|||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Gaming platforms
|
|
||||||
lutris
|
|
||||||
wineWowPackages.waylandFull
|
|
||||||
inputs.prismlauncher-cracked.packages.${system}.default
|
inputs.prismlauncher-cracked.packages.${system}.default
|
||||||
# Games
|
|
||||||
space-cadet-pinball
|
space-cadet-pinball
|
||||||
tty-solitaire
|
tty-solitaire
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
# pkgs
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
@@ -18,5 +19,11 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableSSHSupport = true;
|
enableSSHSupport = true;
|
||||||
};
|
};
|
||||||
|
nix-ld = {
|
||||||
|
enable = true;
|
||||||
|
# libraries = with pkgs; [
|
||||||
|
# biome
|
||||||
|
# ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,6 +41,10 @@
|
|||||||
appimage-run
|
appimage-run
|
||||||
libnotify
|
libnotify
|
||||||
v4l-utils
|
v4l-utils
|
||||||
kronometer
|
tasktimer
|
||||||
|
# Language dicts for Iotas
|
||||||
|
hunspell
|
||||||
|
hunspellDicts.pl_PL
|
||||||
|
hunspellDicts.en_US
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,17 @@
|
|||||||
{ pkgs, ... }:
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
system,
|
||||||
|
...
|
||||||
|
}:
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
virt-viewer
|
virt-viewer
|
||||||
lazydocker
|
lazydocker
|
||||||
docker-client
|
docker-client
|
||||||
docker-compose
|
|
||||||
distrobox
|
distrobox
|
||||||
|
boxbuddy
|
||||||
|
freerdp
|
||||||
|
inputs.winboat.packages.${system}.winboat
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,74 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
{
|
|
||||||
programs = {
|
|
||||||
starship = {
|
|
||||||
enable = false;
|
|
||||||
settings = {
|
|
||||||
add_newline = false;
|
|
||||||
buf = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
c = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
directory = {
|
|
||||||
read_only = " ";
|
|
||||||
};
|
|
||||||
docker_context = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
fossil_branch = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
git_branch = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
golang = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
hg_branch = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
hostname = {
|
|
||||||
ssh_symbol = " ";
|
|
||||||
};
|
|
||||||
lua = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
memory_usage = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
meson = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
nim = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
nix_shell = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
nodejs = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
ocaml = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
package = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
python = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
rust = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
swift = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
zig = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -8,16 +8,14 @@
|
|||||||
gamescopeSession.enable = true;
|
gamescopeSession.enable = true;
|
||||||
extraCompatPackages = [ pkgs.proton-ge-bin ];
|
extraCompatPackages = [ pkgs.proton-ge-bin ];
|
||||||
};
|
};
|
||||||
|
# gamescope = {
|
||||||
gamescope = {
|
# enable = true;
|
||||||
enable = true;
|
# capSysNice = true;
|
||||||
capSysNice = true;
|
# args = [
|
||||||
args = [
|
# "--rt"
|
||||||
"--rt"
|
# "--expose-wayland"
|
||||||
"--expose-wayland"
|
# ];
|
||||||
];
|
# };
|
||||||
};
|
|
||||||
|
|
||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,5 +16,6 @@ in
|
|||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ];
|
systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ];
|
||||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||||
|
environment.systemPackages = with pkgs; [ rocmPackages.rocm-smi ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
@@ -14,27 +15,47 @@ in
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
hardware.nvidia = {
|
environment.systemPackages = with pkgs; [ nvidia-docker ];
|
||||||
# Modesetting is required.
|
hardware = {
|
||||||
modesetting.enable = true;
|
nvidia-container-toolkit.enable = true;
|
||||||
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
|
nvidia = {
|
||||||
powerManagement.enable = true;
|
# Modesetting is required.
|
||||||
# Fine-grained power management. Turns off GPU when not in use.
|
modesetting.enable = true;
|
||||||
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
|
||||||
powerManagement.finegrained = false;
|
powerManagement.enable = true;
|
||||||
# Use the NVidia open source kernel module (not to be confused with the
|
# Fine-grained power management. Turns off GPU when not in use.
|
||||||
# independent third-party "nouveau" open source driver).
|
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
||||||
# Support is limited to the Turing and later architectures. Full list of
|
powerManagement.finegrained = false;
|
||||||
# supported GPUs is at:
|
# Use the NVidia open source kernel module (not to be confused with the
|
||||||
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
|
# independent third-party "nouveau" open source driver).
|
||||||
# Only available from driver 515.43.04+
|
# Support is limited to the Turing and later architectures. Full list of
|
||||||
# Currently alpha-quality/buggy, so false is currently the recommended setting.
|
# supported GPUs is at:
|
||||||
open = false;
|
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
|
||||||
# Enable the Nvidia settings menu,
|
# Only available from driver 515.43.04+
|
||||||
# accessible via `nvidia-settings`.
|
# Currently alpha-quality/buggy, so false is currently the recommended setting.
|
||||||
nvidiaSettings = true;
|
open = false;
|
||||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
# Enable the Nvidia settings menu,
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
# accessible via `nvidia-settings`.
|
||||||
|
nvidiaSettings = true;
|
||||||
|
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||||
|
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Making nvidia docker toolkit work:
|
||||||
|
#
|
||||||
|
# sudo nvidia-ctk cdi generate --output=/etc/cdi/nvidia.yaml
|
||||||
|
#
|
||||||
|
# sudo nvidia-ctk cdi list
|
||||||
|
#
|
||||||
|
# sudo tee /etc/docker/daemon.json > /dev/null <<EOF
|
||||||
|
# {
|
||||||
|
# "features": {
|
||||||
|
# "cdi": true
|
||||||
|
# }
|
||||||
|
# }
|
||||||
|
# EOF
|
||||||
|
#
|
||||||
|
# docker run --device nvidia.com/gpu=all
|
||||||
|
|||||||
10
modules/home/anki.nix
Normal file
10
modules/home/anki.nix
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
{ pkgs, username, ... }:
|
||||||
|
{
|
||||||
|
programs.anki = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.anki;
|
||||||
|
language = "pl_PL";
|
||||||
|
style = "native";
|
||||||
|
sync.username = username;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -6,10 +6,11 @@
|
|||||||
pullos = "git -C /home/${username}/garandos pull";
|
pullos = "git -C /home/${username}/garandos pull";
|
||||||
upd = "nh os switch --hostname ${host}";
|
upd = "nh os switch --hostname ${host}";
|
||||||
upg = "nh os switch --hostname ${host} --update";
|
upg = "nh os switch --hostname ${host} --update";
|
||||||
|
upf = "sudo nix flake update";
|
||||||
upd-bt = "nh os boot --hostname ${host}";
|
upd-bt = "nh os boot --hostname ${host}";
|
||||||
upd-ts = "nh os test --hostname ${host}";
|
upd-ts = "nh os test --hostname ${host}";
|
||||||
upd-bd = "nh os build --hostname ${host}";
|
upd-bd = "nh os build --hostname ${host}";
|
||||||
ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
|
ncg = "nh clean all";
|
||||||
|
|
||||||
# Development aliases
|
# Development aliases
|
||||||
srvenv = "source .venv/bin/activate";
|
srvenv = "source .venv/bin/activate";
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ _: {
|
|||||||
programs.bash = {
|
programs.bash = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
initExtra = ''
|
# initExtra = ''
|
||||||
fastfetch
|
# fastfetch
|
||||||
'';
|
# '';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{ config, ... }:
|
_: {
|
||||||
{
|
|
||||||
programs.cava = {
|
programs.cava = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|||||||
37
modules/home/chromium.nix
Normal file
37
modules/home/chromium.nix
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
programs.chromium = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.ungoogled-chromium;
|
||||||
|
commandLineArgs = [
|
||||||
|
"--disable-gpu" # Do czasu aż naprawią problemy
|
||||||
|
];
|
||||||
|
dictionaries = with pkgs; [
|
||||||
|
hunspellDictsChromium.en_US
|
||||||
|
# hunspellDictsChromium.pl_PL Jeśli się taka pojawi
|
||||||
|
];
|
||||||
|
extensions = [
|
||||||
|
{
|
||||||
|
id = "ocaahdebbfolfmndjeplogmgcagdmblk"; # Chromium Web Store
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; # Dark Reader
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "fnaicdffflnofjppbagibeoednhnbjhg"; # floccus bookmarks sync
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "amknoiejhlmhancpahfcfcfhllgkpbld"; # Hoppscotch Browser Extension
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "nngceckbapebfimnlniiiahkandclblb"; # Menedżer haseł Bitwarden
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "fdaphilojaklgkoocegabckfanjoacjg"; # mtab
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; # uBlock Origin
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@ in
|
|||||||
waybarChoice
|
waybarChoice
|
||||||
./wlogout
|
./wlogout
|
||||||
./amfora.nix
|
./amfora.nix
|
||||||
|
./anki.nix
|
||||||
./bash.nix
|
./bash.nix
|
||||||
./bash-aliases.nix
|
./bash-aliases.nix
|
||||||
./bash-functions.nix
|
./bash-functions.nix
|
||||||
@@ -18,17 +19,20 @@ in
|
|||||||
./btop.nix
|
./btop.nix
|
||||||
./bottom.nix
|
./bottom.nix
|
||||||
./cava.nix
|
./cava.nix
|
||||||
|
./chromium.nix
|
||||||
./emoji.nix
|
./emoji.nix
|
||||||
./eza.nix
|
./eza.nix
|
||||||
./fzf.nix
|
./fzf.nix
|
||||||
./gh.nix
|
./gh.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./gtk.nix
|
./gtk.nix
|
||||||
./htop.nix
|
./kdeConnect.nix
|
||||||
./kitty.nix
|
./kitty.nix
|
||||||
./lazygit.nix
|
|
||||||
./librewolf.nix
|
./librewolf.nix
|
||||||
|
./lutris.nix
|
||||||
|
./nextcloud.nix
|
||||||
./obs-studio.nix
|
./obs-studio.nix
|
||||||
|
./onlyoffice.nix
|
||||||
./qt.nix
|
./qt.nix
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
./starship.nix
|
./starship.nix
|
||||||
@@ -36,10 +40,11 @@ in
|
|||||||
./swappy.nix
|
./swappy.nix
|
||||||
./swaync.nix
|
./swaync.nix
|
||||||
./tealdeer.nix
|
./tealdeer.nix
|
||||||
|
./vesktop.nix
|
||||||
./virtmanager.nix
|
./virtmanager.nix
|
||||||
./xdg.nix
|
./xdg.nix
|
||||||
./zoxide.nix
|
./zoxide.nix
|
||||||
./vscode.nix
|
./vscode.nix
|
||||||
# ./zed.nix
|
./zed.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
type = "os";
|
type = "os";
|
||||||
key = "│ OS";
|
key = "│ OS";
|
||||||
keyColor = "31";
|
keyColor = "31";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,29 +5,19 @@ in
|
|||||||
{
|
{
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "${gitUsername}";
|
settings = {
|
||||||
userEmail = "${gitEmail}";
|
user = {
|
||||||
|
name = "${gitUsername}";
|
||||||
extraConfig = {
|
email = "${gitEmail}";
|
||||||
# FOSS-friendly settings
|
};
|
||||||
push.default = "simple"; # Match modern push behavior
|
push.default = "simple";
|
||||||
credential.helper = "cache --timeout=7200";
|
credential.helper = "cache --timeout=7200";
|
||||||
init.defaultBranch = "main"; # Set default new branches to 'main'
|
init.defaultBranch = "main";
|
||||||
log.decorate = "full"; # Show branch/tag info in git log
|
log = {
|
||||||
log.date = "iso"; # ISO 8601 date format
|
decorate = "full";
|
||||||
# Conflict resolution style for readable diffs
|
date = "iso";
|
||||||
|
};
|
||||||
merge.conflictStyle = "diff3";
|
merge.conflictStyle = "diff3";
|
||||||
};
|
};
|
||||||
# Optional: FOSS-friendly Git aliases
|
|
||||||
aliases = {
|
|
||||||
br = "branch --sort=-committerdate";
|
|
||||||
co = "checkout";
|
|
||||||
df = "diff";
|
|
||||||
com = "commit -a";
|
|
||||||
gs = "stash";
|
|
||||||
gp = "pull";
|
|
||||||
lg = "log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %C(green)(%cr)%C(bold blue) <%an>%Creset' --abbrev-commit";
|
|
||||||
st = "status";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,46 +0,0 @@
|
|||||||
{ config, ... }:
|
|
||||||
{
|
|
||||||
programs.htop = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
color_scheme = 6;
|
|
||||||
cpu_count_from_one = 0;
|
|
||||||
delay = 15;
|
|
||||||
fields = with config.lib.htop.fields; [
|
|
||||||
PID
|
|
||||||
USER
|
|
||||||
PRIORITY
|
|
||||||
NICE
|
|
||||||
M_SIZE
|
|
||||||
M_RESIDENT
|
|
||||||
M_SHARE
|
|
||||||
STATE
|
|
||||||
PERCENT_CPU
|
|
||||||
PERCENT_MEM
|
|
||||||
TIME
|
|
||||||
COMM
|
|
||||||
];
|
|
||||||
highlight_base_name = 1;
|
|
||||||
highlight_megabytes = 1;
|
|
||||||
highlight_threads = 1;
|
|
||||||
}
|
|
||||||
// (
|
|
||||||
with config.lib.htop;
|
|
||||||
leftMeters [
|
|
||||||
(bar "AllCPUs2")
|
|
||||||
(bar "Memory")
|
|
||||||
(bar "Swap")
|
|
||||||
(text "Zram")
|
|
||||||
]
|
|
||||||
)
|
|
||||||
// (
|
|
||||||
with config.lib.htop;
|
|
||||||
rightMeters [
|
|
||||||
(text "Tasks")
|
|
||||||
(text "LoadAverage")
|
|
||||||
(text "Uptime")
|
|
||||||
(text "Systemd")
|
|
||||||
]
|
|
||||||
);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -10,10 +10,12 @@ in
|
|||||||
# APLIKACJE - GŁÓWNE
|
# APLIKACJE - GŁÓWNE
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
"$modifier, A, exec, anki"
|
"$modifier, A, exec, anki"
|
||||||
"$modifier, B, exec, btop"
|
"$modifier, B, exec, bitwarden"
|
||||||
"$modifier, C, exec, chromium"
|
"$modifier, C, exec, chromium"
|
||||||
"$modifier, D, exec, discord"
|
"$modifier, D, exec, vesktop"
|
||||||
"$modifier, G, exec, gimp"
|
"$modifier, G, exec, gimp"
|
||||||
|
"$modifier, I, exec, iotas"
|
||||||
|
"$modifier, L, exec, logseq"
|
||||||
"$modifier, M, exec, plexamp"
|
"$modifier, M, exec, plexamp"
|
||||||
"$modifier, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop"
|
"$modifier, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop"
|
||||||
"$modifier, O, exec, obs"
|
"$modifier, O, exec, obs"
|
||||||
@@ -40,6 +42,8 @@ in
|
|||||||
# =============================================================================
|
# =============================================================================
|
||||||
# APLIKACJE - Z ALT I CONTROL
|
# APLIKACJE - Z ALT I CONTROL
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
"$modifier ALT, B, exec, btop"
|
||||||
|
"$modifier ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop"
|
||||||
"$modifier ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop"
|
"$modifier ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop"
|
||||||
"$modifier ALT, S, exec, slack"
|
"$modifier ALT, S, exec, slack"
|
||||||
"$modifier CONTROL, M, exec, mattermost-desktop"
|
"$modifier CONTROL, M, exec, mattermost-desktop"
|
||||||
@@ -50,7 +54,6 @@ in
|
|||||||
"$modifier, E, exec, emopicker9000"
|
"$modifier, E, exec, emopicker9000"
|
||||||
"$modifier, K, exec, galculator"
|
"$modifier, K, exec, galculator"
|
||||||
"$modifier, P, exec, hyprpicker -a"
|
"$modifier, P, exec, hyprpicker -a"
|
||||||
"$modifier ALT, K, exec, kronometer"
|
|
||||||
"$modifier ALT, W, exec, wallsetter"
|
"$modifier ALT, W, exec, wallsetter"
|
||||||
"$modifier SHIFT, K, exec, list-keybinds"
|
"$modifier SHIFT, K, exec, list-keybinds"
|
||||||
"$modifier SHIFT, P, exec, pavucontrol"
|
"$modifier SHIFT, P, exec, pavucontrol"
|
||||||
@@ -62,6 +65,7 @@ in
|
|||||||
"$modifier, Escape, exec, hyprlock"
|
"$modifier, Escape, exec, hyprlock"
|
||||||
"$modifier, F, fullscreen,"
|
"$modifier, F, fullscreen,"
|
||||||
"$modifier, Q, killactive,"
|
"$modifier, Q, killactive,"
|
||||||
|
"$modifier CONTROL, Escape, exec, wlogout"
|
||||||
"$modifier SHIFT, Escape, exit,"
|
"$modifier SHIFT, Escape, exit,"
|
||||||
"$modifier SHIFT, I, togglesplit,"
|
"$modifier SHIFT, I, togglesplit,"
|
||||||
|
|
||||||
|
|||||||
@@ -9,8 +9,7 @@ in
|
|||||||
exec-once = [
|
exec-once = [
|
||||||
"wl-paste --type text --watch cliphist store" # Saves text
|
"wl-paste --type text --watch cliphist store" # Saves text
|
||||||
"wl-paste --type image --watch cliphist store" # Saves images
|
"wl-paste --type image --watch cliphist store" # Saves images
|
||||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||||
"
|
|
||||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||||
"systemctl --user start hyprpolkitagent"
|
"systemctl --user start hyprpolkitagent"
|
||||||
|
|
||||||
|
|||||||
@@ -135,6 +135,10 @@ in
|
|||||||
direct_scanout = 0;
|
direct_scanout = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
debug = {
|
||||||
|
full_cm_proto = true;
|
||||||
|
};
|
||||||
|
|
||||||
master = {
|
master = {
|
||||||
new_status = "master";
|
new_status = "master";
|
||||||
new_on_top = 1;
|
new_on_top = 1;
|
||||||
|
|||||||
8
modules/home/kdeConnect.nix
Normal file
8
modules/home/kdeConnect.nix
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
services.kdeconnect = {
|
||||||
|
enable = true;
|
||||||
|
indicator = true;
|
||||||
|
package = pkgs.kdePackages.kdeconnect-kde;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
# Lazygit is a simple terminal UI for git commands.
|
|
||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
accent = "#${config.lib.stylix.colors.base0D}";
|
|
||||||
muted = "#${config.lib.stylix.colors.base03}";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
programs.lazygit = {
|
|
||||||
enable = true;
|
|
||||||
settings = lib.mkForce {
|
|
||||||
disableStartupPopups = true;
|
|
||||||
notARepository = "skip";
|
|
||||||
promptToReturnFromSubprocess = false;
|
|
||||||
update.method = "never";
|
|
||||||
git = {
|
|
||||||
commit.signOff = true;
|
|
||||||
parseEmoji = true;
|
|
||||||
};
|
|
||||||
gui = {
|
|
||||||
theme = {
|
|
||||||
activeBorderColor = [
|
|
||||||
accent
|
|
||||||
"bold"
|
|
||||||
];
|
|
||||||
inactiveBorderColor = [ muted ];
|
|
||||||
};
|
|
||||||
showListFooter = false;
|
|
||||||
showRandomTip = false;
|
|
||||||
showCommandLog = false;
|
|
||||||
showBottomLine = false;
|
|
||||||
nerdFontsVersion = "3";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
11
modules/home/lutris.nix
Normal file
11
modules/home/lutris.nix
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{ pkgs, osConfig, ... }:
|
||||||
|
{
|
||||||
|
programs.lutris = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.lutris;
|
||||||
|
protonPackages = [ pkgs.proton-ge-bin ];
|
||||||
|
winePackages = [ pkgs.wineWowPackages.waylandFull ];
|
||||||
|
defaultWinePackage = pkgs.wineWowPackages.waylandFull;
|
||||||
|
steamPackage = osConfig.programs.steam.package;
|
||||||
|
};
|
||||||
|
}
|
||||||
8
modules/home/nextcloud.nix
Normal file
8
modules/home/nextcloud.nix
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
services.nextcloud-client = {
|
||||||
|
enable = true;
|
||||||
|
startInBackground = true;
|
||||||
|
package = pkgs.nextcloud-client;
|
||||||
|
};
|
||||||
|
}
|
||||||
13
modules/home/onlyoffice.nix
Normal file
13
modules/home/onlyoffice.nix
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
programs.onlyoffice = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.onlyoffice-desktopeditors;
|
||||||
|
settings = {
|
||||||
|
UITheme = "theme-night";
|
||||||
|
editorWindowMode = false;
|
||||||
|
position = "@Rect(10 50 1900 1020)";
|
||||||
|
titlebar = "custom";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
icon-theme = "Papirus";
|
icon-theme = "Papirus";
|
||||||
font = "JetBrainsMono Nerd Font Mono 12";
|
font = "JetBrainsMono Nerd Font Mono 12";
|
||||||
drun-display-format = "{icon} {name}";
|
drun-display-format = "{icon} {name}";
|
||||||
display-drun = " Apps";
|
display-drun = " Apps";
|
||||||
display-run = " Run";
|
display-run = " Run";
|
||||||
display-filebrowser = " File";
|
display-filebrowser = " File";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,8 +11,17 @@ pkgs.writeShellScriptBin "list-keybinds" ''
|
|||||||
msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)'
|
msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)'
|
||||||
keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind')
|
keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind')
|
||||||
|
|
||||||
# replace #modifier with SUPER in the displayed keybinds for rofi
|
# replace $modifier with SUPER and clean up paths
|
||||||
display_keybinds=$(echo "$keybinds" | sed 's/\$modifier//g' | sed 's|${desktopEntriesPath}/||g')
|
display_keybinds=$(echo "$keybinds" | sed 's/\$modifier//g' | sed 's|${desktopEntriesPath}/||g')
|
||||||
|
|
||||||
|
# remove "bind=" and "bindm=" prefixes
|
||||||
|
display_keybinds=$(echo "$display_keybinds" | sed 's/^bind=//' | sed 's/^bindm=/🖱️/')
|
||||||
|
|
||||||
|
# add + before CONTROL, SHIFT, ALT when they appear after removed $modifier
|
||||||
|
display_keybinds=$(echo "$display_keybinds" | sed 's/ CONTROL/ + CONTROL/g' | sed 's/ SHIFT/ + SHIFT/g' | sed 's/ ALT/ + ALT/g')
|
||||||
|
|
||||||
|
# replace commas: first comma -> " +", second comma -> " =", remaining commas -> " ->"
|
||||||
|
display_keybinds=$(echo "$display_keybinds" | sed 's/,/ +/1' | sed 's/,/ =/1' | sed 's/,/ ->/g')
|
||||||
|
|
||||||
# use rofi to display the keybinds with the modified content
|
# use rofi to display the keybinds with the modified content
|
||||||
echo "$display_keybinds" | rofi -dmenu -i -config ~/.config/rofi/config-long.rasi -mesg "$msg"
|
echo "$display_keybinds" | rofi -dmenu -i -config ~/.config/rofi/config-long.rasi -mesg "$msg"
|
||||||
|
|||||||
@@ -35,21 +35,24 @@ in
|
|||||||
truncation_symbol = "…/";
|
truncation_symbol = "…/";
|
||||||
truncate_to_repo = false;
|
truncate_to_repo = false;
|
||||||
substitutions = {
|
substitutions = {
|
||||||
"Documents" = "";
|
"Documents" = " ";
|
||||||
"Downloads" = " ";
|
"Downloads" = " ";
|
||||||
"Music" = " ";
|
"Music" = " ";
|
||||||
"Pictures" = " ";
|
"Pictures" = " ";
|
||||||
|
"Projects" = " ";
|
||||||
|
"nix" = " ";
|
||||||
|
"nixos" = " ";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
character = {
|
character = {
|
||||||
success_symbol = "[❯](${accent})";
|
success_symbol = "[ ](${accent})";
|
||||||
error_symbol = "[❯](red)";
|
error_symbol = "[ ](red)";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix_shell = {
|
nix_shell = {
|
||||||
format = "[$symbol]($style) ";
|
format = "[$symbol]($style) ";
|
||||||
symbol = " ";
|
symbol = " ";
|
||||||
style = "";
|
style = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,9 @@
|
|||||||
rofi.enable = false;
|
rofi.enable = false;
|
||||||
hyprland.enable = false;
|
hyprland.enable = false;
|
||||||
hyprlock.enable = false;
|
hyprlock.enable = false;
|
||||||
ghostty.enable = false;
|
|
||||||
vscode.enable = false;
|
vscode.enable = false;
|
||||||
|
zed.enable = false;
|
||||||
|
vesktop.enable = false;
|
||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
platform = "qtct";
|
platform = "qtct";
|
||||||
|
|||||||
3
modules/home/vesktop.nix
Normal file
3
modules/home/vesktop.nix
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
_: {
|
||||||
|
programs.vesktop.enable = true;
|
||||||
|
}
|
||||||
@@ -130,7 +130,7 @@ with lib;
|
|||||||
};
|
};
|
||||||
"custom/startmenu" = {
|
"custom/startmenu" = {
|
||||||
tooltip = false;
|
tooltip = false;
|
||||||
format = " ";
|
format = " ";
|
||||||
# exec = "rofi -show drun";
|
# exec = "rofi -show drun";
|
||||||
on-click = "rofi -show drun";
|
on-click = "rofi -show drun";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ with lib;
|
|||||||
};
|
};
|
||||||
"custom/startmenu" = {
|
"custom/startmenu" = {
|
||||||
tooltip = false;
|
tooltip = false;
|
||||||
format = " ";
|
format = " ";
|
||||||
# exec = "rofi -show drun";
|
# exec = "rofi -show drun";
|
||||||
on-click = "rofi -show drun";
|
on-click = "rofi -show drun";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, config, ... }:
|
||||||
let
|
let
|
||||||
messengerIcon = pkgs.fetchurl {
|
messengerIcon = pkgs.fetchurl {
|
||||||
url = "https://assets.stickpng.com/images/580b57fcd9996e24bc43c526.png";
|
url = "https://assets.stickpng.com/images/580b57fcd9996e24bc43c526.png";
|
||||||
@@ -20,6 +20,10 @@ let
|
|||||||
url = "https://registry.npmmirror.com/@lobehub/icons-static-png/1.65.0/files/dark/claude-color.png";
|
url = "https://registry.npmmirror.com/@lobehub/icons-static-png/1.65.0/files/dark/claude-color.png";
|
||||||
sha256 = "sha256-wmYmbmT2/bR4JrnZJu2stjRZm//O5TB9EPE2NQWdGkQ=";
|
sha256 = "sha256-wmYmbmT2/bR4JrnZJu2stjRZm//O5TB9EPE2NQWdGkQ=";
|
||||||
};
|
};
|
||||||
|
glanceIcon = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/glance.png";
|
||||||
|
sha256 = "sha256-xyFlmPpt+DABoGX5oBqj/aQVdxtmNflat9Jb2BE7SOY=";
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
xdg = {
|
xdg = {
|
||||||
@@ -28,8 +32,23 @@ in
|
|||||||
mimeApps.enable = true;
|
mimeApps.enable = true;
|
||||||
portal = {
|
portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
|
extraPortals = with pkgs; [
|
||||||
configPackages = [ pkgs.hyprland ];
|
xdg-desktop-portal-hyprland
|
||||||
|
xdg-desktop-portal-gtk
|
||||||
|
kdePackages.xdg-desktop-portal-kde
|
||||||
|
];
|
||||||
|
configPackages = [ config.wayland.windowManager.hyprland.package ];
|
||||||
|
config = {
|
||||||
|
common.default = "*";
|
||||||
|
hyprland = {
|
||||||
|
default = [
|
||||||
|
"hyprland"
|
||||||
|
"gtk"
|
||||||
|
];
|
||||||
|
"org.freedesktop.impl.portal.FileChooser" = "kde";
|
||||||
|
"org.freedesktop.impl.portal.Print" = "kde";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
desktopEntries = {
|
desktopEntries = {
|
||||||
"messenger" = {
|
"messenger" = {
|
||||||
@@ -72,6 +91,14 @@ in
|
|||||||
terminal = false;
|
terminal = false;
|
||||||
type = "Application";
|
type = "Application";
|
||||||
};
|
};
|
||||||
|
"glance" = {
|
||||||
|
name = "Glance";
|
||||||
|
genericName = "Glance";
|
||||||
|
exec = "chromium --profile-directory=Default --app=https://glance.garandplg.com/";
|
||||||
|
icon = "${glanceIcon}";
|
||||||
|
terminal = false;
|
||||||
|
type = "Application";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,124 +1,118 @@
|
|||||||
{ pkgs, lib, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
programs.zed-editor = {
|
programs.zed-editor = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.zed-editor;
|
||||||
|
installRemoteServer = true;
|
||||||
|
|
||||||
extensions = [
|
extensions = [
|
||||||
"nix"
|
|
||||||
"one-dark-pro-monokai-darker"
|
|
||||||
"toml"
|
"toml"
|
||||||
"superhtml"
|
|
||||||
"dockerfile"
|
"dockerfile"
|
||||||
"docker-compose"
|
"git-firefly"
|
||||||
"vue"
|
"vue"
|
||||||
|
"astro"
|
||||||
|
"docker-compose"
|
||||||
|
"nix"
|
||||||
|
"csv"
|
||||||
|
"rainbow-csv"
|
||||||
"vscode-icons"
|
"vscode-icons"
|
||||||
|
"codebook"
|
||||||
|
"python-requirements"
|
||||||
|
"one-dark-pro-monokai-darker"
|
||||||
|
"hyprlang"
|
||||||
|
"json5"
|
||||||
|
"html-jinja"
|
||||||
|
"deputy"
|
||||||
|
"biome"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
extraPackages = with pkgs; [ biome ];
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
assistant = {
|
agent = {
|
||||||
enabled = true;
|
always_allow_tool_actions = true;
|
||||||
version = "2";
|
default_profile = "ask";
|
||||||
default_open_ai_model = null;
|
|
||||||
### PROVIDER OPTIONS
|
|
||||||
### zed.dev models { claude-3-5-sonnet-latest } requires github connected
|
|
||||||
### anthropic models { claude-3-5-sonnet-latest claude-3-haiku-latest claude-3-opus-latest } requires API_KEY
|
|
||||||
### copilot_chat models { gpt-4o gpt-4 gpt-3.5-turbo o1-preview } requires github connected
|
|
||||||
default_model = {
|
default_model = {
|
||||||
provider = "zed.dev";
|
provider = "anthropic";
|
||||||
model = "claude-3-5-sonnet-latest";
|
model = "claude-sonnet-4-latest";
|
||||||
};
|
|
||||||
|
|
||||||
# inline_alternatives = [
|
|
||||||
# {
|
|
||||||
# provider = "copilot_chat";
|
|
||||||
# model = "gpt-3.5-turbo";
|
|
||||||
# }
|
|
||||||
# ];
|
|
||||||
};
|
|
||||||
|
|
||||||
node = {
|
|
||||||
path = lib.getExe pkgs.nodejs;
|
|
||||||
npm_path = lib.getExe' pkgs.nodejs "npm";
|
|
||||||
};
|
|
||||||
|
|
||||||
hour_format = "hour24";
|
|
||||||
auto_update = false;
|
|
||||||
terminal = {
|
|
||||||
alternate_scroll = "off";
|
|
||||||
blinking = "off";
|
|
||||||
copy_on_select = false;
|
|
||||||
dock = "bottom";
|
|
||||||
detect_venv = {
|
|
||||||
on = {
|
|
||||||
directories = [
|
|
||||||
".env"
|
|
||||||
"env"
|
|
||||||
".venv"
|
|
||||||
"venv"
|
|
||||||
];
|
|
||||||
activate_script = "default";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
# env = {
|
|
||||||
# TERM = "alacritty";
|
|
||||||
# };
|
|
||||||
font_family = "FiraCode Nerd Font";
|
|
||||||
font_features = null;
|
|
||||||
font_size = null;
|
|
||||||
line_height = "comfortable";
|
|
||||||
option_as_meta = false;
|
|
||||||
button = false;
|
|
||||||
shell = "system";
|
|
||||||
#{
|
|
||||||
# program = "zsh";
|
|
||||||
#};
|
|
||||||
toolbar = {
|
|
||||||
title = true;
|
|
||||||
};
|
|
||||||
working_directory = "current_project_directory";
|
|
||||||
};
|
|
||||||
|
|
||||||
# lsp = {
|
|
||||||
# rust-analyzer = {
|
|
||||||
# binary = {
|
|
||||||
# path = lib.getExe pkgs.rust-analyzer;
|
|
||||||
# path_lookup = true;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# nix = {
|
|
||||||
# binary = {
|
|
||||||
# path_lookup = true;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
languages = {
|
|
||||||
"HTML" = {
|
|
||||||
"language_servers" = [
|
|
||||||
"vscode-html-language-server"
|
|
||||||
"superhtml"
|
|
||||||
];
|
|
||||||
"formatter" = {
|
|
||||||
"language_server" = {
|
|
||||||
"name" = "superhtml";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
telemetry = {
|
||||||
vim_mode = false;
|
diagnostics = false;
|
||||||
load_direnv = "shell_hook";
|
metrics = false;
|
||||||
base_keymap = "VSCode";
|
|
||||||
theme = {
|
|
||||||
mode = "system";
|
|
||||||
light = "One Dark Pro Monokai Darker Theme";
|
|
||||||
dark = "One Dark Pro Monokai Darker Theme";
|
|
||||||
};
|
};
|
||||||
show_whitespaces = "all";
|
icon_theme = "VSCode Icons (Dark)";
|
||||||
ui_font_size = 16;
|
ui_font_size = 16;
|
||||||
buffer_font_size = 16;
|
buffer_font_size = 15;
|
||||||
|
theme = {
|
||||||
|
mode = "dark";
|
||||||
|
light = "One Light";
|
||||||
|
dark = "One Dark Pro Monokai Darker";
|
||||||
|
};
|
||||||
|
languages = {
|
||||||
|
Python = {
|
||||||
|
language_servers = [ "!basedpyright" ];
|
||||||
|
};
|
||||||
|
YAML = {
|
||||||
|
tab_size = 2;
|
||||||
|
};
|
||||||
|
JavaScript = {
|
||||||
|
formatter.language_server.name = "biome";
|
||||||
|
code_actions_on_format = {
|
||||||
|
"source.fixAll.biome" = true;
|
||||||
|
"source.organizeImports.biome" = true;
|
||||||
|
};
|
||||||
|
tab_size = 2;
|
||||||
|
};
|
||||||
|
TypeScript = {
|
||||||
|
formatter.language_server.name = "biome";
|
||||||
|
code_actions_on_format = {
|
||||||
|
"source.fixAll.biome" = true;
|
||||||
|
"source.organizeImports.biome" = true;
|
||||||
|
};
|
||||||
|
tab_size = 2;
|
||||||
|
};
|
||||||
|
Astro = {
|
||||||
|
formatter.language_server.name = "biome";
|
||||||
|
code_actions_on_format = {
|
||||||
|
"source.fixAll.biome" = true;
|
||||||
|
"source.organizeImports.biome" = true;
|
||||||
|
};
|
||||||
|
tab_size = 2;
|
||||||
|
};
|
||||||
|
"Vue.js" = {
|
||||||
|
formatter.language_server.name = "biome";
|
||||||
|
code_actions_on_format = {
|
||||||
|
"source.fixAll.biome" = true;
|
||||||
|
"source.organizeImports.biome" = true;
|
||||||
|
};
|
||||||
|
tab_size = 2;
|
||||||
|
};
|
||||||
|
JSON = {
|
||||||
|
formatter.language_server.name = "biome";
|
||||||
|
code_actions_on_format = {
|
||||||
|
"source.fixAll.biome" = true;
|
||||||
|
"source.organizeImports.biome" = true;
|
||||||
|
};
|
||||||
|
tab_size = 2;
|
||||||
|
};
|
||||||
|
JSONC = {
|
||||||
|
formatter.language_server.name = "biome";
|
||||||
|
code_actions_on_format = {
|
||||||
|
"source.fixAll.biome" = true;
|
||||||
|
"source.organizeImports.biome" = true;
|
||||||
|
};
|
||||||
|
tab_size = 2;
|
||||||
|
};
|
||||||
|
CSS = {
|
||||||
|
formatter.language_server.name = "biome";
|
||||||
|
code_actions_on_format = {
|
||||||
|
"source.fixAll.biome" = true;
|
||||||
|
"source.organizeImports.biome" = true;
|
||||||
|
};
|
||||||
|
tab_size = 2;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
wallpapers/1346530.jpeg
Normal file
BIN
wallpapers/1346530.jpeg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 MiB |
BIN
wallpapers/fullmetal-alchemist-5120x2880-10399.png
Normal file
BIN
wallpapers/fullmetal-alchemist-5120x2880-10399.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 MiB |
Reference in New Issue
Block a user