Compare commits

..

4 commits

Author SHA1 Message Date
168718f13e flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/23ff9821bcaec12981e32049e8687f25f11e5ef3' (2024-03-04)
  → 'github:nix-community/home-manager/bdea159ffab9865f808b8d92fd2bef33521867b2' (2024-03-05)
• Updated input 'w17':
    'git+https://git.darmstadt.ccc.de/avocadoom/w17-cli.git?ref=refs/heads/main&rev=4c67a71dcf4599d8ac1136306d46b299401e1dec' (2024-03-05)
  → 'git+https://git.darmstadt.ccc.de/avocadoom/w17-cli.git?ref=refs/heads/main&rev=92b5e8a6e3710073c68a629a52a964e1ffd6c4a1' (2024-03-05)
2024-03-05 23:57:26 +01:00
e8043fa999 add w17 ssh_config and cli 2024-03-05 23:42:08 +01:00
1abe7e3663 update flake 2024-03-05 20:15:17 +01:00
d89551bb6c small modifications to desktop 2024-03-04 02:10:30 +01:00
6 changed files with 98 additions and 18 deletions

View file

@ -22,9 +22,6 @@
size = 128; size = 128;
}; */ }; */
services.kdeconnect.enable = true;
services.kdeconnect.indicator = true;
home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; }; home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
home.packages = with pkgs; [ libsForQt5.discover ]; home.packages = with pkgs; [ libsForQt5.discover ];

View file

@ -22,6 +22,14 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
binfmt.registrations.appimage = {
wrapInterpreterInShell = false;
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
recognitionType = "magic";
offset = 0;
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
magicOrExtension = ''\x7fELF....AI\x02'';
};
}; };
networking.hostName = "thilo-pc"; networking.hostName = "thilo-pc";
@ -38,6 +46,9 @@
}; };
}; };
programs.kdeconnect.enable = true;
programs.nix-ld.enable = true;
hardware.opengl = { hardware.opengl = {
extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ]; extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
}; };

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709049058, "lastModified": 1709646915,
"narHash": "sha256-RLag2Uy3wezy+oW+bsEwloDRaxV9BV/QdzHmSz1Ciwo=", "narHash": "sha256-Zrk5ffSxWvLqwmyI4Ta/TR2fmgzIbI+g0QMv/zOf64k=",
"owner": "dagger", "owner": "dagger",
"repo": "nix", "repo": "nix",
"rev": "c4d98a163455709a6d8bba53465854981e115c15", "rev": "60a29c97c5fad161abad8d1d0f3b83ab44a72fb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -28,11 +28,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1708701802, "lastModified": 1709596918,
"narHash": "sha256-OvpkuB5Lx8eomwUgUT4s10fzbrDnPCtCsxOlZ63hYFI=", "narHash": "sha256-X8tp7nYunRZds8GdSEp+ZBMPf3ym9e6VjZWN8fmzBrc=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "fa9a708e240c6174f9fc4c6eefbc6a89ce01c350", "rev": "4eccee9a19ad9be42a7859211b456b281d704313",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709204054, "lastModified": 1709677162,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "narHash": "sha256-nIXa0KM3FOVjD3XDDigW12qktQvLG+uKuPg00rjIX/8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15", "rev": "bdea159ffab9865f808b8d92fd2bef33521867b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +381,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1709237383, "lastModified": 1709479366,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,6 +409,19 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"path": "/nix/store/bjvqq8c79dbi59g7xzcc6lhl0f19m3d7-source",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -446,7 +459,8 @@
"nix-software-center": "nix-software-center", "nix-software-center": "nix-software-center",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-update": "nixpkgs-update" "nixpkgs-update": "nixpkgs-update",
"w17": "w17"
} }
}, },
"systems": { "systems": {
@ -479,6 +493,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -496,6 +525,43 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"w17": {
"inputs": {
"nixpkgs": "nixpkgs_7",
"utils": "utils_2"
},
"locked": {
"lastModified": 1709679417,
"narHash": "sha256-I1f3QEmM/ktBVlVk9CvoBtS7/CBlgV4vSgIR20u82lc=",
"ref": "refs/heads/main",
"rev": "92b5e8a6e3710073c68a629a52a964e1ffd6c4a1",
"revCount": 2,
"type": "git",
"url": "https://git.darmstadt.ccc.de/avocadoom/w17-cli.git"
},
"original": {
"type": "git",
"url": "https://git.darmstadt.ccc.de/avocadoom/w17-cli.git"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -14,9 +14,10 @@
dagger.inputs.nixpkgs.follows = "nixpkgs"; dagger.inputs.nixpkgs.follows = "nixpkgs";
nixgl.url = "github:guibou/nixGL"; nixgl.url = "github:guibou/nixGL";
muse-sounds-manager.url = "github:thilobillerbeck/muse-sounds-manager-nix"; muse-sounds-manager.url = "github:thilobillerbeck/muse-sounds-manager-nix";
w17.url = "git+https://git.darmstadt.ccc.de/avocadoom/w17-cli.git";
}; };
outputs = { nixpkgs, home-manager, nixgl, ... }@inputs: outputs = { nixpkgs, home-manager, nixgl, w17, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {

View file

@ -82,6 +82,10 @@ Host *.tailscale.net
User thilo User thilo
IdentityFile ~/.ssh/id_tailscale IdentityFile ~/.ssh/id_tailscale
Host *.w17.io
User chaos
IdentityFile ~/.ssh/id_w17
Host digitaltwinservice.de Host digitaltwinservice.de
User tb12zysu User tb12zysu
IdentityFile ~/.ssh/id_digitaltwinservice-de IdentityFile ~/.ssh/id_digitaltwinservice-de
@ -91,4 +95,4 @@ Host thilo-pc
Host *.relaix.net Host *.relaix.net
User tbillerbeck User tbillerbeck
IdentityFile ~/.ssh/id_relaix-net IdentityFile ~/.ssh/id_relaix-net

View file

@ -69,6 +69,7 @@ in {
nil nil
nixd nixd
unrar unrar
inputs.w17.packages.x86_64-linux.default
] ++ (if config.machine.isGraphical then [ ] ++ (if config.machine.isGraphical then [
(pkgs.nerdfonts.override { (pkgs.nerdfonts.override {
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];