Compare commits
9 commits
d455b448da
...
3fdf07e615
Author | SHA1 | Date | |
---|---|---|---|
3fdf07e615 | |||
4f18279960 | |||
26f7109d32 | |||
865fbeaa73 | |||
c969a91209 | |||
fc89afaceb | |||
689447a5cc | |||
495a6be2ef | |||
3935786a60 |
8 changed files with 113 additions and 85 deletions
60
flake.lock
generated
60
flake.lock
generated
|
@ -25,11 +25,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "/pkgs/firefox-addons",
|
||||
"lastModified": 1733354814,
|
||||
"narHash": "sha256-GNtstc88gUJllOun6UFQzg7P+fDtWkajxN4kUKPLFsw=",
|
||||
"lastModified": 1733875367,
|
||||
"narHash": "sha256-eBMHOM1KvbK8dTrM4N8ytNl8NeJF4lLyoPBRae1CqKs=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "fd1cc13f297bb18b85a776060edca35b18c7a324",
|
||||
"rev": "bda0131e0a7b6b5b687f5ffd8a8622054e7c444d",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
@ -50,11 +50,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733350703,
|
||||
"narHash": "sha256-Lc/gJJFdUDgU0zVGybTowIe+N1jHMLXJwMkjXG86Dpc=",
|
||||
"lastModified": 1733834155,
|
||||
"narHash": "sha256-5A7EfzSmdApKmfHGtGZ4NQvMEpI/NI6VIzTNq9sUH4E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-firefox-nightly",
|
||||
"rev": "bc884efa1a4a60899727a98269cbc0cee8d94f9e",
|
||||
"rev": "f0ab3cfa3607e08169b1d87e63fe9b1e5a57f515",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -152,11 +152,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733354384,
|
||||
"narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=",
|
||||
"lastModified": 1733873195,
|
||||
"narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe",
|
||||
"rev": "f26aa4b76fb7606127032d33ac73d7d507d82758",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -172,11 +172,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733055216,
|
||||
"narHash": "sha256-yB2y7tGJxDI/SDQ0D7b6ocRtLTPm93u8ybdIKQGXRDE=",
|
||||
"lastModified": 1733660018,
|
||||
"narHash": "sha256-DHW2Hzyo8W6wVPGFaYLM9mKMH/qAtHJSUZ4ti7LHMCY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "f67bf0781c69a46bf3a1469f83c98518aa3054c3",
|
||||
"rev": "f710791be27b31ea1ee9c40a94d08bcbba99b3c0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -208,11 +208,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733024876,
|
||||
"narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=",
|
||||
"lastModified": 1733629314,
|
||||
"narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "6e0b7f81367069589a480b91603a10bcf71f3103",
|
||||
"rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -243,11 +243,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1733212471,
|
||||
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
|
||||
"lastModified": 1733759999,
|
||||
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
|
||||
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -259,11 +259,11 @@
|
|||
},
|
||||
"nixpkgs-24-11": {
|
||||
"locked": {
|
||||
"lastModified": 1733261153,
|
||||
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
|
||||
"lastModified": 1733550349,
|
||||
"narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
|
||||
"rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -275,11 +275,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1733015484,
|
||||
"narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=",
|
||||
"lastModified": 1733620091,
|
||||
"narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e",
|
||||
"rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -298,11 +298,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733005589,
|
||||
"narHash": "sha256-NAym0oWYwKgFuAif6Z7HacU6Su/SJNTW4wEYC5urSYU=",
|
||||
"lastModified": 1733858086,
|
||||
"narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "plasma-manager",
|
||||
"rev": "88ca377ff58b5c30a2879745829842554d4b21d5",
|
||||
"rev": "7e2010249529931a3848054d5ff0dbf24675ab68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -384,11 +384,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733363815,
|
||||
"narHash": "sha256-J2XTeJ0xQMPPo2QnPLM1ewhqCh/Okgfonr5N6Pdt7b8=",
|
||||
"lastModified": 1733795858,
|
||||
"narHash": "sha256-K595Q2PrZv2iiumdBkwM2G456T2lKsLD71bn/fbJiQ0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "ffe6b403ba758f8a057a227de2f7235ef3dc61c0",
|
||||
"rev": "66ced222ef9235f90dbdd754ede3d6476722aaa9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -2,39 +2,38 @@
|
|||
{
|
||||
home.packages = (with pkgs; [
|
||||
# Documents
|
||||
logseq
|
||||
libreoffice-qt6-fresh
|
||||
logseq # Outliner
|
||||
libreoffice-qt6-fresh # Office-style editing
|
||||
|
||||
# Video
|
||||
jellyfin-media-player
|
||||
vlc
|
||||
jellyfin-media-player # Jellyfin electron client w/ MPV
|
||||
vlc # Video file player
|
||||
|
||||
# Chat
|
||||
element-desktop
|
||||
vesktop
|
||||
|
||||
# Tailscale
|
||||
tailscale
|
||||
element-desktop # Matrix client
|
||||
vesktop # Discord client
|
||||
signal-desktop # Signal client
|
||||
|
||||
# KDE Themes
|
||||
vimix-cursors
|
||||
(pkgs.callPackage ../../packages/beautyline {})
|
||||
(pkgs.callPackage ../../packages/magna-splash-6 {})
|
||||
vimix-cursors # Cursors
|
||||
(pkgs.callPackage ../../packages/beautyline {}) # Icons
|
||||
(pkgs.callPackage ../../packages/magna-splash-6 {}) # Splash
|
||||
|
||||
# Programming
|
||||
nixd # NixD LSP for .nix files
|
||||
gcc
|
||||
(lib.meta.hiPrio clang)
|
||||
clang-tools
|
||||
cling
|
||||
deno
|
||||
gnumake
|
||||
jetbrains.idea-ultimate # Jetbrains IntelliJ Idea Ultimate IDE
|
||||
nixd # LSP for .nix files
|
||||
gcc # GNU C++ Compiler
|
||||
(lib.meta.hiPrio clang) # LLVM C++ Compiler (better than g++)
|
||||
clang-tools # Clang language server
|
||||
cling # C++ REPL
|
||||
deno # Typescript & Javascript runtime
|
||||
gnumake # Makefile support
|
||||
|
||||
# :3
|
||||
fastfetch
|
||||
fastfetch # Modern & faster neofetch alternative
|
||||
|
||||
# UI Tools
|
||||
qalculate-qt
|
||||
qalculate-qt # Calculator
|
||||
|
||||
# CLI Tools
|
||||
ripgrep # Text searching and manipulation
|
||||
|
@ -46,18 +45,19 @@
|
|||
glow # Markdown rendering
|
||||
tealdeer # TLDR
|
||||
usbutils # `lsusb`
|
||||
unzip
|
||||
pciutils # `lspci`
|
||||
unzip # Extract zip files
|
||||
|
||||
# Process tools
|
||||
btop # Process monitor
|
||||
nvtopPackages.full # GPU monitor
|
||||
]) ++ ([
|
||||
]) ++ [
|
||||
# Firefox nightly
|
||||
inputs.firefox-nightly.packages.${system}.firefox-nightly-bin
|
||||
]) ++ (with pkgs.kdePackages; [
|
||||
kate
|
||||
elisa
|
||||
kdeconnect-kde
|
||||
polkit-kde-agent-1
|
||||
] ++ (with pkgs.kdePackages; [
|
||||
kate # IDE
|
||||
elisa # Music
|
||||
kdeconnect-kde # Phone sync
|
||||
polkit-kde-agent-1 # Polkit authentication popup support
|
||||
]);
|
||||
}
|
||||
|
|
|
@ -21,6 +21,12 @@
|
|||
wallpaper = "${pkgs.kdePackages.plasma-workspace-wallpapers}/share/wallpapers/Shell/contents/images/5120x2880.jpg";
|
||||
# Set colorful splash screen while plasma is loading
|
||||
splashScreen.theme = "magna-splash-6";
|
||||
|
||||
enableMiddleClickPaste = false;
|
||||
};
|
||||
|
||||
desktop = {
|
||||
mouseActions.middleClick = "contextMenu";
|
||||
};
|
||||
|
||||
panels = [
|
||||
|
@ -86,10 +92,15 @@
|
|||
wobblyWindows.enable = true;
|
||||
};
|
||||
|
||||
virtualDesktops.names = [
|
||||
"Personal"
|
||||
"School"
|
||||
virtualDesktops = {
|
||||
names = [
|
||||
"Personal 1"
|
||||
"Personal 2"
|
||||
"School 1"
|
||||
"School 2"
|
||||
];
|
||||
rows = 2;
|
||||
};
|
||||
};
|
||||
|
||||
kscreenlocker = {
|
||||
|
|
|
@ -27,15 +27,20 @@
|
|||
tamasfe.even-better-toml # TOML
|
||||
yzhang.markdown-all-in-one # Markdown
|
||||
denoland.vscode-deno # Deno JS/TS
|
||||
mathiasfrohlich.kotlin # Kotlin (no LSP)
|
||||
matthewpi.caddyfile-support # Caddyfile
|
||||
# Theming
|
||||
pkief.material-icon-theme # Material icons
|
||||
# Utilities
|
||||
streetsidesoftware.code-spell-checker # Spellchecking
|
||||
jeanp413.open-remote-ssh # Remote SSH
|
||||
mkhl.direnv # nix-direnv autoloading
|
||||
cschlosser.doxdocgen # C++ Doxygen generator
|
||||
tomoki1207.pdf # PDF Viewing
|
||||
])
|
||||
++ (with vscode-marketplace; [
|
||||
yy0931.save-as-root # Save as root over SSH
|
||||
akiramiyakoda.cppincludeguard # Auto-insert header guards for header files
|
||||
])
|
||||
);
|
||||
|
||||
|
@ -87,6 +92,9 @@
|
|||
};
|
||||
};
|
||||
"direnv.restart.automatic" = true;
|
||||
# C++ Include guards
|
||||
"C/C++ Include Guard.Comment Style" = "Line";
|
||||
"C/C++ Include Guard.Macro Type" = "Filename";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/f9bea90d-1dca-42d5-8297-0b5be85190a1";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
options = [ "subvol=@" "compress=zstd:3" ];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-16827abe-333c-43d7-b1b0-7d0df0b5931f".device = "/dev/disk/by-uuid/16827abe-333c-43d7-b1b0-7d0df0b5931f";
|
||||
|
|
|
@ -2,10 +2,15 @@
|
|||
{
|
||||
fonts = {
|
||||
packages = with pkgs; [
|
||||
# Core fonts (Arial, Times new roman and the such)
|
||||
corefonts
|
||||
vistafonts
|
||||
# Normal fonts
|
||||
symbola
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
# Monospaced
|
||||
fira-code
|
||||
fira-code-symbols
|
||||
jetbrains-mono
|
||||
|
|
|
@ -1,31 +1,30 @@
|
|||
{ ... }:
|
||||
{
|
||||
# Configure dual-gpu AMD+Nvidia
|
||||
hardware.graphics.enable = true;
|
||||
services.xserver.videoDrivers = ["amdgpu"];
|
||||
services.xserver.videoDrivers = ["amdgpu" "nvidia"];
|
||||
# services.xserver.videoDrivers = ["nvidia" "amdgpu"];
|
||||
# hardware.nvidia = {
|
||||
# modesetting.enable = true;
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
|
||||
# # Experimental nvidia power management
|
||||
# powerManagement.enable = false;
|
||||
# Experimental nvidia power management
|
||||
powerManagement.enable = false;
|
||||
|
||||
# # Experimentally turn off Nvidia GPU when not in use
|
||||
# powerManagement.finegrained = true;
|
||||
# Experimentally turn off Nvidia GPU when not in use
|
||||
powerManagement.finegrained = false;
|
||||
|
||||
# open = false; # Open source module is still very much beta
|
||||
open = false; # Open source module is still very much beta
|
||||
|
||||
# nvidiaSettings = true;
|
||||
nvidiaSettings = true;
|
||||
|
||||
# # Configure dual-gpu offloading
|
||||
# prime = {
|
||||
# amdgpuBusId = "PCI:4:0:0";
|
||||
# nvidiaBusId = "PCI:1:0:0";
|
||||
# Configure dual-gpu offloading
|
||||
prime = {
|
||||
amdgpuBusId = "PCI:4:0:0";
|
||||
nvidiaBusId = "PCI:1:0:0";
|
||||
|
||||
# offload = {
|
||||
# enable = true;
|
||||
# enableOffloadCmd = true;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
offload = {
|
||||
enable = true;
|
||||
enableOffloadCmd = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -7,6 +7,7 @@
|
|||
curl
|
||||
neovim
|
||||
home-manager
|
||||
wl-clipboard-rs
|
||||
# VCS
|
||||
git
|
||||
jujutsu
|
||||
|
@ -14,6 +15,10 @@
|
|||
vimix-cursors # SDDM Cursor theme
|
||||
];
|
||||
|
||||
# Enable waydroid
|
||||
virtualisation.waydroid.enable = true;
|
||||
|
||||
# Enable steam
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
extest.enable = true;
|
||||
|
|
Loading…
Reference in a new issue