Ty/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Ty:3fdf07e615e69c8b7bb8d36fa337f30960ea3070
Branches Tags
Ty:main
Ty:services
..
compare: Ty:d455b448daa9071a352e6192a046f8326bcd9586
Branches Tags
Ty:main
Ty:services

No commits in common. "3fdf07e615e69c8b7bb8d36fa337f30960ea3070" and "d455b448daa9071a352e6192a046f8326bcd9586" have entirely different histories.
3fdf07e615 ... d455b448da

8 changed files with 85 additions and 113 deletions
Show stats Expand all files Collapse all files

60
flake.lock generated
View file

@ -25,11 +25,11 @@
}, },
"locked": { "locked": {
"dir": "/pkgs/firefox-addons", "dir": "/pkgs/firefox-addons",
"lastModified": 1733875367, "lastModified": 1733354814,
"narHash": "sha256-eBMHOM1KvbK8dTrM4N8ytNl8NeJF4lLyoPBRae1CqKs=", "narHash": "sha256-GNtstc88gUJllOun6UFQzg7P+fDtWkajxN4kUKPLFsw=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "bda0131e0a7b6b5b687f5ffd8a8622054e7c444d", "rev": "fd1cc13f297bb18b85a776060edca35b18c7a324",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733834155, "lastModified": 1733350703,
"narHash": "sha256-5A7EfzSmdApKmfHGtGZ4NQvMEpI/NI6VIzTNq9sUH4E=", "narHash": "sha256-Lc/gJJFdUDgU0zVGybTowIe+N1jHMLXJwMkjXG86Dpc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-firefox-nightly", "repo": "flake-firefox-nightly",
"rev": "f0ab3cfa3607e08169b1d87e63fe9b1e5a57f515", "rev": "bc884efa1a4a60899727a98269cbc0cee8d94f9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733873195, "lastModified": 1733354384,
"narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,11 +172,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733660018, "lastModified": 1733055216,
"narHash": "sha256-DHW2Hzyo8W6wVPGFaYLM9mKMH/qAtHJSUZ4ti7LHMCY=", "narHash": "sha256-yB2y7tGJxDI/SDQ0D7b6ocRtLTPm93u8ybdIKQGXRDE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "f710791be27b31ea1ee9c40a94d08bcbba99b3c0", "rev": "f67bf0781c69a46bf3a1469f83c98518aa3054c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733629314, "lastModified": 1733024876,
"narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", "rev": "6e0b7f81367069589a480b91603a10bcf71f3103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733759999, "lastModified": 1733212471,
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +259,11 @@
}, },
"nixpkgs-24-11": { "nixpkgs-24-11": {
"locked": { "locked": {
"lastModified": 1733550349, "lastModified": 1733261153,
"narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,11 +275,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733620091, "lastModified": 1733015484,
"narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=", "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b", "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733858086, "lastModified": 1733005589,
"narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=", "narHash": "sha256-NAym0oWYwKgFuAif6Z7HacU6Su/SJNTW4wEYC5urSYU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "7e2010249529931a3848054d5ff0dbf24675ab68", "rev": "88ca377ff58b5c30a2879745829842554d4b21d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +384,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733795858, "lastModified": 1733363815,
"narHash": "sha256-K595Q2PrZv2iiumdBkwM2G456T2lKsLD71bn/fbJiQ0=", "narHash": "sha256-J2XTeJ0xQMPPo2QnPLM1ewhqCh/Okgfonr5N6Pdt7b8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "66ced222ef9235f90dbdd754ede3d6476722aaa9", "rev": "ffe6b403ba758f8a057a227de2f7235ef3dc61c0",
"type": "github" "type": "github"
}, },
"original": { "original": {

58
home-manager/modules/packages.nix
View file

@ -1,39 +1,40 @@
{ pkgs, inputs, system, ... }: { pkgs, inputs, system, ... }:
{ {
home.packages = (with pkgs; [ home.packages = (with pkgs; [
# Documents # Documents
logseq # Outliner logseq
libreoffice-qt6-fresh # Office-style editing libreoffice-qt6-fresh
# Video # Video
jellyfin-media-player # Jellyfin electron client w/ MPV jellyfin-media-player
vlc # Video file player vlc
# Chat # Chat
element-desktop # Matrix client element-desktop
vesktop # Discord client vesktop
signal-desktop # Signal client
# Tailscale
tailscale
# KDE Themes # KDE Themes
vimix-cursors # Cursors vimix-cursors
(pkgs.callPackage ../../packages/beautyline {}) # Icons (pkgs.callPackage ../../packages/beautyline {})
(pkgs.callPackage ../../packages/magna-splash-6 {}) # Splash (pkgs.callPackage ../../packages/magna-splash-6 {})
# Programming # Programming
jetbrains.idea-ultimate # Jetbrains IntelliJ Idea Ultimate IDE nixd # NixD LSP for .nix files
nixd # LSP for .nix files gcc
gcc # GNU C++ Compiler (lib.meta.hiPrio clang)
(lib.meta.hiPrio clang) # LLVM C++ Compiler (better than g++) clang-tools
clang-tools # Clang language server cling
cling # C++ REPL deno
deno # Typescript & Javascript runtime gnumake
gnumake # Makefile support
# :3 # :3
fastfetch # Modern & faster neofetch alternative fastfetch
# UI Tools # UI Tools
qalculate-qt # Calculator qalculate-qt
# CLI Tools # CLI Tools
ripgrep # Text searching and manipulation ripgrep # Text searching and manipulation
@ -45,19 +46,18 @@
glow # Markdown rendering glow # Markdown rendering
tealdeer # TLDR tealdeer # TLDR
usbutils # `lsusb` usbutils # `lsusb`
pciutils # `lspci` unzip
unzip # Extract zip files
# Process tools # Process tools
btop # Process monitor btop # Process monitor
nvtopPackages.full # GPU monitor nvtopPackages.full # GPU monitor
]) ++ [ ]) ++ ([
# Firefox nightly # Firefox nightly
inputs.firefox-nightly.packages.${system}.firefox-nightly-bin inputs.firefox-nightly.packages.${system}.firefox-nightly-bin
] ++ (with pkgs.kdePackages; [ ]) ++ (with pkgs.kdePackages; [
kate # IDE kate
elisa # Music elisa
kdeconnect-kde # Phone sync kdeconnect-kde
polkit-kde-agent-1 # Polkit authentication popup support polkit-kde-agent-1
]); ]);
} }

19
home-manager/modules/plasma.nix
View file

@ -21,12 +21,6 @@
wallpaper = "${pkgs.kdePackages.plasma-workspace-wallpapers}/share/wallpapers/Shell/contents/images/5120x2880.jpg"; wallpaper = "${pkgs.kdePackages.plasma-workspace-wallpapers}/share/wallpapers/Shell/contents/images/5120x2880.jpg";
# Set colorful splash screen while plasma is loading # Set colorful splash screen while plasma is loading
splashScreen.theme = "magna-splash-6"; splashScreen.theme = "magna-splash-6";
enableMiddleClickPaste = false;
};
desktop = {
mouseActions.middleClick = "contextMenu";
}; };
panels = [ panels = [
@ -92,15 +86,10 @@
wobblyWindows.enable = true; wobblyWindows.enable = true;
}; };
virtualDesktops = { virtualDesktops.names = [
names = [ "Personal"
"Personal 1" "School"
"Personal 2" ];
"School 1"
"School 2"
];
rows = 2;
};
}; };
kscreenlocker = { kscreenlocker = {

8
home-manager/modules/vscode.nix
View file

@ -27,20 +27,15 @@
tamasfe.even-better-toml # TOML tamasfe.even-better-toml # TOML
yzhang.markdown-all-in-one # Markdown yzhang.markdown-all-in-one # Markdown
denoland.vscode-deno # Deno JS/TS denoland.vscode-deno # Deno JS/TS
mathiasfrohlich.kotlin # Kotlin (no LSP)
matthewpi.caddyfile-support # Caddyfile
# Theming # Theming
pkief.material-icon-theme # Material icons pkief.material-icon-theme # Material icons
# Utilities # Utilities
streetsidesoftware.code-spell-checker # Spellchecking streetsidesoftware.code-spell-checker # Spellchecking
jeanp413.open-remote-ssh # Remote SSH jeanp413.open-remote-ssh # Remote SSH
mkhl.direnv # nix-direnv autoloading mkhl.direnv # nix-direnv autoloading
cschlosser.doxdocgen # C++ Doxygen generator
tomoki1207.pdf # PDF Viewing
]) ])
++ (with vscode-marketplace; [ ++ (with vscode-marketplace; [
yy0931.save-as-root # Save as root over SSH yy0931.save-as-root # Save as root over SSH
akiramiyakoda.cppincludeguard # Auto-insert header guards for header files
]) ])
); );
@ -92,9 +87,6 @@
}; };
}; };
"direnv.restart.automatic" = true; "direnv.restart.automatic" = true;
# C++ Include guards
"C/C++ Include Guard.Comment Style" = "Line";
"C/C++ Include Guard.Macro Type" = "Filename";
}; };
}; };
} }

2
hosts/laptop/hardware-configuration.nix
View file

@ -16,7 +16,7 @@
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/f9bea90d-1dca-42d5-8297-0b5be85190a1"; { device = "/dev/disk/by-uuid/f9bea90d-1dca-42d5-8297-0b5be85190a1";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" "compress=zstd:3" ]; options = [ "subvol=@" ];
}; };
boot.initrd.luks.devices."luks-16827abe-333c-43d7-b1b0-7d0df0b5931f".device = "/dev/disk/by-uuid/16827abe-333c-43d7-b1b0-7d0df0b5931f"; boot.initrd.luks.devices."luks-16827abe-333c-43d7-b1b0-7d0df0b5931f".device = "/dev/disk/by-uuid/16827abe-333c-43d7-b1b0-7d0df0b5931f";

5
hosts/laptop/modules/fonts.nix
View file

@ -2,15 +2,10 @@
{ {
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
# Core fonts (Arial, Times new roman and the such)
corefonts
vistafonts
# Normal fonts
symbola symbola
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
# Monospaced
fira-code fira-code
fira-code-symbols fira-code-symbols
jetbrains-mono jetbrains-mono

39
hosts/laptop/modules/nvidia.nix
View file

@ -1,30 +1,31 @@
{ ... }: { ... }:
{ {
# Configure dual-gpu AMD+Nvidia
hardware.graphics.enable = true; hardware.graphics.enable = true;
services.xserver.videoDrivers = ["amdgpu" "nvidia"]; services.xserver.videoDrivers = ["amdgpu"];
# services.xserver.videoDrivers = ["nvidia" "amdgpu"]; # services.xserver.videoDrivers = ["nvidia" "amdgpu"];
hardware.nvidia = { # hardware.nvidia = {
modesetting.enable = true; # modesetting.enable = true;
# Experimental nvidia power management # # Experimental nvidia power management
powerManagement.enable = false; # powerManagement.enable = false;
# Experimentally turn off Nvidia GPU when not in use # # Experimentally turn off Nvidia GPU when not in use
powerManagement.finegrained = false; # powerManagement.finegrained = true;
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 # # Configure dual-gpu offloading
prime = { # prime = {
amdgpuBusId = "PCI:4:0:0"; # amdgpuBusId = "PCI:4:0:0";
nvidiaBusId = "PCI:1:0:0"; # nvidiaBusId = "PCI:1:0:0";
offload = { # offload = {
enable = true; # enable = true;
enableOffloadCmd = true; # enableOffloadCmd = true;
}; # };
}; # };
}; # };
} }

7
hosts/laptop/modules/packages.nix
View file

@ -7,7 +7,6 @@
curl curl
neovim neovim
home-manager home-manager
wl-clipboard-rs
# VCS # VCS
git git
jujutsu jujutsu
@ -15,10 +14,6 @@
vimix-cursors # SDDM Cursor theme vimix-cursors # SDDM Cursor theme
]; ];
# Enable waydroid
virtualisation.waydroid.enable = true;
# Enable steam
programs.steam = { programs.steam = {
enable = true; enable = true;
extest.enable = true; extest.enable = true;
@ -51,4 +46,4 @@
}; };
preferencesStatus = "locked"; preferencesStatus = "locked";
}; };
} }