vinzenz/nixos-configuration
0
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: vinzenz:12a1359d318fcb480531a85e634ad25683b94faa
Branches Tags
vinzenz:main
vinzenz:vpn1-wg
..
compare: vinzenz:0261c84d626896256932a45bbad045e2838d179d
Branches Tags
vinzenz:main
vinzenz:vpn1-wg

No commits in common. "12a1359d318fcb480531a85e634ad25683b94faa" and "0261c84d626896256932a45bbad045e2838d179d" have entirely different histories.
12a1359d31 ... 0261c84d62

4 changed files with 59 additions and 108 deletions
Show stats Expand all files Collapse all files

91
flake.lock
View file

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750792728, "lastModified": 1749154018,
"narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,9 +70,7 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils",
"flake-utils"
],
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": "lix",
"nixpkgs": [ "nixpkgs": [
@ -125,11 +123,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1751073903, "lastModified": 1749144707,
"narHash": "sha256-6pUwEiEJw8PGqUn2+Mf0IEJN4M0FMoXCM4sNa2EZuKk=", "narHash": "sha256-JcSmySCB3pOtzeWMaEksZgaiNedEDIC6qyBezkK+92Q=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "3667e998b5ad7a1ec56207f79c9629a919eafd43", "rev": "32d49ef427be377c82d32ce74ff3082c2c992199",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,16 +139,16 @@
"niri-stable": { "niri-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748151941, "lastModified": 1740117926,
"narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YaLTeR", "owner": "YaLTeR",
"ref": "v25.05.1", "ref": "v25.02",
"repo": "niri", "repo": "niri",
"type": "github" "type": "github"
} }
@ -158,11 +156,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750791124, "lastModified": 1749112952,
"narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", "narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", "rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,36 +184,28 @@
"type": "github" "type": "github"
} }
}, },
"nix-vscode-extensions": { "nix-filter_2": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1751076164, "lastModified": 1731533336,
"narHash": "sha256-to92MoMF7QC2K2gdpkYoN/Y9wuF6Q/qlvNyHca6uPjQ=", "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "nix-community", "owner": "numtide",
"repo": "nix-vscode-extensions", "repo": "nix-filter",
"rev": "7f443f5e4125f9aad3885542c04653f29b15b92a", "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "numtide",
"repo": "nix-vscode-extensions", "repo": "nix-filter",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750969886, "lastModified": 1749086602,
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "rev": "4792576cb003c994bd7cc1edada3129def20b27d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +217,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1750994206, "lastModified": 1749174413,
"narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=", "narHash": "sha256-urN9UMK5cd1dzhR+Lx0xHeTgBp2MatA5+6g9JaxjuQs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf", "rev": "6ad174a6dc07c7742fc64005265addf87ad08615",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,13 +233,10 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix-module": "lix-module", "lix-module": "lix-module",
"naersk": "naersk", "naersk": "naersk",
"niri": "niri", "niri": "niri",
"nix-filter": "nix-filter",
"nix-vscode-extensions": "nix-vscode-extensions",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"servicepoint-cli": "servicepoint-cli", "servicepoint-cli": "servicepoint-cli",
@ -262,9 +249,7 @@
"naersk": [ "naersk": [
"naersk" "naersk"
], ],
"nix-filter": [ "nix-filter": "nix-filter",
"nix-filter"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -288,9 +273,7 @@
"naersk": [ "naersk": [
"naersk" "naersk"
], ],
"nix-filter": [ "nix-filter": "nix-filter_2",
"nix-filter"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -327,16 +310,16 @@
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748488455, "lastModified": 1739246919,
"narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Supreeeme", "owner": "Supreeeme",
"ref": "v0.6", "ref": "v0.5.1",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
@ -344,11 +327,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750821680, "lastModified": 1748488455,
"narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=", "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac", "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
"type": "github" "type": "github"
}, },
"original": { "original": {

34
flake.nix
View file

@ -11,10 +11,7 @@
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
}; };
niri = { niri = {
@ -35,35 +32,17 @@
servicepoint-cli = { servicepoint-cli = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"; url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs"; inputs.naersk.follows = "naersk";
naersk.follows = "naersk";
nix-filter.follows = "nix-filter";
};
}; };
servicepoint-simulator = { servicepoint-simulator = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"; url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs"; inputs.naersk.follows = "naersk";
naersk.follows = "naersk";
nix-filter.follows = "nix-filter";
}; };
}; };
nix-vscode-extensions = {
url = "github:nix-community/nix-vscode-extensions";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
# this is used to pin transitive dependencies to the same version
flake-utils.url = "github:numtide/flake-utils";
nix-filter.url = "github:numtide/nix-filter";
};
outputs = outputs =
inputs@{ inputs@{
self, self,
@ -76,8 +55,6 @@
servicepoint-cli, servicepoint-cli,
servicepoint-simulator, servicepoint-simulator,
naersk, naersk,
nix-vscode-extensions,
...
}: }:
let let
devices = { devices = {
@ -136,7 +113,6 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
niri.overlays.niri niri.overlays.niri
overlays.servicepoint-packages overlays.servicepoint-packages
nix-vscode-extensions.overlays.default
]; ];
} }
]); ]);

2
home/vinzenz/default.nix
View file

@ -47,8 +47,6 @@
"jetbrains-toolbox" "jetbrains-toolbox"
"anydesk" "anydesk"
"vscode-extension-ms-dotnettools-csharp"
]; ];
}; };
} }

16
home/vinzenz/vscode.nix
View file

@ -7,9 +7,7 @@
package = pkgs.vscodium; package = pkgs.vscodium;
profiles.default = { profiles.default = {
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = extensions = with pkgs.vscode-extensions; [
with pkgs.nix-vscode-extensions.open-vsx;
[
jnoortheen.nix-ide jnoortheen.nix-ide
ms-python.python ms-python.python
editorconfig.editorconfig editorconfig.editorconfig
@ -20,14 +18,12 @@
tamasfe.even-better-toml tamasfe.even-better-toml
llvm-vs-code-extensions.vscode-clangd llvm-vs-code-extensions.vscode-clangd
mkhl.direnv mkhl.direnv
muhammad-sammy.csharp
davidanson.vscode-markdownlint
]
++ (with pkgs.vscode-extensions; [
vadimcn.vscode-lldb vadimcn.vscode-lldb
# ms-dotnettools.csharp
# ms-vscode-remote.remote-ssh
RoweWilsonFrederiskHolme.wikitext RoweWilsonFrederiskHolme.wikitext
ms-dotnettools.csharp davidanson.vscode-markdownlint
]); ];
userSettings = { userSettings = {
"files.autoSave" = "afterDelay"; "files.autoSave" = "afterDelay";
"files.autoSaveWhenNoErrors" = true; "files.autoSaveWhenNoErrors" = true;
@ -70,8 +66,6 @@
}; };
}; };
"dotnetAcquisitionExtension.sharedExistingDotnetPath" = "${lib.getBin pkgs.dotnet-sdk}/bin/dotnet";
"\[makefile\]" = { "\[makefile\]" = {
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
"editor.detectIndentation" = false; "editor.detectIndentation" = false;