Andromeda/conf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Andromeda:a6ad2a25be9ba7d7aa442d1340ee2a494f1ff2ef
Branches Tags
Andromeda:master Andromeda:dev Andromeda:phoenix Andromeda:flake-parts Andromeda:r0-persist
Andromeda:nixos-anywhere
...
compare: Andromeda:dev
Branches Tags
Andromeda:dev Andromeda:master Andromeda:phoenix Andromeda:flake-parts Andromeda:r0-persist
Andromeda:nixos-anywhere

5 Commits
a6ad2a25be ... dev

Author SHA1 Message Date
andromeda
33d61130c8 update kernel 2026-04-19 12:24:55 +02:00
andromeda
2783860e4e update inputs 2026-04-19 12:15:31 +02:00
andromeda
d2ea8ab074 bump anki-cli 2026-04-19 10:37:59 +02:00
andromeda
faba184a58 update anki-cli 2026-04-18 08:22:09 +02:00
andromeda
055657e082 stash 2026-04-16 16:52:00 +02:00
10 changed files with 280 additions and 151 deletions
Expand all files Collapse all files

276
flake.lock generated
View File

@@ -23,6 +23,28 @@
"type": "github" "type": "github"
} }
}, },
"anki-cli": {
"inputs": {
"fenix": "fenix",
"naersk": "naersk",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1776540672,
"narHash": "sha256-D43SN81mM21icdtK/9JDwaXsIhFv+gm4G8KXhJDCxsQ=",
"ref": "refs/heads/master",
"rev": "bcd83506ea691861562ade66ce23f57b27e57ee2",
"revCount": 12,
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/anki-cli.git"
},
"original": {
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/anki-cli.git"
}
},
"base16": { "base16": {
"inputs": { "inputs": {
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
@@ -129,14 +151,59 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"anki-cli",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1776153734,
"narHash": "sha256-QvkVX4Go+BnNgQQLc5Ma3WNBZOG5Jpdqsy8Ri0/CbSQ=",
"owner": "nix-community",
"repo": "fenix",
"rev": "a8b0e62fb39299fbeb1aa365f4b57e2c258a178e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"fenix_2": {
"inputs": {
"nixpkgs": [
"anki-cli",
"naersk",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src_2"
},
"locked": {
"lastModified": 1752475459,
"narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
"owner": "nix-community",
"repo": "fenix",
"rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764873433, "lastModified": 1775176642,
"narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "rev": "179704030c5286c729b5b0522037d1d51341022c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -227,11 +294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767609335, "lastModified": 1775087534,
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "250481aafeb741edfe23d29195671c19b36b6dca", "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -269,11 +336,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772893680, "lastModified": 1775585728,
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "rev": "580633fa3fe5fc0379905986543fd7495481913d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -307,20 +374,18 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.gnome.org",
"lastModified": 1767737596, "lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "gitlab" "type": "github"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "gitlab" "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github"
} }
}, },
"home-manager": { "home-manager": {
@@ -351,11 +416,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774007980, "lastModified": 1776562531,
"narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9670de2921812bc4e0452f6e3efd8c859696c183", "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -419,6 +484,28 @@
"type": "github" "type": "github"
} }
}, },
"naersk": {
"inputs": {
"fenix": "fenix_2",
"nixpkgs": [
"anki-cli",
"nixpkgs"
]
},
"locked": {
"lastModified": 1776193198,
"narHash": "sha256-U4w4GpgYt72z8pBKMDaqzlnPJRxI9pn+8tr7SOAxocE=",
"owner": "nix-community",
"repo": "naersk",
"rev": "e4e2ee6c9af67ecd4abb102fc32b9e49c70d92ff",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"ndg": { "ndg": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -444,11 +531,11 @@
"nix-zulip": { "nix-zulip": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772926346, "lastModified": 1775149560,
"narHash": "sha256-fk8lfYmpXtBLzpJb9f97fYzKXcNflA5CYdYEJD1SDoY=", "narHash": "sha256-UoF4z9JL0J5hh3d33ToZKY8ve1R3+3X7bPMVXxN2oMw=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "995e67ff510f413bd0d21af2137159c283223985", "rev": "0ee7f76d6d40f550e10041932aa73ea03b9915cd",
"revCount": 80, "revCount": 90,
"type": "git", "type": "git",
"url": "https://git.afnix.fr/nix-zulip/nix-zulip" "url": "https://git.afnix.fr/nix-zulip/nix-zulip"
}, },
@@ -467,11 +554,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774001769, "lastModified": 1776557524,
"narHash": "sha256-6y8yLrMecnFq21wFlUSxHF7OsabVCCj2p104HEUosvI=", "narHash": "sha256-mOIdjVcnB+IOdJu5FBvRJMD6gQSl7JZJopSiaW1bEdc=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "05968d7978faaa501836d6d2eb7f6cffb4140829", "rev": "fdb1be9b5064df55d5fe27247932aa0c01cd71d4",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -498,11 +585,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1773821835, "lastModified": 1776169885,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -512,26 +599,6 @@
"type": "github" "type": "github"
} }
}, },
"noshell": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1717396029,
"narHash": "sha256-NPIhvnTYkJZqTY+aabbZ6CAaMAgG6IISvh7GZo1MTfQ=",
"owner": "viperML",
"repo": "noshell",
"rev": "4d194d838a50ea106cd0e47c024e47afc154ab42",
"type": "github"
},
"original": {
"owner": "viperML",
"repo": "noshell",
"type": "github"
}
},
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@@ -540,11 +607,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774121134, "lastModified": 1776587421,
"narHash": "sha256-2rY/WUuZEtQ7St3AcFw6dri4oYyBJvr/dnZdpOPe1oM=", "narHash": "sha256-rO2dca1U5xao5BMg+Os2HySVmQlq5hR49NNrGc9dEkg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "4fe0420f495cdcd730969de67f75f44d2a5bb71f", "rev": "11f5d7471f1999a8130e953209765a19f2fb74e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -565,11 +632,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767810917, "lastModified": 1775228139,
"narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -590,11 +657,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1774109759, "lastModified": 1776539146,
"narHash": "sha256-Ksvw+R+kwCr+liA4h+TtQaYSW/0Jl+NDMThU5TBsJIY=", "narHash": "sha256-zuaO3Gi+HUf4Udv6wiCsK29SKh/Q6kwacpTn8gIwyZY=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "4f1074084eb86e8d8a32e19e78f3cf2adba0213e", "rev": "2809f4d43071e124f316ecf6dd0c68302f1078af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -610,34 +677,69 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774120611, "lastModified": 1776592848,
"narHash": "sha256-QZ09cfZnPiF62BgNqVTxEbFtnBjYaBVuhZNdos9ggnE=", "narHash": "sha256-xpoDCBLPNViU9kxDr8f2z1MuPLvrmCkrJxymUuanv88=",
"owner": "celenityy", "ref": "refs/heads/pages",
"repo": "Phoenix", "rev": "1c69c28a9b6184529c0f756a386c6fbfde35a150",
"rev": "df5a6d30c792c0b17017510b35db93e94fb9e6a1", "revCount": 2812,
"type": "github" "type": "git",
"url": "https://codeberg.org/andromeda-fp/Phoenix"
}, },
"original": { "original": {
"owner": "celenityy", "rev": "1c69c28a9b6184529c0f756a386c6fbfde35a150",
"repo": "Phoenix", "type": "git",
"type": "github" "url": "https://codeberg.org/andromeda-fp/Phoenix"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"anki-cli": "anki-cli",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"impermanence": "impermanence", "impermanence": "impermanence",
"nix-zulip": "nix-zulip", "nix-zulip": "nix-zulip",
"nixos-mailserver": "nixos-mailserver", "nixos-mailserver": "nixos-mailserver",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"noshell": "noshell",
"nur": "nur", "nur": "nur",
"nvf": "nvf", "nvf": "nvf",
"phoenix": "phoenix", "phoenix": "phoenix",
"stylix": "stylix" "stylix": "stylix"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1776115521,
"narHash": "sha256-N/R1//Xd8vr84LtyTy8CVz7V2n9NJXXlJEODSunLE9c=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "5205b52ea60dd49c7e33dd2ad1a3e7ef55bb30ec",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-analyzer-src_2": {
"flake": false,
"locked": {
"lastModified": 1752428706,
"narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"stylix": { "stylix": {
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
@@ -652,18 +754,17 @@
], ],
"nur": "nur_2", "nur": "nur_2",
"systems": "systems_3", "systems": "systems_3",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1773792048, "lastModified": 1776170745,
"narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -717,23 +818,6 @@
"type": "github" "type": "github"
} }
}, },
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -753,11 +837,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767710407, "lastModified": 1772661346,
"narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "rev": "13b5b0c299982bb361039601e2d72587d6846294",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -769,11 +853,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767489635, "lastModified": 1772934010,
"narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -785,11 +869,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767488740, "lastModified": 1772909925,
"narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
flake.nix
View File

@@ -4,6 +4,10 @@
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
anki-cli = {
url = "git+https://git.mtgmonkey.net/Andromeda/anki-cli.git";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -18,10 +22,6 @@
url = "git+https://git.afnix.fr/nix-zulip/nix-zulip"; url = "git+https://git.afnix.fr/nix-zulip/nix-zulip";
flake = false; flake = false;
}; };
noshell = {
url = "github:viperML/noshell";
inputs.nixpkgs.follows = "nixpkgs";
};
nur = { nur = {
url = "github:nix-community/NUR"; url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -31,7 +31,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
phoenix = { phoenix = {
url = "github:celenityy/Phoenix"; # TODO when pull #270 gets merged use celenity again
url = "git+https://codeberg.org/andromeda-fp/Phoenix?rev=1c69c28a9b6184529c0f756a386c6fbfde35a150";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
@@ -41,12 +42,12 @@
}; };
outputs = { outputs = {
agenix, agenix,
anki-cli,
home-manager, home-manager,
impermanence, impermanence,
nixos-mailserver, nixos-mailserver,
nixpkgs, nixpkgs,
nix-zulip, nix-zulip,
noshell,
nur, nur,
nvf, nvf,
phoenix, phoenix,
@@ -68,7 +69,6 @@
agenix.nixosModules.default agenix.nixosModules.default
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
nixos-mailserver.nixosModule nixos-mailserver.nixosModule
noshell.nixosModules.default
nix-zulip'.nixosModules.zulip nix-zulip'.nixosModules.zulip
phoenix.nixosModules.default phoenix.nixosModules.default
({pkgs, ...}: { ({pkgs, ...}: {
@@ -76,6 +76,9 @@
agenix.overlays.default agenix.overlays.default
nur.overlays.default nur.overlays.default
nix-zulip'.overlays.default nix-zulip'.overlays.default
(self: super: {
anki-cli = anki-cli.packages.${machine.system}.default;
})
]; ];
}) })
] ]

7
machines.nix
View File

@@ -35,6 +35,13 @@
# substitutors # substitutors
./substitutors.nix ./substitutors.nix
{
services.guix = {
enable = true;
stateDir = "/gnu/var";
};
}
]; ];
}; };
"109-199-104-83" = { "109-199-104-83" = {

4
modules/nixos/common.nix
View File

@@ -10,8 +10,8 @@
]; ];
# allows users to customize shell in `$XDG_CONFIG_HOME/shell` rather than # allows users to customize shell in `$XDG_CONFIG_HOME/shell` rather than
# needing /etc/shells. Useful for home-manager. Falls back. # needing /etc/shells. Useful for home-manager.
programs.noshell.enable = true; # programs.noshell.enable = true;
# cleans /tmp to maintain a tidy system # cleans /tmp to maintain a tidy system
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;

1
modules/nixos/impermanence.nix
View File

@@ -7,6 +7,7 @@
"/var/log" "/var/log"
"/var/lib/nixos" "/var/lib/nixos"
"/var/lib/systemd/coredump" "/var/lib/systemd/coredump"
"/gnu"
]; ];
files = [ files = [
"/etc/machine-id" "/etc/machine-id"

2
modules/nixos/laptop.nix
View File

@@ -7,7 +7,7 @@
services.blueman.enable = true; services.blueman.enable = true;
# locale # locale
i18n.defaultLocale = "de_DE.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
# networking # networking

37
modules/nixos/machines/lenovo.nix
View File

@@ -8,6 +8,7 @@
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "sdhci_pci"]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "sdhci_pci"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
@@ -17,7 +18,29 @@
options = ["subvol=root"]; options = ["subvol=root"];
}; };
boot.initrd.postResumeCommands = lib.mkAfter '' boot.initrd.systemd = {
services.impermanent-btrfs = {
description = "saves old root and makes new one";
unitConfig.DefaultDependencies = false;
serviceConfig = {
Type = "oneshot";
StandardOutput = "journal+console";
StandardError = "journal+console";
};
requiredBy = [
"initrd.target"
];
before = [
"sysroot.mount"
];
requires = [
"initrd-root-device.target"
];
after = [
"initrd-root-device.target"
"local-fs-pre.target"
];
script = ''
mkdir /btrfs_tmp mkdir /btrfs_tmp
mount ${config.fileSystems."/".device} /btrfs_tmp mount ${config.fileSystems."/".device} /btrfs_tmp
if [[ -e /btrfs_tmp/root ]]; then if [[ -e /btrfs_tmp/root ]]; then
@@ -47,6 +70,18 @@
rm -r /btrfs_tmp/root/persist rm -r /btrfs_tmp/root/persist
umount /btrfs_tmp umount /btrfs_tmp
''; '';
};
extraBin = {
"mkdir" = "${pkgs.coreutils}/bin/mkdir";
"date" = "${pkgs.coreutils}/bin/date";
"stat" = "${pkgs.coreutils}/bin/stat";
"mv" = "${pkgs.coreutils}/bin/mv";
"cp" = "${pkgs.coreutils}/bin/cp";
"rm" = "${pkgs.coreutils}/bin/rm";
"btrfs" = "${pkgs.btrfs-progs}/bin/btrfs";
# find, mount, umount already there
};
};
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/0e586651-36f4-42b0-99b3-3f0704a894d6"; device = "/dev/disk/by-uuid/0e586651-36f4-42b0-99b3-3f0704a894d6";

4
modules/nixos/mailserver.nix
View File

@@ -37,10 +37,6 @@
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
}; };
"matrix.${config.networking.domain}" = {
forceSSL = true;
enableACME = true;
};
"${config.networking.domain}" = { "${config.networking.domain}" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;

6
users.nix
View File

@@ -13,8 +13,9 @@
description = "andromeda"; description = "andromeda";
hashedPasswordFile = builtins.toString config.age.secrets.andromeda-pw.path; hashedPasswordFile = builtins.toString config.age.secrets.andromeda-pw.path;
extraGroups = [ extraGroups = [
"networkmanager" "networkmanager" # network configuration
"wheel" "wheel" # serial
"dialout" # access to serial ports
]; ];
}; };
}; };
@@ -41,7 +42,6 @@
]; ];
files = [ files = [
".bash_history" ".bash_history"
".brush_history"
]; ];
}; };
} }

25
users/andromeda/home.nix
View File

@@ -18,7 +18,6 @@
}; };
in { in {
imports = [./stylix.nix]; imports = [./stylix.nix];
xdg.configFile."shell".source = lib.getExe pkgs.brush;
xdg.configFile."sway/config".source = lib.mkForce sway_config; xdg.configFile."sway/config".source = lib.mkForce sway_config;
wayland.windowManager.sway.enable = true; wayland.windowManager.sway.enable = true;
home = { home = {
@@ -31,24 +30,30 @@ in {
pkgs.agenix pkgs.agenix
pkgs.alacritty pkgs.alacritty
pkgs.anki pkgs.anki
pkgs.anki-cli
pkgs.brightnessctl pkgs.brightnessctl
pkgs.brush
pkgs.dust pkgs.dust
pkgs.fluffychat pkgs.fluffychat
pkgs.fzf pkgs.fzf
pkgs.gdb
pkgs.geeqie pkgs.geeqie
pkgs.glow pkgs.glow
pkgs.grim pkgs.grim
pkgs.hexdump
pkgs.http-server
pkgs.jmtpfs pkgs.jmtpfs
pkgs.mindustry-wayland pkgs.mindustry-wayland
pkgs.nasm
pkgs.nix-output-monitor pkgs.nix-output-monitor
pkgs.npins pkgs.npins
pkgs.ranger pkgs.ranger
pkgs.rip2 pkgs.rip2
pkgs.ripgrep pkgs.ripgrep
pkgs.slurp pkgs.slurp
pkgs.tokei
pkgs.tree pkgs.tree
pkgs.zoxide pkgs.wget
pkgs.xxd
]; ];
file.${background-path}.source = config.stylix.image; file.${background-path}.source = config.stylix.image;
}; };
@@ -56,6 +61,7 @@ in {
alacritty.enable = true; alacritty.enable = true;
bash = { bash = {
enable = true; enable = true;
enableCompletion = false;
shellAliases = { shellAliases = {
neofetch = "fastfetch"; neofetch = "fastfetch";
ls = lib.mkForce "lsd"; ls = lib.mkForce "lsd";
@@ -67,7 +73,6 @@ in {
}; };
bashrcExtra = '' bashrcExtra = ''
PS1="\u@\h:\w$" PS1="\u@\h:\w$"
eval "$(zoxide init bash)"
''; '';
}; };
btop = { btop = {
@@ -107,13 +112,6 @@ in {
pkgs.nur.repos.rycee.firefox-addons.tridactyl pkgs.nur.repos.rycee.firefox-addons.tridactyl
]; ];
}; };
search = {
default = "DuckDuckGo (HTML)";
privateDefault = "DuckDuckGo (HTML)";
order = [
"DuckDuckGo (HTML)"
];
};
settings = { settings = {
"extensions.autoDisableScopes" = 0; "extensions.autoDisableScopes" = 0;
}; };
@@ -138,6 +136,7 @@ in {
nvf = { nvf = {
enable = true; enable = true;
settings.vim = { settings.vim = {
startPlugins = [pkgs.vimPlugins.parinfer-rust];
autocomplete.nvim-cmp.enable = false; autocomplete.nvim-cmp.enable = false;
formatter.conform-nvim = { formatter.conform-nvim = {
enable = true; enable = true;
@@ -227,6 +226,10 @@ in {
}; };
}; };
ssh.enable = true; ssh.enable = true;
zoxide = {
enable = true;
enableBashIntegration = true;
};
}; };
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;