sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

persist cinnamon-monitors.xml

This commit is contained in:
Sam 2024-05-28 20:19:30 +01:00
parent 66523171c9
commit 2b74cf80e2
5 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock
View File

@ -182,11 +182,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716847642, "lastModified": 1716908526,
"narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", "narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", "rev": "373ead20606efa9181cd15ba19a5deac7ead1492",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,11 +255,11 @@
"nix-secrets": { "nix-secrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716900655, "lastModified": 1716917146,
"narHash": "sha256-YQBKCTcP+CKP0LWSjVlP+qQ4kbk8ZWjir/nTPIl4+Bs=", "narHash": "sha256-YopICr9b8EqsysVABoJAIDBPtk5PiJjqz+eRWjYHLP0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "c000be534d2c23315a746555e82a30b512c42f65", "rev": "1669319dcc94896a4591dc1118f90818f2591433",
"revCount": 69, "revCount": 73,
"type": "git", "type": "git",
"url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
}, },
@ -270,10 +270,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1716715802,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
"path": "/nix/store/3pif36ks3f56py4wb1dkq6sh0nkf3ygj-source", "owner": "NixOS",
"type": "path" "repo": "nixpkgs",
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",

11
home/sparky.nix
View File

@ -17,4 +17,15 @@
./common/optional/syncthing.nix ./common/optional/syncthing.nix
]; ];
monitors = [
{
name = "HDMI-1";
width = 2560;
height = 1440;
refreshRate = 59.95;
x = 0;
workspace = "1";
primary = true;
}
];
} }

9
hosts/common/users/media/default.nix
View File

@ -7,7 +7,7 @@ let
secretsDirectory = builtins.toString inputs.nix-secrets; secretsDirectory = builtins.toString inputs.nix-secrets;
secretsFile = "${secretsDirectory}/secrets.yaml"; secretsFile = "${secretsDirectory}/secrets.yaml";
in in
{ {
users.users.${username} = { users.users.${username} = {
isNormalUser = true; isNormalUser = true;
@ -16,9 +16,9 @@ in
openssh.authorizedKeys.keys = lib.lists.forEach pubKeys (key: builtins.readFile key); openssh.authorizedKeys.keys = lib.lists.forEach pubKeys (key: builtins.readFile key);
extraGroups = extraGroups =
[ [
"wheel" "wheel"
]; ];
packages = with pkgs; [ packages = with pkgs; [
flatpak flatpak
@ -40,6 +40,7 @@ in
".local" ".local"
]; ];
files = [ files = [
".config/cinnamon-monitors.xml"
]; ];
}; };
}; };

2
hosts/sparky/default.nix
View File

@ -2,7 +2,7 @@
let let
# Disko setup # Disko setup
fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence
dev = "/dev/vda"; # depends on target hardware dev = "/dev/sda"; # depends on target hardware
encrypted = false; # currrently only applies to btrfs encrypted = false; # currrently only applies to btrfs
btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root"; btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root";
in in

2
justfile
View File

@ -25,7 +25,7 @@ edit-sops:
# update keys in secrets.yaml and push to remote # update keys in secrets.yaml and push to remote
update-sops-secrets: update-sops-secrets:
cd $HOME/nix-secrets && (\ cd ../nix-secrets && (\
nix-shell -p sops --run "sops updatekeys -y secrets.yaml" && \ nix-shell -p sops --run "sops updatekeys -y secrets.yaml" && \
git add -u && (git commit -m "updated secrets" || true) && git push \ git add -u && (git commit -m "updated secrets" || true) && git push \
) )