going back to stable
This commit is contained in:
parent
40bd35b02e
commit
c81275e7d8
7 changed files with 59 additions and 60 deletions
73
flake.lock
generated
73
flake.lock
generated
|
@ -127,11 +127,11 @@
|
||||||
},
|
},
|
||||||
"gpdPocket3_nixpkgs": {
|
"gpdPocket3_nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722791413,
|
"lastModified": 1724855419,
|
||||||
"narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
|
"narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
|
"rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -148,32 +148,32 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722630065,
|
"lastModified": 1720042825,
|
||||||
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
|
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "afc892db74d65042031a093adb6010c4c3378422",
|
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "master",
|
"ref": "release-24.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"h002_nixpkgs": {
|
"h002_nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722630782,
|
"lastModified": 1724855419,
|
||||||
"narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
|
"narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
|
"rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -207,32 +207,32 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723399884,
|
"lastModified": 1720042825,
|
||||||
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
|
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
|
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "master",
|
"ref": "release-24.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"joe_nixpkgs": {
|
"joe_nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723637854,
|
"lastModified": 1724855419,
|
||||||
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
"narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
"rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -255,11 +255,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_stable": {
|
"nixpkgs_stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723556749,
|
"lastModified": 1724855419,
|
||||||
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
|
"narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4a92571f9207810b559c9eac203d1f4d79830073",
|
"rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -269,22 +269,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_unstable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1723737611,
|
|
||||||
"narHash": "sha256-PFWdNM5D2qKeDl9H/5ImPnBjEuleHkWwCc3Pm91zT58=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fd61e577354dcc704bfcdc82d26608196fad6043",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "master",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nvim_plugin-Almo7aya/openingh.nvim": {
|
"nvim_plugin-Almo7aya/openingh.nvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -1012,11 +996,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720792364,
|
"lastModified": 1724598927,
|
||||||
"narHash": "sha256-3AvMMvTKkvtDPlTtBZADrQaIRHjW09EO9uyEZNdHOkw=",
|
"narHash": "sha256-/95p6Jr/DqguBqz3NCC+GG3Vdzh/++TokRL3BhWXdDM=",
|
||||||
"owner": "yunfachi",
|
"owner": "yunfachi",
|
||||||
"repo": "nypkgs",
|
"repo": "nypkgs",
|
||||||
"rev": "209a7be0d39ee9a3f5a726abddcdf79753c4f47e",
|
"rev": "35047cb449349f489536b26e5992acfe8256f292",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1100,11 +1084,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721846637,
|
"lastModified": 1724371946,
|
||||||
"narHash": "sha256-BVtrOHTDeQILjacb++lyN8km8fyRA/8186hIxoxlImU=",
|
"narHash": "sha256-9mrd0PA2l5kDW6S3jFsQyowSI3R5Vf09SunYOx3Zc0E=",
|
||||||
"owner": "RingOfStorms",
|
"owner": "RingOfStorms",
|
||||||
"repo": "nvim",
|
"repo": "nvim",
|
||||||
"rev": "76504a2fd5467c9e812ee7c8db7eb1d350160fd1",
|
"rev": "2a0bb2617bd38534b1652a13f42a67585b71e9e1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1122,7 +1106,6 @@
|
||||||
"joe_home-manager": "joe_home-manager",
|
"joe_home-manager": "joe_home-manager",
|
||||||
"joe_nixpkgs": "joe_nixpkgs",
|
"joe_nixpkgs": "joe_nixpkgs",
|
||||||
"nixpkgs_stable": "nixpkgs_stable",
|
"nixpkgs_stable": "nixpkgs_stable",
|
||||||
"nixpkgs_unstable": "nixpkgs_unstable",
|
|
||||||
"nypkgs": "nypkgs",
|
"nypkgs": "nypkgs",
|
||||||
"ragenix": "ragenix",
|
"ragenix": "ragenix",
|
||||||
"ringofstorms-nvim": "ringofstorms-nvim"
|
"ringofstorms-nvim": "ringofstorms-nvim"
|
||||||
|
|
22
flake.nix
22
flake.nix
|
@ -2,31 +2,36 @@
|
||||||
description = "My systems flake";
|
description = "My systems flake";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs_unstable.url = "github:nixos/nixpkgs/master";
|
# TODO_nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs_stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
# TODO_home-manager= {
|
||||||
|
# url = "github:nix-community/home-manager/master";
|
||||||
joe_nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
# inputs.nixpkgs.follows = "TODO_nixpkgs";
|
||||||
|
# };
|
||||||
|
# Host flake pinning
|
||||||
|
joe_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
joe_home-manager= {
|
joe_home-manager= {
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "joe_nixpkgs";
|
inputs.nixpkgs.follows = "joe_nixpkgs";
|
||||||
};
|
};
|
||||||
h002_nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
|
||||||
|
h002_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
h002_home-manager= {
|
h002_home-manager= {
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "h002_nixpkgs";
|
inputs.nixpkgs.follows = "h002_nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpdPocket3_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
gpdPocket3_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
gpdPocket3_home-manager= {
|
gpdPocket3_home-manager= {
|
||||||
url = "github:nix-community/home-manager/release-24.05";
|
url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "gpdPocket3_nixpkgs";
|
inputs.nixpkgs.follows = "gpdPocket3_nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixpkgs_stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
# Nix utility methods
|
# Nix utility methods
|
||||||
nypkgs = {
|
nypkgs = {
|
||||||
url = "github:yunfachi/nypkgs";
|
url = "github:yunfachi/nypkgs";
|
||||||
inputs.nixpkgs.follows = "nixpkgs_stable";
|
inputs.nixpkgs.follows = "nixpkgs_stable";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Secrets management for nix
|
# Secrets management for nix
|
||||||
ragenix = {
|
ragenix = {
|
||||||
url = "github:yaxitech/ragenix";
|
url = "github:yaxitech/ragenix";
|
||||||
|
@ -35,7 +40,6 @@
|
||||||
|
|
||||||
ringofstorms-nvim = {
|
ringofstorms-nvim = {
|
||||||
url = "github:RingOfStorms/nvim";
|
url = "github:RingOfStorms/nvim";
|
||||||
# inputs.nixpkgs.follows = "nixpkgs_unstable";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
};
|
};
|
||||||
services.gnome.core-utilities.enable = false;
|
services.gnome.core-utilities.enable = false;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
dconf-editor
|
gnome.dconf-editor
|
||||||
# wayland clipboard in terminal
|
# wayland clipboard in terminal
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
];
|
];
|
||||||
|
|
|
@ -79,8 +79,12 @@
|
||||||
"thunderbolt"
|
"thunderbolt"
|
||||||
];
|
];
|
||||||
services.xserver.videoDrivers = [ "intel" ];
|
services.xserver.videoDrivers = [ "intel" ];
|
||||||
hardware.opengl.driSupport32Bit = true;
|
hardware.opengl = {
|
||||||
hardware.graphics.enable = true;
|
enable = true;
|
||||||
|
driSupport = true;
|
||||||
|
};
|
||||||
|
# hardware.opengl.driSupport32Bit = true;
|
||||||
|
# hardware.graphics.enable = true;
|
||||||
|
|
||||||
hardware.opengl.extraPackages = with pkgs; [
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
|
|
|
@ -43,8 +43,13 @@
|
||||||
# nvidia gfx https://nixos.wiki/wiki/Nvidia
|
# nvidia gfx https://nixos.wiki/wiki/Nvidia
|
||||||
# =========
|
# =========
|
||||||
# Enable OpenGL
|
# Enable OpenGL
|
||||||
hardware.opengl.driSupport32Bit = true;
|
hardware.opengl = {
|
||||||
hardware.graphics.enable = true;
|
enable = true;
|
||||||
|
# driSupport = true;
|
||||||
|
driSupport32Bit = true;
|
||||||
|
};
|
||||||
|
# hardware.opengl.driSupport32Bit = true;
|
||||||
|
# hardware.graphics.enable = true;
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
hardware.nvidia-container-toolkit.enable = true;
|
hardware.nvidia-container-toolkit.enable = true;
|
||||||
|
|
|
@ -36,6 +36,9 @@
|
||||||
mantle = "#1f1f1f";
|
mantle = "#1f1f1f";
|
||||||
crust = "#171717";
|
crust = "#171717";
|
||||||
};
|
};
|
||||||
|
nix_shell = {
|
||||||
|
heuristic = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [ nautilus qimgv ];
|
home.packages = with pkgs; [ gnome.nautilus qimgv ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue