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

Compare commits

base: titaniumtown:66b4931d083f0cc2adebf15dfdd3ccdc1bed5c4b
Branches Tags
titaniumtown:main
..
compare: titaniumtown:59278188dafd38951a6b90acaad26ea748bef8b2
Branches Tags
titaniumtown:main

No commits in common. "66b4931d083f0cc2adebf15dfdd3ccdc1bed5c4b" and "59278188dafd38951a6b90acaad26ea748bef8b2" have entirely different histories.
66b4931d08 ... 59278188da

5 changed files with 44 additions and 107 deletions
Show Stats Expand all files Collapse all files

100
flake.lock generated
View File

@ -1,36 +1,5 @@
{ {
"nodes": { "nodes": {
"chaotic": {
"inputs": {
"flake-schemas": "flake-schemas",
"home-manager": [
"home-manager"
],
"jovian": [
"jovian"
],
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": [
"rust-overlay"
]
},
"locked": {
"lastModified": 1764031508,
"narHash": "sha256-4Yh26aEgO1O0kV6qhW+Uw/CzAQTSbGkBGuiw6OkI/Ws=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "2d5f96ca62d47d93d67fa7267e92aa2f660a3a36",
"type": "github"
},
"original": {
"owner": "chaotic-cx",
"ref": "nyxpkgs-unstable",
"repo": "nyx",
"type": "github"
}
},
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1763938834, "lastModified": 1763938834,
@ -115,11 +84,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764088169, "lastModified": 1764001463,
"narHash": "sha256-l0zJRJg8Fm4pcewILYqw/0jkLdMn2Kvl2SLG9xK9HB8=", "narHash": "sha256-4kEGNgKDLTv8Vw2mMi/0lJoXY3NyritYHvm8T/YPoxE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ea48b8bca040158fe8559179a9a71b462cdeda03", "rev": "fcc5578b096e98a2f0c9657634b6f19bd17805b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,20 +129,6 @@
"type": "github" "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": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -203,11 +158,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764075860, "lastModified": 1764007004,
"narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=", "narHash": "sha256-OnonWWGrUGPc3y1TES/RVCe4Gd75YgdU8aIp07Au4lc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "295d90e22d557ccc3049dc92460b82f372cd3892", "rev": "125e40fa68b340aee9d474a46b540907e2537b5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,7 +186,7 @@
"type": "github" "type": "github"
} }
}, },
"jovian": { "jovian-nixos": {
"inputs": { "inputs": {
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": [ "nixpkgs": [
@ -289,11 +244,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1764081740, "lastModified": 1764008093,
"narHash": "sha256-eeQzyHJjSQTxcjSCy1OgOgNAUjdBnIjSYntfJK0Z4+I=", "narHash": "sha256-8OmHLuPkZMjjEkn/TA2tk/3tEOE+zoUYiP5YFk7JsrU=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "e579b1a51f26341eeeb41e32d5b5c6e2a032e339", "rev": "340b81b5d7cb4f15bf23f9ae8e372366c06fd423",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +277,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764046829, "lastModified": 1763990232,
"narHash": "sha256-XFSR43nAKXDMhtNa+V2sd6Url/bCPGwawkmCqUKKRfI=", "narHash": "sha256-RdtlZ+nufSwEgNsF0yuTOO2eGpn87Qm9b3tRQPsibH4=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "54c7fdcd1adcfade596aca1070062f3f0fb5d4d0", "rev": "45b45ac29d654c0e6759ab996c69dfde40053536",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -347,11 +302,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1764060317, "lastModified": 1763980357,
"narHash": "sha256-ngeRNhpBYCuMgG+wbiwDv1lp4f1Tda3EHjnfxfsz7Tw=", "narHash": "sha256-o39Zr+uZ01yq217KAQTUxO8k9gN7PLKYmoK1UTQ7eBc=",
"owner": "marienz", "owner": "marienz",
"repo": "nix-doom-emacs-unstraightened", "repo": "nix-doom-emacs-unstraightened",
"rev": "8342ea98bf04d41447d3b7513760232407d351e0", "rev": "817bc5de1ebd1045f591ae1e7cb67e78e098019c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,7 +333,7 @@
"nix-github-actions": { "nix-github-actions": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"jovian", "jovian-nixos",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -399,11 +354,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1764080039, "lastModified": 1762847253,
"narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "da17006633ca9cda369be82893ae36824a2ddf1a", "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +370,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1763966396, "lastModified": 1763835633,
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,13 +409,12 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"chaotic": "chaotic",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"jovian": "jovian", "jovian-nixos": "jovian-nixos",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"niri": "niri", "niri": "niri",
"nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
@ -499,11 +453,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764038373, "lastModified": 1763952169,
"narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
flake.nix
View File

@ -61,22 +61,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
jovian = { jovian-nixos = {
url = "github:Jovian-Experiments/Jovian-NixOS"; url = "github:Jovian-Experiments/Jovian-NixOS";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
chaotic = {
url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
inputs = {
nixpkgs.follows = "nixpkgs";
home-manager.follows = "home-manager";
rust-overlay.follows = "rust-overlay";
jovian.follows = "jovian";
};
};
}; };
outputs = outputs =
@ -87,8 +75,7 @@
nixos-hardware, nixos-hardware,
home-manager, home-manager,
deploy-rs, deploy-rs,
jovian, jovian-nixos,
chaotic,
... ...
}@inputs: }@inputs:
let let
@ -117,9 +104,7 @@
; ;
}; };
modules = [ modules = [
chaotic.nixosModules.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
jovian.nixosModules.default
( (
{ config, ... }: { config, ... }:
{ {

9
system/common.nix
View File

@ -81,19 +81,12 @@
]; ];
}; };
# weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
# if I move to another lock screen program, i will have to replace `swaylock`
security.pam.services.swaylock = { };
# allow unfree packages for jovian-nixos # allow unfree packages for jovian-nixos
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
services.scx.enable = true;
# kernel options # kernel options
boot = { boot = {
# kernelPackages = pkgs.linuxPackages_cachyos-lto; kernelPackages = pkgs.linuxPackages_latest;
# kernelPackages = pkgs.linuxPackages_latest;
# kernelPackages = pkgs.linuxPackages; # kernelPackages = pkgs.linuxPackages;
lanzaboote = { lanzaboote = {

17
system/system-mreow.nix
View File

@ -27,10 +27,9 @@
# PST # PST
# time.timeZone = lib.mkForce "America/Los_Angeles"; # time.timeZone = lib.mkForce "America/Los_Angeles";
boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride { # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
# my system is zen 5, but zen 4 is the highest option # if I move to another lock screen program, i will have to replace `swaylock`
mArch = "ZEN4"; security.pam.services.swaylock = { };
};
# disable framework kernel module # disable framework kernel module
# https://github.com/NixOS/nixos-hardware/issues/1330 # https://github.com/NixOS/nixos-hardware/issues/1330
@ -44,6 +43,16 @@
command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time"; command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time";
user = username; user = username;
}; };
terminal.vt = lib.mkForce 2;
}; };
}; };
environment.etc."xdg/wayland-sessions/niri-session.desktop".text = ''
[Desktop Entry]
Name=Niri Session
Comment=Niri Wayland compositor
Exec=niri-session
Type=Application
DesktopNames=niri
'';
} }

6
system/system-yarn.nix
View File

@ -18,13 +18,9 @@
inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
inputs.impermanence.nixosModules.impermanence inputs.impermanence.nixosModules.impermanence
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.jovian-nixos.nixosModules.default
]; ];
boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride {
# this system is zen 3, but this is the highest level this system supports
mArch = "GENERIC_V4";
};
fileSystems."/media/games" = { fileSystems."/media/games" = {
device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8"; device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8";
fsType = "f2fs"; fsType = "f2fs";