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

fixing updates

Browse source
This commit is contained in:
Ingolf Wagner 2023-02-16 21:43:28 +01:00
parent 4a7826fee1
commit c11e1943e2
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
4 changed files with 42 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
flake.lock
View file

@ -29,11 +29,11 @@
"stable": "stable" "stable": "stable"
}, },
"locked": { "locked": {
"lastModified": 1675400331, "lastModified": 1675730932,
"narHash": "sha256-ja0DhWBARzcimqMBhQ+DP7NQoJSlNasqvlj5GiHRYY0=", "narHash": "sha256-XcmirehPIcZGS7PzkS3WvAYQ9GBlBvCxYToIOIV2PVE=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "colmena", "repo": "colmena",
"rev": "31d8240504e91c3ea5c758d92f02f94af3fae6c3", "rev": "e034c15825c439131e4489de5a82cf8e5398fa61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,11 +138,11 @@
"emacs-overlay_2": { "emacs-overlay_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1675674706, "lastModified": 1676543864,
"narHash": "sha256-OkbmD3qf+Lv5P7n7sr6TEOO57whO7DxViGS/7UpdT+c=", "narHash": "sha256-ZdPhRGbUb0cFWd+iYtoIH0CIslnnTH2fJNEkpbtJzJE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "cf267241b56b425d20faed46ab8e16dd0434a663", "rev": "4bb9abd04a46a7b52ff07af252204ca3ce6d337f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -508,11 +508,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1674550793, "lastModified": 1675933606,
"narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", "narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", "rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,11 +545,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674305531, "lastModified": 1676282852,
"narHash": "sha256-0p7gNg56XlmZJrk5VIv4ZGnO6mkJ50eCNKoLaOvTH0w=", "narHash": "sha256-iEUGygxGB90E9t+lhVl8HD9FL2cz+1vUrgBDGKeIdWw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-fmt", "repo": "nixpkgs-fmt",
"rev": "d94168e9d7f8ffb24fe43726d3f9bd29c95b9ef3", "rev": "f4c3f141c2821589198bffe07f2f45681540504f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -576,11 +576,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1675556398, "lastModified": 1676162277,
"narHash": "sha256-5Gf5KlmFXfIGVQb2hmiiE7FQHoLd4UtEhIolLQvNB/A=", "narHash": "sha256-GK3cnvKNo1l0skGYXXiLJ/TLqdKyIYXd7jOlo0gN+Qw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e32c33811815ca4a535a16faf1c83eeb4493145b", "rev": "d863ca850a06d91365c01620dcac342574ecf46f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -592,11 +592,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1675545634, "lastModified": 1676300157,
"narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1675600654, "lastModified": 1676375384,
"narHash": "sha256-ipsDTkzRq1CAl2g5tYd7ugjVMSKF6KLh9F+5Kso0lT0=", "narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cff83d5032a21aad4f69bf284e95b5f564f4a54e", "rev": "c43f676c938662072772339be6269226c77b51b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +653,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1675523619, "lastModified": 1675940568,
"narHash": "sha256-jHvkAwkbAj1s0O5riHMghSDHh9iz8AwLTbXQuVQKQcg=", "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a211d5e8d18b20b5a2b22157266cc00f8c4f3b9", "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -821,17 +821,17 @@
}, },
"retiolum": { "retiolum": {
"locked": { "locked": {
"lastModified": 1675172931, "lastModified": 1676473689,
"narHash": "sha256-ZDnwiqDJHF3Bxf+JpzRtqNY9jsGO7+z8P854o9JQCs4=", "narHash": "sha256-TGQbsiIojBj4DvGhhkI3i2dq9NmU2Vkt+i7Rw2U/BEg=",
"ref": "refs/heads/master", "owner": "Mic92",
"rev": "a0078df20c98fd5bc199385985e652dad5ac4fe9", "repo": "retiolum",
"revCount": 279, "rev": "30152917194d6e54ce68e45b499323356db3ae7c",
"type": "git", "type": "github"
"url": "file:///home/palo/dev/nixos/retiolum"
}, },
"original": { "original": {
"type": "git", "owner": "Mic92",
"url": "file:///home/palo/dev/nixos/retiolum" "repo": "retiolum",
"type": "github"
} }
}, },
"revealjs": { "revealjs": {
@ -944,11 +944,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1675566616, "lastModified": 1676171095,
"narHash": "sha256-Wki1ffvQUIB044M9ltjOxpXJGsqnQiVQPvMpQ0RiEBE=", "narHash": "sha256-2laeSjBAAJ9e/C3uTIPb287iX8qeVLtWiilw1uxqG+A=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4d16c18787ba8ff80c1ff8db25c5ca56f68ceed3", "rev": "c5dab21d8706afc7ceb05c23d4244dcb48d6aade",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -60,8 +60,8 @@
flake = false; flake = false;
}; };
retiolum = { retiolum = {
#url = "github:Mic92/retiolum"; url = "github:Mic92/retiolum";
url = "git+file:///home/palo/dev/nixos/retiolum"; #url = "git+file:///home/palo/dev/nixos/retiolum";
}; };
landingpage = { landingpage = {
#url = "git+file:///home/palo/dev/landingpage"; #url = "git+file:///home/palo/dev/landingpage";

6
nixos/machines/cream/configuration.nix
View file

@ -51,6 +51,7 @@
programs.custom.urxvt.fontType = "vector"; programs.custom.urxvt.fontType = "vector";
programs.custom.xterm.fontSize = 16; programs.custom.xterm.fontSize = 16;
# todo : add xterm fontType # todo : add xterm fontType
# programs.custom.xterm.fontType = "vector";
virtualisation = { virtualisation = {
docker.enable = true; docker.enable = true;
@ -68,7 +69,8 @@
}; };
services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.videoDrivers = [ "modesetting" ]; #services.xserver.displayManager.lightdm.enable = false;
#services.xserver.displayManager.sddm.enable = true;
custom.samba-share = { custom.samba-share = {
enable = false; enable = false;
@ -81,7 +83,7 @@
# for congress and streaming # for congress and streaming
hardware.opengl = { hardware.opengl = {
enable = true; enable = true; # todo I actually want opengl
#driSupport = true; #driSupport = true;
#driSupport32Bit = true; #driSupport32Bit = true;
}; };

9
nixos/modules/system/x11.nix
View file

@ -21,18 +21,9 @@ in
enable = true; enable = true;
# Configure video Drivers
# -----------------------
videoDrivers = [ "intel" ];
deviceSection = ''
Option "DRI" "2"
Option "TearFree" "true"
'';
# window-manager : Xmonad # window-manager : Xmonad
# ----------------------- # -----------------------
displayManager = { displayManager = {
#defaultSession = lib.mkDefault "none+xmonad";
defaultSession = lib.mkDefault "none+i3"; defaultSession = lib.mkDefault "none+i3";
autoLogin.enable = lib.mkDefault true; autoLogin.enable = lib.mkDefault true;
autoLogin.user = cfg.autoLoginUser; autoLogin.user = cfg.autoLoginUser;