titaniumtown/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: titaniumtown:e269c50306c561cbca34768b66f0682a6b1bb7ea
Branches Tags
titaniumtown:main
...
compare: titaniumtown:f21fef1a51d199a32e726d907a4e3c8e6c669775
Branches Tags
titaniumtown:main

3 Commits
e269c50306 ... f21fef1a51

Author SHA1 Message Date
Simon Gardling
f21fef1a51 move imports around regarding emacs stuff 2025-06-25 23:20:32 -07:00
Simon Gardling
1fdc25ca4e 25.05 2025-06-25 19:28:01 -07:00
Simon Gardling
b370184767 cleanup 2025-06-25 19:18:22 -07:00
11 changed files with 40 additions and 166 deletions
Expand all files Collapse all files

2
deploy.sh
View File

@@ -5,4 +5,4 @@ if [ "$ARG" = "" ]; then
ARG="boot"
fi
nixos-rebuild "$ARG" --flake . --sudo
nixos-rebuild "$ARG" --flake . --use-remote-sudo

18
etcnixos/common.nix
View File

@@ -11,19 +11,17 @@
{
imports = [
./declarative-nm.nix
./distrobox.nix
# ./vm.nix
./steam.nix
./networking.nix
inputs.nixos-hardware.nixosModules.common-pc-ssd
inputs.chaotic.nixosModules.default
inputs.disko.nixosModules.disko
inputs.lanzaboote.nixosModules.lanzaboote
];
hardware.enableRedistributableFirmware = true;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode = true;
swapDevices = [ ];
@@ -42,10 +40,10 @@
# extract all my secureboot keys
# TODO! proper secrets management
"secureboot-keys".text = ''
#!/bin/sh
#!/usr/bin/env sh
rm -fr ${config.boot.lanzaboote.pkiBundle} || true
mkdir -p ${config.boot.lanzaboote.pkiBundle}
${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle}
${lib.getExe pkgs.gnutar} xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle}
chown -R root:wheel ${config.boot.lanzaboote.pkiBundle}
chmod -R 500 ${config.boot.lanzaboote.pkiBundle}
'';
@@ -53,8 +51,7 @@
# kernel options
boot = {
kernelPackages = pkgs.linuxPackages_cachyos-lto;
# kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_latest;
# kernelPackages = pkgs.linuxPackages;
lanzaboote = {
@@ -85,6 +82,7 @@
"thunderbolt"
"nvme"
"usbhid"
"amdgpu"
];
};
@@ -145,8 +143,6 @@
];
};
# age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ];
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
@@ -231,12 +227,12 @@
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
exec ${lib.getExe pkgs.fish} $LOGIN_OPTION
fi
'';
};
system.stateVersion = "24.11";
system.stateVersion = "25.05";
nixpkgs.hostPlatform = "x86_64-linux";
documentation.enable = true;

11
etcnixos/distrobox.nix
View File

@@ -1,11 +0,0 @@
{ pkgs, ... }:
{
virtualisation.podman = {
enable = true;
};
environment.systemPackages = [
pkgs.distrobox
pkgs.podman-compose
];
}

2
etcnixos/steam.nix
View File

@@ -5,7 +5,6 @@
...
}:
{
nixpkgs.config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
@@ -17,7 +16,6 @@
programs.steam = {
enable = true;
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
extraCompatPackages = with pkgs; [ proton-ge-bin ];
};

11
etcnixos/system-mreow.nix
View File

@@ -31,21 +31,12 @@
enable = true;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session";
command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
user = username;
};
};
};
programs.gamescope = {
enable = true;
capSysNice = true;
};
programs.steam = {
gamescopeSession.enable = true;
};
system.activationScripts = {
# FIX: https://github.com/NixOS/nix/issues/2982
"profile-channel-dummy".text = ''

3
etcnixos/system-yarn.nix
View File

@@ -58,7 +58,8 @@
# };
programs.steam = {
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
remotePlay.openFirewall = true;
localNetworkGameTransfers.openFirewall = true;
};
# LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT

125
flake.lock generated
View File

@@ -1,32 +1,5 @@
{
"nodes": {
"chaotic": {
"inputs": {
"flake-schemas": "flake-schemas",
"home-manager": [
"home-manager"
],
"jovian": "jovian",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1750642025,
"narHash": "sha256-ZixZpSMtrf2MFw7Ztg6JUbMRkoxxvDDipQCPqnlCDgE=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "2b666bb8aca306397ef6abb68dec67e78680882b",
"type": "github"
},
"original": {
"owner": "chaotic-cx",
"ref": "nyxpkgs-unstable",
"repo": "nyx",
"type": "github"
}
},
"crane": {
"locked": {
"lastModified": 1748970125,
@@ -123,20 +96,6 @@
"type": "github"
}
},
"flake-schemas": {
"locked": {
"lastModified": 1721999734,
"narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
"rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
"revCount": 75,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -166,41 +125,20 @@
]
},
"locked": {
"lastModified": 1750690749,
"narHash": "sha256-x6fRPeqdgDKVTCyvbp4J8Q5UQ3DV3oWYSoyM444N8cY=",
"lastModified": 1750792728,
"narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "05b8c9506452349d8be854ac46e5a7630fa7917d",
"rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"jovian": {
"inputs": {
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1750403547,
"narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736",
"type": "github"
},
"original": {
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"type": "github"
}
},
"lanzaboote": {
"inputs": {
"crane": "crane",
@@ -288,29 +226,6 @@
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"chaotic",
"jovian",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729697500,
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
"owner": "zhaofengli",
"repo": "nix-github-actions",
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "matrix-name",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1750431636,
@@ -329,16 +244,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1750506804,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
"lastModified": 1750622754,
"narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
"rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -371,7 +286,6 @@
},
"root": {
"inputs": {
"chaotic": "chaotic",
"disko": "disko",
"emacs-overlay": "emacs-overlay",
"home-manager": "home-manager",
@@ -379,32 +293,11 @@
"niri": "niri",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay_2",
"rust-overlay": "rust-overlay",
"zen-browser": "zen-browser"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1750560265,
"narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"

10
flake.nix
View File

@@ -2,7 +2,7 @@
description = "System nixOS flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
lanzaboote = {
url = "github:nix-community/lanzaboote";
@@ -13,16 +13,10 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
chaotic = {
url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
disko = {
url = "github:nix-community/disko/latest";
inputs.nixpkgs.follows = "nixpkgs";

2
home-manager/gui.nix
View File

@@ -63,7 +63,7 @@
finamp # music player
delfin # jellyfin client
signal-desktop
signal-desktop-bin
#accounting
# gnucash

4
home-manager/no-gui.nix
View File

@@ -106,7 +106,6 @@ in
{
nixpkgs.overlays = [
inputs.rust-overlay.overlays.default
inputs.emacs-overlay.overlays.default
];
}
)
@@ -127,8 +126,6 @@ in
# for benchmaking stuff
hyperfine
just
pfetch-rs
waypipe
@@ -181,7 +178,6 @@ in
# terminal image viewer
timg
lsof
tcpdump

18
home-manager/progs/emacs.nix
View File

@@ -1,5 +1,21 @@
{ pkgs, config, ... }:
{
pkgs,
config,
inputs,
...
}:
{
imports = [
(
{ ... }:
{
nixpkgs.overlays = [
inputs.emacs-overlay.overlays.default
];
}
)
];
programs.emacs = {
enable = true;
package = pkgs.emacs-unstable-pgtk;