Compare commits
187 commits
stable-2.5
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb12d82468 | ||
|
|
93c05ad88e | ||
|
|
927e38e5dc | ||
|
|
b2165ec35e | ||
|
|
145d98da1d | ||
|
|
60b97fe42c | ||
|
|
affa1f0ce6 | ||
|
|
6fe106eccc | ||
|
|
72de16b9bf | ||
|
|
05550da619 | ||
|
|
6607eb598f | ||
|
|
6027ada4d1 | ||
|
|
f5106616b5 | ||
|
|
b797cac700 | ||
|
|
f95a583a96 | ||
|
|
605b66fbb4 | ||
|
|
400f8510dc | ||
|
|
e81ea5a023 | ||
|
|
6b7acb7fa5 | ||
|
|
4f02995d0d | ||
|
|
2e29f9fabc | ||
|
|
d2c0128e01 | ||
|
|
0bbcb7866d | ||
|
|
10f3587c6a | ||
|
|
4f7e54a218 | ||
|
|
27ba6b3935 | ||
|
|
9bc46719d5 | ||
|
|
34ab1c370e | ||
|
|
8e16811c60 | ||
|
|
9ba72c53fa | ||
|
|
c5b6ec2840 | ||
|
|
33476ce562 | ||
|
|
a7753d4945 | ||
|
|
3773b596a3 | ||
|
|
d3880758b2 | ||
|
|
856ea7d37b | ||
|
|
0a3e015b22 | ||
|
|
60f11d70c3 | ||
|
|
117b4c0039 | ||
|
|
d10a9bc6de | ||
|
|
39b8117fcf | ||
|
|
2ababcca8b | ||
|
|
a9c573e59e | ||
|
|
0d2b750e37 | ||
|
|
da962b3169 | ||
|
|
4f8d983ab3 | ||
|
|
a5c1fb2064 | ||
|
|
bd7e402430 | ||
|
|
5957df54fd | ||
|
|
e3c98cd633 | ||
|
|
abd97421cb | ||
|
|
e5dac51840 | ||
|
|
6a2df211f9 | ||
|
|
6dc70452ef | ||
|
|
3a7a54c208 | ||
|
|
11134e8cd2 | ||
|
|
ce02cc2ead | ||
|
|
127ff7cf1e | ||
|
|
6583ee73ab | ||
|
|
e2bd8d74cb | ||
|
|
1f55d99d33 | ||
|
|
dc3b40e0e9 | ||
|
|
e3cb8291c5 | ||
|
|
a453eb5a8e | ||
|
|
0862894fa9 | ||
|
|
3ec7b4cbc5 | ||
|
|
1af724aba9 | ||
|
|
d1c93fe273 | ||
|
|
e94ac6f918 | ||
|
|
f612693b8f | ||
|
|
220d94c798 | ||
|
|
694cc69cc4 | ||
|
|
7901507f74 | ||
|
|
4afc385c16 | ||
|
|
90409769ad | ||
|
|
278a680f15 | ||
|
|
b52b0b635e | ||
|
|
75a72df7ae | ||
|
|
7322a8ed85 | ||
|
|
ae758cccef | ||
|
|
80f8bfb41a | ||
|
|
e9272827a8 | ||
|
|
8ab6f8d444 | ||
|
|
49f7fb1819 | ||
|
|
0c443c1efb | ||
|
|
d26b8450fa | ||
|
|
6740674304 | ||
|
|
6f408c9732 | ||
|
|
1eaa3e3e36 | ||
|
|
d207b2481f | ||
|
|
3f9126b8e8 | ||
|
|
8011d85dc4 | ||
|
|
3f13aed775 | ||
|
|
ed3883a36c | ||
|
|
5e815311f8 | ||
|
|
b1188be273 | ||
|
|
1560ddd95d | ||
|
|
f2dfddff6a | ||
|
|
7ed6c34777 | ||
|
|
cdec0772a5 | ||
|
|
ab4cdf6368 | ||
|
|
c8bc71c34d | ||
|
|
248f497ae0 | ||
|
|
6266205508 | ||
|
|
ef354742c6 | ||
|
|
9bc44bb149 | ||
|
|
d411134b47 | ||
|
|
ded6260bee | ||
|
|
9b49bc3cfe | ||
|
|
6b5078f6d0 | ||
|
|
5d60504500 | ||
|
|
ff10c2d0b7 | ||
|
|
38b5d9e54a | ||
|
|
21288d4263 | ||
|
|
6e2510c6b8 | ||
|
|
eacae88adb | ||
|
|
7bf03fa1b6 | ||
|
|
83af9c7fa6 | ||
|
|
b535f6c591 | ||
|
|
73b5aa79b9 | ||
|
|
083bd39a52 | ||
|
|
4e1fc68a7c | ||
|
|
eeccf0d30e | ||
|
|
1a2a4f7a5b | ||
|
|
ecf670f0f7 | ||
|
|
e220b9f4e9 | ||
|
|
055f2bbc6c | ||
|
|
c8ae7698c0 | ||
|
|
20283f060c | ||
|
|
99e8928c14 | ||
|
|
6c4f677de8 | ||
|
|
5295dc11ba | ||
|
|
3e0327cff0 | ||
|
|
fa935c21a4 | ||
|
|
b826889cbc | ||
|
|
35ae6ae712 | ||
|
|
32de3014f2 | ||
|
|
194e32d401 | ||
|
|
775b1c2816 | ||
|
|
ce0c09243b | ||
|
|
25872b387d | ||
|
|
fd39b9d069 | ||
|
|
db925ffeb8 | ||
|
|
e1612b0f01 | ||
|
|
35f81cc642 | ||
|
|
4de3f10061 | ||
|
|
a8bc6e1f1a | ||
|
|
4b2f57185e | ||
|
|
9ea4d928da | ||
|
|
68eac0282e | ||
|
|
584f92d702 | ||
|
|
78fe8fd8e3 | ||
|
|
cecce68892 | ||
|
|
8966d5318e | ||
|
|
c48416e1a2 | ||
|
|
512d649632 | ||
|
|
cd2f411a9c | ||
|
|
6ac33da452 | ||
|
|
38da401e6e | ||
|
|
196a592af6 | ||
|
|
4782e91840 | ||
|
|
34c8ab11f7 | ||
|
|
3a12e024cc | ||
|
|
d6252d294c | ||
|
|
0286b6b283 | ||
|
|
ce9b10bd88 | ||
|
|
244e644014 | ||
|
|
6067faa436 | ||
|
|
2a3ef88312 | ||
|
|
143adeda6a | ||
|
|
59b88ba802 | ||
|
|
616e0ac60c | ||
|
|
5117fdb4a8 | ||
|
|
680f32b594 | ||
|
|
cc5cc79a0b | ||
|
|
e97b78e468 | ||
|
|
191d97feed | ||
|
|
9102b55fef | ||
|
|
207109d388 | ||
|
|
956863650e | ||
|
|
5d0e8eccb9 | ||
|
|
5e2cb285ae | ||
|
|
38e635fa64 | ||
|
|
16d7269f1e | ||
|
|
50c1e3d727 | ||
|
|
ec08d2a577 | ||
|
|
d34a414488 |
240 changed files with 11308 additions and 4345 deletions
492
CHANGELOG.md
492
CHANGELOG.md
|
|
@ -5,7 +5,497 @@
|
|||
|
||||
---
|
||||
|
||||
# 🚀 **Current Release - ZaneyOS v2.5.4**
|
||||
# 🚀 **Current Release - ZaneyOS v2.6.1**
|
||||
|
||||
- Removed `discord` and `discord-canary`
|
||||
- They use an outdated `electron`
|
||||
- That build uses and `openssl v1.1.1w`
|
||||
- That ius OEL and marked insecure in NIXOS
|
||||
- Users can use an alternativve client until discord is updated
|
||||
- Disabled `zen browser` in `zaneyos/modules/home/default.nix`
|
||||
- Needs to be migrated to being enabled via host variable
|
||||
- Changed from `zen` to `latest` kernel
|
||||
- Linux kernel v7.0 is much better than 6.19_zen
|
||||
- Disabled `vfr = true;` in hyprland config
|
||||
- It's not supportorted after `v54.3`
|
||||
- Disabling now to avoid error on next update
|
||||
- Added `awww` as flake input for installs < 25.11
|
||||
- Fixed eval warnings:
|
||||
- `gtk.gtk4.theme` set to `null`
|
||||
- `git.signing.format` set to `null`
|
||||
- `nixvim` lualine theme set to `auto`
|
||||
- Changed to NixOS unstable branch
|
||||
- Ported `DropTerminal` from `KoolDots` to ZaneyOS
|
||||
- Replaces pyprland and some python dependencies
|
||||
- Hyprland updated to v0.54
|
||||
- Added support for scrolling and monocle layouts
|
||||
- Fixed hyprland float-all bindings
|
||||
- Updated Window Rules for new Hyprland format
|
||||
- Disabled steam by default
|
||||
- Removed `adb.enable` no longer supported and not needed for ZaneyOS
|
||||
- Changed `nixfmt-rfc-style` package for updated `nitfmt`
|
||||
- `nixfmt-rfc-style` no longer supported
|
||||
- Fixed other evaluation warnings with `Xorg` package changes
|
||||
|
||||
# 🚀 **Current Release - ZaneyOS v2.6.0**
|
||||
|
||||
#### 📅 **Updated: April 3rd, 2026**
|
||||
|
||||
- Swapped `awww` for `swww`
|
||||
- `swww` is no longer maintained
|
||||
- removed `--format xrgb` flag also no needed
|
||||
|
||||
#### 📅 **Updated: February 19th, 2026**
|
||||
|
||||
- Fixed `zcli` GPU detection for newer AMD GPUs
|
||||
- Fixed the fix to properly detect VMs
|
||||
- `nixvim.nix` changes
|
||||
- Disabled Zig language server
|
||||
- Disabled marksman language server
|
||||
- Caused dotnet lib to be compiled (takes hours)
|
||||
|
||||
#### 📅 **Updated: February 16th, 2026**
|
||||
|
||||
- Removed `hyprpanel`
|
||||
- No longer maintained
|
||||
- Vendor created `wayle` to replace it
|
||||
- Replaced in ZaneyOS with 'noctalia-shell'
|
||||
|
||||
- `webkitgtk` being built from source
|
||||
- Removed audacity is called `wxwidgets`
|
||||
- Created overlay for `tumbler` to disable `libepub`
|
||||
- These caused the build from source issue
|
||||
- Building `webkitgtk` takes hours every rebuild/update
|
||||
|
||||
#### 📅 **Updated: January 31st, 2026**
|
||||
|
||||
- Changed default login manager to `TUI`
|
||||
- Issues recently (again) with SDDM and some GPUs
|
||||
- Often related to SDDM wayland support option
|
||||
- Some GPUs need it enabled, others disabled
|
||||
|
||||
#### 📅 **Updated: January 28th, 2026**
|
||||
|
||||
- Disabled gnome in stylix. Caused install failure
|
||||
|
||||
#### 📅 **Updated: January 26th, 2026**
|
||||
|
||||
- `noctalia-shell` regression:
|
||||
- Removed `noctalia-shell` systemd service
|
||||
- Caused old version of `noctalia-shell`
|
||||
- Adjusted `noctalia-shell` bindings to match change
|
||||
- Default applications now settable
|
||||
- Globally for all hosts
|
||||
- `zaneyos/modules/home/xdg.nix`
|
||||
- Per host
|
||||
- `zaneyos/hosts/HOSTNAME/variables.nix`
|
||||
- Host settings override `xdg.nix` settings
|
||||
|
||||
#### 📅 **Updated: January 23rd, 2026**
|
||||
|
||||
- Added additional fonts
|
||||
- Fixed issue with Hypridle and Home Manager
|
||||
- Added `systemdTarget = "hyprland-session.target";`
|
||||
- Thank you `Yang Kexuan` for the fix
|
||||
- Reference issue: [5899](https://github.com/nix-community/home-manager/issues/5899)
|
||||
|
||||
#### 📅 **Updated: January 5th, 2026**
|
||||
|
||||
- Removed extra newline in `exec-once.nix`
|
||||
- Fixed typo in `noctalia.nix`
|
||||
- Added docs reference per systemd spec
|
||||
- Improved code overall
|
||||
- Thanks `lichen.gel.calm` for finding these issues
|
||||
- Disabled `noctalia-shell` systemd service
|
||||
- Caused older revision of `noctalia-shell` to load
|
||||
- Now started from hyprland
|
||||
|
||||
#### 📅 **Updated: December 29th, 2025**
|
||||
|
||||
- Removed extra `noctalia-shell` startup
|
||||
- Added initial support for AMD, NVIDIA Hybrid laptops
|
||||
- Keypress to recover from DPMS now enabled by default
|
||||
|
||||
#### 📅 **Updated: December 21st, 2025**
|
||||
|
||||
- Added user systemd service for `noctalia-shell`
|
||||
- Updated Hyprland bindings to accomodate change
|
||||
- Updated `nixvim`
|
||||
|
||||
## `nixvim` Features Migrated from Bugsvim
|
||||
|
||||
#### Custom Diagnostic Icons
|
||||
|
||||
```lua
|
||||
Error = " "
|
||||
Warn = " "
|
||||
Hint = ""
|
||||
Info = ""
|
||||
```
|
||||
- Custom unicode symbols for each diagnostic severity level
|
||||
- Integrated into vim.diagnostic.config() for gutter display
|
||||
|
||||
#### Diagnostic Display Options
|
||||
|
||||
- **Sign Column**: Shows diagnostic icons in the gutter with custom text and highlight groups
|
||||
- **Virtual Text**: Inline diagnostics with custom prefix (`●`) and 2-space spacing
|
||||
- **Virtual Lines**: Enhanced visibility for error context without cluttering
|
||||
- **Underline**: Visual underline for error locations
|
||||
- **Floating Window**: Hover diagnostics with rounded borders and source attribution
|
||||
- **Severity Sorting**: Errors prioritized over warnings
|
||||
|
||||
### 2. Text Yank Highlighting
|
||||
|
||||
**Migration**: Highlight yanked text for 200ms (IncSearch highlight group)
|
||||
- Autocmd-based implementation in extraConfigLua
|
||||
- Uses vim.hl.on_yank for smooth visual feedback
|
||||
|
||||
### 3. LSP Attachment Keybindings
|
||||
|
||||
**Enhanced LSP Integration** with on-attach callbacks:
|
||||
```
|
||||
K - Hover documentation
|
||||
gd - Goto definition
|
||||
gD - Goto declaration
|
||||
gi - Goto implementation
|
||||
gr - References
|
||||
<leader>rn - Rename symbol
|
||||
<leader>ca - Code action
|
||||
```
|
||||
- Buffer-local scope prevents global pollution
|
||||
- Guard against multiple registrations with flag check
|
||||
|
||||
### 4. Startup Dashboard
|
||||
|
||||
**Migration**: alpha-nvim with custom banner generation
|
||||
|
||||
#### Dynamic Header Generation
|
||||
|
||||
- Primary: `toilet -f ansi-shadow NIXOS`
|
||||
- Secondary: `figlet -f "ANSI Shadow" NIXOS`
|
||||
- Tertiary: `figlet NIXOS`
|
||||
- Fallback: ASCII art banner (9 lines)
|
||||
|
||||
#### Dashboard Buttons
|
||||
|
||||
| Shortcut | Action | Command |
|
||||
|----------|--------|---------|
|
||||
| `f` | Find file | Telescope find_files |
|
||||
| `r` | Recent files | Telescope oldfiles |
|
||||
| `g` | Live grep | Telescope live_grep |
|
||||
| `n` | New file | :enew |
|
||||
| `e` | File browser | Neotree toggle |
|
||||
| `q` | Quit | :qa |
|
||||
|
||||
#### Footer
|
||||
|
||||
Dynamic version display: `NixVim • Neovim X.Y.Z`
|
||||
|
||||
### 5. Theme Integration
|
||||
|
||||
**Migration**: Tokyo Night colorscheme with Stylix integration
|
||||
- Tokyo Night colors for status line (lualine)
|
||||
- Notify background color tied to Stylix palette: `#${config.lib.stylix.colors.base01}`
|
||||
- Consistent color management across UI components
|
||||
|
||||
## Comprehensive Feature Set
|
||||
|
||||
### UI/Visuals Migrated
|
||||
|
||||
- Lualine status line (Tokyo Night theme)
|
||||
- Bufferline for buffer management
|
||||
- Indent-blankline for visual indentation
|
||||
- Colorizer for inline color display
|
||||
- Illuminate for reference highlighting
|
||||
- Which-key for keybinding discovery (Helix preset)
|
||||
|
||||
### Core Editing
|
||||
|
||||
- Treesitter for syntax highlighting
|
||||
- Neo-tree file browser
|
||||
- Telescope fuzzy finder with media_files extension
|
||||
- Project.nvim for project management
|
||||
- Hop/Leap motion plugins
|
||||
- vim-surround for text manipulation
|
||||
- Comment.nvim for toggle comments
|
||||
|
||||
### Advanced Features
|
||||
|
||||
- snacks.nvim ecosystem (terminal, scratch buffers, zen mode, git integration, notifier)
|
||||
- Noice for enhanced UI/messages
|
||||
- Notify for notifications
|
||||
- todo-comments for task navigation
|
||||
- nvim-autopairs with Treesitter support
|
||||
|
||||
### Language Support
|
||||
|
||||
**LSP Servers**: nil_ls, lua_ls, pyright, ts_ls, html, cssls, clangd, zls, marksman, hyprls, tailwindcss, bashls
|
||||
|
||||
**Formatters**:
|
||||
- Nix: alejandra
|
||||
- Lua: stylua
|
||||
- JavaScript/TypeScript: prettierd
|
||||
- Shell: shfmt
|
||||
|
||||
**Completion**: blink-cmp with luasnip snippets
|
||||
|
||||
### Development Tools
|
||||
|
||||
- Git integration: gitsigns + diffview
|
||||
- Markdown preview
|
||||
- Trouble diagnostics panel
|
||||
- Terminal: toggleterm with float direction
|
||||
|
||||
## Implementation Details
|
||||
|
||||
### Module Structure
|
||||
|
||||
- **File**: `modules/home/editors/nixvim.nix` (743 lines)
|
||||
- **Framework**: Nixvim home-manager module
|
||||
- **Theme**: Tokyo Night (primary), Catppuccin (fallback)
|
||||
- **Runtime Tools**: 23+ packages (bat, chafa, fd, figlet, lazygit, prettierd, ripgrep, etc.)
|
||||
|
||||
## Keybinding Highlights
|
||||
|
||||
```
|
||||
jk - Exit insert mode
|
||||
<leader>ff - Find files
|
||||
<leader>fm - Find media files
|
||||
<leader>lg - Live grep
|
||||
<leader>fe - File explorer toggle
|
||||
<leader>t - Toggle terminal
|
||||
<leader>. - Toggle comment (line/visual)
|
||||
<leader>z - Zen mode
|
||||
<leader>Z - Zoom
|
||||
<leader>gg - Lazygit
|
||||
<c-/> - Terminal (via snacks)
|
||||
]t / [t - Next/prev TODO comment
|
||||
<leader>n - Notification history
|
||||
```
|
||||
|
||||
#### 📅 **Updated: December 21st, 2025**
|
||||
|
||||
- Added user systemd service for `noctalia-shell`
|
||||
- Updated Hyprland bindings to accomodate change
|
||||
- Updated `nixvim`
|
||||
|
||||
## `nixvim` Features Migrated from Bugsvim
|
||||
|
||||
#### Custom Diagnostic Icons
|
||||
|
||||
```lua
|
||||
Error = " "
|
||||
Warn = " "
|
||||
Hint = ""
|
||||
Info = ""
|
||||
```
|
||||
- Custom unicode symbols for each diagnostic severity level
|
||||
- Integrated into vim.diagnostic.config() for gutter display
|
||||
|
||||
#### Diagnostic Display Options
|
||||
|
||||
- **Sign Column**: Shows diagnostic icons in the gutter with custom text and highlight groups
|
||||
- **Virtual Text**: Inline diagnostics with custom prefix (`●`) and 2-space spacing
|
||||
- **Virtual Lines**: Enhanced visibility for error context without cluttering
|
||||
- **Underline**: Visual underline for error locations
|
||||
- **Floating Window**: Hover diagnostics with rounded borders and source attribution
|
||||
- **Severity Sorting**: Errors prioritized over warnings
|
||||
|
||||
### 2. Text Yank Highlighting
|
||||
|
||||
**Migration**: Highlight yanked text for 200ms (IncSearch highlight group)
|
||||
- Autocmd-based implementation in extraConfigLua
|
||||
- Uses vim.hl.on_yank for smooth visual feedback
|
||||
|
||||
### 3. LSP Attachment Keybindings
|
||||
|
||||
**Enhanced LSP Integration** with on-attach callbacks:
|
||||
```
|
||||
K - Hover documentation
|
||||
gd - Goto definition
|
||||
gD - Goto declaration
|
||||
gi - Goto implementation
|
||||
gr - References
|
||||
<leader>rn - Rename symbol
|
||||
<leader>ca - Code action
|
||||
```
|
||||
- Buffer-local scope prevents global pollution
|
||||
- Guard against multiple registrations with flag check
|
||||
|
||||
### 4. Startup Dashboard
|
||||
|
||||
**Migration**: alpha-nvim with custom banner generation
|
||||
|
||||
#### Dynamic Header Generation
|
||||
|
||||
- Primary: `toilet -f ansi-shadow NIXOS`
|
||||
- Secondary: `figlet -f "ANSI Shadow" NIXOS`
|
||||
- Tertiary: `figlet NIXOS`
|
||||
- Fallback: ASCII art banner (9 lines)
|
||||
|
||||
#### Dashboard Buttons
|
||||
|
||||
| Shortcut | Action | Command |
|
||||
|----------|--------|---------|
|
||||
| `f` | Find file | Telescope find_files |
|
||||
| `r` | Recent files | Telescope oldfiles |
|
||||
| `g` | Live grep | Telescope live_grep |
|
||||
| `n` | New file | :enew |
|
||||
| `e` | File browser | Neotree toggle |
|
||||
| `q` | Quit | :qa |
|
||||
|
||||
#### Footer
|
||||
|
||||
Dynamic version display: `NixVim • Neovim X.Y.Z`
|
||||
|
||||
### 5. Theme Integration
|
||||
|
||||
**Migration**: Tokyo Night colorscheme with Stylix integration
|
||||
- Tokyo Night colors for status line (lualine)
|
||||
- Notify background color tied to Stylix palette: `#${config.lib.stylix.colors.base01}`
|
||||
- Consistent color management across UI components
|
||||
|
||||
## Comprehensive Feature Set
|
||||
|
||||
### UI/Visuals Migrated
|
||||
|
||||
- Lualine status line (Tokyo Night theme)
|
||||
- Bufferline for buffer management
|
||||
- Indent-blankline for visual indentation
|
||||
- Colorizer for inline color display
|
||||
- Illuminate for reference highlighting
|
||||
- Which-key for keybinding discovery (Helix preset)
|
||||
|
||||
### Core Editing
|
||||
|
||||
- Treesitter for syntax highlighting
|
||||
- Neo-tree file browser
|
||||
- Telescope fuzzy finder with media_files extension
|
||||
- Project.nvim for project management
|
||||
- Hop/Leap motion plugins
|
||||
- vim-surround for text manipulation
|
||||
- Comment.nvim for toggle comments
|
||||
|
||||
### Advanced Features
|
||||
|
||||
- snacks.nvim ecosystem (terminal, scratch buffers, zen mode, git integration, notifier)
|
||||
- Noice for enhanced UI/messages
|
||||
- Notify for notifications
|
||||
- todo-comments for task navigation
|
||||
- nvim-autopairs with Treesitter support
|
||||
|
||||
### Language Support
|
||||
|
||||
**LSP Servers**: nil_ls, lua_ls, pyright, ts_ls, html, cssls, clangd, zls, marksman, hyprls, tailwindcss, bashls
|
||||
|
||||
**Formatters**:
|
||||
- Nix: alejandra
|
||||
- Lua: stylua
|
||||
- JavaScript/TypeScript: prettierd
|
||||
- Shell: shfmt
|
||||
|
||||
**Completion**: blink-cmp with luasnip snippets
|
||||
|
||||
### Development Tools
|
||||
|
||||
- Git integration: gitsigns + diffview
|
||||
- Markdown preview
|
||||
- Trouble diagnostics panel
|
||||
- Terminal: toggleterm with float direction
|
||||
|
||||
## Implementation Details
|
||||
|
||||
### Module Structure
|
||||
|
||||
- **File**: `modules/home/editors/nixvim.nix` (743 lines)
|
||||
- **Framework**: Nixvim home-manager module
|
||||
- **Theme**: Tokyo Night (primary), Catppuccin (fallback)
|
||||
- **Runtime Tools**: 23+ packages (bat, chafa, fd, figlet, lazygit, prettierd, ripgrep, etc.)
|
||||
|
||||
## Keybinding Highlights
|
||||
|
||||
```
|
||||
jk - Exit insert mode
|
||||
<leader>ff - Find files
|
||||
<leader>fm - Find media files
|
||||
<leader>lg - Live grep
|
||||
<leader>fe - File explorer toggle
|
||||
<leader>t - Toggle terminal
|
||||
<leader>. - Toggle comment (line/visual)
|
||||
<leader>z - Zen mode
|
||||
<leader>Z - Zoom
|
||||
<leader>gg - Lazygit
|
||||
<c-/> - Terminal (via snacks)
|
||||
]t / [t - Next/prev TODO comment
|
||||
<leader>n - Notification history
|
||||
```
|
||||
|
||||
#### 📅 **Updated: December 21st, 2025**
|
||||
|
||||
- Updated:
|
||||
- `nixvim.nix` now uses `blink-cmp` for completion/suggestions
|
||||
- This replaces `nvim-cmp`
|
||||
- `blink-cmp` is better, integrated in nixvim
|
||||
- Removed LUA code related to `nvim-cmp`
|
||||
|
||||
- Fixed:
|
||||
- Output of `zcli list-gens` corrected
|
||||
- Thanks `@codingismy11to71`
|
||||
|
||||
#### 📅 **Updated: December 14th, 2025**
|
||||
|
||||
- Fixed:
|
||||
- hyprlock background image
|
||||
- `--diff-always` to `nh` rebuilds
|
||||
- Removed extra `Ghz` in `fastfetch` output
|
||||
- Fixed hard coded directory for cheatsheets path
|
||||
- Removed hard coded title
|
||||
- Focus follows mouse
|
||||
- Consistent with hyprland
|
||||
- Turned off resize overlay
|
||||
- Added curosr wrap shader
|
||||
- Thanks to Steven Scott for the fixes
|
||||
|
||||
#### 📅 **Updated: December 12th, 2025**
|
||||
|
||||
- Fixed:
|
||||
- `Weather.py` script
|
||||
- Start menu in waybars
|
||||
- Ported from ddubsos:
|
||||
- `kitty-bg` and `ghostty-bg`
|
||||
- Adds random backgrounds to terminals
|
||||
- Custom Quickshell logout menu
|
||||
- Custom startmenu
|
||||
- Custom logout menu
|
||||
- Quickshell wallpaper apps
|
||||
- One for images, one for video wallpapers
|
||||
- `ly` login manager
|
||||
- `nwg-dock-hyprland.nix`
|
||||
- `SUPERCTRL+D` to toggle
|
||||
- Added:
|
||||
- More wallpapers
|
||||
- Video wallpapers
|
||||
|
||||
#### 📅 **Updated: December 9th, 2025**
|
||||
|
||||
- Notifcation history binding had wrong keyword
|
||||
- Thanks to Kexuan Yang for fixing it
|
||||
|
||||
#### 📅 **Updated: December 7th, 2025**
|
||||
|
||||
- Added `alejandra` formatter to `flake.nix`
|
||||
- ran `nix fmt ./` and updated all files to current format spec
|
||||
- Added `alejandra` as default formatter in `nixvim.nix`
|
||||
- Hybrid GPU detection fails in `install-zaneyos.sh`
|
||||
- Should be `nvidia-laptop` not `hybrid`
|
||||
- Thanks to sasek @sasek333 for spotting this
|
||||
|
||||
#### 📅 **Updated: December 6th, 2025**
|
||||
|
||||
- Changed:
|
||||
- Quickshell now comes fromm NixPkgs.
|
||||
- No more compiling on rebuilds
|
||||
- Remove Flake input and input in `quickshell.nix`
|
||||
|
||||
#### 📅 **Updated: December 3rd, 2025**
|
||||
|
||||
|
|
|
|||
42
FAQ.es.md
42
FAQ.es.md
|
|
@ -1,8 +1,8 @@
|
|||
[English](FAQ.md) | [Español](FAQ.es.md)
|
||||
|
||||
# 💬 Preguntas frecuentes de ZaneyOS para v2.5.3
|
||||
# 💬 Preguntas frecuentes de ZaneyOS
|
||||
|
||||
- **Fecha:** 3 de deciembre de 2025
|
||||
- **Fecha:** 14 de deciembre de 2025
|
||||
|
||||
**⌨ ¿Dónde puedo ver los atajos de teclado de Hyprland?**
|
||||
|
||||
|
|
@ -139,6 +139,32 @@ zcli doom status # Verifica estado de instalación
|
|||
</div>
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>**¿Cómo configuro aplicaciones predeterminadas (PDF, navegador) por host?**</summary>
|
||||
|
||||
- Edita `~/zaneyos/hosts/<HOSTNAME>/variables.nix` y descomenta `mimeDefaultApps`.
|
||||
- Home Manager usará esto vía `modules/home/xdg.nix` para escribir tu `~/.config/mimeapps.list`.
|
||||
- Usa IDs `.desktop` reales de `/usr/share/applications` o `~/.local/share/applications`.
|
||||
|
||||
```nix
|
||||
# hosts/<HOSTNAME>/variables.nix
|
||||
# Aplicaciones predeterminadas a nivel de host (consumidas por xdg.mimeApps)
|
||||
# mimeDefaultApps = {
|
||||
# # PDFs
|
||||
# "application/pdf" = ["okular.desktop"];
|
||||
# "application/x-pdf" = ["okular.desktop"];
|
||||
# # Navegador web
|
||||
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # o brave-browser.desktop, firefox.desktop
|
||||
# "x-scheme-handler/https" = ["google-chrome.desktop"];
|
||||
# "text/html" = ["google-chrome.desktop"];
|
||||
# # Archivos
|
||||
# "inode/directory" = ["thunar.desktop"]; # gestor de archivos
|
||||
# "text/plain" = ["nvim.desktop"]; # o code.desktop
|
||||
# };
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
## Atajos Principales de Hyprland
|
||||
|
||||
A continuación se muestran los atajos de teclado para Hyprland, formateados para
|
||||
|
|
@ -387,9 +413,9 @@ Edita la línea `extraMonitorSettings`. **Ejemplos:**
|
|||
- Monitor Único: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
|
||||
- Monitores Múltiples:
|
||||
`extraMonitorSettings = "
|
||||
monitor=eDP-1,1920x1080@60,auto,auto
|
||||
monitor=HDMI-A-1,2560x1440@75,auto,auto
|
||||
";`
|
||||
monitor=eDP-1,1920x1080@60,auto,auto
|
||||
monitor=HDMI-A-1,2560x1440@75,auto,auto
|
||||
";`
|
||||
|
||||
- Para configuraciones multi-monitor más complejas, puedes usar la aplicación
|
||||
GUI, `nwg-displays` Esta mostrará tus monitores conectados actualmente
|
||||
|
|
@ -799,7 +825,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
|||
<summary>** ¿Cómo puedo establecer un temporizador para cambiar el wallpaper automáticamente? **</summary>
|
||||
|
||||
1. Edita el archivo `~/zaneyos/modules/home/hyprland/config.nix` file.
|
||||
2. Comenta la línea `sleep 1.5 && swww img ...`
|
||||
2. Comenta la línea `sleep 1.5 && awww img ...`
|
||||
3. Agrega nueva línea después de eso con `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -807,13 +833,13 @@ settings = {
|
|||
exec-once = [
|
||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"killall -q swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
|
|||
54
FAQ.md
54
FAQ.md
|
|
@ -1,8 +1,8 @@
|
|||
[English](FAQ.md) | [Español](FAQ.es.md)
|
||||
|
||||
# 💬 ZaneyOS FAQ for v2.5.3
|
||||
# 💬 ZaneyOS FAQ
|
||||
|
||||
- **Date:** 3-Decemnber-2025
|
||||
- **Date:** 14-Decemnber-2025
|
||||
|
||||
**⌨ Where can I see the Hyprland keybindings?**
|
||||
|
||||
|
|
@ -228,6 +228,32 @@ Below are the keybindings for Hyprland, formatted for easy reference.
|
|||
|
||||
<div style="margin-left: 20px;">
|
||||
|
||||
<details>
|
||||
<summary>**How do I set default apps (PDF, browser) per host?**</summary>
|
||||
|
||||
- Edit `~/zaneyos/hosts/<HOSTNAME>/variables.nix` and uncomment `mimeDefaultApps`.
|
||||
- Home Manager will consume these via `modules/home/xdg.nix` to write your `~/.config/mimeapps.list`.
|
||||
- Use real `.desktop` IDs from `/usr/share/applications` or `~/.local/share/applications`.
|
||||
|
||||
```nix
|
||||
# hosts/<HOSTNAME>/variables.nix
|
||||
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
|
||||
# mimeDefaultApps = {
|
||||
# # PDFs
|
||||
# "application/pdf" = ["okular.desktop"];
|
||||
# "application/x-pdf" = ["okular.desktop"];
|
||||
# # Web browser
|
||||
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
|
||||
# "x-scheme-handler/https" = ["google-chrome.desktop"];
|
||||
# "text/html" = ["google-chrome.desktop"];
|
||||
# # Files
|
||||
# "inode/directory" = ["thunar.desktop"]; # file manager
|
||||
# "text/plain" = ["nvim.desktop"]; # or code.desktop
|
||||
# };
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>**How to I add flatpaks? ?**</summary>
|
||||
|
||||
|
|
@ -375,9 +401,9 @@ Edit the `extraMonitorSettings` line. **Examples:**
|
|||
- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
|
||||
- Multiple Monitors:
|
||||
`extraMonitorSettings = "
|
||||
monitor=eDP-1,1920x1080@60,auto,auto
|
||||
monitor=HDMI-A-1,2560x1440@75,auto,auto
|
||||
";`
|
||||
monitor=eDP-1,1920x1080@60,auto,auto
|
||||
monitor=HDMI-A-1,2560x1440@75,auto,auto
|
||||
";`
|
||||
|
||||
- For more complex, multi-monitor configurations, you may wish to use the GUI
|
||||
application, `nwg-displays` This will show your currently connected monitors
|
||||
|
|
@ -785,7 +811,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
|||
<summary>** How can I set a timer to change the wallpaper automatically? **</summary>
|
||||
|
||||
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
|
||||
2. Comment out the line `sleep 1.5 && swww img ...`
|
||||
2. Comment out the line `sleep 1.5 && awww img ...`
|
||||
3. Add new line after that with `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -793,13 +819,13 @@ settings = {
|
|||
exec-once = [
|
||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"killall -q swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
@ -1570,9 +1596,9 @@ Edit the `extraMonitorSettings` line. **Examples:**
|
|||
- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
|
||||
- Multiple Monitors:
|
||||
`extraMonitorSettings = "
|
||||
monitor=eDP-1,1920x1080@60,auto,auto
|
||||
monitor=HDMI-A-1,2560x1440@75,auto,auto
|
||||
";`
|
||||
monitor=eDP-1,1920x1080@60,auto,auto
|
||||
monitor=HDMI-A-1,2560x1440@75,auto,auto
|
||||
";`
|
||||
|
||||
- For more complex, multi-monitor configurations, you may wish to use the GUI
|
||||
application, `nwg-displays` This will show your currently connected monitors
|
||||
|
|
@ -1976,7 +2002,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
|||
<summary>** How can I set a timer to change the wallpaper automatically? **</summary>
|
||||
|
||||
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
|
||||
2. Comment out the line `sleep 1.5 && swww img ...`
|
||||
2. Comment out the line `sleep 1.5 && awww img ...`
|
||||
3. Add new line after that with `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -1984,13 +2010,13 @@ settings = {
|
|||
exec-once = [
|
||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"killall -q swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
|
|||
87
README.es.md
87
README.es.md
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
## ZaneyOS 🟰 Mejores Configs ❄️ NixOS
|
||||
|
||||
** Actualizado: 3 de junio de 2025
|
||||
\*\* Actualizado: 16 de enero de 2026
|
||||
|
||||
ZaneyOS es una forma sencilla de reproducir mi configuración en cualquier sistema NixOS.
|
||||
Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración y más.
|
||||
|
|
@ -47,13 +47,6 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración
|
|||
- Guía para Principiantes de Nix: [English](cheatsheets/nix-beginner-guide.md) | [Español](cheatsheets/nix-beginner-guide.es.md)
|
||||
- Guía de Personalización de Hyprland: [English](cheatsheets/hyprland-customization-guide.md) | [Español](cheatsheets/hyprland-customization-guide.es.md)
|
||||
|
||||
### Ten en cuenta:
|
||||
|
||||
> **Este proyecto tiene un [Wiki](https://zaney.org/wiki/zaneyos-2.3/). ¡Aprende a usar ZaneyOS aquí!**
|
||||
> **ddubs ha puesto mucho esfuerzo en el
|
||||
> [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq), así que debería ser preciso.
|
||||
> Sin embargo, si notas que algo está mal, crea un issue o contáctanos en Discord.**
|
||||
|
||||
#### 🍖 Requisitos
|
||||
|
||||
- Debes estar ejecutando NixOS, versión 23.11+.
|
||||
|
|
@ -89,13 +82,6 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración
|
|||
- Muchas personas pacientes y con ganas de ayudar te apoyan usando ZaneyOS.
|
||||
- No dudes en pasar por el Discord para pedir ayuda.
|
||||
|
||||
<div align="center">
|
||||
|
||||
Hazte un favor y
|
||||
[lee el wiki](https://zaney.org/wiki/zaneyos-2.3/).
|
||||
|
||||
</div>
|
||||
|
||||
#### 📦 ¿Cómo instalo paquetes?
|
||||
|
||||
- Puedes buscar en [Nix Packages](https://search.nixos.org/packages?) y
|
||||
|
|
@ -109,9 +95,7 @@ Hazte un favor y
|
|||
|
||||
- Siéntete libre de abrir un issue en el repo. Por favor etiqueta las solicitudes
|
||||
de funcionalidades comenzando el título con [feature request], ¡gracias!
|
||||
- Contáctanos también en [Discord](https://discord.gg/2cRdBs8) para una respuesta potencialmente más rápida.
|
||||
|
||||
- No olvides revisar el [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq)
|
||||
- Contáctanos también en [Discord](https://discord.gg/XhZmNTnhtp) para una respuesta potencialmente más rápida.
|
||||
|
||||
# Atajos de Hyprland
|
||||
|
||||
|
|
@ -180,7 +164,7 @@ A continuación los atajos de Hyprland, en formato de referencia rápida. La col
|
|||
|
||||
## 🎨 Atajos de Noctalia Shell
|
||||
|
||||
*Disponibles cuando `barChoice = "noctalia"` en `variables.nix`*
|
||||
_Disponibles cuando `barChoice = "noctalia"` en `variables.nix`_
|
||||
|
||||
- `$modifier + D` → Alternar iniciador
|
||||
- `$modifier + Shift + Return` → Alternar iniciador
|
||||
|
|
@ -196,7 +180,7 @@ A continuación los atajos de Hyprland, en formato de referencia rápida. La col
|
|||
|
||||
### Iniciador Rofi (Modo Waybar)
|
||||
|
||||
*Disponible cuando `barChoice = "waybar"` en `variables.nix`*
|
||||
_Disponible cuando `barChoice = "waybar"` en `variables.nix`_
|
||||
|
||||
- `$modifier + D` → Lanzar Rofi
|
||||
- `$modifier + Shift + Return` → Lanzar Rofi
|
||||
|
|
@ -240,7 +224,7 @@ Luego:
|
|||

|
||||
|
||||
```
|
||||
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.4/install-zaneyos.sh)
|
||||
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)
|
||||
```
|
||||
|
||||
#### El proceso de instalación se verá así:
|
||||
|
|
@ -271,7 +255,7 @@ nix-shell -p git vim
|
|||
2. Clona este repo y entra:
|
||||
|
||||
```
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
|
||||
cd zaneyos
|
||||
|
||||
También puedes ejecutar el script `install.sh` si quieres.
|
||||
|
|
@ -299,7 +283,7 @@ nixos-generate-config --show-hardware-config > hosts/<nombre-del-host>/hardware.
|
|||
7. Ejecuta esto para habilitar flakes e instalar, reemplazando hostname por el perfil (p. ej. `intel`, `nvidia`, `nvidia-laptop`, `amd-hybrid` o `vm`):
|
||||
|
||||
```
|
||||
NIX_CONFIG="experimental-features = nix-command flakes"
|
||||
NIX_CONFIG="experimental-features = nix-command flakes"
|
||||
sudo nixos-rebuild switch --flake .#profile
|
||||
```
|
||||
|
||||
|
|
@ -307,66 +291,13 @@ Ahora, cuando quieras reconstruir, tienes el alias `fr` que reconstruye el flake
|
|||
|
||||
</details>
|
||||
|
||||
## Actualizar de ZaneyOS 2.3 a 2.4
|
||||
|
||||
> **🚀 IMPORTANTE:** Si ya tienes ZaneyOS 2.3, usa el sistema de actualización automatizado en lugar de reinstalar.
|
||||
|
||||
### ✅ Proceso de actualización automatizado:
|
||||
|
||||
ZaneyOS incluye un sistema de actualización completo que migra tu configuración de forma segura:
|
||||
|
||||
```bash
|
||||
cd ~/zaneyos
|
||||
./upgrade-2.3-to-2.4.sh
|
||||
```
|
||||
|
||||
### 🔍 ¿Qué hace el sistema de actualización?
|
||||
|
||||
1. **Análisis previo**: Escaneo integral de tus personalizaciones
|
||||
2. **Respaldo completo**: Copia total de tu configuración actual
|
||||
3. **Migración automática**: Conserva todos tus ajustes y personalizaciones
|
||||
4. **Actualización segura**: Usa la opción `boot` para evitar conflictos del gestor de acceso
|
||||
5. **Reversión fácil**: Un solo comando si algo sale mal
|
||||
|
||||
### 📋 ¿Qué se migra automáticamente?
|
||||
|
||||
- ✅ Todas las configuraciones y variables de hosts
|
||||
- ✅ Configuraciones de hardware
|
||||
- ✅ Paquetes personalizados (globales y por host)
|
||||
- ✅ Temas, fondos y ajustes de monitores
|
||||
- ✅ Configuración de Git y preferencias personales
|
||||
- ✅ Preferencias de terminal con habilitación automática
|
||||
|
||||
### ⚠️ Qué requiere atención manual
|
||||
|
||||
- Entradas personalizadas en flake.nix
|
||||
- Archivos de configuración personal del shell (zshrc-personal.nix, etc.)
|
||||
- Modificaciones de módulos personalizados
|
||||
|
||||
### 📚 Documentación completa
|
||||
|
||||
Para instrucciones detalladas, solución de problemas y seguridad:
|
||||
|
||||
- **Lee**: `UPGRADE-2.3-to-2.4.md` en tu directorio zaneyos
|
||||
- **Informe de análisis**: Guardado automáticamente como `~/zaneyos-upgrade-analysis-TIMESTAMP.txt`
|
||||
|
||||
### 🔄 Reversión sencilla
|
||||
|
||||
Si algo falla, vuelve a 2.3 fácilmente:
|
||||
|
||||
```bash
|
||||
cd ~/zaneyos
|
||||
./upgrade-2.3-to-2.4.sh --revert
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Reconocimientos especiales:
|
||||
|
||||
Gracias por toda su ayuda
|
||||
|
||||
- KoolDots https://github.com/LinuxBeginnings
|
||||
- Jakookit https://github.com/jakookit
|
||||
- Justaguylinux https://github.com/drewgrif
|
||||
- Justaguylinux https://codeberg.org/Justaguylinux
|
||||
- Jerry Starke https://github.com/JerrySM64
|
||||
|
||||
## ¡Disfruta!
|
||||
|
|
|
|||
103
README.md
103
README.md
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
## ZaneyOS 🟰 Best ❄️ NixOS Configs
|
||||
|
||||
\*\* Updated: November 28th,2025
|
||||
\*\* Updated: January 16th, 2026
|
||||
|
||||
ZaneyOS is a simple way of reproducing my configuration on any NixOS system.
|
||||
This includes the wallpaper, scripts, applications, config files, and more.
|
||||
|
|
@ -55,14 +55,6 @@ This includes the wallpaper, scripts, applications, config files, and more.
|
|||
[English](cheatsheets/hyprland-customization-guide.md) |
|
||||
[Español](cheatsheets/hyprland-customization-guide.es.md)
|
||||
|
||||
### Please note:
|
||||
|
||||
> **This project has a [Wiki](https://zaney.org/wiki/zaneyos-2.3/). Find out how
|
||||
> to use ZaneyOS here!** **ddubs has put a lot of effort into the
|
||||
> [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq) so it should be accurate.
|
||||
> However, please if you notice that something is wrong with it create an issue
|
||||
> or reach out to us on Discord.**
|
||||
|
||||
#### 🍖 Requirements
|
||||
|
||||
- You must be running on NixOS, version 24.05+.
|
||||
|
|
@ -84,7 +76,7 @@ This includes the wallpaper, scripts, applications, config files, and more.
|
|||
#### 🏇 Optimized Workflow & Simple Yet Elegant Neovim
|
||||
|
||||
- Using Hyprland for increased elegance, functionality, and efficiency.
|
||||
- No massive NeoVIM project here. This is my simple, easy to understand, yet
|
||||
- No massive NeoVIM project here, using `nixvim` for an
|
||||
incredible NeoVIM setup. With language support already added in.
|
||||
|
||||
#### 🖥️ Multi Host & User Configuration
|
||||
|
|
@ -102,13 +94,6 @@ This includes the wallpaper, scripts, applications, config files, and more.
|
|||
running ZaneyOS.
|
||||
- Feel free to reach out on the Discord for any help with anything.
|
||||
|
||||
<div align="center">
|
||||
|
||||
Please do yourself a favor and
|
||||
[read the wiki](https://zaney.org/wiki/zaneyos-2.3/).
|
||||
|
||||
</div>
|
||||
|
||||
#### 📦 How To Install Packages?
|
||||
|
||||
- You can search the [Nix Packages](https://search.nixos.org/packages?) &
|
||||
|
|
@ -123,11 +108,9 @@ Please do yourself a favor and
|
|||
|
||||
- Please feel free to raise an issue on the repo, please label a feature request
|
||||
with the title beginning with [feature request], thank you!
|
||||
- Contact us on [Discord](https://discord.gg/2cRdBs8) as well, for a potentially
|
||||
- Contact us on [Discord](https://discord.gg/XhZmNTnhtp) as well, for a potentially
|
||||
faster response.
|
||||
|
||||
- Don't forget to checkout the [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq)
|
||||
|
||||
# Hyprland Keybindings
|
||||
|
||||
Below are the keybindings for Hyprland, formatted for easy reference. The right
|
||||
|
|
@ -262,7 +245,7 @@ Then:
|
|||

|
||||
|
||||
```
|
||||
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.4/install-zaneyos.sh)
|
||||
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)
|
||||
```
|
||||
|
||||
#### The install process will look something like this:
|
||||
|
|
@ -293,7 +276,7 @@ nix-shell -p git vim
|
|||
2. Clone this repo & enter it:
|
||||
|
||||
```
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
|
||||
cd zaneyos
|
||||
|
||||
You can still run the `install.sh` script if you want to.
|
||||
|
|
@ -308,93 +291,33 @@ cp -r hosts/default hosts/<your-desired-hostname>
|
|||
git add .
|
||||
```
|
||||
|
||||
4. Edit `hosts/<your-desired-hostname>/variables.nix`.
|
||||
4. Edit `hosts/<your-desired-hostname>/variables.nix`
|
||||
```nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/hardware.nix```
|
||||
|
||||
5. Edit `flake.nix` and fill in your username, profile, and hostname.
|
||||
|
||||
6. Generate your hardware.nix like so:
|
||||
|
||||
```
|
||||
nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/hardware.nix
|
||||
```
|
||||
|
||||
7. Run this to enable flakes and install the flake replacing hostname with
|
||||
profile. I.e. `intel`, `nvidia`, `nvidia-laptop`, `amd-hybrid`, or `vm`
|
||||
|
||||
```
|
||||
|
||||
NIX_CONFIG="experimental-features = nix-command flakes"
|
||||
sudo nixos-rebuild switch --flake .#profile
|
||||
|
||||
```
|
||||
|
||||
Now when you want to rebuild the configuration you have access to an alias
|
||||
called `fr` that will rebuild the flake and you do not have to be in the
|
||||
`zaneyos` folder for it to work.
|
||||
|
||||
</details>
|
||||
|
||||
## Upgrading from ZaneyOS 2.3 to 2.4 -- At this time do NOT user the upgrade script
|
||||
|
||||
> **🚀 IMPORTANT:** If you already have ZaneyOS 2.3 installed, use the automated
|
||||
> upgrade system instead of reinstalling!
|
||||
|
||||
### ✅ Automated Upgrade Process:
|
||||
|
||||
ZaneyOS includes a comprehensive upgrade system that safely migrates your
|
||||
configuration:
|
||||
|
||||
```bash
|
||||
cd ~/zaneyos
|
||||
./upgrade-2.3-to-2.4.sh
|
||||
```
|
||||
|
||||
### 🔍 What the Upgrade System Does:
|
||||
|
||||
1. **Pre-Upgrade Analysis** - Comprehensive scan of your customizations
|
||||
2. **Complete Backup** - Full backup of your current configuration
|
||||
3. **Automatic Migration** - Preserves all your settings and customizations
|
||||
4. **Safe Upgrade** - Uses `boot` option to prevent display manager conflicts
|
||||
5. **Easy Revert** - One-command rollback if needed
|
||||
|
||||
### 📋 What Gets Automatically Migrated:
|
||||
|
||||
- ✅ All host configurations and variables
|
||||
- ✅ Hardware configurations
|
||||
- ✅ Custom packages (both global and per-host)
|
||||
- ✅ Themes, wallpapers, and monitor settings
|
||||
- ✅ Git configuration and personal settings
|
||||
- ✅ Terminal preferences with automatic enabling
|
||||
|
||||
### ⚠️ What Requires Manual Attention:
|
||||
|
||||
- Custom flake.nix inputs
|
||||
- Personal shell configuration files (zshrc-personal.nix, etc.)
|
||||
- Custom module modifications
|
||||
|
||||
### 📚 Complete Documentation:
|
||||
|
||||
For detailed upgrade instructions, troubleshooting, and safety information:
|
||||
|
||||
- **Read**: `UPGRADE-2.3-to-2.4.md` in your zaneyos directory
|
||||
- **Analysis Report**: Saved automatically as
|
||||
`~/zaneyos-upgrade-analysis-TIMESTAMP.txt`
|
||||
|
||||
### 🔄 Easy Revert:
|
||||
|
||||
If anything goes wrong, easily revert to 2.3:
|
||||
|
||||
```bash
|
||||
cd ~/zaneyos
|
||||
./upgrade-2.3-to-2.4.sh --revert
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Special Recognitions:
|
||||
|
||||
Thank you for all your assistance
|
||||
|
||||
- Jakookit https://github.com/jakookit
|
||||
- Justaguylinux https://github.com/drewgrif
|
||||
- KoolDots https://github.com/LinuxBeginnings
|
||||
- JakKoolit https://github.com/Jakoolit
|
||||
- Justaguylinux https://codeberg.org/Justaguylinux
|
||||
- Jerry Starke https://github.com/JerrySM64
|
||||
|
||||
## Hope you enjoy!
|
||||
```
|
||||
|
|
|
|||
58
cheatsheets/add-gnome.md
Normal file
58
cheatsheets/add-gnome.md
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
# Add GNOME Desktop (overview)
|
||||
|
||||
This guide gives **basic steps** and **which files to edit** to add GNOME to ZaneyOS.
|
||||
|
||||
In NixOS, you enable it through NixOS options in a module (a `.nix` file), then pick a display manager (login screen).
|
||||
This repo already has **SDDM** (graphical) and **LY** (text) login support. You can keep using either — both can start GNOME sessions.
|
||||
|
||||
## Files to edit (minimal list)
|
||||
|
||||
1. `modules/core/default.nix`
|
||||
- Import your new GNOME module so it becomes part of the system config.
|
||||
|
||||
2. `modules/core/xserver.nix`
|
||||
- GNOME needs `services.xserver.enable = true;` (this file currently disables X11).
|
||||
|
||||
3. `modules/core/gnome.nix` (new file you create)
|
||||
- Turn on GNOME’s desktop manager.
|
||||
|
||||
4. `hosts/<hostname>/variables.nix`
|
||||
- Make sure your `displayManager` is set to either `"sddm"` or `"tui"` (for LY), since those are already supported here.
|
||||
|
||||
## Suggested minimal GNOME module (example)
|
||||
|
||||
```nix path=null start=null
|
||||
{ ... }:
|
||||
{
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
## Where to import the GNOME module
|
||||
|
||||
In `modules/core/default.nix`, add your GNOME file to the imports list:
|
||||
|
||||
```nix path=null start=null
|
||||
imports = [
|
||||
# ...
|
||||
./gnome.nix
|
||||
# ...
|
||||
];
|
||||
```
|
||||
|
||||
## Flatpak: GNOME Extensions Manager
|
||||
|
||||
To add the Flatpak app **Extension Manager** (for GNOME extensions), edit `modules/core/flatpak.nix` and add its ID:
|
||||
|
||||
```nix path=null start=null
|
||||
services.flatpak.packages = [
|
||||
"com.mattjakeman.ExtensionManager"
|
||||
];
|
||||
```
|
||||
|
||||
## `git add .` and rebuild
|
||||
|
||||
Once you have the file created. In the ZaneyOS directory run `git add . ` then `zcli rebuild`
|
||||
483
flake.lock
generated
483
flake.lock
generated
|
|
@ -1,5 +1,27 @@
|
|||
{
|
||||
"nodes": {
|
||||
"alejandra": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flakeCompat": "flakeCompat",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777149230,
|
||||
"narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=",
|
||||
"owner": "kamadorueda",
|
||||
"repo": "alejandra",
|
||||
"rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kamadorueda",
|
||||
"repo": "alejandra",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"antigravity-nix": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
|
|
@ -8,11 +30,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763923069,
|
||||
"narHash": "sha256-rz0rpiWu333RNbzVV+3t3AGotCSM7g4J6xf4d/xeyP8=",
|
||||
"lastModified": 1776411505,
|
||||
"narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=",
|
||||
"owner": "jacopone",
|
||||
"repo": "antigravity-nix",
|
||||
"rev": "31ba7531e8a84b9e5ee498f822e35bc6a419f3c0",
|
||||
"rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -21,6 +43,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"awww": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777136912,
|
||||
"narHash": "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "f66e12a76dbc4c669b2f1375f78bce49f5b19d66",
|
||||
"revCount": 1363,
|
||||
"type": "git",
|
||||
"url": "https://codeberg.org/LGFae/awww"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://codeberg.org/LGFae/awww"
|
||||
}
|
||||
},
|
||||
"base16": {
|
||||
"inputs": {
|
||||
"fromYaml": "fromYaml"
|
||||
|
|
@ -42,28 +86,28 @@
|
|||
"base16-fish": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1754405784,
|
||||
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
|
||||
"lastModified": 1765809053,
|
||||
"narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1760703920,
|
||||
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||
"lastModified": 1776754714,
|
||||
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -89,14 +133,36 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"alejandra",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768113825,
|
||||
"narHash": "sha256-f09fAifGPEuRrz1DFY910jexq0DaBuQBbq7WcxQIUgs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "55106e04d905c6a7726d0f6be77ed39a99f66a61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764724327,
|
||||
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
|
||||
"lastModified": 1776136500,
|
||||
"narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
|
||||
"rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -106,6 +172,22 @@
|
|||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1761588595,
|
||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751685974,
|
||||
|
|
@ -129,11 +211,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"lastModified": 1777988971,
|
||||
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -150,11 +232,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760948891,
|
||||
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -171,11 +253,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"lastModified": 1775087534,
|
||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -202,21 +284,19 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"flakeCompat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"lastModified": 1767039857,
|
||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -239,20 +319,18 @@
|
|||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"lastModified": 1764524476,
|
||||
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
|
||||
"lastModified": 1767737596,
|
||||
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
|
||||
"type": "gitlab"
|
||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"owner": "GNOME",
|
||||
"ref": "gnome-49",
|
||||
"repo": "gnome-shell",
|
||||
"type": "gitlab"
|
||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
|
|
@ -262,16 +340,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764776959,
|
||||
"narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=",
|
||||
"lastModified": 1778503501,
|
||||
"narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e1680d594a9281651cbf7d126941a8c8e2396183",
|
||||
"rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"ref": "master",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -284,11 +362,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762964643,
|
||||
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
|
||||
"lastModified": 1777594677,
|
||||
"narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
|
||||
"rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -297,41 +375,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754860581,
|
||||
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.1.1",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mnw": {
|
||||
"locked": {
|
||||
"lastModified": 1758834834,
|
||||
"narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
|
||||
"lastModified": 1777828893,
|
||||
"narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "mnw",
|
||||
"rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
|
||||
"rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -340,13 +390,35 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ndg": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nvf",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776882296,
|
||||
"narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
|
||||
"owner": "feel-co",
|
||||
"repo": "ndg",
|
||||
"rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "feel-co",
|
||||
"ref": "refs/tags/v2.6.0",
|
||||
"repo": "ndg",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1739444422,
|
||||
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
|
||||
"lastModified": 1767983141,
|
||||
"narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
|
||||
"rev": "440818969ac2cbd77bfe025e884d0aa528991374",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -358,48 +430,48 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1764800781,
|
||||
"narHash": "sha256-vSNALyWgk6vwdIQcLd7phN4nwv9QgkwLf5eImaEorHk=",
|
||||
"lastModified": 1777954456,
|
||||
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6a0a964635aa209cc1129755b560bb4ac697da3b",
|
||||
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "release-25.11",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1761880412,
|
||||
"narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
|
||||
"lastModified": 1774386573,
|
||||
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
|
||||
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1764522689,
|
||||
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
|
||||
"lastModified": 1777268161,
|
||||
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
|
||||
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -410,20 +482,18 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764755396,
|
||||
"narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=",
|
||||
"lastModified": 1778510615,
|
||||
"narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969",
|
||||
"rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixvim",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -432,14 +502,15 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"noctalia-qs": "noctalia-qs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764789847,
|
||||
"narHash": "sha256-q/q97hi5bGDTE1Quoo13L35Nc+oqcPGFVd7PPCmLk6E=",
|
||||
"lastModified": 1778464608,
|
||||
"narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "c80a68007b34791bcc25b94df35427d0d04a51cf",
|
||||
"rev": "761869a561548874fe7e293b157fd7841576b367",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -448,6 +519,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"noctalia-qs": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noctalia",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_3",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778377995,
|
||||
"narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"rev": "d8327a723eed6dd9aebe8e0b162126f390e827df",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
|
|
@ -460,11 +554,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764773531,
|
||||
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
|
||||
"lastModified": 1777598946,
|
||||
"narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
|
||||
"rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -473,43 +567,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761730856,
|
||||
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvf": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"mnw": "mnw",
|
||||
"ndg": "ndg",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762622004,
|
||||
"narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=",
|
||||
"lastModified": 1778408907,
|
||||
"narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=",
|
||||
"owner": "notashelf",
|
||||
"repo": "nvf",
|
||||
"rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909",
|
||||
"rev": "e86a92e4b29b499e5f1285b737b7612115103da9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -518,40 +590,59 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"quickshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764663772,
|
||||
"narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
|
||||
"revCount": 713,
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"alejandra": "alejandra",
|
||||
"antigravity-nix": "antigravity-nix",
|
||||
"awww": "awww",
|
||||
"home-manager": "home-manager",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixvim": "nixvim",
|
||||
"noctalia": "noctalia",
|
||||
"nvf": "nvf",
|
||||
"quickshell": "quickshell",
|
||||
"stylix": "stylix",
|
||||
"zen-browser": "zen-browser"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1768083390,
|
||||
"narHash": "sha256-TGWPJq2mXwxfAe83iZ18DIqXC4sOSj7RkW9b59h6Ox4=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "e42e8ff582ba12a88b6845525d08b6428e6d0fb9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"awww",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764038373,
|
||||
"narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"stylix": {
|
||||
"inputs": {
|
||||
"base16": "base16",
|
||||
|
|
@ -564,23 +655,22 @@
|
|||
"nixpkgs": "nixpkgs_3",
|
||||
"nur": "nur",
|
||||
"systems": "systems_5",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-schemes": "tinted-schemes",
|
||||
"tinted-tmux": "tinted-tmux",
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764795851,
|
||||
"narHash": "sha256-DgtI/SwRiVnAfAVrXoRFymVP1AGvB3ZxYL6XMOZFvJQ=",
|
||||
"lastModified": 1778104276,
|
||||
"narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "cfde343ff369c8aa898f263ed3dad8c5eb095491",
|
||||
"rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"ref": "release-25.11",
|
||||
"ref": "master",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -617,16 +707,16 @@
|
|||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -660,23 +750,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726913040,
|
||||
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-foot",
|
||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-foot",
|
||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-kitty": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -696,11 +769,11 @@
|
|||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1763914658,
|
||||
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
|
||||
"lastModified": 1777041405,
|
||||
"narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
|
||||
"rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -712,11 +785,11 @@
|
|||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764465359,
|
||||
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
|
||||
"lastModified": 1777169200,
|
||||
"narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
|
||||
"rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -728,11 +801,11 @@
|
|||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764464512,
|
||||
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
|
||||
"lastModified": 1777463218,
|
||||
"narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
|
||||
"rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -741,6 +814,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noctalia",
|
||||
"noctalia-qs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775636079,
|
||||
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
|
|
@ -749,11 +844,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764598958,
|
||||
"narHash": "sha256-sJQHRL8trBoG/ArR+mUlyp5cyKU0pgQY+qDQzZGnVgM=",
|
||||
"lastModified": 1778377655,
|
||||
"narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "8cded25e10b13e2999241f1c73a7d4e5e5d6f69e",
|
||||
"rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
95
flake.nix
95
flake.nix
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
inputs = {
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nvf.url = "github:notashelf/nvf";
|
||||
stylix.url = "github:danth/stylix/release-25.11";
|
||||
stylix.url = "github:danth/stylix/master";
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
|
||||
|
||||
noctalia = {
|
||||
|
|
@ -18,13 +18,7 @@
|
|||
|
||||
# Checking nixvim to see if it's better
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim/nixos-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# QuickShell (optional add quickshell to outputs to enable)
|
||||
quickshell = {
|
||||
url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
|
||||
url = "github:nix-community/nixvim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -38,46 +32,55 @@
|
|||
url = "github:0xc000022070/zen-browser-flake/beta";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
alejandra = {
|
||||
url = "github:kamadorueda/alejandra";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
awww = {
|
||||
url = "git+https://codeberg.org/LGFae/awww";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ nixpkgs
|
||||
, home-manager
|
||||
, nixvim
|
||||
, nix-flatpak
|
||||
, ...
|
||||
} @ inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
host = "zaneyos-24-vm";
|
||||
profile = "vm";
|
||||
username = "dwilliams";
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nixvim,
|
||||
nix-flatpak,
|
||||
alejandra,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
host = "zaneyos-24-vm";
|
||||
profile = "vm";
|
||||
username = "dwilliams";
|
||||
|
||||
# Deduplicate nixosConfigurations while preserving the top-level 'profile'
|
||||
mkNixosConfig = gpuProfile:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit username;
|
||||
inherit host;
|
||||
inherit profile; # keep using the let-bound profile for modules/scripts
|
||||
};
|
||||
modules = [
|
||||
./modules/core/overlays.nix
|
||||
./profiles/${gpuProfile}
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
];
|
||||
# Deduplicate nixosConfigurations while preserving the top-level 'profile'
|
||||
mkNixosConfig = gpuProfile:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit username;
|
||||
inherit host;
|
||||
inherit profile; # keep using the let-bound profile for modules/scripts
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
amd = mkNixosConfig "amd";
|
||||
nvidia = mkNixosConfig "nvidia";
|
||||
nvidia-laptop = mkNixosConfig "nvidia-laptop";
|
||||
amd-hybrid = mkNixosConfig "amd-hybrid";
|
||||
intel = mkNixosConfig "intel";
|
||||
vm = mkNixosConfig "vm";
|
||||
modules = [
|
||||
./modules/core/overlays.nix
|
||||
./profiles/${gpuProfile}
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
];
|
||||
};
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
amd = mkNixosConfig "amd";
|
||||
nvidia = mkNixosConfig "nvidia";
|
||||
nvidia-laptop = mkNixosConfig "nvidia-laptop";
|
||||
amd-nvidia-hybrid = mkNixosConfig "amd-nvidia-hybrid";
|
||||
intel = mkNixosConfig "intel";
|
||||
vm = mkNixosConfig "vm";
|
||||
};
|
||||
|
||||
formatter.x86_64-linux = inputs.alejandra.packages.x86_64-linux.default;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./host-packages.nix
|
||||
|
|
|
|||
|
|
@ -1,35 +1,36 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/dd005850-6230-40c4-9d70-8c8cf443658d";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/dd005850-6230-40c4-9d70-8c8cf443658d";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-b7565781-148e-4c94-9c76-36c84dd93dc8".device = "/dev/disk/by-uuid/b7565781-148e-4c94-9c76-36c84dd93dc8";
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/C2A6-DF56";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/C2A6-DF56";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,7 +1,28 @@
|
|||
{pkgs, ...}: {
|
||||
{configs, pkgs, ...}: {
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
audacity
|
||||
discord
|
||||
nodejs
|
||||
# Add local pacakaged here
|
||||
];
|
||||
# Add host specific flatpaks here
|
||||
services = {
|
||||
flatpak = {
|
||||
packages = [
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
services.auto-cpufreq.enable = false;
|
||||
services.auto-cpufreq.settings = {
|
||||
battery = {
|
||||
governor = "powersave";
|
||||
turbo = "never";
|
||||
};
|
||||
charger = {
|
||||
governor = "performance";
|
||||
turbo = "auto";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
# Git Configuration ( For Pulling Software Repos )
|
||||
gitUsername = "Tyler Kelley";
|
||||
gitEmail = "tylerzanekelley@gmail.com";
|
||||
gitUsername = "Don Williams";
|
||||
gitEmail = "don.e.williams@gmail.com";
|
||||
|
||||
# Set Displau Manager
|
||||
# `tui` for Text login
|
||||
# `sddm` for graphical GUI (default)
|
||||
# SDDM background is set with stylixImage
|
||||
displayManager = "sddm";
|
||||
displayManager = "tui";
|
||||
|
||||
# Emable/disable bundled applications
|
||||
tmuxEnable = false;
|
||||
|
|
@ -21,6 +21,8 @@
|
|||
#To install: Enable here, zcli rebuild, then run zcli doom install
|
||||
doomEmacsEnable = false;
|
||||
|
||||
# Python development tools are included by default
|
||||
|
||||
# Hyprland Settings
|
||||
# Examples:
|
||||
# extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1";
|
||||
|
|
@ -28,7 +30,7 @@
|
|||
# You can configure multiple monitors.
|
||||
# Inside the quotes, create a new line for each monitor.
|
||||
extraMonitorSettings = "
|
||||
|
||||
monitor = Virtual-1,1920x1080@60,auto,1
|
||||
";
|
||||
|
||||
# Bar/Shell Settings
|
||||
|
|
@ -45,6 +47,21 @@
|
|||
# or as a flatpak
|
||||
browser = "brave";
|
||||
|
||||
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
|
||||
# Uncomment and adjust the .desktop IDs to set per-host defaults.
|
||||
# mimeDefaultApps = {
|
||||
# # PDFs
|
||||
# "application/pdf" = ["okular.desktop"];
|
||||
# "application/x-pdf" = ["okular.desktop"];
|
||||
# # Web browser
|
||||
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
|
||||
# "x-scheme-handler/https" = ["google-chrome.desktop"];
|
||||
# "text/html" = ["google-chrome.desktop"];
|
||||
# # Files
|
||||
# "inode/directory" = ["thunar.desktop"]; # file manager
|
||||
# "text/plain" = ["nvim.desktop"]; # or code.desktop
|
||||
# };
|
||||
|
||||
# Available Options:
|
||||
# Kitty, ghostty, wezterm, aalacrity
|
||||
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
|
||||
|
|
@ -67,8 +84,8 @@
|
|||
printEnable = false;
|
||||
|
||||
# Enable Thunar GUI File Manager
|
||||
# Yazi is default File Manager
|
||||
thunarEnable = false;
|
||||
# Yazi is alternate File Manager
|
||||
thunarEnable = true;
|
||||
|
||||
# Themes, waybar and animation.
|
||||
# Only uncomment your selection
|
||||
|
|
@ -78,17 +95,17 @@
|
|||
# This will set your color palette
|
||||
# Default background
|
||||
# Add new images to ~/zaneyos/wallpapers
|
||||
stylixImage = ../../wallpapers/mountainscapedark.jpg;
|
||||
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
|
||||
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
||||
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
|
||||
#stylixImage = ../../wallpapers/Rainnight.jpg;
|
||||
stylixImage = ../../wallpapers/Rainnight.jpg;
|
||||
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
|
||||
#stylixImage = ../../wallpapers/nix-wallpaper-stripes-logo.png;
|
||||
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
|
||||
|
||||
# Set Waybar
|
||||
# Available Options:
|
||||
waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
|
||||
|
|
@ -107,12 +124,12 @@
|
|||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
|
||||
waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
|
||||
|
||||
# Set Animation style
|
||||
# Available options are:
|
||||
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-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
|
||||
|
|
@ -121,7 +138,7 @@
|
|||
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./host-packages.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
{ config
|
||||
, lib
|
||||
, modulesPath
|
||||
, ...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelModules = [ ];
|
||||
luks.devices = {
|
||||
"luks-8941ac93-f043-46d1-b128-37d5e846303f".device = "/dev/disk/by-uuid/8941ac93-f043-46d1-b128-37d5e846303f";
|
||||
};
|
||||
};
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/8bac633b-c4e6-44bc-83b3-97b5472594e8";
|
||||
fsType = "ext4";
|
||||
};
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/BC0C-F843";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
"/home/zaney/BFD" = {
|
||||
device = "/dev/disk/by-uuid/5A30E2CC30E2AE67";
|
||||
fsType = "ntfs";
|
||||
options = [
|
||||
"defaults"
|
||||
"umask=000"
|
||||
"dmask=027"
|
||||
"fmask=137"
|
||||
"uid=1000"
|
||||
"gid=1000"
|
||||
"windows_names"
|
||||
];
|
||||
};
|
||||
};
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
{ pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
audacity
|
||||
discord
|
||||
nodejs
|
||||
obs-studio
|
||||
handbrake
|
||||
yt-dlp
|
||||
android-studio
|
||||
android-studio-tools
|
||||
android-tools
|
||||
];
|
||||
}
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
{
|
||||
# Git Configuration ( For Pulling Software Repos )
|
||||
gitUsername = "Tyler Kelly";
|
||||
gitEmail = "tylerzanekelly@gmail.com";
|
||||
|
||||
# Set Displau Manager
|
||||
# `tui` for Text login
|
||||
# `sddm` for graphical GUI
|
||||
# SDDM background is set with stylixImage
|
||||
displayManager = "sddm";
|
||||
|
||||
# Emable/disable bundled applications
|
||||
tmuxEnable = false;
|
||||
alacrittyEnable = false;
|
||||
weztermEnable = false;
|
||||
ghosttyEnable = false;
|
||||
vscodeEnable = false;
|
||||
antigravityEnable = false; # Google port of vscodium
|
||||
helixEnable = false;
|
||||
#To install rebuild, then run zcli doom install
|
||||
doomEmacsEnable = false;
|
||||
|
||||
# P10K or starship prompt
|
||||
userPrompt = "starship";
|
||||
|
||||
# Hyprland Settings
|
||||
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
|
||||
|
||||
# Bar/Shell Settings
|
||||
# Choose between noctalia or waybar
|
||||
barChoice = "noctalia";
|
||||
|
||||
# Waybar Settings (used when barChoice = "waybar")
|
||||
clock24h = false;
|
||||
|
||||
# Program Options
|
||||
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
|
||||
terminal = "kitty"; # Set Default System Terminal
|
||||
keyboardLayout = "us";
|
||||
consoleKeyMap = "us";
|
||||
|
||||
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
|
||||
intelID = "PCI:1:0:0";
|
||||
amdgpuID = "PCI:5:0:0";
|
||||
nvidiaID = "PCI:0:2:0";
|
||||
|
||||
# Enable NFS
|
||||
enableNFS = true;
|
||||
|
||||
# Enable Printing Support
|
||||
printEnable = false;
|
||||
|
||||
# Enable Thunar GUI File Manager
|
||||
thunarEnable = true;
|
||||
|
||||
# Set Stylix Image
|
||||
# This will set your color palette
|
||||
# Default background
|
||||
# Add new images to ~/zaneyos/wallpapers
|
||||
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
|
||||
stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
||||
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
|
||||
#stylixImage = ../../wallpapers/Rainnight.jpg;
|
||||
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
|
||||
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
|
||||
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
|
||||
|
||||
# Set Waybar
|
||||
# Available options:
|
||||
waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
|
||||
|
||||
# Set Animation style
|
||||
# Available options are:
|
||||
animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-def.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
|
||||
|
||||
# Set network hostId if required (needed for zfs)
|
||||
# Otherwise leave as-is
|
||||
hostId = "5ab03f50";
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./host-packages.nix
|
||||
|
|
|
|||
|
|
@ -1,37 +1,41 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/e5fc1006-4d0b-41db-8c43-22b3cb8110c6";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/e5fc1006-4d0b-41db-8c43-22b3cb8110c6";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/9287-3738";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/9287-3738";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/nas" =
|
||||
{ device = "192.168.40.11:/volume1/DiskStation54TB";
|
||||
fsType = "nfs";
|
||||
};
|
||||
fileSystems."/mnt/nas" = {
|
||||
device = "192.168.40.11:/volume1/DiskStation54TB";
|
||||
fsType = "nfs";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087"; }
|
||||
];
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087";}
|
||||
];
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
audacity
|
||||
discord
|
||||
nodejs
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
# `tui` for Text login
|
||||
# `sddm` for graphical GUI (default)
|
||||
# SDDM background is set with stylixImage
|
||||
displayManager = "sddm";
|
||||
displayManager = "tui";
|
||||
|
||||
# Emable/disable bundled applications
|
||||
tmuxEnable = true;
|
||||
|
|
@ -21,6 +21,9 @@
|
|||
#To install: Enable here, zcli rebuild, then run zcli doom install
|
||||
doomEmacsEnable = true;
|
||||
|
||||
# Python development tools
|
||||
pythonEnable = false;
|
||||
|
||||
# Hyprland Settings
|
||||
# Examples:
|
||||
# extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1";
|
||||
|
|
@ -43,7 +46,22 @@
|
|||
# This does NOT install your browser
|
||||
# You need to install it by adding it to the `packages.nix`
|
||||
# or as a flatpak
|
||||
browser = "brave";
|
||||
browser = "google-chrome";
|
||||
|
||||
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
|
||||
# Uncomment and adjust the .desktop IDs to set per-host defaults.
|
||||
# mimeDefaultApps = {
|
||||
# # PDFs
|
||||
# "application/pdf" = ["okular.desktop"];
|
||||
# "application/x-pdf" = ["okular.desktop"];
|
||||
# # Web browser
|
||||
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
|
||||
# "x-scheme-handler/https" = ["google-chrome.desktop"];
|
||||
# "text/html" = ["google-chrome.desktop"];
|
||||
# # Files
|
||||
# "inode/directory" = ["thunar.desktop"]; # file manager
|
||||
# "text/plain" = ["nvim.desktop"]; # or code.desktop
|
||||
# };
|
||||
|
||||
# Available Options:
|
||||
# Kitty, ghostty, wezterm, aalacrity
|
||||
|
|
@ -81,14 +99,14 @@
|
|||
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
|
||||
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
||||
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
|
||||
#stylixImage = ../../wallpapers/Rainnight.jpg;
|
||||
stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
|
||||
stylixImage = ../../wallpapers/Rainnight.jpg;
|
||||
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
|
||||
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
|
||||
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
|
||||
|
||||
# Set Waybar
|
||||
# Available Options:
|
||||
waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
|
||||
|
|
@ -100,7 +118,7 @@
|
|||
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
|
||||
waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
|
||||
|
|
@ -119,9 +137,9 @@
|
|||
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
|
||||
animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./host-packages.nix
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, modulesPath
|
||||
, ...
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/e5fc1006-4d0b-41db-8c43-22b3cb8110c6";
|
||||
|
|
@ -24,7 +25,7 @@
|
|||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/9287-3738";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/nas" = {
|
||||
|
|
@ -33,7 +34,7 @@
|
|||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087"; }
|
||||
{device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087";}
|
||||
];
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
nodejs
|
||||
atop
|
||||
bottom
|
||||
dua
|
||||
fd
|
||||
gping
|
||||
lunarvim
|
||||
luarocks
|
||||
mission-center
|
||||
resources
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@
|
|||
#To install rebuild, then run zcli doom install
|
||||
doomEmacsEnable = false;
|
||||
|
||||
# Python development tools
|
||||
pythonEnable = false;
|
||||
|
||||
# P10K or starship prompt
|
||||
userPrompt = "starship";
|
||||
|
||||
|
|
@ -35,6 +38,22 @@
|
|||
|
||||
# Program Options
|
||||
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
|
||||
|
||||
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
|
||||
# Uncomment and adjust the .desktop IDs to set per-host defaults.
|
||||
# mimeDefaultApps = {
|
||||
# # PDFs
|
||||
# "application/pdf" = ["okular.desktop"];
|
||||
# "application/x-pdf" = ["okular.desktop"];
|
||||
# # Web browser
|
||||
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
|
||||
# "x-scheme-handler/https" = ["google-chrome.desktop"];
|
||||
# "text/html" = ["google-chrome.desktop"];
|
||||
# # Files
|
||||
# "inode/directory" = ["thunar.desktop"]; # file manager
|
||||
# "text/plain" = ["nvim.desktop"]; # or code.desktop
|
||||
# };
|
||||
|
||||
terminal = "kitty"; # Set Default System Terminal
|
||||
keyboardLayout = "us";
|
||||
keyboardVariant = "";
|
||||
|
|
|
|||
|
|
@ -138,24 +138,51 @@ has_nvidia=false
|
|||
has_intel=false
|
||||
has_amd=false
|
||||
has_vm=false
|
||||
detect_vm() {
|
||||
if command -v systemd-detect-virt &>/dev/null; then
|
||||
if systemd-detect-virt --quiet; then
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
for f in /sys/class/dmi/id/product_name /sys/class/dmi/id/sys_vendor; do
|
||||
if [ -r "$f" ] && grep -Eqi 'qemu|kvm|vmware|virtualbox|hyper-v|microsoft corporation|xen|parallels' "$f"; then
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
if lspci | grep -qi 'vga\|3d'; then
|
||||
if detect_vm; then
|
||||
has_vm=true
|
||||
fi
|
||||
|
||||
if lspci | grep -qi 'vga\|3d\|display'; then
|
||||
while read -r line; do
|
||||
if echo "$line" | grep -qi 'nvidia'; then
|
||||
if echo "$line" | grep -Eq '\[10de:'; then
|
||||
has_nvidia=true
|
||||
elif echo "$line" | grep -qi 'amd'; then
|
||||
elif echo "$line" | grep -Eq '\[1002:'; then
|
||||
has_amd=true
|
||||
elif echo "$line" | grep -Eq '\[8086:'; then
|
||||
has_intel=true
|
||||
elif echo "$line" | grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then
|
||||
has_vm=true
|
||||
elif echo "$line" | grep -qi 'nvidia'; then
|
||||
has_nvidia=true
|
||||
elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then
|
||||
has_amd=true
|
||||
elif echo "$line" | grep -qi 'intel'; then
|
||||
has_intel=true
|
||||
elif echo "$line" | grep -qi 'virtio\|vmware'; then
|
||||
elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then
|
||||
has_vm=true
|
||||
fi
|
||||
done < <(lspci | grep -i 'vga\|3d')
|
||||
done < <(lspci -nn | grep -i 'vga\|3d\|display')
|
||||
|
||||
if $has_vm; then
|
||||
DETECTED_PROFILE="vm"
|
||||
elif $has_nvidia && $has_amd; then
|
||||
DETECTED_PROFILE="amd-nvidia-hybrid"
|
||||
elif $has_nvidia && $has_intel; then
|
||||
DETECTED_PROFILE="hybrid"
|
||||
DETECTED_PROFILE="nvidia-laptop"
|
||||
elif $has_nvidia; then
|
||||
DETECTED_PROFILE="nvidia"
|
||||
elif $has_amd; then
|
||||
|
|
@ -183,9 +210,10 @@ if [ -z "$profile" ]; then
|
|||
read -rp "Enter Your Hardware Profile (GPU)
|
||||
Options:
|
||||
[ amd ]
|
||||
amd-nvidia-hybrid
|
||||
intel
|
||||
nvidia
|
||||
nvidia-laptop
|
||||
intel
|
||||
vm
|
||||
Please type out your choice: " profile
|
||||
if [ -z "$profile" ]; then
|
||||
|
|
@ -291,12 +319,38 @@ print_header "Keyboard Variant Configuration"
|
|||
# Suggest a variant when user typed a variant-like layout
|
||||
variant_suggestion=""
|
||||
case "$keyboardLayout" in
|
||||
dvorak|colemak|workman|intl|us-intl)
|
||||
variant_suggestion="$keyboardLayout";;
|
||||
*) ;;
|
||||
dvorak | colemak | workman | intl | us-intl)
|
||||
variant_suggestion="$keyboardLayout"
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
read -rp "Enter your keyboard variant (e.g., dvorak) [ $variant_suggestion ]: " keyboardVariant
|
||||
keyboardVariant="${keyboardVariant:-$variant_suggestion}"
|
||||
|
||||
# Normalize layout/variant to avoid accidentally forcing US for non-US layouts
|
||||
# - Accept uppercase inputs; treat BR/DE/FR/ES/IT/RU/UK in variant field as layout
|
||||
# - Map us-intl/intl and dvorak/colemak/workman to layout=us + appropriate variant
|
||||
keyboardLayout=$(echo "$keyboardLayout" | tr '[:upper:]' '[:lower:]')
|
||||
keyboardVariant=$(echo "$keyboardVariant" | tr '[:upper:]' '[:lower:]')
|
||||
|
||||
case "$keyboardLayout" in
|
||||
us-intl | intl)
|
||||
keyboardLayout="us"
|
||||
if [ -z "$keyboardVariant" ]; then keyboardVariant="intl"; fi
|
||||
;;
|
||||
dvorak | colemak | workman)
|
||||
if [ -z "$keyboardVariant" ]; then keyboardVariant="$keyboardLayout"; fi
|
||||
keyboardLayout="us"
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
|
||||
# If a layout accidentally ended up in the variant field, fix it
|
||||
if [[ "$keyboardVariant" =~ ^(us|br|de|fr|es|it|ru|uk)$ ]]; then
|
||||
keyboardLayout="$keyboardVariant"
|
||||
keyboardVariant=""
|
||||
fi
|
||||
|
||||
if [ -z "$keyboardVariant" ]; then
|
||||
echo -e "${GREEN}✓ Keyboard variant set to: none${NC}"
|
||||
else
|
||||
|
|
@ -362,23 +416,23 @@ rm ./flake.nix.bak
|
|||
|
||||
# Update timezone in system.nix
|
||||
cp ./modules/core/system.nix ./modules/core/system.nix.bak
|
||||
awk -v newtz="$timezone" '/^ time\.timeZone = / { sub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak > ./modules/core/system.nix
|
||||
awk -v newtz="$timezone" '/^ time\.timeZone = / { sub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak >./modules/core/system.nix
|
||||
rm ./modules/core/system.nix.bak
|
||||
|
||||
# Update variables in host file (do all keys in one pass to avoid quoting issues)
|
||||
cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak
|
||||
awk -v v_user="$gitUsername" \
|
||||
-v v_email="$gitEmail" \
|
||||
-v v_kb="$keyboardLayout" \
|
||||
-v v_kv="$keyboardVariant" \
|
||||
-v v_ckm="$consoleKeyMap" '
|
||||
-v v_email="$gitEmail" \
|
||||
-v v_kb="$keyboardLayout" \
|
||||
-v v_kv="$keyboardVariant" \
|
||||
-v v_ckm="$consoleKeyMap" '
|
||||
/^ gitUsername = / { sub(/"[^"]*"/, "\"" v_user "\"") }
|
||||
/^ gitEmail = / { sub(/"[^"]*"/, "\"" v_email "\"") }
|
||||
/^ keyboardLayout = / { sub(/"[^"]*"/, "\"" v_kb "\"") }
|
||||
/^ keyboardVariant = / { sub(/"[^"]*"/, "\"" v_kv "\"") }
|
||||
/^ consoleKeyMap = / { sub(/"[^"]*"/, "\"" v_ckm "\"") }
|
||||
{ print }
|
||||
' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix
|
||||
' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix
|
||||
rm ./hosts/$hostName/variables.nix.bak
|
||||
|
||||
echo "Configuration files updated successfully!"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
{ pkgs, config, ... }:
|
||||
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
kernelModules = [ "v4l2loopback" ];
|
||||
extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
|
||||
kernel.sysctl = { "vm.max_map_count" = 2147483642; };
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelModules = ["v4l2loopback"];
|
||||
extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
|
||||
kernel.sysctl = {"vm.max_map_count" = 2147483642;};
|
||||
loader.systemd-boot.enable = true;
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
# Appimage Support
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
{lib, ...}: {
|
||||
nix.settings = {
|
||||
substituters = lib.mkAfter [
|
||||
"https://cache.nixos.org"
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@
|
|||
inputs,
|
||||
host,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
# Import the host-specific variables.nix
|
||||
vars = import ../../hosts/${host}/variables.nix;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
./boot.nix
|
||||
./flatpak.nix
|
||||
|
|
@ -20,7 +18,11 @@ in
|
|||
./packages.nix
|
||||
./printing.nix
|
||||
# Conditionally import the display manager module
|
||||
(if vars.displayManager == "tui" then ./greetd.nix else ./sddm.nix)
|
||||
(
|
||||
if vars.displayManager == "tui"
|
||||
then ./ly.nix
|
||||
else ./sddm.nix
|
||||
)
|
||||
./security.nix
|
||||
./services.nix
|
||||
./steam.nix
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
|
||||
configPackages = [ pkgs.hyprland ];
|
||||
extraPortals = [pkgs.xdg-desktop-portal-hyprland];
|
||||
configPackages = [pkgs.hyprland];
|
||||
};
|
||||
services = {
|
||||
flatpak = {
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
#"com.github.tchx84.Flatseal" #Manage flatpak permissions - should always have this
|
||||
#"com.rtosta.zapzap" # WhatsApp client
|
||||
#"io.github.flattool.Warehouse" # Manage flatpaks, clean data, remove flatpaks and deps
|
||||
#"it.mijorus.gearlever" # Manage and support AppImages
|
||||
#"it.mijorus.gearlever" # Manage and support AppImages
|
||||
#"io.github.freedoom.Phase1" # Classic Doom FPS 1
|
||||
#"io.github.freedoom.Phase2" # Classic Doom FPS 2
|
||||
#"io.github.dvlv.boxbuddyrs" # Manage distroboxes
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
fonts = {
|
||||
packages = with pkgs; [
|
||||
dejavu_fonts
|
||||
|
|
@ -15,6 +14,11 @@
|
|||
minecraftia
|
||||
nerd-fonts.im-writing
|
||||
nerd-fonts.blex-mono
|
||||
nerd-fonts.iosevka-term
|
||||
nerd-fonts.lilex
|
||||
nerd-fonts.ubuntu
|
||||
nerd-fonts.jetbrains-mono
|
||||
nerd-fonts.fira-mono
|
||||
noto-fonts
|
||||
noto-fonts-color-emoji
|
||||
noto-fonts-cjk-sans
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs
|
||||
, username
|
||||
, ...
|
||||
{
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
hardware = {
|
||||
sane = {
|
||||
enable = true;
|
||||
extraBackends = [ pkgs.sane-airscan ];
|
||||
disabledDefaultBackends = [ "escl" ];
|
||||
extraBackends = [pkgs.sane-airscan];
|
||||
disabledDefaultBackends = ["escl"];
|
||||
};
|
||||
logitech.wireless.enable = false;
|
||||
logitech.wireless.enableGraphical = false;
|
||||
|
|
|
|||
33
modules/core/ly.nix
Normal file
33
modules/core/ly.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
host,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
# Import the host-specific variables.nix
|
||||
vars = import ../../hosts/${host}/variables.nix;
|
||||
useLy = vars.displayManager == "tui";
|
||||
in {
|
||||
config = lib.mkIf useLy {
|
||||
# Prefer ly when TUI is selected; avoid greetd conflicts
|
||||
services.greetd.enable = lib.mkDefault false;
|
||||
|
||||
services.displayManager.ly = {
|
||||
enable = true;
|
||||
settings = {
|
||||
animation = "matrix";
|
||||
bigclock = true;
|
||||
# --- Color Settings (0xAARRGGBB) ---
|
||||
# Background color of dialog box (Black)
|
||||
bg = "0x00000000";
|
||||
# Foreground text color (Cyan: #00FFFF)
|
||||
fg = "0x0000FFFF";
|
||||
# Border color (Red: #FF0000)
|
||||
border_fg = "0x00FF0000";
|
||||
# Error message color (Red)
|
||||
error_fg = "0x00FF0000";
|
||||
# Clock color (Purple: #800080)
|
||||
clock_color = "#800080";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,17 +1,16 @@
|
|||
{ pkgs
|
||||
, host
|
||||
, options
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../hosts/${host}/variables.nix) hostId;
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
host,
|
||||
options,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../../hosts/${host}/variables.nix) hostId;
|
||||
in {
|
||||
networking = {
|
||||
hostName = "${host}";
|
||||
hostId = hostId;
|
||||
networkmanager.enable = true;
|
||||
timeServers = options.networking.timeServers.default ++ [ "pool.ntp.org" ];
|
||||
timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [
|
||||
|
|
@ -29,5 +28,5 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ networkmanagerapplet ];
|
||||
environment.systemPackages = with pkgs; [networkmanagerapplet];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
{host, ...}: let
|
||||
inherit (import ../../hosts/${host}/variables.nix) enableNFS;
|
||||
in
|
||||
{
|
||||
in {
|
||||
services = {
|
||||
rpcbind.enable = enableNFS;
|
||||
nfs.server.enable = enableNFS;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs
|
||||
, username
|
||||
, ...
|
||||
{
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
{ inputs, ... }: {
|
||||
{inputs, ...}: {
|
||||
nixpkgs.overlays = [
|
||||
# Provide pkgs.google-antigravity via antigravity-nix overlay
|
||||
inputs.antigravity-nix.overlays.default
|
||||
# Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk
|
||||
(_final: prev: {
|
||||
xfce = prev.xfce // {
|
||||
tumbler = prev.xfce.tumbler.overrideAttrs (old: {
|
||||
buildInputs = prev.lib.remove prev.libgepub old.buildInputs;
|
||||
});
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
host,
|
||||
...
|
||||
|
|
@ -12,6 +13,7 @@
|
|||
with pkgs; [
|
||||
matugen # color palette generator needed for noctalia-shell
|
||||
app2unit # launcher for noctalia-shell
|
||||
gpu-screen-recorder # needed for nnoctalia-shell
|
||||
]
|
||||
else [];
|
||||
in {
|
||||
|
|
@ -29,7 +31,6 @@ in {
|
|||
seahorse.enable = true;
|
||||
fuse.userAllowOther = true;
|
||||
mtr.enable = true;
|
||||
adb.enable = true;
|
||||
hyprlock.enable = true;
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
|
|
@ -38,10 +39,15 @@ in {
|
|||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
|
||||
|
||||
environment.systemPackages = with pkgs;
|
||||
noctaliaPkgs
|
||||
[
|
||||
inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
|
||||
]
|
||||
++ noctaliaPkgs
|
||||
++ [
|
||||
alejandra # nix formatter
|
||||
amfora # Fancy Terminal Browser For Gemini Protocol
|
||||
appimage-run # Needed For AppImage Support
|
||||
brave # Brave Browser
|
||||
|
|
@ -49,16 +55,14 @@ in {
|
|||
cliphist # Clipboard manager using rofi menu
|
||||
cmatrix # Matrix Movie Effect In Terminal
|
||||
cowsay # Great Fun Terminal Program
|
||||
discord # Stable client
|
||||
discord-canary # beta client
|
||||
docker-compose # Allows Controlling Docker From A Single File
|
||||
duf # Utility For Viewing Disk Usage In Terminal
|
||||
dysk # Disk space util nice formattting
|
||||
eza # Beautiful ls Replacement
|
||||
ffmpeg # Terminal Video / Audio Editing
|
||||
file-roller # Archive Manager
|
||||
gedit # Simple Graphical Text Editor
|
||||
gemini-cli # CLI AI client ONLY (optional)
|
||||
gearlever # Manage / run Appimages
|
||||
icu # dep for gearlever
|
||||
gimp # Great Photo Editor
|
||||
gpu-screen-recorder # needed for nnoctalia-shell
|
||||
power-profiles-daemon # needed for noctalia-shell power cycle
|
||||
|
|
@ -75,8 +79,11 @@ in {
|
|||
mdcat # CLI markdown parser
|
||||
mpv # Incredible Video Player
|
||||
ncdu # Disk Usage Analyzer With Ncurses Interface
|
||||
nixfmt-rfc-style # Nix Formatter
|
||||
nixfmt # Nix Formatter
|
||||
nwg-displays # configure monitor configs via GUI
|
||||
nwg-drawer # Application launcher for wayland
|
||||
nwg-dock-hyprland # Dock for hyprland
|
||||
nwg-menu # App menu for waybar
|
||||
onefetch # provides zsaneyos build info on current system
|
||||
pandoc # format MD to HTML for cheatsheet parser
|
||||
pavucontrol # For Editing Audio Levels & Devices
|
||||
|
|
@ -93,9 +100,9 @@ in {
|
|||
upower # noctalia shell battery
|
||||
uwsm # Universal Wayland Session Manager (optional must be enabled)
|
||||
v4l-utils # Used For Things Like OBS Virtual Camera
|
||||
warp-terminal # Terminal with AI support build in
|
||||
waypaper # Change wallpaper
|
||||
wget # Tool For Fetching Files With Links
|
||||
ytmdl # Tool For Downloading Audio From YouTube
|
||||
python3 # Python 3 programming language
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
{host, ...}: let
|
||||
inherit (import ../../hosts/${host}/variables.nix) printEnable;
|
||||
in
|
||||
{
|
||||
in {
|
||||
services = {
|
||||
printing = {
|
||||
enable = printEnable;
|
||||
|
|
|
|||
|
|
@ -1,31 +1,34 @@
|
|||
{ pkgs, inputs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
|
||||
# Qt6 related kits(for slove Qt5Compat problem)
|
||||
qt6.qt5compat
|
||||
qt6.qtbase
|
||||
qt6.qtquick3d
|
||||
qt6.qtwayland
|
||||
qt6.qtdeclarative
|
||||
qt6.qtsvg
|
||||
|
||||
# alternate options
|
||||
# libsForQt5.qt5compat
|
||||
kdePackages.qt5compat
|
||||
libsForQt5.qt5.qtgraphicaleffects
|
||||
];
|
||||
|
||||
# necessary environment variables
|
||||
environment.variables = {
|
||||
QML_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
|
||||
QML2_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
|
||||
};
|
||||
|
||||
# make sure the Qt application is working properly
|
||||
environment.sessionVariables = {
|
||||
QT_QPA_PLATFORM = "wayland;xcb";
|
||||
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
|
||||
};
|
||||
}
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
quickshell
|
||||
|
||||
# Qt6 related kits(for slove Qt5Compat problem)
|
||||
qt6.qt5compat
|
||||
qt6.qtbase
|
||||
qt6.qtquick3d
|
||||
qt6.qtwayland
|
||||
qt6.qtdeclarative
|
||||
qt6.qtsvg
|
||||
|
||||
# alternate options
|
||||
# libsForQt5.qt5compat
|
||||
kdePackages.qt5compat
|
||||
libsForQt5.qt5.qtgraphicaleffects
|
||||
];
|
||||
|
||||
# necessary environment variables
|
||||
environment.variables = {
|
||||
QML_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
|
||||
QML2_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
|
||||
};
|
||||
|
||||
# make sure the Qt application is working properly
|
||||
environment.sessionVariables = {
|
||||
QT_QPA_PLATFORM = "wayland;xcb";
|
||||
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ in {
|
|||
services.displayManager = {
|
||||
sddm = {
|
||||
package = pkgs.kdePackages.sddm;
|
||||
extraPackages = [ sddm-astronaut ];
|
||||
extraPackages = [sddm-astronaut];
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
theme = "sddm-astronaut-theme";
|
||||
|
|
@ -87,8 +87,8 @@ in {
|
|||
vars = import ../../hosts/${host}/variables.nix;
|
||||
keyboardLayout = vars.keyboardLayout or "us";
|
||||
keyboardVariant = vars.keyboardVariant or "";
|
||||
in ({ XKB_DEFAULT_LAYOUT = keyboardLayout; }
|
||||
// lib.optionalAttrs (keyboardVariant != "") { XKB_DEFAULT_VARIANT = keyboardVariant; });
|
||||
in ({XKB_DEFAULT_LAYOUT = keyboardLayout;}
|
||||
// lib.optionalAttrs (keyboardVariant != "") {XKB_DEFAULT_VARIANT = keyboardVariant;});
|
||||
|
||||
environment.systemPackages = [ sddm-astronaut ];
|
||||
environment.systemPackages = [sddm-astronaut];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ profile, ... }: {
|
||||
{profile, ...}: {
|
||||
# Services to start
|
||||
services = {
|
||||
upower.enable = true; # noctalia shell battery
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
PasswordAuthentication = true; #Users can SSH using kb and password
|
||||
KbdInteractiveAuthentication = true;
|
||||
};
|
||||
ports = [ 22 ];
|
||||
ports = [22];
|
||||
};
|
||||
blueman.enable = true; # Bluetooth Support
|
||||
tumbler.enable = true; # Image/video preview
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
programs = {
|
||||
starship = {
|
||||
enable = false;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
programs = {
|
||||
steam = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = false;
|
||||
gamescopeSession.enable = true;
|
||||
extraCompatPackages = [ pkgs.proton-ge-bin ];
|
||||
extraCompatPackages = [pkgs.proton-ge-bin];
|
||||
};
|
||||
|
||||
gamescope = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{ pkgs
|
||||
, host
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../hosts/${host}/variables.nix) stylixImage;
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
host,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../../hosts/${host}/variables.nix) stylixImage;
|
||||
in {
|
||||
# Styling Options
|
||||
stylix = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ username, ... }: {
|
||||
{username, ...}: {
|
||||
services.syncthing = {
|
||||
enable = false;
|
||||
user = "${username}";
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ in {
|
|||
};
|
||||
environment.variables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
ZANEYOS_VERSION = "2.5.4";
|
||||
ZANEYOS_VERSION = "2.6.1";
|
||||
ZANEYOS = "true";
|
||||
};
|
||||
console.keyMap = "${consoleKeyMap}";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
{ host
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../hosts/${host}/variables.nix) thunarEnable;
|
||||
in
|
||||
{
|
||||
host,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../../hosts/${host}/variables.nix) thunarEnable;
|
||||
in {
|
||||
programs = {
|
||||
thunar = {
|
||||
enable = thunarEnable;
|
||||
plugins = with pkgs.xfce; [
|
||||
thunar-archive-plugin
|
||||
thunar-volman
|
||||
plugins = [
|
||||
pkgs.thunar-archive-plugin
|
||||
pkgs.thunar-volman
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
{ pkgs
|
||||
, inputs
|
||||
, username
|
||||
, host
|
||||
, profile
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
inherit (import ../../hosts/${host}/variables.nix) gitUsername;
|
||||
in
|
||||
{
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||
pkgs,
|
||||
inputs,
|
||||
username,
|
||||
host,
|
||||
profile,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../../hosts/${host}/variables.nix) gitUsername;
|
||||
in {
|
||||
imports = [inputs.home-manager.nixosModules.home-manager];
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = false;
|
||||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = { inherit inputs username host profile pkgs; };
|
||||
extraSpecialArgs = {inherit inputs username host profile pkgs;};
|
||||
users.${username} = {
|
||||
imports = [ ./../home ];
|
||||
imports = [./../home];
|
||||
home = {
|
||||
username = "${username}";
|
||||
homeDirectory = "/home/${username}";
|
||||
|
|
@ -35,11 +34,11 @@ in
|
|||
"lp"
|
||||
"networkmanager"
|
||||
"scanner"
|
||||
"wheel" #subdo access
|
||||
"wheel" #sudo access
|
||||
"vboxusers" #Virtual Box
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
ignoreShellProgramCheck = true;
|
||||
};
|
||||
nix.settings.allowed-users = [ "${username}" ];
|
||||
nix.settings.allowed-users = ["${username}"];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
# Only enable either docker or podman -- Not both
|
||||
virtualisation = {
|
||||
docker = {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,40 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
{host, ...}: let
|
||||
vars = import ../../hosts/${host}/variables.nix;
|
||||
keyboardLayout = vars.keyboardLayout or "us";
|
||||
keyboardVariant = vars.keyboardVariant or "";
|
||||
layoutIsVariant = builtins.elem keyboardLayout [ "dvorak" "colemak" "workman" "intl" "us-intl" ];
|
||||
xkbLayout = if (keyboardVariant != "" || layoutIsVariant) then "us" else keyboardLayout;
|
||||
xkbVariant = if (keyboardVariant != "") then keyboardVariant else if layoutIsVariant then keyboardLayout else "";
|
||||
in
|
||||
{
|
||||
|
||||
# Treat only known US-based variants as implying layout = "us".
|
||||
usVariants = ["dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl"];
|
||||
normalizeUSVariant = v:
|
||||
if v == "us-intl"
|
||||
then "intl"
|
||||
else v;
|
||||
|
||||
# If layout itself is a US variant (e.g., "dvorak", "us-intl"), normalize it
|
||||
layoutFromLayout =
|
||||
if builtins.elem keyboardLayout usVariants
|
||||
then "us"
|
||||
else keyboardLayout;
|
||||
variantFromLayout =
|
||||
if builtins.elem keyboardLayout usVariants
|
||||
then normalizeUSVariant keyboardLayout
|
||||
else "";
|
||||
|
||||
# If the provided variant is a US variant, force layout to us; otherwise keep layout
|
||||
layoutFromVariant =
|
||||
if builtins.elem keyboardVariant usVariants
|
||||
then "us"
|
||||
else layoutFromLayout;
|
||||
variantFinal =
|
||||
if builtins.elem keyboardVariant usVariants
|
||||
then normalizeUSVariant keyboardVariant
|
||||
else if variantFromLayout != ""
|
||||
then variantFromLayout
|
||||
else keyboardVariant;
|
||||
|
||||
xkbLayout = layoutFromVariant;
|
||||
xkbVariant = variantFinal;
|
||||
in {
|
||||
services.xserver = {
|
||||
enable = false;
|
||||
xkb = {
|
||||
|
|
|
|||
|
|
@ -1,19 +1,18 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, config
|
||||
, ...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.drivers.amdgpu;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.drivers.amdgpu;
|
||||
in {
|
||||
options.drivers.amdgpu = {
|
||||
enable = mkEnableOption "Enable AMD Drivers";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ];
|
||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||
systemd.tmpfiles.rules = ["L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"];
|
||||
services.xserver.videoDrivers = ["amdgpu"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{ ...
|
||||
}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./amd-drivers.nix
|
||||
./intel-drivers.nix
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, config
|
||||
, ...
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.drivers.intel;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.drivers.intel = {
|
||||
enable = mkEnableOption "Enable Intel Graphics Drivers";
|
||||
};
|
||||
|
|
@ -19,6 +19,7 @@ in
|
|||
intel-vaapi-driver
|
||||
libva-vdpau-driver
|
||||
libvdpau-va-gl
|
||||
vpl-gpu-rt
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, config
|
||||
, ...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.local.hardware-clock;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.hardware-clock;
|
||||
in {
|
||||
options.local.hardware-clock = {
|
||||
enable = mkEnableOption "Change Hardware Clock To Local Time";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable { time.hardwareClockInLocalTime = true; };
|
||||
config = mkIf cfg.enable {time.hardwareClockInLocalTime = true;};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +1,34 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.drivers.nvidia-amd-hybrid;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.drivers.nvidia-amd-hybrid = {
|
||||
enable = mkEnableOption "Enable AMD iGPU + NVIDIA dGPU (Prime offload)";
|
||||
# AMD iGPU Bus ID (e.g., PCI:5:0:0). Expose as option for future host wiring.
|
||||
amdgpuBusID = mkOption {
|
||||
amdgpuBusId = mkOption {
|
||||
type = types.str;
|
||||
default = "PCI:5:0:0";
|
||||
description = "PCI Bus ID for AMD iGPU (amdgpuBusId)";
|
||||
description = "PCI Bus ID for AMD iGPU";
|
||||
};
|
||||
# NVIDIA dGPU Bus ID (e.g., PCI:1:0:0)
|
||||
nvidiaBusID = mkOption {
|
||||
nvidiaBusId = mkOption {
|
||||
type = types.str;
|
||||
default = "PCI:1:0:0";
|
||||
description = "PCI Bus ID for NVIDIA dGPU (nvidiaBusId)";
|
||||
description = "PCI Bus ID for NVIDIA dGPU";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# Enforce kernel 6.12 when this hybrid config is selected
|
||||
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
|
||||
# Not sure this is still neeeded but leaving just in case
|
||||
# boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
|
|
@ -44,8 +48,8 @@ in
|
|||
};
|
||||
|
||||
# Wire from options
|
||||
amdgpuBusId = cfg.amdgpuBusID;
|
||||
nvidiaBusId = cfg.nvidiaBusID;
|
||||
amdgpuBusId = cfg.amdgpuBusId;
|
||||
nvidiaBusId = cfg.nvidiaBusId;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,19 +1,18 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, config
|
||||
, ...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.drivers.nvidia;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.drivers.nvidia;
|
||||
in {
|
||||
options.drivers.nvidia = {
|
||||
enable = mkEnableOption "Enable Nvidia Drivers";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
hardware.nvidia = {
|
||||
# Modesetting is required.
|
||||
modesetting.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, config
|
||||
, ...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.drivers.nvidia-prime;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.drivers.nvidia-prime;
|
||||
in {
|
||||
options.drivers.nvidia-prime = {
|
||||
enable = mkEnableOption "Enable Nvidia Prime Hybrid GPU Offload";
|
||||
intelBusID = mkOption {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, config
|
||||
, ...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.vm.guest-services;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.vm.guest-services;
|
||||
in {
|
||||
options.vm.guest-services = {
|
||||
enable = mkEnableOption "Enable Virtual Machine Guest Services";
|
||||
};
|
||||
|
|
@ -15,6 +14,6 @@ in
|
|||
config = mkIf cfg.enable {
|
||||
services.qemuGuest.enable = true;
|
||||
services.spice-vdagentd.enable = true;
|
||||
services.spice-webdavd.enable = false; #Causes build failure davsfs2 unsupported neon version 9-12-25
|
||||
services.spice-webdavd.enable = false; #Causes build failure davsfs2 unsupported neon version 9-12-25
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ profile, ... }: {
|
||||
{profile, ...}: {
|
||||
programs.bash = {
|
||||
enable = false;
|
||||
enableCompletion = true;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [ bash ];
|
||||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [bash];
|
||||
|
||||
home.file."./.bashrc-personal".text = ''
|
||||
|
||||
# This file allows you to define your own aliases, functions, etc
|
||||
# below are just some examples of what you can use this file for
|
||||
|
||||
#!/usr/bin/env bash
|
||||
# Set defaults
|
||||
#
|
||||
#export EDITOR="nvim"
|
||||
#export VISUAL="nvim"
|
||||
|
||||
#alias c="clear"
|
||||
#eval "$(zoxide init bash)"
|
||||
#eval "$(oh-my-posh init bash --config $HOME/.config/powerlevel10k_rainbow.omp.json)"
|
||||
# This file allows you to define your own aliases, functions, etc
|
||||
# below are just some examples of what you can use this file for
|
||||
|
||||
#!/usr/bin/env bash
|
||||
# Set defaults
|
||||
#
|
||||
#export EDITOR="nvim"
|
||||
#export VISUAL="nvim"
|
||||
|
||||
#alias c="clear"
|
||||
#eval "$(zoxide init bash)"
|
||||
#eval "$(oh-my-posh init bash --config $HOME/.config/powerlevel10k_rainbow.omp.json)"
|
||||
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs
|
||||
, lib
|
||||
, ...
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
programs.bottom = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -9,14 +9,14 @@
|
|||
{
|
||||
ratio = 2;
|
||||
child = [
|
||||
{ type = "cpu"; }
|
||||
{ type = "temp"; }
|
||||
{type = "cpu";}
|
||||
{type = "temp";}
|
||||
];
|
||||
}
|
||||
{
|
||||
ratio = 2;
|
||||
child = [
|
||||
{ type = "network"; }
|
||||
{type = "network";}
|
||||
];
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
programs.btop = {
|
||||
enable = true;
|
||||
package = pkgs.btop.override {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }: {
|
||||
{config, ...}: {
|
||||
programs.cava = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
# Fzf is a general-purpose command-line fuzzy finder.
|
||||
{ config
|
||||
, lib
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
accent = "#" + config.lib.stylix.colors.base0D;
|
||||
foreground = "#" + config.lib.stylix.colors.base05;
|
||||
muted = "#" + config.lib.stylix.colors.base03;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
programs = {
|
||||
gh.enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
{host, ...}: let
|
||||
inherit (import ../../../hosts/${host}/variables.nix) gitUsername gitEmail;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
signing.format = null;
|
||||
|
||||
settings = {
|
||||
user = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }: {
|
||||
{config, ...}: {
|
||||
programs.htop = {
|
||||
enable = true;
|
||||
settings =
|
||||
|
|
@ -25,18 +25,18 @@
|
|||
highlight_threads = 1;
|
||||
}
|
||||
// (with config.lib.htop;
|
||||
leftMeters [
|
||||
(bar "AllCPUs2")
|
||||
(bar "Memory")
|
||||
(bar "Swap")
|
||||
(text "Zram")
|
||||
])
|
||||
leftMeters [
|
||||
(bar "AllCPUs2")
|
||||
(bar "Memory")
|
||||
(bar "Swap")
|
||||
(text "Zram")
|
||||
])
|
||||
// (with config.lib.htop;
|
||||
rightMeters [
|
||||
(text "Tasks")
|
||||
(text "LoadAverage")
|
||||
(text "Uptime")
|
||||
(text "Systemd")
|
||||
]);
|
||||
rightMeters [
|
||||
(text "Tasks")
|
||||
(text "LoadAverage")
|
||||
(text "Uptime")
|
||||
(text "Systemd")
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
# Lazygit is a simple terminal UI for git commands.
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
accent = "#${config.lib.stylix.colors.base0D}";
|
||||
muted = "#${config.lib.stylix.colors.base03}";
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = lib.mkForce {
|
||||
|
|
@ -18,8 +20,8 @@ in
|
|||
};
|
||||
gui = {
|
||||
theme = {
|
||||
activeBorderColor = [ accent "bold" ];
|
||||
inactiveBorderColor = [ muted ];
|
||||
activeBorderColor = [accent "bold"];
|
||||
inactiveBorderColor = [muted];
|
||||
};
|
||||
showListFooter = false;
|
||||
showRandomTip = false;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ in {
|
|||
./bash.nix
|
||||
./bashrc-personal.nix
|
||||
./overview.nix
|
||||
./python.nix
|
||||
./cli/bat.nix
|
||||
./cli/btop.nix
|
||||
./cli/bottom.nix
|
||||
|
|
@ -57,7 +58,7 @@ in {
|
|||
./wlogout
|
||||
./xdg.nix
|
||||
./yazi
|
||||
./zen-browser.nix
|
||||
#./zen-browser.nix
|
||||
./zoxide.nix
|
||||
./zsh
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
# Google Antigravity IDE helper, exposed via antigravity-nix overlay as pkgs.google-antigravity
|
||||
home.packages = with pkgs; [
|
||||
google-antigravity
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
doom-icon = pkgs.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/jeetelongname/doom-banners/master/splashes/doom/doom-emacs-color2.svg";
|
||||
sha256 = "1xxi5ra1z8njsqaqiaq96wyn1sc967l42kvjzbji1zrjj8za6bgq";
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
# 1. Create a script to install Doom Emacs
|
||||
home.packages = [
|
||||
(pkgs.writeShellScriptBin "get-doom" ''
|
||||
|
|
@ -73,6 +70,6 @@ in
|
|||
icon = doom-icon;
|
||||
terminal = false;
|
||||
type = "Application";
|
||||
categories = [ "Development" "TextEditor" ];
|
||||
categories = ["Development" "TextEditor"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
emacs-pgtk
|
||||
git
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
enableEvilHelix = true; # Set to true to enable the configuration
|
||||
in
|
||||
{
|
||||
in {
|
||||
home.packages = with pkgs; (
|
||||
if enableEvilHelix
|
||||
then [
|
||||
|
|
@ -11,7 +9,8 @@ in
|
|||
jsonnet-language-server
|
||||
luaformatter
|
||||
lua-language-server
|
||||
marksman
|
||||
#marksman # causes dotnet and dotnet-swr to build which takes hours
|
||||
multimarkdown
|
||||
taplo
|
||||
nil
|
||||
jq-lsp
|
||||
|
|
@ -25,7 +24,7 @@ in
|
|||
docker-language-server
|
||||
typescript-language-server
|
||||
]
|
||||
else [ ]
|
||||
else []
|
||||
);
|
||||
|
||||
home.file.".config/helix/languages.toml".text =
|
||||
|
|
|
|||
|
|
@ -44,6 +44,9 @@
|
|||
settings = {
|
||||
flavour = "mocha";
|
||||
transparent_background = false;
|
||||
integrations = {
|
||||
lualine = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -53,7 +56,7 @@
|
|||
lualine = {
|
||||
enable = true;
|
||||
settings = {
|
||||
options = {theme = "catppuccin";};
|
||||
options = {theme = "auto";};
|
||||
};
|
||||
};
|
||||
bufferline.enable = true;
|
||||
|
|
@ -74,11 +77,16 @@
|
|||
treesitter-context.enable = false;
|
||||
|
||||
# Project management
|
||||
project-nvim.enable = true;
|
||||
project-nvim = {
|
||||
enable = true;
|
||||
settings = {
|
||||
history.save_dir = "${config.home.homeDirectory}/.local/share/nvim/project_nvim";
|
||||
};
|
||||
};
|
||||
|
||||
# Notifications and UI polish
|
||||
notify.enable = true;
|
||||
noice.enable = true;
|
||||
noice.enable = false;
|
||||
|
||||
# Startup dashboard
|
||||
alpha = {
|
||||
|
|
@ -124,14 +132,38 @@
|
|||
markdown-preview.enable = true;
|
||||
|
||||
# Completion and snippets
|
||||
cmp = {
|
||||
blink-cmp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
keymap = {
|
||||
preset = "default";
|
||||
"<CR>" = ["accept" "fallback"];
|
||||
"<Tab>" = ["select_next" "fallback"];
|
||||
"<S-Tab>" = ["select_prev" "fallback"];
|
||||
};
|
||||
appearance = {
|
||||
nerd_font_variant = "mono";
|
||||
};
|
||||
completion = {
|
||||
documentation = {
|
||||
auto_show = true;
|
||||
auto_show_delay_ms = 500;
|
||||
};
|
||||
};
|
||||
sources = {
|
||||
default = ["lsp" "path" "snippets" "buffer"];
|
||||
};
|
||||
snippets = {
|
||||
preset = "luasnip";
|
||||
};
|
||||
fuzzy = {
|
||||
implementation = "prefer_rust_with_warning";
|
||||
};
|
||||
signature = {
|
||||
enabled = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
# Completion sources for LSP, buffer, path, and snippets
|
||||
cmp-nvim-lsp.enable = true;
|
||||
cmp-buffer.enable = true;
|
||||
cmp-path.enable = true;
|
||||
cmp_luasnip.enable = true;
|
||||
|
||||
luasnip.enable = true;
|
||||
friendly-snippets.enable = true;
|
||||
|
|
@ -150,8 +182,8 @@
|
|||
html.enable = true;
|
||||
cssls.enable = true;
|
||||
clangd.enable = true;
|
||||
zls.enable = true;
|
||||
marksman.enable = true;
|
||||
zls.enable = false;
|
||||
marksman.enable = false;
|
||||
hyprls.enable = true;
|
||||
# hyprls is optional; keep tools available via extraPackages
|
||||
};
|
||||
|
|
@ -169,7 +201,7 @@
|
|||
enable = true;
|
||||
settings = {
|
||||
formatters_by_ft = {
|
||||
nix = ["nixpkgs_fmt"];
|
||||
nix = ["alejandra"];
|
||||
lua = ["stylua"];
|
||||
javascript = ["prettierd"];
|
||||
typescript = ["prettierd"];
|
||||
|
|
@ -302,13 +334,14 @@
|
|||
lazygit
|
||||
nil
|
||||
hyprls
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.typescript
|
||||
typescript-language-server
|
||||
typescript
|
||||
vscode-langservers-extracted
|
||||
pyright
|
||||
lua-language-server
|
||||
zls
|
||||
marksman
|
||||
multimarkdown
|
||||
clang-tools
|
||||
prettierd
|
||||
stylua
|
||||
|
|
@ -316,6 +349,8 @@
|
|||
nixpkgs-fmt
|
||||
figlet
|
||||
toilet
|
||||
bash-language-server
|
||||
tailwindcss-language-server
|
||||
];
|
||||
|
||||
# Diagnostic UI and notify background tweaks
|
||||
|
|
@ -361,44 +396,6 @@
|
|||
vim.notify = notify
|
||||
end
|
||||
|
||||
-- nvim-cmp setup: sources + mappings + snippet expansion
|
||||
do
|
||||
local ok_cmp, cmp = pcall(require, "cmp")
|
||||
if ok_cmp then
|
||||
local ok_snip, luasnip = pcall(require, "luasnip")
|
||||
if ok_snip then
|
||||
-- Load friendly-snippets lazily if available
|
||||
pcall(function()
|
||||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
end)
|
||||
end
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
if ok_snip then luasnip.lsp_expand(args.body) end
|
||||
end,
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
["<Tab>"] = cmp.mapping.select_next_item(),
|
||||
["<S-Tab>"] = cmp.mapping.select_prev_item(),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
}, {
|
||||
{ name = "path" },
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
-- nvim-cmp integration with nvim-autopairs (optional)
|
||||
local ok_ap, cmp_autopairs = pcall(require, "nvim-autopairs.completion.cmp")
|
||||
if ok_ap then
|
||||
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Startup dashboard (alpha-nvim)
|
||||
do
|
||||
|
|
@ -421,17 +418,18 @@
|
|||
return #lines > 0 and lines or nil
|
||||
end
|
||||
|
||||
header_lines = gen_banner('toilet -f ansi-shadow NIXOS 2>/dev/null')
|
||||
or gen_banner('figlet -f "ANSI Shadow" NIXOS 2>/dev/null')
|
||||
or gen_banner('figlet NIXOS 2>/dev/null')
|
||||
header_lines = gen_banner('toilet -f ansi-shadow NIXVIM 2>/dev/null')
|
||||
or gen_banner('figlet -f "ANSI Shadow" NIXVIM 2>/dev/null')
|
||||
or gen_banner('figlet NIXVIM 2>/dev/null')
|
||||
|
||||
if not header_lines then
|
||||
header_lines = {
|
||||
" _ _ ___ __ __ ___ ___ ____ ",
|
||||
"| \\ | |_ _| \\ \\/ / / _ \\ / _ \\\ | _ \\ ",
|
||||
"| \\| || | \\ / | | | | | | || | | |",
|
||||
"| |\\ || | / \\ | |_| | |_| || |_| |",
|
||||
"|_| \\_|___| /_/\\_\\ \\___/ \\___/ |____/ ",
|
||||
"███╗ ██╗██╗██╗ ██╗██╗ ██╗██╗███╗ ███╗",
|
||||
"████╗ ██║██║╚██╗██╔╝██║ ██║██║████╗ ████║",
|
||||
"██╔██╗ ██║██║ ╚███╔╝ ██║ ██║██║██╔████╔██║",
|
||||
"██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║",
|
||||
"██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║",
|
||||
"╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝",
|
||||
}
|
||||
end
|
||||
dashboard.section.header.val = header_lines
|
||||
|
|
@ -462,4 +460,9 @@
|
|||
end
|
||||
'';
|
||||
};
|
||||
|
||||
home.activation.projectNvimHistory = ''
|
||||
mkdir -p "$HOME/.local/share/nvim/project_nvim"
|
||||
find "$HOME/.local/share/nvim/project_nvim" -type f -size 0 -delete 2>/dev/null || true
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ inputs
|
||||
, config
|
||||
, ...
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
imports = [ inputs.nvf.homeManagerModules.default ];
|
||||
imports = [inputs.nvf.homeManagerModules.default];
|
||||
|
||||
programs.nvf = {
|
||||
enable = true;
|
||||
|
|
@ -50,55 +51,55 @@
|
|||
keymaps = [
|
||||
{
|
||||
key = "jk";
|
||||
mode = [ "i" ];
|
||||
mode = ["i"];
|
||||
action = "<ESC>";
|
||||
desc = "Exit insert mode";
|
||||
}
|
||||
{
|
||||
key = "<leader>nh";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
action = ":nohl<CR>";
|
||||
desc = "Clear search highlights";
|
||||
}
|
||||
{
|
||||
key = "<leader>ff";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
action = "<cmd>Telescope find_files<cr>";
|
||||
desc = "Search files by name";
|
||||
}
|
||||
{
|
||||
key = "<leader>lg";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
action = "<cmd>Telescope live_grep<cr>";
|
||||
desc = "Search files by contents";
|
||||
}
|
||||
{
|
||||
key = "<leader>fe";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
action = "<cmd>Neotree toggle<cr>";
|
||||
desc = "File browser toggle";
|
||||
}
|
||||
{
|
||||
key = "<C-h>";
|
||||
mode = [ "i" ];
|
||||
mode = ["i"];
|
||||
action = "<Left>";
|
||||
desc = "Move left in insert mode";
|
||||
}
|
||||
{
|
||||
key = "<C-j>";
|
||||
mode = [ "i" ];
|
||||
mode = ["i"];
|
||||
action = "<Down>";
|
||||
desc = "Move down in insert mode";
|
||||
}
|
||||
{
|
||||
key = "<C-k>";
|
||||
mode = [ "i" ];
|
||||
mode = ["i"];
|
||||
action = "<Up>";
|
||||
desc = "Move up in insert mode";
|
||||
}
|
||||
{
|
||||
key = "<C-l>";
|
||||
mode = [ "i" ];
|
||||
mode = ["i"];
|
||||
action = "<Right>";
|
||||
desc = "Move right in insert mode";
|
||||
}
|
||||
|
|
@ -108,7 +109,7 @@
|
|||
|
||||
spellcheck = {
|
||||
enable = true;
|
||||
languages = [ "en" ];
|
||||
languages = ["en"];
|
||||
programmingWordlist.enable = true;
|
||||
};
|
||||
|
||||
|
|
@ -223,7 +224,7 @@
|
|||
comments = {
|
||||
comment-nvim.enable = true;
|
||||
};
|
||||
|
||||
|
||||
luaConfigPost = ''
|
||||
-- Nix LSP (nil) configuration for auto-eval-inputs
|
||||
local lspconfig = require('lspconfig')
|
||||
|
|
@ -236,7 +237,7 @@
|
|||
},
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
-- Auto-update programming wordlist on first startup
|
||||
vim.api.nvim_create_autocmd("VimEnter", {
|
||||
callback = function()
|
||||
|
|
@ -258,7 +259,7 @@
|
|||
dirtytalkUpdate = ''
|
||||
# Create the spell directory if it doesn't exist
|
||||
mkdir -p "$HOME/.local/share/nvim/site/spell"
|
||||
|
||||
|
||||
# Try to run DirtytalkUpdate in headless mode with better error handling
|
||||
if ! ${config.programs.nvf.finalPackage}/bin/nvim --headless -c "DirtytalkUpdate" -c "qa!" 2>/dev/null; then
|
||||
echo "Note: DirtytalkUpdate will run automatically on first Neovim startup"
|
||||
|
|
|
|||
|
|
@ -90,4 +90,5 @@ in {
|
|||
};
|
||||
};
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
home.file.".config/.emoji".text = ''
|
||||
😀 grinning face face smile happy joy :D grin
|
||||
😃 grinning face with big eyes face happy joy haha :D :) smile funny
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
}
|
||||
{
|
||||
type = "cpu";
|
||||
format = "{1} ({3}) @ {7} GHz";
|
||||
format = "{1} ({3}) @ {7}";
|
||||
key = " ├ ";
|
||||
keyColor = "33";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
{config, pkgs, ...}: {
|
||||
gtk = {
|
||||
gtk4.theme = null;
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
animations = {
|
||||
enabled = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
# name "Dynamic"
|
||||
# credit https://github.com/mylinuxforwork/dotfiles
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
# Name: END-4
|
||||
# Credit: END-4 project https://github.com/end-4/dots-hyprland
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
# name "moving"
|
||||
# credit https://github.com/mylinuxforwork/dotfiles
|
||||
|
|
|
|||
|
|
@ -10,17 +10,18 @@
|
|||
noctaliaBind =
|
||||
if barChoice == "noctalia"
|
||||
then [
|
||||
"$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle"
|
||||
"$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle"
|
||||
"$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggle"
|
||||
"$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard"
|
||||
"$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle"
|
||||
"$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle"
|
||||
"$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend"
|
||||
"$modifier SHIFT,Y, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle"
|
||||
"$modifier,X, Noctalia Power Menu, exec, dms qs -c noctalia-shell ipc call sessionMenu toggle"
|
||||
"$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle"
|
||||
"$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle"
|
||||
"$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
|
||||
"$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
|
||||
"$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory"
|
||||
"$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard"
|
||||
"$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
|
||||
"$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
|
||||
"$modifier CTRL,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockscreen lock"
|
||||
"$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle"
|
||||
"$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle"
|
||||
"$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle"
|
||||
"$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle"
|
||||
"$modifier SHIFT,R, Restart Noctalia shell, exec, restart.noctalia"
|
||||
]
|
||||
else [];
|
||||
# Rofi launcher bindings (only included when barChoice != "noctalia")
|
||||
|
|
@ -46,16 +47,17 @@ in {
|
|||
++ rofiClipboardBind
|
||||
++ [
|
||||
# ============= WORKSPACE OVERVIEW =============
|
||||
"$modifier CTRL,D, Toggle Dock, exec, dock"
|
||||
"$modifier, TAB, QS Overview, exec, qs ipc -c overview call overview toggle"
|
||||
# ============= TERMINALS =============
|
||||
"$modifier,Return, Terminal, exec, ${terminal}"
|
||||
# ============= APPLICATION LAUNCHERS =============
|
||||
"$modifier,K, Keybinds Search Tool, exec, qs-keybinds"
|
||||
"$modifier CTRL,C, Cheatsheets Viewer, exec, qs-cheatsheets"
|
||||
"$modifier SHIFT,K, Legacy Keybinds Menu, exec, list-keybinds"
|
||||
"$modifier SHIFT,K, Keybinds Search Tool, exec, qs-keybinds"
|
||||
"$modifier SHIFT,D, Discord, exec, discord"
|
||||
"$modifier SHIFT,W, Web Search, exec, web-search"
|
||||
"$modifier ALT,W, Wallpaper Setter, exec, wallsetter"
|
||||
"$modifier ALT,W, Web Search, exec, web-search"
|
||||
"$modifier SHIFT,W, QS Wallpaper Setter, exec, qs-wallpapers-apply"
|
||||
"$modifier SHIFT,N, Notification Reset, exec, swaync-client -rs"
|
||||
"$modifier,W, Web Browser, exec, ${browser}"
|
||||
"$modifier,Y, File Manager, exec, kitty -e yazi"
|
||||
|
|
@ -68,16 +70,22 @@ in {
|
|||
"$modifier,O, OBS Studio, exec, obs"
|
||||
"$modifier ALT,C, Color Picker, exec, hyprpicker -a"
|
||||
"$modifier,G, GIMP, exec, gimp"
|
||||
"$modifier shift,T, Dropdown Terminal, exec, pypr toggle term"
|
||||
"$modifier SHIFT,T, Dropdown Terminal, exec, sh -lc 'DropTerminal'"
|
||||
"$modifier,T, Thunar, exec, thunar"
|
||||
"$modifier ALT,M, Audio Control, exec, pavucontrol"
|
||||
# ============= WINDOW MANAGEMENT =============
|
||||
"$modifier,Q, Kill Active Window, killactive,"
|
||||
"$modifier,P, Pseudo Tile, pseudo,"
|
||||
"$modifier SHIFT,I, Toggle Split, togglesplit,"
|
||||
"$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit"
|
||||
"$modifier,F, Maximize, fullscreen,"
|
||||
"$modifier SHIFT,F, Toggle Floating, togglefloating,"
|
||||
"$modifier ALT,F, Float All Windows, workspaceopt, allfloat"
|
||||
"$modifier ALT,F, Float All Windows, exec, hyprland-float-all"
|
||||
# ============= LAYOUTS =============
|
||||
"$modifier ALT,L, Toggle Layouts, exec, hyprland-change-layout toggle"
|
||||
"$modifier ALT,1, Layout Dwindle, exec, hyprland-change-layout dwindle"
|
||||
"$modifier ALT,2, Layout Master, exec, hyprland-change-layout master"
|
||||
"$modifier ALT,3, Layout Scrolling, exec, hyprland-change-layout scrolling"
|
||||
"$modifier ALT,4, Layout Monocle, exec, hyprland-change-layout monocle"
|
||||
"$modifier SHIFT,C, Exit/Logout of Hyprland, exit,"
|
||||
# ============= WINDOW MOVEMENT (ARROW KEYS) =============
|
||||
"$modifier SHIFT,left, Move Left, movewindow, l"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
{host, ...}: let
|
||||
inherit (import ../../../hosts/${host}/variables.nix) animChoice;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
animChoice
|
||||
./binds.nix
|
||||
|
|
@ -11,7 +9,6 @@ in
|
|||
./hypridle.nix
|
||||
./hyprland.nix
|
||||
./hyprlock.nix
|
||||
./pyprland.nix
|
||||
./windowrules.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
env = [
|
||||
|
|
|
|||
|
|
@ -1,38 +1,45 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
{host, ...}: let
|
||||
vars = import ../../../hosts/${host}/variables.nix;
|
||||
inherit (vars)
|
||||
inherit
|
||||
(vars)
|
||||
barChoice
|
||||
stylixImage
|
||||
;
|
||||
# Noctalia-specific startup commands
|
||||
noctaliaExec = if barChoice == "noctalia" then [
|
||||
"killall -q waybar"
|
||||
"pkill waybar"
|
||||
"killall -q swaync"
|
||||
"pkill swaync"
|
||||
"qs -c noctalia-shell"
|
||||
] else [];
|
||||
noctaliaExec =
|
||||
if barChoice == "noctalia"
|
||||
then [
|
||||
"killall -q waybar"
|
||||
"pkill waybar"
|
||||
"killall -q swaync"
|
||||
"pkill swaync"
|
||||
"noctalia-shell &"
|
||||
]
|
||||
else [];
|
||||
# Waybar-specific startup commands
|
||||
waybarExec = if barChoice != "noctalia" then [
|
||||
"killall -q swww;sleep .5 && swww-daemon"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"sleep 1.0 && swww img ${stylixImage}"
|
||||
] else [];
|
||||
in
|
||||
{
|
||||
waybarExec =
|
||||
if barChoice != "noctalia"
|
||||
then [
|
||||
"killall -q awww;sleep .5 && awww-daemon"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
# Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change
|
||||
"sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'"
|
||||
]
|
||||
else [];
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
exec-once = [
|
||||
"wl-paste --type text --watch cliphist store" # Saves text
|
||||
"wl-paste --type image --watch cliphist store" # Saves images
|
||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
||||
"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user start hyprpolkitagent"
|
||||
"pypr &"
|
||||
"qs -c overview" # Start quickshell-overview daemon
|
||||
] ++ noctaliaExec ++ waybarExec;
|
||||
exec-once =
|
||||
[
|
||||
"wl-paste --type text --watch cliphist store" # Saves text
|
||||
"wl-paste --type image --watch cliphist store" # Saves images
|
||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user start hyprpolkitagent"
|
||||
"qs -c overview" # Start quickshell-overview daemon
|
||||
"hyprland-change-layout init"
|
||||
]
|
||||
++ noctaliaExec ++ waybarExec;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
{...}: {
|
||||
services = {
|
||||
hypridle = {
|
||||
enable = true;
|
||||
systemdTarget = "hyprland-session.target";
|
||||
settings = {
|
||||
general = {
|
||||
after_sleep_cmd = "hyprctl dispatch dpms on";
|
||||
|
|
|
|||
|
|
@ -4,20 +4,46 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
vars = import ../../../hosts/${host}/variables.nix;
|
||||
extraMonitorSettings = vars.extraMonitorSettings or "";
|
||||
keyboardLayout = vars.keyboardLayout or "us";
|
||||
keyboardVariant = vars.keyboardVariant or "";
|
||||
stylixImage = vars.stylixImage or null;
|
||||
layoutIsVariant = builtins.elem keyboardLayout [ "dvorak" "colemak" "workman" "intl" "us-intl" ];
|
||||
hyprKbLayout = if (keyboardVariant != "" || layoutIsVariant) then "us" else keyboardLayout;
|
||||
hyprKbVariant = if (keyboardVariant != "") then keyboardVariant else if layoutIsVariant then keyboardLayout else "";
|
||||
in
|
||||
{
|
||||
|
||||
# Treat only known US-based variants as implying layout = "us".
|
||||
usVariants = ["dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl"];
|
||||
normalizeUSVariant = v:
|
||||
if v == "us-intl"
|
||||
then "intl"
|
||||
else v;
|
||||
|
||||
# If layout itself is a US variant (e.g., "dvorak", "us-intl"), normalize it
|
||||
layoutFromLayout =
|
||||
if builtins.elem keyboardLayout usVariants
|
||||
then "us"
|
||||
else keyboardLayout;
|
||||
variantFromLayout =
|
||||
if builtins.elem keyboardLayout usVariants
|
||||
then normalizeUSVariant keyboardLayout
|
||||
else "";
|
||||
|
||||
# If the provided variant is a US variant, force layout to us; otherwise keep layout
|
||||
layoutFromVariant =
|
||||
if builtins.elem keyboardVariant usVariants
|
||||
then "us"
|
||||
else layoutFromLayout;
|
||||
variantFinal =
|
||||
if builtins.elem keyboardVariant usVariants
|
||||
then normalizeUSVariant keyboardVariant
|
||||
else if variantFromLayout != ""
|
||||
then variantFromLayout
|
||||
else keyboardVariant;
|
||||
|
||||
hyprKbLayout = layoutFromVariant;
|
||||
hyprKbVariant = variantFinal;
|
||||
in {
|
||||
home.packages = with pkgs; [
|
||||
swww
|
||||
grim
|
||||
slurp
|
||||
wl-clipboard
|
||||
|
|
@ -25,6 +51,7 @@ in
|
|||
ydotool
|
||||
hyprpolkitagent
|
||||
hyprshot
|
||||
hyprshutdown
|
||||
hyprpicker
|
||||
#hyprland-qtutils # needed for banners and ANR messages
|
||||
];
|
||||
|
|
@ -46,32 +73,34 @@ in
|
|||
systemd = {
|
||||
enable = true;
|
||||
enableXdgAutostart = true;
|
||||
variables = [ "--all" ];
|
||||
variables = ["--all"];
|
||||
};
|
||||
xwayland = {
|
||||
enable = true;
|
||||
};
|
||||
settings = {
|
||||
input = ({
|
||||
kb_layout = hyprKbLayout;
|
||||
kb_options = [
|
||||
"grp:alt_caps_toggle"
|
||||
"caps:super"
|
||||
];
|
||||
numlock_by_default = true;
|
||||
repeat_delay = 300;
|
||||
follow_mouse = 1;
|
||||
float_switch_override_focus = 0;
|
||||
sensitivity = 0;
|
||||
touchpad = {
|
||||
natural_scroll = true;
|
||||
disable_while_typing = true;
|
||||
scroll_factor = 0.8;
|
||||
};
|
||||
} // lib.optionalAttrs (hyprKbVariant != "") { kb_variant = hyprKbVariant; });
|
||||
input =
|
||||
{
|
||||
kb_layout = hyprKbLayout;
|
||||
kb_options = [
|
||||
"grp:alt_caps_toggle"
|
||||
"caps:super"
|
||||
];
|
||||
numlock_by_default = true;
|
||||
repeat_delay = 300;
|
||||
follow_mouse = 1;
|
||||
float_switch_override_focus = 0;
|
||||
sensitivity = 0;
|
||||
touchpad = {
|
||||
natural_scroll = true;
|
||||
disable_while_typing = true;
|
||||
scroll_factor = 0.8;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (hyprKbVariant != "") {kb_variant = hyprKbVariant;};
|
||||
|
||||
gestures = {
|
||||
gesture = [ "3, horizontal, workspace" ];
|
||||
gesture = ["3, horizontal, workspace"];
|
||||
workspace_swipe_distance = 500;
|
||||
workspace_swipe_invert = true;
|
||||
workspace_swipe_min_speed_to_force = 30;
|
||||
|
|
@ -79,16 +108,24 @@ in
|
|||
workspace_swipe_create_new = true;
|
||||
workspace_swipe_forever = true;
|
||||
};
|
||||
"$modifier" = "SUPER";
|
||||
|
||||
scrolling = {
|
||||
column_width = 0.80;
|
||||
fullscreen_on_one_column = true;
|
||||
direction = "right";
|
||||
follow_focus = true;
|
||||
};
|
||||
|
||||
monocle = {};
|
||||
|
||||
general = {
|
||||
"$modifier" = "SUPER";
|
||||
layout = "dwindle";
|
||||
gaps_in = 6;
|
||||
gaps_out = 8;
|
||||
border_size = 2;
|
||||
resize_on_border = true;
|
||||
"col.active_border" =
|
||||
"rgb(${config.lib.stylix.colors.base08}) rgb(${config.lib.stylix.colors.base0C}) 45deg";
|
||||
"col.active_border" = "rgb(${config.lib.stylix.colors.base08}) rgb(${config.lib.stylix.colors.base0C}) 45deg";
|
||||
"col.inactive_border" = "rgb(${config.lib.stylix.colors.base01})";
|
||||
};
|
||||
|
||||
|
|
@ -96,11 +133,11 @@ in
|
|||
layers_hog_keyboard_focus = true;
|
||||
initial_workspace_tracking = 0;
|
||||
mouse_move_enables_dpms = true;
|
||||
key_press_enables_dpms = false;
|
||||
key_press_enables_dpms = true;
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
enable_swallow = false;
|
||||
vfr = true; # Variable Frame Rate
|
||||
# vfr = true; # Variable Frame Rate Not supported post v0.54.3
|
||||
vrr = 2; # Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES
|
||||
# Screen flashing to black momentarily or going black when app is fullscreen
|
||||
# Try setting vrr to 0
|
||||
|
|
@ -111,9 +148,15 @@ in
|
|||
};
|
||||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
pseudotile = false;
|
||||
preserve_split = true;
|
||||
force_split = 2;
|
||||
smart_resizing = true;
|
||||
use_active_for_splits = true;
|
||||
smart_split = false;
|
||||
default_split_ratio = 1.0;
|
||||
split_bias = 0;
|
||||
precise_mouse_move = false;
|
||||
special_scale_factor = 0.8;
|
||||
};
|
||||
|
||||
decoration = {
|
||||
|
|
@ -154,9 +197,16 @@ in
|
|||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
new_on_top = 1;
|
||||
mfact = 0.5;
|
||||
new_status = "slave";
|
||||
new_on_top = false;
|
||||
new_on_active = "none";
|
||||
orientation = "left";
|
||||
mfact = 0.55;
|
||||
slave_count_for_center_master = 2;
|
||||
center_master_fallback = "left";
|
||||
smart_resizing = true;
|
||||
drop_at_cursor = true;
|
||||
always_keep_position = false;
|
||||
};
|
||||
|
||||
# Ensure Xwayland windows render at integer scale; compositor scales them
|
||||
|
|
@ -168,9 +218,7 @@ in
|
|||
extraConfig = "
|
||||
monitor=,preferred,auto,auto
|
||||
monitor=Virtual-1,1920x1080@60,auto,1
|
||||
${
|
||||
extraMonitorSettings
|
||||
}
|
||||
${extraMonitorSettings}
|
||||
# To enable blur on waybar uncomment the line below
|
||||
# Thanks to SchotjeChrisman
|
||||
#layerrule = blur,waybar
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ username, ... }: {
|
||||
{
|
||||
config,
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -10,7 +14,7 @@
|
|||
};
|
||||
background = [
|
||||
{
|
||||
path = "/home/${username}/Pictures/Wallpapers/beautifulmountainscape.jpg";
|
||||
path = config.stylix.image;
|
||||
blur_passes = 3;
|
||||
blur_size = 8;
|
||||
}
|
||||
|
|
|
|||
106
modules/home/hyprland/nwg-dock-hyprland/colors.css
Normal file
106
modules/home/hyprland/nwg-dock-hyprland/colors.css
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
/*
|
||||
* Css Colors
|
||||
* Generated with Matugen
|
||||
*/
|
||||
@define-color blur_background rgba(18, 19, 24, 0.3);
|
||||
@define-color blur_background8 rgba(18, 19, 24, 0.8);
|
||||
|
||||
@define-color background #121318;
|
||||
|
||||
@define-color error #ffb4ab;
|
||||
|
||||
@define-color error_container #93000a;
|
||||
|
||||
@define-color inverse_on_surface #2f3036;
|
||||
|
||||
@define-color inverse_primary #485d92;
|
||||
|
||||
@define-color inverse_surface #e2e2e9;
|
||||
|
||||
@define-color on_background #e2e2e9;
|
||||
|
||||
@define-color on_error #690005;
|
||||
|
||||
@define-color on_error_container #ffdad6;
|
||||
|
||||
@define-color on_primary #162e60;
|
||||
|
||||
@define-color on_primary_container #dae2ff;
|
||||
|
||||
@define-color on_primary_fixed #001946;
|
||||
|
||||
@define-color on_primary_fixed_variant #2f4578;
|
||||
|
||||
@define-color on_secondary #2a3042;
|
||||
|
||||
@define-color on_secondary_container #dce2f9;
|
||||
|
||||
@define-color on_secondary_fixed #151b2c;
|
||||
|
||||
@define-color on_secondary_fixed_variant #404659;
|
||||
|
||||
@define-color on_surface #e2e2e9;
|
||||
|
||||
@define-color on_surface_variant #c5c6d0;
|
||||
|
||||
@define-color on_tertiary #412742;
|
||||
|
||||
@define-color on_tertiary_container #fed7fa;
|
||||
|
||||
@define-color on_tertiary_fixed #2a122c;
|
||||
|
||||
@define-color on_tertiary_fixed_variant #593d59;
|
||||
|
||||
@define-color outline #8f9099;
|
||||
|
||||
@define-color outline_variant #44464f;
|
||||
|
||||
@define-color primary #b1c5ff;
|
||||
|
||||
@define-color primary_container #2f4578;
|
||||
|
||||
@define-color primary_fixed #dae2ff;
|
||||
|
||||
@define-color primary_fixed_dim #b1c5ff;
|
||||
|
||||
@define-color scrim #000000;
|
||||
|
||||
@define-color secondary #c0c6dc;
|
||||
|
||||
@define-color secondary_container #404659;
|
||||
|
||||
@define-color secondary_fixed #dce2f9;
|
||||
|
||||
@define-color secondary_fixed_dim #c0c6dc;
|
||||
|
||||
@define-color shadow #000000;
|
||||
|
||||
@define-color source_color #1253be;
|
||||
|
||||
@define-color surface #121318;
|
||||
|
||||
@define-color surface_bright #38393f;
|
||||
|
||||
@define-color surface_container #1e1f25;
|
||||
|
||||
@define-color surface_container_high #282a2f;
|
||||
|
||||
@define-color surface_container_highest #33343a;
|
||||
|
||||
@define-color surface_container_low #1a1b21;
|
||||
|
||||
@define-color surface_container_lowest #0d0e13;
|
||||
|
||||
@define-color surface_dim #121318;
|
||||
|
||||
@define-color surface_tint #b1c5ff;
|
||||
|
||||
@define-color surface_variant #44464f;
|
||||
|
||||
@define-color tertiary #e0bbdd;
|
||||
|
||||
@define-color tertiary_container #593d59;
|
||||
|
||||
@define-color tertiary_fixed #fed7fa;
|
||||
|
||||
@define-color tertiary_fixed_dim #e0bbdd;
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [ pyprland ];
|
||||
|
||||
home.file.".config/hypr/pyprland.toml".text = ''
|
||||
[pyprland]
|
||||
plugins = [
|
||||
"scratchpads",
|
||||
]
|
||||
|
||||
[scratchpads.term]
|
||||
animation = "fromTop"
|
||||
command = "kitty --class kitty-dropterm"
|
||||
class = "kitty-dropterm"
|
||||
size = "70% 70%"
|
||||
max_size = "1920px 100%"
|
||||
position = "150px 150px"
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,90 +1,436 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
extraMonitorSettings
|
||||
;
|
||||
in {
|
||||
_: {
|
||||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
windowrule = [
|
||||
#"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps
|
||||
# downside it can impact other xwayland apps
|
||||
# This rule is a template for a more targeted approach
|
||||
"noblur, class:^(\bresolve\b)$, xwayland:1" # Window rule for just resolve
|
||||
"tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$"
|
||||
"tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$"
|
||||
"tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$"
|
||||
"tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$"
|
||||
"tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$"
|
||||
"tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$"
|
||||
"tag +projects, class:^(codium|codium-url-handler|VSCodium)$"
|
||||
"tag +projects, class:^(VSCode|code-url-handler)$"
|
||||
"tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$"
|
||||
"tag +im, class:^([Ff]erdium)$"
|
||||
"tag +im, class:^([Ww]hatsapp-for-linux)$"
|
||||
"tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$"
|
||||
"tag +im, class:^(teams-for-linux)$"
|
||||
"tag +games, class:^(gamescope)$"
|
||||
"tag +games, class:^(steam_app_\d+)$"
|
||||
"tag +gamestore, class:^([Ss]team)$"
|
||||
"tag +gamestore, title:^([Ll]utris)$"
|
||||
"tag +gamestore, class:^(com.heroicgameslauncher.hgl)$"
|
||||
"tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$"
|
||||
"tag +settings, class:^([Rr]ofi)$"
|
||||
"tag +settings, class:^(file-roller|org.gnome.FileRoller)$"
|
||||
"tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$"
|
||||
"tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$"
|
||||
"tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$"
|
||||
"tag +settings, class:(xdg-desktop-portal-gtk)"
|
||||
"tag +settings, class:(.blueman-manager-wrapped)"
|
||||
"tag +settings, class:(nwg-displays)"
|
||||
"move 72% 7%,title:^(Picture-in-Picture)$"
|
||||
# qs-keybinds floating viewer
|
||||
"float, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
|
||||
"center, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
|
||||
"size 55% 66%, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
|
||||
# qs-cheatsheets floating viewer
|
||||
"float, title:^(Cheatsheets Viewer)$"
|
||||
"center, title:^(Cheatsheets Viewer)$"
|
||||
"size 65% 60%, title:^(Cheatsheets Viewer)$"
|
||||
"center, class:^([Ff]erdium)$"
|
||||
"float, class:^([Ww]aypaper)$"
|
||||
"center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$"
|
||||
"center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)"
|
||||
"center, title:^(Authentication Required)$"
|
||||
"idleinhibit fullscreen, class:^(*)$"
|
||||
"idleinhibit fullscreen, title:^(*)$"
|
||||
"idleinhibit fullscreen, fullscreen:1"
|
||||
"float, tag:settings*"
|
||||
"float, class:^([Ff]erdium)$"
|
||||
"float, title:^(Picture-in-Picture)$"
|
||||
"float, class:^(mpv|com.github.rafostar.Clapper)$"
|
||||
"float, title:^(Authentication Required)$"
|
||||
"float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)"
|
||||
"float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)"
|
||||
"float, class:^([Ss]team)$, title:negative:^([Ss]team)$"
|
||||
"float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)"
|
||||
"float, initialTitle:(Add Folder to Workspace)"
|
||||
"float, initialTitle:(Open Files)"
|
||||
"float, initialTitle:(wants to save)"
|
||||
"size 70% 60%, initialTitle:(Open Files)"
|
||||
"size 70% 60%, initialTitle:(Add Folder to Workspace)"
|
||||
"size 70% 70%, tag:settings*"
|
||||
"size 60% 70%, class:^([Ff]erdium)$"
|
||||
"opacity 1.0 1.0, tag:browser*"
|
||||
"opacity 0.9 0.8, tag:projects*"
|
||||
"opacity 0.94 0.86, tag:im*"
|
||||
"opacity 0.9 0.8, tag:file-manager*"
|
||||
"opacity 0.8 0.7, tag:terminal*"
|
||||
"opacity 0.8 0.7, tag:settings*"
|
||||
"opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$"
|
||||
"opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui"
|
||||
"opacity 0.95 0.75, title:^(Picture-in-Picture)$"
|
||||
"pin, title:^(Picture-in-Picture)$"
|
||||
"keepaspectratio, title:^(Picture-in-Picture)$"
|
||||
"noblur, tag:games*"
|
||||
"fullscreen, tag:games*"
|
||||
];
|
||||
};
|
||||
extraConfig = ''
|
||||
# Set float and centering for dialog boxes
|
||||
rule = float(true), match:modal:1
|
||||
rule = center(true), match:modal:1
|
||||
|
||||
windowrule {
|
||||
name = Resolve
|
||||
match:class = ^(\bresolve\b)$
|
||||
match:xwayland = 1
|
||||
no_blur = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Thunar
|
||||
match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$
|
||||
tag = +file-manager
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Terminals
|
||||
match:class = ^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm|dropterminal)$
|
||||
tag = +terminal
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Brave-browser
|
||||
match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$
|
||||
tag = +browser
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Firefox
|
||||
match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
|
||||
tag = +browser
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Google-chrome
|
||||
match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
|
||||
tag = +browser
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Thorium-browser
|
||||
match:class = ^([Tt]horium-browser|[Cc]achy-browser)$
|
||||
tag = +browser
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = vscodium
|
||||
match:class = ^(codium|codium-url-handler|VSCodium)$
|
||||
tag = +projects
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = vscode
|
||||
match:class = ^(VSCode|code-url-handler)$
|
||||
tag = +projects
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Discord
|
||||
match:class = ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
|
||||
tag = +im
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Ferdium
|
||||
match:class = ^([Ff]erdium)$
|
||||
center = on
|
||||
float = on
|
||||
size = 60% = 70%
|
||||
tag = +im
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Whatsapp
|
||||
match:class = ^([Ww]hatsapp-for-linux)$
|
||||
tag = +im
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Telegram-desktop
|
||||
match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
|
||||
tag = +im
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = teams-for-linux
|
||||
match:class = ^(teams-for-linux)$
|
||||
tag = +im
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = gamescope
|
||||
match:class = ^(gamescope)$
|
||||
tag = +games
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = steam-app
|
||||
match:class = ^(steam_app\d+)$
|
||||
tag = +games
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Steam
|
||||
match:class = ^([Ss]team)$
|
||||
tag = +gamestore
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Lutris
|
||||
match:title = ^([Ll]utris)$
|
||||
tag = +gamestore
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = heroicgameslauncher
|
||||
match:class = ^(com.heroicgameslauncher.hgl)$
|
||||
tag = +gamestore
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = gnome-disks
|
||||
match:class = ^(gnome-disks|wihotspot(-gui)?)$
|
||||
tag = +settings
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = rofi
|
||||
match:class = ^([Rr]ofi)$
|
||||
tag = +settings
|
||||
no_blur = off
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = FileRoller
|
||||
match:class = ^(file-roller|org.gnome.FileRoller)$
|
||||
tag = +settings
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = NetworkManger
|
||||
match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$
|
||||
tag = +settings
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = PlusAudio
|
||||
match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
|
||||
center = on
|
||||
tag = +settings
|
||||
no_blur = off
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = nwg-look
|
||||
match:class = ^(nwg-look|qt5ct|qt6ct|[Yy]ad)$
|
||||
tag = +settings
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = xdg-desktop-portal-gtk
|
||||
match:class = (xdg-desktop-portal-gtk)
|
||||
tag = +settings
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = blueman
|
||||
match:class = (.blueman-manager-wrapped)
|
||||
tag = +settings
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = nwg-displays
|
||||
match:class = (nwg-displays)
|
||||
tag = +settings
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Picture-in-Picture
|
||||
match:title = ^(Picture-in-Picture)$
|
||||
float = on
|
||||
move = 72% = 7%
|
||||
opacity = 0.95 = 0.75
|
||||
pin = 0
|
||||
keep_aspect_ratio = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = ThunarFileMgr
|
||||
match:class = ([Tt]hunar)
|
||||
match:title = negative:(.*[Tt]hunar.*)
|
||||
center = on
|
||||
float = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Authentication-Required
|
||||
match:title = ^(Authentication Required)$
|
||||
center = on
|
||||
float = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = IdleInhibit-fullscreen-1
|
||||
match:class = ^(*)$
|
||||
idle_inhibit = fullscreen
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = IdleInhibit-fullscreen-2
|
||||
match:title = ^(*)$
|
||||
idle_inhibit = fullscreen
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = IdleInhibit-fullscreen-3
|
||||
match:fullscreen = 1
|
||||
idle_inhibit = fullscreen
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Settings-Tag
|
||||
match:tag = settings*
|
||||
float = on
|
||||
opacity = 0.8 = 0.7
|
||||
size = 70% = 70%
|
||||
no_blur = off
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = WayPaper
|
||||
match:class = ^([Ww]aypaper)$
|
||||
float = on
|
||||
no_blur = off
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = mpv-or-clapper
|
||||
match:class = ^(mpv|com.github.rafostar.Clapper)$
|
||||
float = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = codium-url-handler
|
||||
match:class = (codium|codium-url-handler|VSCodium)
|
||||
match:title = negative:(.*codium.*|.*VSCodium.*)
|
||||
float = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = heroicgameslauncher-1
|
||||
match:class = ^(com.heroicgameslauncher.hgl)$
|
||||
match:title = negative:(Heroic Games Launcher)
|
||||
float = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Steam
|
||||
match:class = ^([Ss]team)$
|
||||
match:title = negative:^([Ss]team)$
|
||||
float = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Add-Folder
|
||||
match:initial_title = (Add Folder to Workspace)
|
||||
float = on
|
||||
size = 70% = 60%
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Open-File
|
||||
match:initial_title = (Open Files)
|
||||
float = on
|
||||
size = 70% = 60%
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Wants-to-Save
|
||||
match:initial_title = (wants to save)
|
||||
float = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Browsers
|
||||
match:tag = browser*
|
||||
opacity = 1.0 = 1.0
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Projects
|
||||
match:tag = projects*
|
||||
opacity = 0.9 = 0.8
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Instant-Messaging
|
||||
match:tag = im*
|
||||
opacity = 0.94 = 0.86
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = File-Managers
|
||||
match:tag = file-manager*
|
||||
opacity = 0.9 = 0.8
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = Terminals-opacity
|
||||
match:tag = terminal*
|
||||
opacity = 0.8 = 0.7
|
||||
no_blur = off
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = windowrule-77
|
||||
match:class = ^(gedit|org.gnome.TextEditor|mousepad)$
|
||||
opacity = 0.8 = 0.7
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = windowrule-78
|
||||
match:class = ^(seahorse)$
|
||||
opacity = 0.9 = 0.8
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = windowrule-79
|
||||
match:tag = games*
|
||||
no_blur = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = windowrule-80
|
||||
match:tag = games*
|
||||
fullscreen = on
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = qs-keybinds
|
||||
match:title = ^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$
|
||||
float = on
|
||||
center = on
|
||||
size = 55% = 66%
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = qs-cheatsheets
|
||||
match:title = ^(Cheatsheets Viewer)$
|
||||
float = on
|
||||
center = on
|
||||
size = 65% = 60%
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = qs-extended-viewers
|
||||
match:title = ^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$
|
||||
float = on
|
||||
center = on
|
||||
size = 55% = 66%
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = QS-Wallpapers
|
||||
match:class = ^(org\.qt-project\.qml)$
|
||||
match:title = ^(Wallpapers)$
|
||||
border_size = 0
|
||||
float = on
|
||||
no_blur = on
|
||||
no_shadow = on
|
||||
rounding = 12
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = QA-Video-Wallpapers
|
||||
match:class = ^(org\.qt-project\.qml)$
|
||||
match:title = ^(Video Wallpapers)$
|
||||
border_size = 0
|
||||
center = on
|
||||
float = on
|
||||
no_blur = on
|
||||
no_shadow = on
|
||||
rounding = 12
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = QS-wlogout
|
||||
match:class = ^(org\.qt-project\.qml)$
|
||||
match:title = ^(qs-wlogout)$
|
||||
border_size = 0
|
||||
center = on
|
||||
float = on
|
||||
opacity = 1.0 = 1.0
|
||||
rounding = 20
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = QA-Panels
|
||||
match:class = ^(org\.qt-project\.qml)$
|
||||
match:title = ^(Panels)$
|
||||
center = on
|
||||
float = on
|
||||
no_blur = on
|
||||
no_shadow = on
|
||||
rounding = 12
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = QS-Cheatsheets
|
||||
match:class = ^(org\.qt-project\.qml)$
|
||||
match:title = ^(Cheatsheets Viewer)$
|
||||
border_size = 0
|
||||
center = on
|
||||
float = on
|
||||
no_shadow = on
|
||||
rounding = 12
|
||||
}
|
||||
|
||||
windowrule {
|
||||
name = QS-Documentation-Viewer
|
||||
match:class = ^(org\.qt-project\.qml)$
|
||||
match:title = ^(Documentation Viewer)$
|
||||
border_size = 0
|
||||
center = on
|
||||
float = on
|
||||
no_shadow = on
|
||||
rounding = 12
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,18 +102,18 @@ has_intel=false
|
|||
has_amd=false
|
||||
has_vm=false
|
||||
|
||||
if lspci | grep -qi 'vga\|3d'; then
|
||||
if lspci | grep -qi 'vga\|3d\|display'; then
|
||||
while read -r line; do
|
||||
if echo "$line" | grep -qi 'nvidia'; then
|
||||
has_nvidia=true
|
||||
elif echo "$line" | grep -qi 'amd'; then
|
||||
elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then
|
||||
has_amd=true
|
||||
elif echo "$line" | grep -qi 'intel'; then
|
||||
has_intel=true
|
||||
elif echo "$line" | grep -qi 'virtio\|vmware'; then
|
||||
has_vm=true
|
||||
fi
|
||||
done < <(lspci | grep -i 'vga\|3d')
|
||||
done < <(lspci | grep -i 'vga\|3d\|display')
|
||||
|
||||
if $has_vm; then
|
||||
DETECTED_PROFILE="vm"
|
||||
|
|
|
|||
|
|
@ -1,26 +1,29 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
noctaliaPath = inputs.noctalia.packages.${system}.default;
|
||||
configDir = "${noctaliaPath}/share/noctalia-shell";
|
||||
in
|
||||
{
|
||||
# Install the Noctalia package for this user (CLI, assets, etc.)
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
noctaliaPkg = inputs.noctalia.packages.${system}.default;
|
||||
configDir = "${noctaliaPkg}/share/noctalia-shell";
|
||||
in {
|
||||
# Install the Noctalia package
|
||||
home.packages = [
|
||||
noctaliaPath
|
||||
noctaliaPkg
|
||||
pkgs.quickshell # Ensure quickshell is available for the service
|
||||
];
|
||||
|
||||
# Seed the Noctalia QuickShell shell code into ~/.config/quickshell/noctalia-shell
|
||||
# once, then leave it writable so the GUI and the user can tweak it.
|
||||
home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
# Seed the configuration
|
||||
home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||
set -eu
|
||||
DEST="$HOME/.config/quickshell/noctalia-shell"
|
||||
SRC="${configDir}"
|
||||
|
||||
if [ ! -d "$DEST" ]; then
|
||||
mkdir -p "$HOME/.config/quickshell"
|
||||
cp -R "$SRC" "$DEST"
|
||||
chmod -R u+rwX "$DEST"
|
||||
$DRY_RUN_CMD mkdir -p "$HOME/.config/quickshell"
|
||||
$DRY_RUN_CMD cp -R "$SRC" "$DEST"
|
||||
$DRY_RUN_CMD chmod -R u+rwX "$DEST"
|
||||
fi
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
#enableVirtualCamera = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
{ config, lib, ... }:
|
||||
let
|
||||
overviewSource = ./overview;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
overviewSource = ./overview;
|
||||
in {
|
||||
# Quickshell-overview is a Qt6 QML app for Hyprland workspace overview
|
||||
# It shows all workspaces with live window previews, drag-and-drop support
|
||||
# Toggled via: SUPER + TAB (bound in hyprland/binds.nix)
|
||||
|
|
@ -10,11 +12,11 @@ in
|
|||
|
||||
# Seed the Quickshell overview code into ~/.config/quickshell/overview
|
||||
# Copy (not symlink) so QML module resolution works and users can edit files
|
||||
home.activation.seedOverviewCode = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
home.activation.seedOverviewCode = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||
set -eu
|
||||
DEST="$HOME/.config/quickshell/overview"
|
||||
SRC="${overviewSource}"
|
||||
|
||||
|
||||
if [ ! -d "$DEST" ]; then
|
||||
mkdir -p "$HOME/.config/quickshell"
|
||||
cp -R "$SRC" "$DEST"
|
||||
|
|
|
|||
35
modules/home/python.nix
Normal file
35
modules/home/python.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
python3Packages.pip # Python package installer
|
||||
python3Packages.virtualenv # Virtual environment tool
|
||||
python3Packages.setuptools # Package development library
|
||||
python3Packages.black # Code formatter
|
||||
python3Packages.flake8 # Linting tool
|
||||
python3Packages.mypy # Type checking
|
||||
python3Packages.requests # HTTP library for the Weather.py script
|
||||
];
|
||||
|
||||
# Add pip configuration
|
||||
home.file.".config/pip/pip.conf".text = ''
|
||||
[global]
|
||||
user = true
|
||||
'';
|
||||
|
||||
# Set environment variables for Python development
|
||||
home.sessionVariables = {
|
||||
PIP_USER = "1";
|
||||
};
|
||||
|
||||
# Create a wrapper script for Weather.py to ensure it uses Python with required packages
|
||||
home.file.".local/bin/weather" = {
|
||||
text = ''
|
||||
#!/bin/sh
|
||||
# Use python3 with the correct package path
|
||||
exec ${pkgs.python3.withPackages (p: [p.requests])}/bin/python3 $HOME/.config/waybar/scripts/Weather.py "$@"
|
||||
'';
|
||||
executable = true;
|
||||
};
|
||||
|
||||
# Set Python path in environment
|
||||
home.sessionPath = ["${pkgs.python3}/bin"];
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue