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

Compare commits

base: Ty:61be7a1f745df83c084031b0e949975673ddf287
Branches Tags
Ty:main
Ty:services
..
compare: Ty:5c4bf0f023216380941ef1cfc3ff160955131a7b
Branches Tags
Ty:main
Ty:services

No commits in common. "61be7a1f745df83c084031b0e949975673ddf287" and "5c4bf0f023216380941ef1cfc3ff160955131a7b" have entirely different histories.
61be7a1f74 ... 5c4bf0f023

18 changed files with 47 additions and 151 deletions
Show stats Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1 +0,0 @@
./secrets.nix

42
flake.lock generated
View file

@ -25,11 +25,11 @@
}, },
"locked": { "locked": {
"dir": "/pkgs/firefox-addons", "dir": "/pkgs/firefox-addons",
"lastModified": 1733087703, "lastModified": 1732479769,
"narHash": "sha256-WKdLy5t8SH9HBtajC8BZb+V4n0FaP71aUUYLuku46Rk=", "narHash": "sha256-barZy95JsQt4G9EDZ7RNrjgTneelXXfSzRLJJvokjsI=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "d4cbff4dda07726005224b33cf2cc5dc4a2c4211", "rev": "80bf66046d8b8624c5991a0c8e512b211acce2b2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732670254, "lastModified": 1732497628,
"narHash": "sha256-5z4pN4FnhZ/LedFrMmEhzCqFORd2cj227Jm1I2Lj4Zg=", "narHash": "sha256-r6vHlGeHoG51e9c77V5wadv6tnBD8bQnzTspH0Hn/3A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-firefox-nightly", "repo": "flake-firefox-nightly",
"rev": "c7eb601bd2d36aa4b9b6cdddc5793a36d77c0f06", "rev": "60ff5970ff90ef231cf8ecc140ea269fb5df2a11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733085484, "lastModified": 1732482255,
"narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,11 +223,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1732014248,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +239,11 @@
}, },
"nixpkgs-24-11": { "nixpkgs-24-11": {
"locked": { "locked": {
"lastModified": 1732981179, "lastModified": 1732350895,
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +278,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733005589, "lastModified": 1732465698,
"narHash": "sha256-NAym0oWYwKgFuAif6Z7HacU6Su/SJNTW4wEYC5urSYU=", "narHash": "sha256-xiue+Kj2Jm8PwyZQcHl4CaYmMIgo5oi37hVHqiw2Unk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "88ca377ff58b5c30a2879745829842554d4b21d5", "rev": "16d65cd02b5de665d1bcfec1616c02c71a1014a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +363,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733104664, "lastModified": 1732499683,
"narHash": "sha256-UhlyYYO84s36aSj0/xZdclY6CgwJSWPYtTHTOBuHodM=", "narHash": "sha256-Hw95rpgNiyAL4v9pJF2756PMud6O0p/1XQixs5f/Shk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "e3a9b717e8327886d4ab6115f6989f4d1ef44e51", "rev": "b376bfa567fd25f9f22b6f51ffaa4f84d0b7c72f",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -48,7 +48,6 @@
outputs = inputs@{ nixpkgs, home-manager, plasma-manager, ... }: let outputs = inputs@{ nixpkgs, home-manager, plasma-manager, ... }: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
secrets = import ./secrets.nix;
in { in {
nixosConfigurations.ty-nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.ty-nixos = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
@ -62,7 +61,7 @@
]; ];
specialArgs = { specialArgs = {
inherit inputs system secrets; inherit inputs system;
}; };
}; };
@ -78,7 +77,7 @@
]; ];
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs system secrets; inherit inputs system;
}; };
}; };
}; };

6
home-manager/default.nix
View file

@ -1,12 +1,12 @@
{ inputs, system, secrets, ... }: { inputs, system, ... }:
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit inputs system secrets; inherit inputs;
inherit system;
}; };
home-manager.backupFileExtension = "backup";
home-manager.users.ty = { home-manager.users.ty = {
imports = [ imports = [

1
home-manager/home.nix
View file

@ -16,6 +16,5 @@
./modules/vscode.nix ./modules/vscode.nix
./modules/desktop.nix ./modules/desktop.nix
./modules/gtk.nix ./modules/gtk.nix
./modules/beets.nix
]; ];
} }

42
home-manager/modules/accounts/email.nix
View file

@ -1,10 +1,10 @@
{ ... }: { ... }:
{ {
accounts.email.accounts = { accounts.email.accounts = {
PurelyMail = rec { PurelyMail = {
realName = "Tyler Beckman"; realName = "Tyler Beckman";
address = "ty@myriation.xyz"; address = "ty@myriation.xyz";
userName = address; userName = "ty@myriation.xyz";
primary = true; primary = true;
folders = { folders = {
@ -40,43 +40,5 @@
thunderbird.enable = true; thunderbird.enable = true;
}; };
Gmail = rec {
realName = "Tyler Beckman";
address = "tbeckman530@gmail.com";
userName = address;
flavor = "gmail.com";
folders = {
inbox = "Inbox";
drafts = "Drafts";
sent = "Sent";
trash = "Trash";
};
gpg = {
encryptByDefault = false;
signByDefault = false;
key = "A6299C20250223DCDEBA5E2C933B9437A97A56B8";
};
smtp.tls.useStartTls = false;
thunderbird.enable = true;
};
School = rec {
realName = "Tyler Beckman";
address = "tyler_beckman@mines.edu";
userName = address;
flavor = "outlook.office365.com";
folders = {
inbox = "Inbox";
drafts = "Drafts";
sent = "Sent Items";
trash = "Trash";
};
};
}; };
} }

23
home-manager/modules/beets.nix
View file

@ -1,23 +0,0 @@
{ lib, secrets, ... }:
{
programs.beets = {
enable = true;
settings = {
directory = "~/Music";
library = "~/Music/library.db";
plugins = "fetchart lyrics lastgenre";
lyrics = {
synced = "yes";
auto = "yes";
force = "yes";
sources = with secrets.programs.beets; lib.mkMerge [
(lib.mkIf (google_api_key != null) "lrclib google genius tekstowo")
(lib.mkIf (google_api_key == null) "lrclib genius tekstowo")
];
google_API_key = with secrets.programs.beets; lib.mkIf (google_api_key != null) google_api_key;
};
};
};
}

7
home-manager/modules/firefox.nix
View file

@ -35,7 +35,6 @@
"findbar.highlightAll" = true; # Highlight all search results in Ctrl+F "findbar.highlightAll" = true; # Highlight all search results in Ctrl+F
# Toolbar customization # Toolbar customization
"browser.download.autohideButton" = false;
"browser.uiCustomization.state" = '' "browser.uiCustomization.state" = ''
{ {
"placements": { "placements": {
@ -56,10 +55,10 @@
"stop-reload-button", "stop-reload-button",
"urlbar-container", "urlbar-container",
"save-to-pocket-button", "save-to-pocket-button",
"fxa-toolbar-menu-button",
"downloads-button", "downloads-button",
"unified-extensions-button", "fxa-toolbar-menu-button",
"reset-pbm-toolbar-button", "reset-pbm-toolbar-button",
"unified-extensions-button",
"addon_darkreader_org-browser-action", "addon_darkreader_org-browser-action",
"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action", "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action",
"ublock0_raymondhill_net-browser-action", "ublock0_raymondhill_net-browser-action",
@ -106,7 +105,7 @@
"unified-extensions-area" "unified-extensions-area"
], ],
"currentVersion": 20, "currentVersion": 20,
"newElementCount": 9 "newElementCount": 5
} }
''; '';
}; };

5
home-manager/modules/gtk.nix
View file

@ -1,11 +1,8 @@
{ pkgs, config, ... }: { pkgs, ... }:
{ {
gtk = { gtk = {
enable = true; enable = true;
# The other file gets overwritten, so change the path
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme = { theme = {
name = "Breeze-Dark"; name = "Breeze-Dark";
package = pkgs.kdePackages.breeze-gtk; package = pkgs.kdePackages.breeze-gtk;

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

@ -3,7 +3,7 @@
home.packages = (with pkgs; [ home.packages = (with pkgs; [
# Documents # Documents
logseq logseq
libreoffice-qt6-fresh inputs.nixpkgs-24-11.legacyPackages.${system}.libreoffice-qt6-fresh # Lock to 24.11 as the build is failing as of 11/24/24 on unstable
# Video # Video
jellyfin-media-player jellyfin-media-player
@ -22,7 +22,6 @@
# Programming # Programming
nixd # NixD LSP for .nix files nixd # NixD LSP for .nix files
deno
# :3 # :3
fastfetch fastfetch

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

@ -37,7 +37,7 @@
name = "org.kde.plasma.kickoff"; name = "org.kde.plasma.kickoff";
config = { config = {
General = { General = {
icon = "nix-snowflake"; icon = "nixos";
}; };
}; };
} }
@ -47,20 +47,11 @@
config = { config = {
General = { General = {
launchers = [ launchers = [
# System apps "applications:systemsettings.desktop" # KDE System Settings
"applications:systemsettings.desktop" # System Settings "applications:org.kde.dolphin.desktop" # KDE File Manager
"applications:org.kde.dolphin.desktop" # File Manager
"applications:org.kde.konsole.desktop" # Terminal emulator
# Communication
"applications:vesktop.desktop" # Vesktop (discord)
"applications:element-desktop.desktop" # Element Desktop
"applications:thunderbird.desktop" # Thunderbird
# Internet
"applications:firefox-nightly.desktop" # Firefox "applications:firefox-nightly.desktop" # Firefox
# Other "applications:org.kde.konsole.desktop" # KDE Terminal App
"applications:logseq.desktop" # LogSeq notes
"applications:codium.desktop" # VSCodium "applications:codium.desktop" # VSCodium
"applications:steam.desktop" # Steam
]; ];
}; };
}; };

2
home-manager/modules/vcs/jj.nix
View file

@ -28,7 +28,7 @@
}; };
revset-aliases = { revset-aliases = {
"immutable_heads()" = "builtin_immutable_heads()"; "immutable_heads()" = "builtin_immutable_heads() | main@forgejo";
}; };
}; };
}; };

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

@ -16,7 +16,6 @@
jnoortheen.nix-ide # Nix jnoortheen.nix-ide # Nix
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
# Theming # Theming
pkief.material-icon-theme # Material icons pkief.material-icon-theme # Material icons
# Utilities # Utilities

12
hosts/laptop/modules/bluetooth.nix
View file

@ -1,14 +1,6 @@
{ ... }: { ... }:
{ {
# Enable bluetooth # Enable bluetooth
hardware.bluetooth = { hardware.bluetooth.enable = true;
enable = true; hardware.bluetooth.powerOnBoot = true;
powerOnBoot = true;
settings = {
General = {
Enable = "Source,Sink,Media,Socket";
};
};
};
} }

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

@ -1,12 +1,11 @@
{ ... }: { ... }:
{ {
# Enable wayland support # Enable wayland support
environment.sessionVariables = { environment.sessionVariables ={
# Wayland electron has no hardware acceleration support, so disable it for now NIXOS_OZONE_WL = "1";
# NIXOS_OZONE_WL = "1";
STEAM_FORCE_DESKTOPUI_SCALING = "2"; STEAM_FORCE_DESKTOPUI_SCALING = "2";
}; };
# Enable zsh-autocomplete compatibility # Enable zsh-autocomplete compatibility
environment.pathsToLink = [ "/share/zsh" ]; environment.pathsToLink = [ "/share/zsh" ];
} }

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

@ -10,10 +10,10 @@
fira-code-symbols fira-code-symbols
jetbrains-mono jetbrains-mono
# Nerd fonts # Nerd fonts
] ++ (with pkgs.nerd-fonts; [ (nerdfonts.override {
fira-code fonts = [ "FiraCode" "JetBrainsMono" ];
jetbrains-mono })
]); ];
# Disable any fonts not defined above # Disable any fonts not defined above
enableDefaultPackages = false; enableDefaultPackages = false;
}; };

8
secrets.example.nix
View file

@ -1,8 +0,0 @@
{
programs = {
beets = {
# The API key to use for google custom search lyrics backend
google_api_key = null;
};
};
}

8
secrets.nix
View file

@ -1,8 +0,0 @@
{
programs = {
beets = {
# The API key to use for google custom search lyrics backend
google_api_key = "AIzaSyAWg0jEt2wPXNo2Q6dx2yvihT1FqkG26I4";
};
};
}